From f19edc96af3261347f48cb8f66f1f5b2feb6071e Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 17 十一月 2023 16:43:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before

---
 src/views/plan/customerorder/schedule-table.vue |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/plan/customerorder/schedule-table.vue b/src/views/plan/customerorder/schedule-table.vue
index 82957c7..c3f4331 100644
--- a/src/views/plan/customerorder/schedule-table.vue
+++ b/src/views/plan/customerorder/schedule-table.vue
@@ -84,15 +84,15 @@
             label="鏈璁″垝鏁伴噺"
           >
             <template scope="scope">
-              <el-form-item>{{ scope.row.qtyPlaned }}</el-form-item>
-              <!-- <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-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -132,10 +132,19 @@
           <el-table-column
             header-align="center"
             align="center"
-            label="闇�姹傛棩鏈�"
+            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>
             </template>
           </el-table-column>
           <el-table-column
@@ -234,8 +243,6 @@
       this.isSubmit = true
       this.$refs.dataForm.validate((valid) => {
         if (valid) {
-          console.log(this.dataForm.customer);
-          return
           checkSchedule(this.dataForm.customer)
             .then((res) => {
               if (res.data.data.success) {

--
Gitblit v1.9.3