From 2ed5ea323f3a92bde5e43bba1c3996c6c44de2fc Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Mon, 8 Jan 2024 16:59:15 +0800
Subject: [PATCH] 2024.1.8

---
 .../customer/customerInformationManagement.vue  |  4 ++--
 .../modules/project/projectInfo/projectInfo.vue |  8 ++++----
 .../modules/proofing/requestForProofing.vue     | 15 ++++-----------
 src/views/modules/quotation/requestForQuote.vue | 15 ++++-----------
 .../quotationCustomerContact.vue                |  2 +-
 .../quotationCustomerInformation.vue            | 15 ++++-----------
 .../technicalSpecificationList.vue              |  6 +++---
 src/views/modules/test/requestForTest.vue       | 17 ++++-------------
 8 files changed, 26 insertions(+), 56 deletions(-)

diff --git a/src/views/modules/customer/customerInformationManagement.vue b/src/views/modules/customer/customerInformationManagement.vue
index ef84d61..6e3a4b3 100644
--- a/src/views/modules/customer/customerInformationManagement.vue
+++ b/src/views/modules/customer/customerInformationManagement.vue
@@ -1004,7 +1004,7 @@
             columnProp: 'potentialRevenueOfYear',
             headerAlign: 'center',
             align: 'right',
-            columnLabel: '年度潜在收入',
+            columnLabel: '年潜在投入',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -2124,7 +2124,7 @@
           addressName: '',
           companyName: this.customerCurrentRow.customerDesc,
           defaultAddress: '',
-          addressStatus: '',
+          addressStatus: '启用',
           addressType: '',
           remark: '',
           createDate: '',
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index eea4dde..bb54e09 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -188,14 +188,14 @@
               </el-form-item>
             </div></el-col>
             <el-col :span="4"><div class="grid-content bg-purple">
-              <el-form-item :label="'年度潜在收入'">
+              <el-form-item :label="'年潜在投入'">
                 <el-input v-model="customerData.potentialRevenueOfYear" readonly  ></el-input>
               </el-form-item>
             </div></el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="4"><div class="grid-content bg-purple">
-              <el-form-item :label="'关键客户'">
+              <el-form-item :label="'重要程度'">
                 <el-input v-model="customerData.importantCustomer" readonly ></el-input>
               </el-form-item>
             </div></el-col>
@@ -205,8 +205,8 @@
               </el-form-item>
             </div></el-col>
             <el-col :span="16"><div class="grid-content bg-purple">
-              <el-form-item :label="'备注信息'">
-                <el-input v-model="customerData.remark" readonly ></el-input>
+              <el-form-item :label="'客户描述'">
+                <el-input v-model="customerData.customerDescription" readonly ></el-input>
               </el-form-item>
             </div></el-col>
           </el-row>
diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index 7f5146b..8211563 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -676,7 +676,7 @@
             </el-col>
             <el-col :span="8">
               <div class="grid-content bg-purple">
-                <el-form-item label="关键客户">
+                <el-form-item label="重要程度">
                   <el-input v-model="customerInformationData.importantCustomer" readonly></el-input>
                 </el-form-item>
               </div>
@@ -754,15 +754,8 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <div class="grid-content bg-purple">
-                <el-form-item label="岗位描述">
-                  <el-input v-model="customerInformationData.jobDescription" readonly></el-input>
-                </el-form-item>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="grid-content bg-purple">
-                <el-form-item label="备注信息">
-                  <el-input v-model="customerInformationData.remark" readonly></el-input>
+                <el-form-item label="客户描述">
+                  <el-input v-model="customerInformationData.customerDescription" readonly></el-input>
                 </el-form-item>
               </div>
             </el-col>
@@ -1028,7 +1021,7 @@
           customerIndustry: '',
           companyName: '',
           jobDescription: '',
-          remark: '',
+          customerDescription: '',
           contactName: '',
           contactPhoneNumber1: '',
           position: '',
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 135d687..a49801f 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -688,7 +688,7 @@
             </el-col>
             <el-col :span="8">
               <div class="grid-content bg-purple">
-                <el-form-item label="关键客户">
+                <el-form-item label="重要程度">
                   <el-input v-model="customerInformationData.importantCustomer" readonly></el-input>
                 </el-form-item>
               </div>
@@ -766,15 +766,8 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <div class="grid-content bg-purple">
-                <el-form-item label="岗位描述">
-                  <el-input v-model="customerInformationData.jobDescription" readonly></el-input>
-                </el-form-item>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="grid-content bg-purple">
-                <el-form-item label="备注信息">
-                  <el-input v-model="customerInformationData.remark" readonly></el-input>
+                <el-form-item label="客户描述">
+                  <el-input v-model="customerInformationData.customerDescription" readonly></el-input>
                 </el-form-item>
               </div>
             </el-col>
