details

package-lock.json

@@ -15362,8 +15362,7 @@
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -15523,7 +15522,6 @@
               "version": "2.9.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -15542,7 +15540,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -15645,7 +15642,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -15731,8 +15727,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -15768,7 +15763,6 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -15832,14 +15826,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
@@ -18617,6 +18609,7 @@
             "minimatch": {
               "version": "3.0.4",
               "bundled": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -19485,7 +19478,6 @@
               "version": "2.9.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -19504,7 +19496,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -19607,7 +19598,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -19693,8 +19683,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -19794,14 +19783,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },

pages/aps/complete/index.vue

@@ -5,9 +5,9 @@
         <Col :span="6" class="chan-chi">排产池</Col>
         <Col :span="18" class="l-ringht">
           <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
-            <Radio label="-1">全部</Radio>
             <Radio label="0">未排产</Radio>
             <Radio label="2">已排查</Radio>
+            <!-- <Radio label="-1">全部</Radio> -->
           </RadioGroup>
         </Col>
       </Row>
@@ -20,7 +20,11 @@
         >
           <Row class="title-i">
             <Col :span="20" class="order-code">
-              <Checkbox v-model="li.checked" @on-change="checkData(li)">订单号：{{li.mesCode}}</Checkbox>
+              <Checkbox
+                v-model="li.checked"
+                @on-change="checkData(li)"
+                :disabled="isdisabled"
+              >订单号：{{li.mesCode}}</Checkbox>
             </Col>
             <Col :span="4" class="order-ringht">
               <Icon type="md-close" @click="close(li.id)" />
@@ -130,19 +134,18 @@ export default {
   },
   data() {
     return {
-      //   activeindex: 1,
       list: [],
-      status: "-1", //全部排产-1，0为未排产；2为已排查；
+      status: "0", //全部排产-1，0为未排产；2为已排查；
+      isdisabled: false,
       formItem: {
-        // resourcesType: 0,
         radio: "0",
         time: "",
         beginTime: "",
         endTime: "",
         remark: "",
         departmentTitle: "",
-        shopId: "",
-        userName: ""
+        shopId: ""
+        // userName: ""
       },
       //   listGroup: [
       //     {
@@ -182,13 +185,18 @@ export default {
     };
   },
   created() {
-    this.orderlist(-1);
+    this.orderlist(0);
   },
   methods: {
     // 过滤条件
     changeStatus(name) {
       this.status = name;
       this.orderlist(this.status);
+      if (this.status == 1) {
+        this.isdisabled = true;
+      } else {
+        this.isdisabled = false;
+      }
     },
     //排产池列表
     orderlist(a) {
@@ -233,13 +241,14 @@ export default {
           userIds: this.formItem.userIds,
           beginTime: this.formItem.beginTime,
           endTime: this.formItem.endTime,
-          remark: this.formItem.remark,
-          userName: this.formItem.userName
+          remark: this.formItem.remark
+          // userName: this.formItem.userName
         };
         Api.cmonestepschedule(params1).then(r => {
           if (r.success) {
             this.$Message.success("下发成功");
             this.orderlist(this.status);
+            this.orderIds = [];
           } else {
             this.$Message.success("下发失败");
             this.formItem = {};
@@ -259,6 +268,7 @@ export default {
           if (r.success) {
             this.$Message.success("下发成功");
             this.orderlist(this.status);
+            this.orderIds = [];
             this.formItem = {};
             this.formItem.radio = 0;
           } else {

pages/aps/stream/index.vue

@@ -5,9 +5,9 @@
         <Col :span="6" class="chan-chi">排产池</Col>
         <Col :span="18" class="l-ringht">
           <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
-            <Radio label="-1">全部</Radio>
             <Radio label="0">未排产</Radio>
             <Radio label="2">已排查</Radio>
+            <Radio label="-1">全部</Radio>
           </RadioGroup>
         </Col>
       </Row>
@@ -152,7 +152,7 @@ export default {
       active: null,
       activeindex: 1,
       list: [],
-      status: "-1", //全部排产-1，0为未排产；2为已排查；
+      status: "0", //全部排产-1，0为未排产；2为已排查；
       result: [],
       isactive: null,
       resourcesType: null,
@@ -161,13 +161,13 @@ export default {
       maxnum: 1,
       chaiModal: false,
       orderId: 0,
-      quantity: 0,
+
       routingHeaderId: 0,
       detailId: 0
     };
   },
   created() {
-    this.orderlist(-1);
+    this.orderlist(0);
   },
   methods: {
     // 排产池过滤条件
@@ -217,7 +217,6 @@ export default {
             u.chai = false;
           });
           this.result = r.result;
-          this.quantity = r.result.quantity;
         }
       });
     },
@@ -303,7 +302,7 @@ export default {
     },
     //下发
     lowerHair() {
-      if (this.orderId || this.quantity) {
+      if (this.orderId) {
         var items = [];
         var obj = {};
         if (this.mode == 1) {
@@ -324,7 +323,7 @@ export default {
             items: items
           };
           Api.flonestepschedule(data).then(r => {
-            if (r.success) {
+            if (r.result) {
               this.$Message.success("下发成功");
               this.orderlist(this.status);
             } else {
@@ -349,7 +348,7 @@ export default {
             items: items
           };
           Api.fltwostepschedule(data).then(r => {
-            if (r.success) {
+            if (r.result) {
               this.$Message.success("下发成功");
               this.orderlist(this.status);
             } else {

pages/technology/details/routingStep/api.js

@@ -11,7 +11,7 @@ export default {
     return Api.post(`${technologyUrl}routingstep/create`,params);
     },
     update(params){
-    return Api.post(`${technologyUrl}routingstep/update`,params);
+    return Api.put(`${technologyUrl}routingstep/update`,params);
     },
     delete(id) {
     return Api.delete(`${technologyUrl}routingstep/delete`,{params:{id:id}});

pages/technology/details/routingStep/index.vue

@@ -3,9 +3,11 @@
     <DataGrid :columns="columns" ref="grid" :action="action">
       <template slot="easySearch">
         <Form ref="formInline" :model="easySearch" inline>
+            <!-- <Poptip trigger="focus" title="Title" content="请输入关键字工步名称/描述/备注/工步内容"> -->
           <FormItem prop="keys">
-            <Input placeholder="请输入关键字工步名称/描述/备注/工步内容" v-model="easySearch.keys.value" />
+                <Input placeholder="请输入关键字工步名称/描述/备注/工步内容" v-model="easySearch.keys.value" />
           </FormItem>
+            <!-- <Poptip/> -->
           <FormItem>
             <Button type="primary" @click="search">查询</Button>
           </FormItem>
@@ -79,13 +81,13 @@ export default {
         {
           key: "routingHeaderId",
           title: this.l("routingHeaderId"),
-          hide: true,
+          high: true,
           align: "left"
         },
         {
           key: "routingDetailId",
           title: this.l("routingDetailId"),
-          hide: true,
+          high: true,
           align: "left"
         },
         { key: "classId", title: this.l("classId"), hide: true, align: "left" },
@@ -101,8 +103,13 @@ export default {
           key: "description",
           title: this.l("description"),
           align: "left",
-          easy: true,
-          high: true
+          hide: true
+        },
+        {
+          key: "stepContent",
+          title: this.l("stepContent"),
+          align: "left",
+          hide: true
         },
         {
           key: "status",

pages/technology/index.vue

@@ -16,7 +16,7 @@
   right: 0;
   //   bottom:100%;
   //   right: 100%;
-  z-index: 990;
+  z-index: 898;
   background-color: white;
   // background: red;
   .top {