Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

src/views/MountOrder/details.vue

@@ -56,7 +56,10 @@ export default {
                 {title:'产品',name:'Select',serverName:'product',placeholder:'请选择产品',value:'',
                     option:[]
                 },
-                {title:'部件',name:'Select',serverName:'parts',placeholder:'部件',value:'',optionValue: 'id', optionName: 'title',
+                 {title:'图号',name:'Select',serverName:'url_number',placeholder:'请选择图号',value:'',optionValue: 'url_number', optionName: 'url_number',
+                    option:[]
+                },
+                {title:'部件',name:'Select',serverName:'parts',placeholder:'部件',value:'',optionValue: 'title', optionName: 'title',
                 option:[]} ,
                 {title:'出库时间',name:'Input',start_server:'start_time',end_server:'end_time',start_value:'',end_value:'',isDate:true,serverName:'id2',start_placeholder:'开始日期',end_placeholder:'结束日期'}
             ],
@@ -71,6 +74,7 @@ export default {
                     }
                 },
                 {title:'产品名称',align:'center',minWidth:200,key:'product_title'},
+                {title:'图号',align:'center',minWidth:200,key:'url_number'},
                 {title:'部件名称',align:'center',minWidth:200,key:'part_title'},
                 {title:'位置',align:'center',minWidth:200,key:'position'},
                 {title:'零部件名称',align:'center',minWidth:200,key:'sub_part_title'},
