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

src/views/leadMatch/MatchList/matchCheck.vue

@@ -9,7 +9,7 @@
         >{{ isMatchedSelectAll ? "取消选中" : "全部选中" }}</Button
       >
       <Button
-        @click="handleGoProduction"
+        @click="handleGoProduction(1)"
         type="primary"
         style="margin-right: 10px"
         >下生产</Button
@@ -110,7 +110,7 @@
           <Col style="display:flex;justify-content: space-between;" span="6">
             <span v-if="matched_info.matching_status == 2">
               <Button
-                @click="handleGoProduction(matched_info)"
+                @click="handleGoProduction(2,matched_info)"
                 type="primary"
                 size="small"
                 :disabled='matched_info.produce_status!=0'
@@ -416,18 +416,23 @@ export default {
       });
       this.isMatchedSelectAll = flag;
       this.cut_order_product_ids = this.matchedSelectedList;
+      console.log(this.cut_order_product_ids)
     },
     back() {
       this.$router.go(-1);
     },
-    handleGoProduction(row) {
-      if (row) {
+    handleGoProduction(type,row) {
+      console.log(row)
+      if (type === 2) {
         this.cut_order_product_ids = [row.id];
+      }else{
+        this.cut_order_product_ids = this.matchedSelectedList
       }
       this.processModal = true;
     },
     handleProcess() {
       this.process_control = true;
+      console.log(this.cut_order_product_ids)
       this.axios({
         method: "post",
         url: "/api/bst_pull",
@@ -460,6 +465,7 @@ export default {
           },
         })
         .then((res) => {
+          this.matchedList = [];
           res.data.list.map((v) => {
             v.isCurrenct = false;
           });
@@ -468,9 +474,9 @@ export default {
           // this.matchedList = res.data.list;
           res.data.list.forEach((v,index)=>{
                   if(v.matching_status==2&&v.produce_status==0){
-                   
+                    console.log(this.matchedList)
                    this.matchedList.push(v)
-        
+                    console.log(this.matchedList)
                   }
           });
           console.log(this.matchedList)

vue.config.js

@@ -1,6 +1,7 @@
 const axios_default_ip =
     process.env.NODE_ENV == 'dev' ?
-    'http://121.41.102.225:82' :
+    // 'http://121.41.102.225:82' 
+    "http://121.37.173.82:82":
     process.env.NODE_ENV == 'test-prd' ?
     'http://121.41.102.225:82' //测试服
     :