@@ -1045,7 +1038,7 @@
           customerIndustry: '',
           companyName: '',
           jobDescription: '',
-          remark: '',
+          customerDescription: '',
           contactName: '',
           contactPhoneNumber1: '',
           position: '',
diff --git a/src/views/modules/quotation/sellForQuotation/quotationCustomerContact.vue b/src/views/modules/quotation/sellForQuotation/quotationCustomerContact.vue
index ec24196..9a5e0d1 100644
--- a/src/views/modules/quotation/sellForQuotation/quotationCustomerContact.vue
+++ b/src/views/modules/quotation/sellForQuotation/quotationCustomerContact.vue
@@ -165,7 +165,7 @@ export default {
           columnProp: 'primaryContact',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '主联系人',
+          columnLabel: '默认联系人',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
diff --git a/src/views/modules/quotation/sellForQuotation/quotationCustomerInformation.vue b/src/views/modules/quotation/sellForQuotation/quotationCustomerInformation.vue
index 14d2c51..8040e31 100644
--- a/src/views/modules/quotation/sellForQuotation/quotationCustomerInformation.vue
+++ b/src/views/modules/quotation/sellForQuotation/quotationCustomerInformation.vue
@@ -18,7 +18,7 @@
         </el-col>
         <el-col :span="8">
           <div class="grid-content bg-purple">
-            <el-form-item label="关键客户">
+            <el-form-item label="重要程度">
               <el-input v-model="customerInformationData.importantCustomer" readonly></el-input>
             </el-form-item>
           </div>
@@ -96,15 +96,8 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <div class="grid-content bg-purple">
-            <el-form-item label="岗位描述">
-              <el-input v-model="customerInformationData.jobDescription" readonly></el-input>
-            </el-form-item>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="grid-content bg-purple">
-            <el-form-item label="备注信息">
-              <el-input v-model="customerInformationData.remark" readonly></el-input>
+            <el-form-item label="客户描述">
+              <el-input v-model="customerInformationData.customerDescription" readonly></el-input>
             </el-form-item>
           </div>
         </el-col>
@@ -179,7 +172,7 @@ export default {
         customerIndustry: '',
         companyName: '',
         jobDescription: '',
-        remark: '',
+        customerDescription: '',
         contactName: '',
         contactPhoneNumber1: '',
         position: '',
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index 4bc0814..0027429 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -163,12 +163,12 @@
             </div></el-col>
             <el-col :span="6"><div class="grid-content bg-purple">
               <el-form-item :label="'客户名称'">
-                <el-input v-model="customerData.customerDesc" readonly ></el-input>
+                <el-input v-model="customerData.customerName" readonly ></el-input>
               </el-form-item>
             </div></el-col>
             <el-col :span="12"><div class="grid-content bg-purple">
               <el-form-item :label="'客户描述'">
-                <el-input v-model="customerData.customerDescription" readonly  ></el-input>
+                <el-input v-model="customerData.customerDesc" readonly  ></el-input>
               </el-form-item>
             </div></el-col>
           </el-row>
@@ -639,8 +639,8 @@
         },
         customerData:{
           customerId:'',
+          customerName:'',
           customerDesc:'',
-          customerDescription:'',
           finalCustomer:'',
           customerRemark:'',
           remark:'',
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index 41171f3..ba57142 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -676,7 +676,7 @@
             </el-col>
             <el-col :span="8">
               <div class="grid-content bg-purple">
-                <el-form-item label="关键客户">
+                <el-form-item label="重要程度">
                   <el-input v-model="customerInformationData.importantCustomer" readonly></el-input>
                 </el-form-item>
               </div>
@@ -754,20 +754,11 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <div class="grid-content bg-purple">
-                <el-form-item label="岗位描述">
-                  <el-input v-model="customerInformationData.jobDescription" readonly></el-input>
+                <el-form-item label="客户描述">
+                  <el-input v-model="customerInformationData.customerDescription" readonly></el-input>
                 </el-form-item>
               </div>
             </el-col>
-            <el-col :span="12">
-              <div class="grid-content bg-purple">
-                <el-form-item label="备注信息">
-                  <el-input v-model="customerInformationData.remark" readonly></el-input>
-                </el-form-item>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
             <el-col :span="12">
               <div class="grid-content bg-purple">
                 <el-form-item label="客户联系地址">
@@ -1028,7 +1019,7 @@
           customerIndustry: '',
           companyName: '',
           jobDescription: '',
-          remark: '',
+          customerDescription: '',
           contactName: '',
           contactPhoneNumber1: '',
           position: '',