13

src/views/ProductionOrderList/ProductionsOrder/BST_Decorationlist.vue

@@ -990,7 +990,7 @@ export default {
           this.list[2].option = res.data.layer;
           this.list[3].option = res.data.number_detail;
           this.list[4].option = res.data.part;
-          this.list[9].option = res.data.img_number;
+          this.list[8].option = res.data.img_number;
         }
       );
     },

src/views/ProductionOrderList/ProductionsOrder/demo_Decorationlist.vue

@@ -990,7 +990,7 @@ export default {
           this.list[2].option = res.data.layer;
           this.list[3].option = res.data.number_detail;
           this.list[4].option = res.data.part;
-          this.list[9].option = res.data.img_number;
+          this.list[8].option = res.data.img_number;
         }
       );
     },

src/views/leadMatch/MatchList/matchPage.vue

@@ -1108,6 +1108,7 @@ export default {
           this.unmatchedObj.urlList = data;
           this.urlSelectList = res.data.image_number;
           this.productList = res.data.product_name;
+          
         }
       });
     },

src/views/leadMatch/roomList/list.vue

@@ -81,10 +81,10 @@ export default {
         { title: "项目编码", key: "project_number", align: "center", minWidth: 140 },
         { title: "项目名称", key: "project_name", align: "center", minWidth: 140 },
         { title: "项目简称", key: "abbreviation", align: "center", minWidth: 140 },
-        { title: "匹配状态", key: "state", align: "center", minWidth: 140 ,
-        render:(h,params)=>{
-          return h('span',{},params.row.state===0?'未匹配':params.row.state===2?'匹配完成':'匹配中')
-        }},
+        // { title: "匹配状态", key: "state", align: "center", minWidth: 140 ,
+        // render:(h,params)=>{
+        //   return h('span',{},params.row.state===0?'未匹配':params.row.state===2?'匹配完成':'匹配中')
+        // }},
         { title: "制单日期", key: "make_data", align: "center", minWidth: 140 ,slot:"make_data"},
         { title: "操作", key:'',align: "center", minWidth: 140 , 
          render: (h, params) => {

src/views/leadMatch/weightMemo/edit.vue

@@ -83,8 +83,14 @@
             <Topsearch :list="list" @searchData="search_data" />
           </div>
           <div v-for="(_item,_index) in tableData" :key="_index">
-              <div class="mate_info"><div>匹配信息：{{_item.value}} {{_item.number}}组</div><span>总计{{_item.children.length}}条数据</span></div>
-              <Table :columns="tableColumns" border :data="_item.children" max-height="450">
+              <div class="mate_info">
+                <div>匹配信息：{{_item.value}} {{_item.number}}组</div>
+                <div>
+                <span>总计{{_item.children.length}}条数据</span>
+                <span style="margin:0 30px;cursor: pointer;" @click="showDetail(_item,_index)">{{_item.ishidden?'收缩':'展开'}}<Icon type="md-arrow-dropright"  ref="ico" class="ico_detail"/></span>
+                </div>
+                </div>
+              <Table :columns="tableColumns" border :data="_item.children" max-height="450" v-if='_item.ishidden'>
                   <template slot="state" slot-scope="{row}">
                        <span>{{row.state ==0?'未匹配':row.state ==2?'匹配完成':'匹配中'}}</span>
                   </template>
@@ -203,6 +209,17 @@ export default {
     },
   },
   methods: {
+    showDetail(row,index){
+       if(row.ishidden){
+        document.getElementsByClassName('ico_detail')[index].style.transform = 'rotate(0deg)'
+        row.ishidden = false
+        this.$forceUpdate()
+       }else{
+          document.getElementsByClassName('ico_detail')[index].style.transform = 'rotate(90deg)'
+         row.ishidden = true
+         this.$forceUpdate();
+       }
+    },
       saveData(){
           if(!this.formData.project_number){
                 this.$Message.warning('请填写项目编码！')
@@ -233,6 +250,9 @@ export default {
               ...row
               }).then(res=>{
                   this.tableData=res.data.data;
+                  this.tableData.forEach(v=>{
+                    v.ishidden = fasle;
+                  })
               })
       },
       search(item){
@@ -242,6 +262,10 @@ export default {
               order_type:1
               }).then(res=>{
                   this.tableData=res.data.data;
+                  this.tableData.forEach(v=>{
+                    v.ishidden=false
+                  })
+                  console.log(this.tableData)
                   this.part_title = res.data.part_title;
                   this.cut_size = res.data.cut_size;
                 
@@ -311,6 +335,9 @@ export default {
            _item.showType = false;
         })
             document.getElementsByClassName('ico')[index].style.transform = 'rotate(0deg)'
+            this.tableData.forEach(v=>{
+              v.ishidden = false;
+            })
             this.$forceUpdate();
         }
     },

src/views/leadMatch/weightMemo/list.vue

@@ -81,10 +81,10 @@ export default {
         { title: "项目编码", key: "project_number", align: "center", minWidth: 140 },
         { title: "项目名称", key: "project_name", align: "center", minWidth: 140 },
         { title: "项目简称", key: "abbreviation", align: "center", minWidth: 140 },
-        { title: "匹配状态", key: "state", align: "center", minWidth: 140,
-        render:(h,params)=>{
-          return h('span',{},params.row.state===0?'未匹配':params.row.state===2?'匹配完成':'匹配中')
-        }},
+        // { title: "匹配状态", key: "state", align: "center", minWidth: 140,
+        // render:(h,params)=>{
+        //   return h('span',{},params.row.state===0?'未匹配':params.row.state===2?'匹配完成':'匹配中')
+        // }},
         { title: "制单日期", key: "make_data", align: "center", minWidth: 140 ,slot:"make_data"},
         { title: "操作", key:'',align: "center", minWidth: 140 , 
          render: (h, params) => {