From 2518e47a3ac999978fbf14612c967c3bbf421d25 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 17 十一月 2023 13:31:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/plan/customerorder/schedule-table.vue |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/views/plan/customerorder/schedule-table.vue b/src/views/plan/customerorder/schedule-table.vue
index a5588d4..0f60dab 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,43 +68,41 @@
               <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
+              <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>
-              </el-form-item>
+                  placeholder="璇疯緭鍏ユ湰娆¤鍒掓暟閲�"
+                ></el-input> -->
+              <!-- </el-form-item> -->
             </template>
           </el-table-column>
           <el-table-column
             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">
@@ -135,10 +133,9 @@
             header-align="center"
             align="center"
             label="闇�姹傛棩鏈�"
-            width="160px"
           >
             <template slot-scope="scope">
-              <el-form-item>{{ scope.row.wantedDeliveryDate }}</el-form-item>
+              <el-form-item>{{ scope.row.deliveryDate }}</el-form-item>
             </template>
           </el-table-column>
           <el-table-column
@@ -146,6 +143,7 @@
             align="center"
             show-overflow-tooltip
             label="澶囨敞"
+            min-width="140"
           >
             <template slot-scope="scope">
               <el-form-item>
@@ -227,6 +225,9 @@
           customerList.push(item)
         })
         this.dataForm.customer = JSON.parse(JSON.stringify(customerList))
+        this.dataForm.customer.forEach(item=>{
+            item.qtyPlaned=item.buyQtyDue
+        })
       })
     },
     dataFormSubmit() {

--
Gitblit v1.9.3