From 1aa0324702a4c6ec1a2372032f755a8063080be9 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 28 Mar 2025 14:25:23 +0800
Subject: [PATCH] 2025-03-27

---
 src/utils/index.js                            |  5 +++
 .../quotation/inquiry/inquiryQuoteDetail.vue  |  2 +-
 .../com_bm_customerInformation.vue            | 25 ++++++++++-----
 .../com_tsd_basicInformation.vue              | 31 ++++++++++++++-----
 4 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index 0a80a2a..b153017 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -61,6 +61,11 @@ export function treeDataTranslate (data, id = 'id', pid = 'parentId') {
 export function clearLoginInfo () {
   Vue.cookie.delete('token')
   store.commit('resetStore')
+  // 加入清空权限信息
+  sessionStorage.removeItem("dynamicMenuRoutes")
+  sessionStorage.removeItem("accessField")
+  sessionStorage.removeItem("menuList")
+  sessionStorage.removeItem("permissions")
   router.options.isAddDynamicMenuRoutes = false
 }
 
diff --git a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
index 1799c92..806e807 100644
--- a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
+++ b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
@@ -290,7 +290,7 @@ export default {
   },
   watch:{
     "quotation"(newVal,oldVal){
-      if (newVal){
+      if (newVal && newVal !== {}){
         this.handleQuery();
       }else {
         this.dataList = [];
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
index 42a8f64..62c0af1 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
@@ -38,14 +38,15 @@
         </div></el-col>
         <el-col :span="6"><div class="grid-content bg-purple">
           <el-form-item :label="'终端客户/End Customer'">
-            <el-input v-model="dataForm.finalCustomerNo" disabled  ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'客户名称'">
-            <el-input v-model="dataForm.finalCustomerDesc" disabled  ></el-input>
+            <dict-data-select v-if="dataForm.site" v-model="dataForm.finalCustomerNo" :site="dataForm.site" clearable filterable dict-type="finalCustomer" :use-default-value="true" :disabled="ifDisableFlag"></dict-data-select>
+            <el-input v-else v-model="dataForm.finalCustomerNo" disabled  ></el-input>
           </el-form-item>
         </div></el-col>
+<!--        <el-col :span="6"><div class="grid-content bg-purple">-->
+<!--          <el-form-item :label="'客户名称'">-->
+<!--            <el-input v-model="dataForm.finalCustomerDesc" disabled  ></el-input>-->
+<!--          </el-form-item>-->
+<!--        </div></el-col>-->
       </el-row>
       <el-row :gutter="20">
         <el-col :span="6"><div class="grid-content bg-purple">
@@ -128,7 +129,9 @@
       <el-row :gutter="20" style="margin-top: 60px">
         <el-col :span="24"><div class="grid-content bg-purple">
           <el-form-item >
-            <span slot="label" style="" @click="openNewPage(dataForm.pictureAddess)"><a herf="#">附加客户图纸/Attach Customer Drawing(点击跳转)</a></span>
+            <span slot="label" style="" @click="openNewPage(dataForm.pictureAddess)">
+              <a herf="#">附加客户图纸/Attach Customer Drawing(点击跳转)</a>
+            </span>
             <el-input  v-model="dataForm.pictureAddess" :disabled="ifDisableFlag" ></el-input>
           </el-form-item>
         </div></el-col>
@@ -136,6 +139,9 @@
       <el-row :gutter="20">
         <el-col :span="24"><div class="grid-content bg-purple">
           <el-form-item :label="'客户图纸变更说明/Attach Customer Drawing'">
+            <span slot="label" style="" @click="openNewPage(dataForm.customerPictureChangeRemark)">
+              <a herf="#">客户图纸变更说明/Attach Customer Drawing</a>
+            </span>
             <el-input
               type="textarea"
               v-model="dataForm.customerPictureChangeRemark "
@@ -151,6 +157,9 @@
       <el-row :gutter="20" style="margin-top: 60px">
         <el-col :span="24"><div class="grid-content bg-purple">
           <el-form-item :label="'转量产附档说明/MP Comments'">
+            <span slot="label" style="" @click="openNewPage(dataForm.productionFileComments)">
+              <a herf="#">转量产附档说明/MP Comments</a>
+            </span>
             <el-input
               type="textarea"
               v-model="dataForm.productionFileComments "
@@ -213,8 +222,10 @@
     getNodeAuthority, // 获取节点权限
   } from '@/api/changeManagement/changeManagement.js'
   import Chooselist from '@/views/modules/common/Chooselist'
+  import DictDataSelect from "../../sys/dict-data-select.vue";
   export default {
     components: {
+      DictDataSelect,
       Chooselist
     },
     data() {
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index 9bf868e..f4ea5da 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -219,17 +219,30 @@
         </el-col>
       </el-row>
 
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <div class="grid-content bg-purple">
+            <el-form-item  label="备注区" class="auto-form">
+              <el-input
+                type="textarea"
+                v-model="dataForm.remarkPage "
+                :rows="10"
+                resize='none'
+                :disabled="ifDisableFlag">
+              </el-input>
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
       <el-row :gutter="20">
         <el-col :span="24"><div class="grid-content bg-purple">
-          <el-form-item  label="备注区" style="height: 200px">
+          <el-form-item  label="关联料号" class="auto-form">
             <el-input
               type="textarea"
-              v-model="dataForm.remarkPage "
-              :rows="10"
+              v-model="dataForm.relevancePartNo"
+              :rows="4"
               resize='none'
-              maxlength="200"
-              :disabled="ifDisableFlag"
-              style="height: 200px" >
+              :disabled="ifDisableFlag">
             </el-input>
           </el-form-item>
         </div></el-col>
@@ -408,6 +421,7 @@
           technicianNo:'',
           dcc:'',
           dccList:'',
+          relevancePartNo:'',
         },
         dataRole: {
           partTypeDesc: [
@@ -951,5 +965,8 @@
 </script>
 
 <style scoped>
-
+.auto-form /deep/ .el-form-item__content {
+  height: auto;
+  line-height: 1.5;
+}
 </style>