From c25cf592547b73eec192162ae0351152ddf1fcff Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 18 十月 2023 11:22:28 +0800
Subject: [PATCH] 	modified:   src/const/crud/customerOrder/customerOrderForm.js 	modified:   src/views/plan/customerorder/customerorder-form.vue 	modified:   src/views/plan/customerorder/index.vue 	modified:   src/views/plan/customerorder/sample-customerorder-form.vue

---
 src/views/plan/customerorder/index.vue                     |    2 +-
 src/const/crud/customerOrder/customerOrderForm.js          |    2 +-
 src/views/plan/customerorder/sample-customerorder-form.vue |   17 ++++++++++++++++-
 src/views/plan/customerorder/customerorder-form.vue        |   17 ++++++++++++++++-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/const/crud/customerOrder/customerOrderForm.js b/src/const/crud/customerOrder/customerOrderForm.js
index f5080d1..4083909 100644
--- a/src/const/crud/customerOrder/customerOrderForm.js
+++ b/src/const/crud/customerOrder/customerOrderForm.js
@@ -100,7 +100,7 @@
     minWidth: 200,
     span: 24
   }, {
-    label: '澶囨敞',
+    label: '浜у搧澶囨敞',
     prop: 'remark',
     cell: true,
     type: 'textarea',
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index c19dd65..2997ba9 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -337,7 +337,22 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="璁㈠崟璇存槑" prop="remark">
+              <el-form-item label="璁㈠崟澶囨敞" prop="comment">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  placeholder=""
+                  v-model="dataForm.comment"
+                  maxlength="500"
+                  show-word-limit
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="浜у搧澶囨敞" prop="remark">
                 <el-input
                   type="textarea"
                   :rows="3"
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index cc8afa1..dbee1f0 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -190,7 +190,7 @@
         <span slot="footer" class="dialog-footer"> </span>
       </el-dialog>
       <!-- 瀵煎嚭 -->
-      <el-dialog title="瀵煎嚭" :visible.sync="exportDialogVisible" width="30%">
+      <el-dialog title="瀵煎嚭鍙拌处" :visible.sync="exportDialogVisible" width="20%">
         <div style="display: flex;justify-content: center">
           <el-form :model="dataForm" :inline="true" :rules="dataRule" ref="exportForm" class="l-mes">
             <el-form-item label="鏃ユ湡" prop="exportTime">
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index 158385f..c4aa3ea 100644
--- a/src/views/plan/customerorder/sample-customerorder-form.vue
+++ b/src/views/plan/customerorder/sample-customerorder-form.vue
@@ -135,6 +135,19 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="璁㈠崟澶囨敞" prop="comment">
+              <el-input
+                v-model="dataForm.comment"
+                style="width: 100%"
+                type="textarea"
+                :rows="1"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
 
@@ -443,6 +456,7 @@
         returnStatus: null,
         salesMan: null,
         salerWorkCode: null,
+        comment: null
       },
       dataRule: {},
       units: [],
@@ -482,8 +496,9 @@
       this.dataForm.customerNo = null
       this.dataForm.returnStatus = null
       this.dataForm.placeOrderDate = dateFormat(new Date(),'yyyy-MM-dd hh:mm:ss')
-      this.dataForm.factoryPlaceOrderDate = null
+      this.dataForm.factoryPlaceOrderDate = dateFormat(new Date(),'yyyy-MM-dd hh:mm:ss')
       this.dataForm.deliveryDate = null
+      this.dataForm.comment = null
       this.dataForm.customerOrderVOList = [{
           "$cellEdit": true,
           "$index": 0,

--
Gitblit v1.9.3