mushencc 3 gadi atpakaļ
vecāks
revīzija
f17e05eb4a

+ 1 - 1
src/views/ProductionOrderList/ProductionPlanlist/BST_two.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <FullPage
-      title="生产排产列表1"
+      title="生产排产列表"
       :list="set_list"
       @init="init"
       @searchData="searchData"

+ 1 - 1
src/views/ProductionOrderList/ProductionPlanlist/type_one.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <FullPage
-      title="生产排产列表2"
+      title="生产排产列表"
       :list="set_list"
       @init="init"
       @searchData="searchData"

+ 1 - 1
src/views/ProductionOrderList/ProductionsOrder/BST_two.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <FullPage title='生产订单列表1'
+    <FullPage title='生产订单列表'
               :list='set_list'
               @init='init'
               @searchData='searchData'

+ 1 - 1
src/views/ProductionOrderList/ProductionsOrder/type_one.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <FullPage title='生产订单列表2'
+    <FullPage title='生产订单列表'
               :list='set_list'
               @init='init'
               @searchData='searchData'

+ 13 - 4
src/views/leadMatch/MatchList/matchCheck.vue

@@ -84,7 +84,7 @@
         class="matched-block"
       >
         <Row type="flex" justify="space-between" align="top">
-            <Col span="4" v-if="matched_info.matching_status == 1" style="display:flex;justify-content: space-around;">
+            <Col style="display:flex;justify-content: space-around;">
                <div v-if="matched_info.matching_status == 2">
                   <Checkbox
                   v-show="matched_info.produce_status == 0"
@@ -308,6 +308,7 @@
 </template>
 
 <script>
+import colorSettingVue from '../../BasicSettings/colorSetting.vue';
 // 这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
 // 例如:import 《组件名称》 from '《组件路径》';
 
@@ -402,7 +403,7 @@ export default {
     },
    handleMatchedSelect(row, e) {
       row.isSelect = e;
-      
+      console.log(row)
       let flag = true;
       this.matchedSelectedList = [];
       this.matchedList.map((v) => {
@@ -443,6 +444,7 @@ export default {
         if (res.code == 200) {
           this.$Message.success(res.msg);
           this.processModal = false;
+          this.initData();
         }
         setTimeout(() => {
           this.process_control = false;
@@ -459,13 +461,20 @@ export default {
           },
         })
         .then((res) => {
-          console.log(res);
           res.data.list.map((v) => {
             v.isCurrenct = false;
           });
           this.urlMatchedList = res.data.image_number;
           this.productMatchedList = res.data.product_name;
-          this.matchedList = res.data.list;
+          // this.matchedList = res.data.list;
+          res.data.list.forEach((v,index)=>{
+                  if(v.matching_status==2){
+                    console.log(this.matchedList)
+                   this.matchedList.push(v)
+                    console.log(this.matchedList)
+                  }
+          });
+          console.log(this.matchedList)
         });
     },
     handleHiddenMatchedDetail(row) {