@@ -155,6 +159,9 @@ export default {
                 this.list[2].option = res.data.layer;
                 this.list[3].option = res.data.number_detail;
                 this.list[4].option = res.data.product;
+                this.list[5].option = res.data.url_number;
+                this.list[6].option = res.data.part;
+                console.log(res.data.url_number)
             })
         },
         getData(row){

src/views/ProductionOrderList/Dispatchlist/confirm.vue

@@ -58,6 +58,12 @@ export default {
           minWidth: 150,
           key: "procedure_title",
         },
+        {
+          title: "工序状态",
+          align: "center",
+          minWidth: 150,
+          key: "rework_state",
+        },
         { title: "班组信息", align: "center", minWidth: 150, key: "username" },
         {
           title: "完工状态",

src/views/leadMatch/MatchList/matchCheck.vue

@@ -403,11 +403,15 @@ export default {
     this.initData();
   },
   methods: {
-    handleMatchedSelectAll() {
-      this.isMatchedSelectAll = !this.isMatchedSelectAll;
+    handleMatchedSelectAll(){
+ this.isMatchedSelectAll = !this.isMatchedSelectAll;
+ this.matchedSelectedList = [];
       this.matchedList.map((v) => {
         if (v.produce_status == 0) {
           v.isSelect = this.isMatchedSelectAll;
+          if(v.isSelect){
+            this.matchedSelectedList.push(v.id)
+          }
         }
       });
     },

src/views/leadMatch/roomList/edit.vue

@@ -27,7 +27,7 @@
            @change="onChange"
            ref='file'
 
-           class="inputmultiple" />
+           id="inputmultiple" />
   </div>
         <Button style="margin-left:10px" @click="$router.go(-1)">返回</Button>
         <Button style="margin-left:10px" v-if="$route.query.type != 2" @click="saveData">保存</Button>
@@ -348,6 +348,10 @@ export default {
             this.$forceUpdate();
         }
     },
+    repeatFile(){
+        document.querySelector('#inputmultiple').setAttribute('type','text');
+        document.querySelector('#inputmultiple').setAttribute('type','file');
+    },
      async onChange (e) {
       let fileList = e.target.files;
        for (let i in fileList) {
@@ -364,6 +368,7 @@ export default {
               method: "post",
               data,
             }).then((res) => {
+              this.repeatFile();
               if (res.data.code == 200) {
                 this.$Message.success("导入成功");
          this.cut_order_id = res.data.data.cut_order_id;
@@ -386,6 +391,8 @@ export default {
               this.infoNumber.splice(index,1,res.data.data.children)
           }
         })}
+              }else{
+                this.$Message.error(res.data.msg)
               }
             })
             // await setTimeout(() => { }, 1000);
@@ -472,7 +479,7 @@ export default {
   position: relative;
   display: inline-block;
 }
-.inputmultiple {
+#inputmultiple {
   width: 100%;
   height: 100%;
   display: none;

src/views/leadMatch/weightMemo/edit.vue

@@ -27,7 +27,7 @@
            @change="onChange"
            ref='file'
 
-           class="inputmultiple" />
+           id="inputmultiple" />
            </div>
         <Button style="margin-left:10px" @click="$router.go(-1)">返回</Button>
         <Button style="margin-left:10px" v-if="$route.query.type != 2" @click="saveData">保存</Button>
@@ -114,7 +114,8 @@ export default {
               { title: "部件名称", key: "part_title", align: "center", minWidth: 140 },
                 { title: "行号", key: "line_number", align: "center", minWidth: 140 },
                   { title: "木皮1", key: "veneer_one", align: "center", minWidth: 140 },
-                    { title: "原材料", key: "material", align: "center", minWidth: 140 },
+                    { title: "原材料1", key: "board1", align: "center", minWidth: 140 },
+                    { title: "原材料2", key: "board2", align: "center", minWidth: 140 },
                       { title: "木皮2", key: "veneer_two", align: "center", minWidth: 140 },
                         { title: "毛料尺寸", key: "wollens_size", align: "center", minWidth: 140 },
                          { title: "毛料合并的行号", key: "wool_line", align: "center", minWidth: 140 },
@@ -124,6 +125,7 @@ export default {
                                 { title: "贴皮面积", key: "treatment_area", align: "center", minWidth: 140 },
                                 { title: "精裁面积", key: "vacuum_area", align: "center", minWidth: 140 },
                                 { title: "工艺要求", key: "technological_requirements", align: "center", minWidth: 140 },
+                                { title: "打印芯片", key: "chip_state", align: "center", minWidth: 140 },
                                 { title: "匹配状态", key: "state", align: "center", minWidth: 140,slot:'state' },
       ],
       headers: { Authorization: localStorage.getItem("token") },//请求头
@@ -311,8 +313,14 @@ export default {
             this.$forceUpdate();
         }
     },
+    repeatFile(){
+        document.querySelector('#inputmultiple').setAttribute('type','text');
+        document.querySelector('#inputmultiple').setAttribute('type','file');
+    },
      async onChange (e) {
-      let fileList = e.target.files;
+      
+      let fileList =e.target.files;
+      console.log(fileList)
        for (let i in fileList) {
         if (!isNaN(Number(i))) {
           this.headers["Content-Type"] = "application/x-www-form-urlencoded";
@@ -320,7 +328,7 @@ export default {
               ...this.uploadData,
               your_file: fileList[i],
             });
-      
+           
             await axios({
               url: this.$store.state.ip + '/api/cut_order_import',
               headers: this.headers,
@@ -328,6 +336,7 @@ export default {
               data,
             }).then((res) => {
               console.log(res)
+              this.repeatFile();
               if (res.data.code == 200) {
                    this.$Message.success("导入成功");
         this.cut_order_id = res.data.data.cut_order_id;
@@ -349,6 +358,8 @@ export default {
           }
         })}
 
+        }else{
+          this.$Message.error(res.data.msg)
         }
               })
             // await setTimeout(() => { }, 1000);
@@ -364,7 +375,8 @@ export default {
     },
     //点击事件
     onClickBtn () {
-      this.$refs.file.click()
+      this.$refs.file.click();
+
     }
   },
 };
@@ -422,7 +434,7 @@ export default {
   position: relative;
   display: inline-block;
 }
-.inputmultiple {
+#inputmultiple {
   width: 100%;
   height: 100%;
   display: none;