Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

package.json

@@ -48,7 +48,7 @@
     "vue-i18n": "^8.15.5",
     "vue-json-viewer": "^2.2.8",
     "vue-quill-editor": "^3.0.6",
-    "vue-slider-component": "^3.1.3",
+    "vue-slider-component": "^3.1.5",
     "vue-switches": "^2.0.1",
     "vue-ueditor-wrap": "^2.4.1",
     "vue2-editor": "^2.10.2",

pages/produce/execute/datafilling/entryrecorddata.vue

@@ -115,7 +115,7 @@ export default {
       this.datafrom.fill_in_user_type = fill_in_user_type;
       this.datafrom.data_type = 4;
       this.ids = [];
-      console.log(params);
+   
       if (
         fill_in_user_type == 1 &&    //自检
         params.selfchecklist != null &&
@@ -151,9 +151,9 @@ export default {
             : params.seizurechecklist.record_id;
       }
 
-      this.datafrom.product_code = product_code.join(",");
+      this.datafrom.product_code = product_code;
       // this.datafrom.board_code = board_code
-alert(2)
+
       this.loaddata();
     },
     loaddata() {
@@ -204,14 +204,20 @@ alert(2)
         this.moviedata.push(row);
         this.editIndex = this.moviedata.length - 1;
       } else {
+
         let lastindex = this.moviedata.length - 1;
 
+if(lastindex<0)
+{
+
+lastindex=0;
+}
         this.data_content1 = this.moviedata[lastindex].data_content1;
         this.data_content2 = this.moviedata[lastindex].data_content2;
         this.data_content3 = this.moviedata[lastindex].data_content3;
         this.editIndex = lastindex;
       }
-      this.datafrom.product_code = this.datafrom.product_code.join(",");
+      
     },
     handleEdit(row, index) {
       this.data_content1 = row.data_content1;

pages/produce/execute/datafilling/sendCheck.vue

@@ -6,7 +6,7 @@
        
         <span class="ml20">产品号</span>
         <Select
-          :disabled="disabled"
+          
           multiple
           @on-change="productonchange"
           v-model="product_ID"
@@ -121,6 +121,7 @@ export default {
     },
     handleClose() {},
     loadentry(entryModel) {
+      
       this.user.dispatch_id = entryModel.id
       this.user.execute_id = entryModel.executeId
       this.user.order_id = entryModel.order_id
@@ -128,14 +129,11 @@ export default {
       this.user.routingDetailId = entryModel.routingDetailId
       this.isMain = entryModel.isMain
 
-      if (this.isMain == 1) {
-        this.disabled = false
-      } else {
-        this.disabled = true
-      }
-      this.checker = []
-      ;(this.product_ID = []), (this.board_ID = []), this.loadproduct()
-      this.loaduser()
+   
+      this.checker = [];
+      this.product_ID = [];
+       this.loadproduct();
+     this.loaduser();
     },
     loadproduct() {
       var url =
@@ -144,7 +142,7 @@ export default {
 
       service.post(`${url}`).then((response) => {
         this.product_List = response.result
-        this.board_List = response.result
+       
       })
     },
     loaduser() {

pages/produce/execute/datafilling/usercard.vue

@@ -7,9 +7,9 @@
         <Select multiple @on-change="productonchange" v-model="product_ID" class="w200">
           <Option
             v-for="item in product_List"
-            :value="item.value"
+            :value="item.productids"
             :key="item.index"
-          >{{ item.label }}</Option>
+          >{{ item.productcodes }}</Option>
         </Select>
       </Col>
     </Row>
@@ -152,29 +152,26 @@ export default {
       this.product_ID = [];
       // this.board_ID = [];
       this.productisabled = fillModel.productisabled;
-      this.product_List = fillModel.product_List;
-      console.log(this.product_List);
-      // if (this.isMain == 1) {
-      //   this.productdisabled = false;
-      // } else {
-      //   this.productdisabled = true;
-      // }
+     
+     
 
       this.product_ID.push(fillModel.product_ID);
-      alert(this.product_ID);
-      // this.board_ID.push(fillModel.board_ID);
+      
+    
       if (
         fillModel.fill_in_user_type == 1 ||
         fillModel.fill_in_user_type == 3
       ) {
-        this.board_List = fillModel.board_List;
+        //自检或专检取全部产品
+         this.product_List = fillModel.product_List;
       } else {
-        this.board_List = [];
+        //互检只取待互检和打回的
+     
         this.product_List = [];
         for (let i = 0; i < fillModel.product_List.length; i++) {
           let obj = fillModel.product_List[i];
           if (obj.productstatus == 2 || obj.productstatus == 4) {
-            this.board_List.push(obj);
+           
             this.product_List.push(obj);
           }
         }
@@ -185,8 +182,8 @@ export default {
       if (e) {
         this.product_ID = [];
         for (let i = 0; i < this.product_List.length; i++) {
-          let obj = this.product_List[i];
-          this.product_ID.push(obj.value);
+          let obj = this.product_List[i]
+          this.product_ID.push(obj.productids)
         }
       } else {
         this.product_ID = [];
@@ -197,7 +194,7 @@ export default {
 
     getCurrentUser(e) {
       if (e) {
-        console.log(this.$store.state.admin.user.info);
+        //console.log(this.$store.state.admin.user.info);
         let userInfo = this.$store.state.admin.user.info;
 
         this.user.cardno = userInfo.cardNo;

pages/produce/execute/index.vue

@@ -81,6 +81,10 @@ export default {
     row.id = this.$route.query.id;
     row.orderId = this.$route.query.orderId;
     row.executeId = this.$route.query.executeId;
+row.headid=this.$route.query.headid;
+row.routingdetailId=this.$route.query.routid;
+
+    
     this.row = row;
     this.inputId = this.$route.query.id;
     this.detail = () => import("./starOrder/index");