From d541cc1adf43277932f9367356c0fdba99e8b34a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 12 十月 2023 15:22:35 +0800
Subject: [PATCH] 	modified:   src/views/admin/productType/index.vue 	modified:   src/views/plan/customerorder/sample-customerorder-form.vue 	modified:   src/views/plan/manufacturingorder/index.vue

---
 src/views/plan/customerorder/customerorder-form.vue |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index e33a374..6c5ec49 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -123,7 +123,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="闆朵欢鍙�" prop="partNo">
                 <el-input v-model="dataForm.partNo" placeholder="" readonly>
                   <el-button
@@ -132,6 +132,15 @@
                     @click="openPartDialog()"
                   ></el-button>
                 </el-input>
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="6">
+              <el-form-item label="鐩橀暱瑕佹眰" prop="lengthRequirement">
+                <el-input
+                  v-model="dataForm.lengthRequirement"
+                  placeholder=""
+                  disabled
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -304,15 +313,6 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="鐩橀暱瑕佹眰" prop="lengthRequirement">
-                <el-input
-                  v-model="dataForm.lengthRequirement"
-                  placeholder=""
-                  disabled
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="OTC鎺ㄩ�佺姸鎬�" prop="remark">
                 <span>{{
                   dataForm.otcPartSync != null
@@ -339,7 +339,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-card header="璁㈠崟鍙傛暟" shadow="never">
+          <!-- <el-card header="璁㈠崟鍙傛暟" shadow="never">
             <el-row>
               <el-form-item
                 style="float:left;width: 50%"
@@ -354,7 +354,7 @@
                 ></el-input
               ></el-form-item>
             </el-row>
-          </el-card>
+          </el-card> -->
         </el-tab-pane>
         <el-tab-pane label="OTC闄勪欢" type="card">
           <el-table :data="fileList" style="width: 100%" height="500">
@@ -786,7 +786,7 @@
         coLineNo: '',
         partNo: '',
         customerPartName: '',
-        buyQtyDue: '',
+        otcQuantity: '',
         wantedDeliveryDate: '',
         plannedDeliveryDate: '',
         customerPoNo: '',
@@ -959,7 +959,7 @@
       if (!this.dataForm.id) {
         return true
       }
-      if (this.dataForm.id && this.dataForm.sourceId !== 'GSM') {
+      if (this.dataForm.id && (this.dataForm.sourceId != null && this.dataForm.sourceId !== 'GSM')) {
         return true
       }
       return false
@@ -997,7 +997,10 @@
             this.dataForm = response.data.data
             // }
             // this.fileList = response.data.data.customerOrderAttachmentList
-            this.getFileList()
+            const sourceId = response.data.data.sourceId
+            if(sourceId != null){
+              this.getFileList()
+            }
             this.orderParamList = response.data.data.orderParamList
             this.title =
               this.dataForm.customerName + this.dataForm.customerOrderNo

--
Gitblit v1.9.3