Skip to content

M
mes-ui
Commit ed0ece29 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

工艺设置，未设置

parent b945fd4f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 412 additions and 113 deletions
pages/order/monitoring/index.vue
View file @ ed0ece29
This diff is collapsed.
pages/technology/setProcess/api.js 0 → 100644
View file @ ed0ece29
import Api from '@/plugins/request'
export default {
index: `${PlanUrl}/mesorders/getpagedmesordersforpdefm`,
paged(params) {
return Api.post(`${PlanUrl}/mesorders/getpagedmesordersforpdefm`, params);
},
index1: `${technologyUrl}routingheader/paged`,
paged1(params) {
return Api.post(`${technologyUrl}routingheader/paged`, params);
},
// get(params) {
// return Api.get(`${technologyUrl}routingheader/get`, params);
// },
// create(params) {
// return Api.post(`${technologyUrl}routingheader/create`, params);
// },
// update(params) {
// return Api.put(`${technologyUrl}routingheader/update`, params);
// },
// getCloneHeader(params){
// return Api.post(`${technologyUrl}routingheader/cloneheader`,params);
// },
// getCodeNumber(params){
// return Api.post(`${systemUrl}/cache/generate_serialcode`,params);
// },
// delete(id) {
// return Api.delete(`${technologyUrl}routingheader/delete`, {
// params: {
// id: id
// }
// });
// },
// deletes(params) {
// return Api.post(`${technologyUrl}routingheader/batchdelete`, params);
// }
}
pages/technology/setProcess/index.vue
View file @ ed0ece29
......@@ -13,8 +13,11 @@
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="productingpreparationpeople" style="width:200px">
<departmentSelect v-model="easySearch.productingpreparationpeople.value" :type="3"></departmentSelect>
</FormItem>
<FormItem prop="keys">
<Input placeholder="请输入订单编号/产品名称" v-model="easySearch.keys.value" />
<Input placeholder="请输入订单编号/产品名称" v-model="easySearch.keys.value" clearable/>
</FormItem>
<FormItem>
<Button type="primary" @click="search">查询</Button>
......@@ -32,9 +35,20 @@
</DataGrid>
</Content>
</Layout>
<Modal
v-model="modal"
:title="title"
width="1200"
footer-hide
fullscreen
:mask-closable="false"
>
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal>
</div>
</template>
<script>
import Api from "./api";
import ProductTree from "@/components/page/productTree.vue"; //左侧树列表
import Search from "./search";
export default {
......@@ -44,54 +58,82 @@ export default {
},
data() {
return {
action: "",
action: Api.index,
showMenu: true,
showMenu: true,
title: "",
curId: 0,
detail: null,
modal: false,
easySearch: {
keys: { op: "mmcode,name", value: null },
levelId: { op: "In", value: "" },
upId: { op: "In", value: 0 },
keys: { op: "mescode,productName", value: null },
productingpreparationpeople: { op: "Equal", value: null },
},
columns: [
{ type: "selection", width: 70, align: "center" },
// { type: "selection", width: 70, align: "center" },
{
title: "序号",
key: "id",
type: "index",
width: 80,
align: "center",
},
{
title: "订单编号",
key: "mesCode",
align: "center",
},
{
title: "任务类型",
key: "taskTypeName",
key: "taskType",
align: "center",
code: "plan.order.taskType",
},
{
title: "产品名称",
key: "productName",
align: "center",
},
{ title: "图号", key: "drawnNumber" },
{ title: "项目号", key: "projectNumber" },
{ title: "批次号", key: "batchNumber" },
{ title: "数量", key: "quantity", align: "center" },
{
title: "工艺规程",
key: "mainRoutingID",
code: "process.RoutingStatus",
key: "mainRoutingStatus",
render: (h, params) => {
return h(
"div",
[
h("state", {
props: {
code: "process.RoutingStatus",
type: "text",
value:
params.row.mainRoutingStatus != 4
? params.row.mainRoutingStatus
: "",
},
}),
h(
"a",
{
on: {
click: () => {
this.record(params.row);
},
},
},
params.row.mainRoutingStatus == 4 ? "未设置" : ""
),
],
{}
);
},
},
{
title: "料单",
key: "materialbillID",
key: "materialbillStatus",
code: "process.RoutingStatus",
},
],
......@@ -101,6 +143,12 @@ export default {
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
record(row) {
this.curId = 0;
this.title = "设置";
this.detail = () => import("./set");
this.modal = true;
},
onHide() {
this.showMenu = false;
},
......@@ -108,13 +156,8 @@ export default {
this.showMenu = true;
},
productSearch(id, item, ids) {
if (ids.length > 0) {
this.orderSearchForm.productId = ids.join(",");
} else {
this.orderSearchForm.productId = "-1";
this.orderSearchForm.productName = "";
}
this.easySearch(this.orderSearchForm);
let where = { productId: { op: "In", value: ids } };
this.$refs.grid.reload(where);
},
search() {
this.$refs.grid.reload(this.easySearch);
......@@ -122,6 +165,15 @@ export default {
search2() {
this.$refs.grid.modalSearch = true;
},
ok() {
this.$refs.grid.load();
this.modal = false;
this.curId = 0;
},
cancel() {
this.curId = 0;
this.modal = false;
},
},
};
</script>
......
pages/technology/setProcess/set.vue 0 → 100644
View file @ ed0ece29
<template>
<div class="product-mix">
<Layout>
<Sider hide-trigger v-if="showMenu" width="300">
<ProductTree @on-hide="onHide" @on-select="productSearch" />
</Sider>
<div v-if="!showMenu" class="show_menu">
<a class="menu_play fr" @click="showMenuFn" title="展开">
<Icon type="ios-arrow-forward" size="24" />
</a>
</div>
<Content :class="!showMenu?'con_bord':''">
<DataGrid
:columns="columns"
ref="grid"
:action="action"
:conditions="easySearch"
:set="false"
>
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input
placeholder="请输入工艺名称/工艺编号"
v-width="200"
v-model="easySearch.keys.value"
clearable
/>
</FormItem>
<FormItem>
<Button type="primary" @click="search">查询</Button>
</FormItem>
</Form>
</template>
</DataGrid>
</Content>
</Layout>
</div>
</template>
<script>
import Api from "./api";
import ProductTree from "@/components/page/productTree.vue"; //左侧树列表
export default {
components: {
ProductTree,
},
data() {
return {
action: Api.index1,
showMenu: true,
showMenu: true,
title: "",
easySearch: {
keys: { op: "unicode,name,code", value: null },
},
columns: [
{ type: "selection", width: 70, align: "center" },
{
key: "code",
title: this.l("code"),
align: "left",
width: 200,
easy: true,
high: true,
},
{
key: "name",
title: this.l("name"),
align: "left",
easy: true,
high: true,
tooltip: true,
},
{
key: "phase",
title: this.l("phase"),
align: "center",
high: true,
width: 100,
code: "Process.Routing.phase",
},
{
key: "versionid",
title: this.l("version"),
align: "center",
high: true,
width: 100,
code: "Process.Routing.version",
},
{
title: this.l("approvalStatus"),
key: "approvalStatus",
align: "center",
width: "120",
code: "process.RoutingStatus",
},
{
key: "routingType",
title: this.l("routingType"),
align: "center",
width: 100,
high: true,
code: "Process.Routing.routingType",
},
{
key: "drawingNo",
title: this.l("drawingNo"),
align: "left",
high: true,
},
{
key: "productName",
title: this.l("productName"),
align: "left",
high: true,
tooltip: true,
},
{
key: "departmentName",
title: this.l("departmentName"),
width: 100,
align: "left",
high: true,
tooltip: true,
},
{
key: "isEffect",
title: this.l("isEffect"),
align: "center",
width: 80,
high: true,
code: "Process.Status",
},
{
key: "creationTime",
title: this.$t("creationTime"),
align: "left",
hide: true,
},
{
key: "creatorUserId",
title: this.$t("creatorUserId"),
align: "left",
hide: true,
type: "user",
},
{
key: "lastModificationTime",
title: this.$t("lastModificationTime"),
align: "left",
hide: true,
},
{
key: "lastModifierUserId",
title: this.$t("lastModifierUserId"),
align: "left",
hide: true,
type: "user",
},
],
};
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
record(row) {
alert(1);
},
onHide() {
this.showMenu = false;
},
showMenuFn() {
this.showMenu = true;
},
productSearch(id, item, ids) {
let where = { productId: { op: "In", value: ids } };
this.$refs.grid.reload(where);
},
search() {
this.$refs.grid.reload(this.easySearch);
},
l(key) {
let vkey = "routingHeader" + "." + key;
return this.$t(vkey) || key;
},
},
};
</script>
<style lang="less">
.product-mix {
font-family: Microsoft YaHei;
padding-top: 3px;
.ivu-layout-sider {
background: rgba(255, 255, 255, 1);
margin-right: 10px;
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
height: 91vh;
overflow: auto;
}
.ivu-layout-content {
// margin-left: 5px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
overflow: auto;
padding: 10px;
height: 91vh;
}
}
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment