工艺设置

pages/processManage/setProcess/index.vue

@@ -490,7 +490,6 @@ export default {
         organizType: 0,
         organizName: ""
       },
-
       newColumn: [],
       value: "",
       column: [],

pages/technology/setProcess/api.js

@@ -8,9 +8,10 @@ export default {
   paged1(params) {
     return Api.post(`${technologyUrl}routingheader/paged`, params);
   },
-//   get(params) {
-//     return Api.get(`${technologyUrl}routingheader/get`, params);
-//   },
+  
+  routingset(params) {
+    return Api.post(`${technologyUrl}orderrouting/routingset`, params);
+  },
 //   create(params) {
 //     return Api.post(`${technologyUrl}routingheader/create`, params);
 //   },

pages/technology/setProcess/index.vue

@@ -17,16 +17,11 @@
                 <departmentSelect v-model="easySearch.productingpreparationpeople.value" :type="3"></departmentSelect>
               </FormItem>
               <FormItem prop="keys">
-                <Input placeholder="请输入订单编号/产品名称" v-model="easySearch.keys.value" clearable/>
+                <Input placeholder="请输入订单编号/产品名称" v-model="easySearch.keys.value" clearable />
               </FormItem>
               <FormItem>
                 <Button type="primary" @click="search">查询</Button>
               </FormItem>
-              <!-- <FormItem>
-                <Button @click="search2" type="text">
-                  <Icon type="md-search" />高级
-                </Button>
-              </FormItem>-->
             </Form>
           </template>
           <template slot="searchForm">
@@ -43,7 +38,7 @@
       fullscreen
       :mask-closable="false"
     >
-      <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
+      <component :is="detail" :eid="child" @on-close="cancel" @on-ok="ok" />
     </Modal>
   </div>
 </template>
@@ -60,9 +55,13 @@ export default {
     return {
       action: Api.index,
       showMenu: true,
-      showMenu: true,
       title: "",
-      curId: 0,
+      child: {
+        curId: 0,
+        productingPreparationPeople: 0,
+        orderIds: 0,
+      },
+
       detail: null,
       modal: false,
 
@@ -74,7 +73,8 @@ export default {
         // { type: "selection", width: 70, align: "center" },
         {
           title: "序号",
-          type: "index",
+          key: "id",
+          // type: "index",
           width: 80,
           align: "center",
         },
@@ -102,40 +102,38 @@ export default {
           title: "工艺规程",
           key: "mainRoutingStatus",
           render: (h, params) => {
-            return h(
-              "div",
-              [
-                h("state", {
-                  props: {
-                    code: "process.RoutingStatus",
-                    type: "text",
-                    value:
-                      params.row.mainRoutingStatus != 4
-                        ? params.row.mainRoutingStatus
-                        : "",
+            return h("a", [
+              h("state", {
+                props: {
+                  code: "process.RoutingStatus",
+                  type: "text",
+                  value: params.row.mainRoutingStatus,
+                },
+                nativeOn: {
+                  click: () => {
+                    this.record(params.row);
                   },
-                }),
-                h(
-                  "a",
-                  {
-                    on: {
-                      click: () => {
-                        this.record(params.row);
-                      },
-                    },
-                  },
-                  params.row.mainRoutingStatus == 4 ? "未设置" : ""
-                ),
-              ],
-              {}
-            );
+                },
+              }),
+              // h(
+              //   "a",
+              //   {
+              //     on: {
+              //       click: () => {
+              //         this.record(params.row);
+              //       },
+              //     },
+              //   },
+              //   params.row.mainRoutingStatus == 4 ? "未设置" : ""
+              // ),
+            ]);
           },
         },
-        {
-          title: "料单",
-          key: "materialbillStatus",
-          code: "process.RoutingStatus",
-        },
+        // {
+        //   title: "料单",
+        //   key: "materialbillStatus",
+        //   code: "process.RoutingStatus",
+        // },
       ],
     };
   },
@@ -144,10 +142,18 @@ export default {
   },
   methods: {
     record(row) {
-      this.curId = 0;
-      this.title = "设置";
-      this.detail = () => import("./set");
-      this.modal = true;
+      if (row.mainRoutingStatus == -1) {
+        //未设置
+        this.child.curId = row.productId;
+        this.child.productingPreparationPeople =
+          row.productingPreparationPeople;
+        this.child.orderIds = row.id;
+        this.title = "设置";
+        this.detail = () => import("./set");
+        this.modal = true;
+      } else if (row.mainRoutingStatus == 1) {
+        //受控中，查看
+      }
     },
     onHide() {
       this.showMenu = false;
@@ -168,10 +174,10 @@ export default {
     ok() {
       this.$refs.grid.load();
       this.modal = false;
-      this.curId = 0;
+      this.child.curId = 0;
     },
     cancel() {
-      this.curId = 0;
+      this.child.curId = 0;
       this.modal = false;
     },
   },