Merge branch 'master' of 121.41.102.225:Nidong/jiufang into hw

src/views/Agreement/match/check.vue

@@ -34,7 +34,7 @@
     </Row>
     <div class="context-tabs">
       <div
-        v-for="(matched_info,index) in matchedList"
+        v-for="(matched_info, index) in matchedList"
         :key="matched_info.index"
         class="matched-block"
       >
@@ -195,15 +195,15 @@
               :summary-method="handleSummary"
               style="width: 100%"
             >
-              <!-- <template slot="setSlot" slot-scope="{ row }">
+              <template slot="setSlot" slot-scope="{ row }">
                 <Button
                   @click="underProduction(row)"
                   style="margin: 0 5px"
                   type="text"
-                  :disabled="productionBtn"
+                  :disabled="row.product_state == 1"
                   >下生产</Button
                 >
-              </template> -->
+              </template>
             </Table>
           </div>
         </div>
@@ -227,7 +227,10 @@
           style="margin-right: 10px"
           >取消</Button
         >
-        <Button @click="handleProcess" type="primary" style="margin-right: 10px"
+        <Button
+          @click="handleProcess()"
+          type="primary"
+          style="margin-right: 10px"
           >确定</Button
         >
       </div>
@@ -288,7 +291,7 @@ export default {
           align: "center",
           key: "url_number",
           resizable: true,
-          width: 160,
+          width: 100,
         },
         {
           title: "产品名称",
@@ -309,7 +312,7 @@ export default {
           align: "center",
           key: "unit",
           resizable: true,
-          width: 180,
+          width: 100,
         },
         {
           title: "饰面",
@@ -332,7 +335,7 @@ export default {
           resizable: true,
           width: 170,
         },
-        // { title: "操作", align: "center", slot: "setSlot", width: 100 },
+        { title: "操作", align: "center", slot: "setSlot", width: 100 },
       ], //匹配表头
       processModal: false,
       process_man: "",
@@ -428,6 +431,10 @@ export default {
     underProduction(row) {
       //表单里点击下生产事件
       this.processModal = true;
+      this.params = {
+        id: [row.id],
+        order_no: row.order_no,
+      };
     },
     handleProcess() {
       //下生产通知弹框二次确认
@@ -443,9 +450,10 @@ export default {
             // this.initData();
             this.detail();
             this.deepenList();
+            this.params = {};
             setTimeout(() => {
               this.process_control = false;
-              this.isMatchedSelectAll = false
+              this.isMatchedSelectAll = false;
             }, 500);
           }
         });
@@ -654,4 +662,8 @@ span {
 /deep/ .ivu-table table {
   width: 100% !important;
 }
+/deep/ .ivu-table-cell-slot {
+  display: flex;
+  justify-content: center;
+}
 </style>

src/views/Agreement/match/matching.vue

@@ -728,7 +728,7 @@ export default {
           type: "index",
           resizable: true,
           key: "index",
-          width: 100,
+          width: 60,
         },
         {
           title: "区域",
@@ -785,7 +785,7 @@ export default {
           key: "total_price",
           resizable: true,
           slot: "total_price",
-          minWidth: 100,
+          minWidth: 150,
         },
       ], //深化信息表头
       unmatchedRoomTableColumnsModal: [],