From 550b1fc6a640d09b93d2115799b5871634524ef1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 18:32:42 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before

---
 src/views/plan/customerorder/schedule-table.vue |   45 +++++++++++++++++++++++++++++----------------
 1 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/views/plan/customerorder/schedule-table.vue b/src/views/plan/customerorder/schedule-table.vue
index a5588d4..b37d0aa 100644
--- a/src/views/plan/customerorder/schedule-table.vue
+++ b/src/views/plan/customerorder/schedule-table.vue
@@ -19,6 +19,7 @@
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" class="l-mes">
       <div class="avue-crud">
         <el-table
+          border
           :data="dataForm.customer"
           style="width: 100%"
           class="mps-table"
@@ -28,17 +29,17 @@
             header-align="center"
             align="center"
             label="瀹㈡埛璁㈠崟缂栧彿"
-            width="120px"
+            min-width="130px"
           >
             <template slot-scope="scope">
-              <el-form-item>{{ scope.row.customerOrderNo }}</el-form-item>
+              <el-form-item>{{ scope.row.contractNo }}</el-form-item>
             </template>
           </el-table-column>
           <el-table-column
             header-align="center"
             align="center"
             label="闆朵欢鍙�"
-            width="120px"
+            min-width="130"
           >
             <template slot-scope="scope">
               <el-form-item>{{ scope.row.partNo }}</el-form-item>
@@ -53,7 +54,7 @@
           >
             <template slot-scope="scope">
               <el-form-item class="inline-el-hidden">{{
-                scope.row.partName
+                scope.row.productName
               }}</el-form-item>
             </template>
           </el-table-column>
@@ -67,32 +68,31 @@
               <el-form-item>{{ scope.row.buyQtyDue }}</el-form-item>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             header-align="center"
             align="center"
             label="宸茶鍒掓暟閲�"
-            width="120px"
           >
             <template slot-scope="scope">
               <el-form-item>{{ scope.row.requireNumber }}</el-form-item>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             prop="remainderRequired"
             header-align="center"
             align="center"
             label="鏈璁″垝鏁伴噺"
-            width="170px"
           >
             <template scope="scope">
+              <!-- <el-form-item>{{ scope.row.qtyPlaned }}</el-form-item> -->
               <el-form-item
                 :prop="'customer.' + scope.$index"
                 :rules="rules.qtyPlaned"
               >
                 <el-input
-                  v-model="scope.row.qtyPlaned"
-                  placeholder=""
-                ></el-input>
+                  v-model="remainderRequired"
+                  placeholder="璇疯緭鍏ユ湰娆¤鍒掓暟閲�"
+                ></el-input> 
               </el-form-item>
             </template>
           </el-table-column>
@@ -100,10 +100,9 @@
             header-align="center"
             align="center"
             label="鍗曚綅"
-            width="60px"
           >
             <template slot-scope="scope">
-              <span>{{ scope.row.unit }}</span>
+              <span>{{ scope.row.otcUnit }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -111,7 +110,6 @@
             header-align="center"
             align="center"
             label="鍒堕�犲睘鎬�"
-            width="170px"
           >
             <template scope="scope">
               <el-form-item :prop="'manufactureAttr.' + scope.$index">
@@ -134,8 +132,16 @@
           <el-table-column
             header-align="center"
             align="center"
-            label="闇�姹傛棩鏈�"
-            width="160px"
+            label="璁″垝鏃ユ湡"
+          >
+            <template slot-scope="scope">
+              <el-form-item>{{ scope.row.deliveryDate }}</el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            label="瀹㈡埛闇�姹傛棩鏈�"
           >
             <template slot-scope="scope">
               <el-form-item>{{ scope.row.wantedDeliveryDate }}</el-form-item>
@@ -146,6 +152,7 @@
             align="center"
             show-overflow-tooltip
             label="澶囨敞"
+            min-width="140"
           >
             <template slot-scope="scope">
               <el-form-item>
@@ -227,6 +234,10 @@
           customerList.push(item)
         })
         this.dataForm.customer = JSON.parse(JSON.stringify(customerList))
+        this.dataForm.customer.forEach(item=>{
+          // let num=Number(item.buyQtyDue)
+          //   item.qtyPlaned=num
+        })
       })
     },
     dataFormSubmit() {
@@ -235,6 +246,8 @@
         if (valid) {
           checkSchedule(this.dataForm.customer)
             .then((res) => {
+              console.log(this.dataForm.customer);
+              return
               if (res.data.data.success) {
                 createMasterProductionSchedule(this.dataForm.customer)
                   .then((res) => {

--
Gitblit v1.9.3