Andy пре 3 година
родитељ
комит
1816987072

+ 6 - 1
src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -3811,6 +3811,7 @@ export default {
           if (!row.is_metal) {
             this.route_id_at_copy = row.route_id;
           }
+          this.pre_process_obj = JSON.parse(JSON.stringify(row.procedure_properties))
           this.tableData.splice(index + 1, 0, obj);
           this.handleCalcCount();
           break;
@@ -4235,11 +4236,15 @@ export default {
                 element.part_title = "";
                 element.title = "";
               } else {
+                for (const key in this.pre_process_obj) {
+                  const item = this.pre_process_obj[key];
+                  row[key] = item*1;
+                }
                 element.change_id = element.change[0].id;
               }
               element.part_detail = element.sub_part;
               //展示非拆分部件
-              // 默认替换部件
+              // 默认替换部件   pre_process_obj
               //存计算公式
               element.long ? "" : (element.long = 0);
               element.wide ? "" : (element.wide = 0);

+ 6 - 6
src/views/leadMatch/MatchList/matchPage.vue

@@ -97,7 +97,7 @@
         >
           匹配
         </Button>
-        <TabPane label="匹配" name="1">
+        <TabPane label="匹配" name="1">
           <Row>
             <Col
               span="16"
@@ -264,12 +264,12 @@
                                 size="small"
                                 type="text"
                               >
-                                {{ table_info.isHidden ? "展开" : "收缩" }}
+                                {{ !table_info.isHidden ? "展开" : "收缩" }}
                               </Button>
                             </Col>
                           </Row>
                         </div>
-                        <div v-show="!table_info.isHidden">
+                        <div v-show="table_info.isHidden">
                           <Table
                             :columns="unmatchedSheetTableColumns"
                             border
@@ -440,7 +440,7 @@
             </Col>
           </Row>
         </TabPane>
-        <TabPane label="匹配" name="2">
+        <TabPane label="匹配" name="2">
           <Row type="flex" align="middle" style="padding:10px 0">
             <Col span="4">
               <span>图号:</span>
@@ -653,12 +653,12 @@
                       size="small"
                       type="text"
                     >
-                      {{ matched_detail.isHidden ? "展开" : "收缩" }}
+                      {{ !matched_detail.isHidden ? "展开" : "收缩" }}
                     </Button>
                   </Col>
                 </Row>
                 <Table
-                  v-show="!matched_detail.isHidden"
+                  v-show="matched_detail.isHidden"
                   :columns="matchedSheetTableColumns"
                   border
                   :ref="'matched' + index"