From 0fa34a0ba6421bfb0cfb8bfae2c565f05e36306d Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 20 Mar 2025 11:15:33 +0800
Subject: [PATCH] 2025-03-20

---
 .../com_projectInfo-add-or-update.vue         |   2 +-
 .../com_technical-add-or-update.vue           |  20 +-
 .../com_tsd_basicInformation.vue              | 181 +++++++++---------
 3 files changed, 107 insertions(+), 96 deletions(-)

diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
index bb2f7ee..d2b7ea3 100644
--- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
+++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
@@ -88,7 +88,7 @@
 <!--            </el-form-item>-->
 <!--          </el-col>-->
           <el-col :span="6">
-            <el-form-item  label="客户项目料号">
+            <el-form-item  label="客户项目号">
               <el-input v-model="dataForm.customerProjectNo"  ></el-input>
             </el-form-item>
           </el-col>
diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
index 59e5ebf..91cfde3 100644
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@@ -31,11 +31,17 @@
         <el-form-item :label="'BU'" >
           <el-input v-model="dataForm.buNo" disabled style="width: 130px" ></el-input>
         </el-form-item>
-        <el-form-item :label="'参数卡编码'" >
-          <el-input v-model="dataForm.oriCodeNo" disabled style="width: 130px" ></el-input>
+<!--        <el-form-item :label="'参数卡编码'" >-->
+<!--          <el-input v-model="dataForm.oriCodeNo" disabled style="width: 130px" ></el-input>-->
+<!--        </el-form-item>-->
+        <el-form-item :label="'系统版本号'" prop="revNo" :rules="dataRole.revNo">
+          <el-input v-model="dataForm.revNo" style="width: 130px" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="Rev No" prop="rev" :rules="dataRole.rev">
+          <el-input v-model="dataForm.rev" style="width: 130px"></el-input>
         </el-form-item>
-        <el-form-item :label="'版本号'" prop="revNo" :rules="dataRole.revNo">
-          <el-input v-model="dataForm.revNo" style="width: 130px" :disabled="dataForm.id!=0" ></el-input>
+        <el-form-item label="Customer Rev" prop="customerRev" :rules="dataRole.customerRev">
+          <el-input v-model="dataForm.customerRev" style="width: 130px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole">
@@ -428,6 +434,8 @@
           buNo:'',
           dcc:'',
           dccList:[],
+          rev:'',
+          customerRev:''
         },
         dccList:'',
         dccFlag:false,
@@ -751,7 +759,7 @@
             testPartNo: '',
             partDesc: '',
             status: '',
-            revNo: '',
+            revNo: 1,
             remark: '',
             technician: '',
             quotationOfficer: '',
@@ -777,6 +785,8 @@
             buNo: '',
             dcc: '',
             dccList: [],
+            rev:'',
+            customerRev:''
           }
           this.visible = true
         }
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index 1e52cfe..fb07781 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -1,126 +1,126 @@
 <template>
   <div class="mod-config"  v-highlight-container>
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
-      <el-row :gutter="20">
-        <el-col :span="18"><div class="grid-content bg-purple">
-      <el-form-item :label="' '">
-        <el-button type="primary" @click="refresh()" >刷新数据</el-button>
-        <el-button type="primary" @click="saveData()" v-if="(!ifDisableFlag && isAuth('103002:bmSave')) || (superAdmin)">保存数据</el-button>
-        <el-button v-if="dataForm.status === 'spz' && ((!ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="agreeSubmit">同意</el-button>
-        <el-button v-if="dataForm.status === 'spz' && ((dataForm.isReject === 'Y' && !ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="submitDataModal">驳回</el-button>
-        <el-button v-if="dataForm.status === 'cg' && (!ifDisableFlag || (superAdmin))" type="primary" @click="issueModal">下达</el-button>
-      </el-form-item>
-        </div>
-        </el-col><el-col :span="3"><div class="grid-content bg-purple">
-          <el-form-item :label="'当前节点'" >
-            <el-input v-model="spForm.nodeName" disabled  ></el-input>
+      <el-row :gutter="10">
+        <el-col :span="15">
+          <div class="grid-content bg-purple">
+            <el-form-item :label="' '">
+              <el-button type="primary" @click="refresh()">刷新数据</el-button>
+              <template v-if="(!ifDisableFlag && isAuth('103002:bmSave')) || (superAdmin)">
+                <el-button type="primary" @click="saveData()">保存数据 </el-button>
+              </template>
+              <template v-if="dataForm.status === 'spz' && ((!ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))">
+                <el-button type="primary" @click="agreeSubmit">同意</el-button>
+              </template>
+              <template v-if="dataForm.status === 'spz' && ((dataForm.isReject === 'Y' && !ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))">
+                <el-button  type="primary" @click="submitDataModal">驳回</el-button>
+              </template>
+              <template v-if="dataForm.status === 'cg' && (!ifDisableFlag || (superAdmin))">
+                <el-button type="primary" @click="issueModal">下达</el-button>
+              </template>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item label="BU">
+            <el-input v-model="dataForm.buNo" disabled></el-input>
           </el-form-item>
-        </div>
         </el-col>
-        <el-col :span="3"><div class="grid-content bg-purple">
-          <el-form-item :label="'当前节点审批人'" >
-            <el-input v-model="spForm.sp" disabled  ></el-input>
+        <el-col :span="3">
+          <el-form-item label="当前节点">
+            <el-input v-model="spForm.nodeName" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item label="当前节点审批人">
+            <el-input v-model="spForm.sp" disabled></el-input>
           </el-form-item>
-        </div>
         </el-col>
       </el-row>
     </el-form>
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'BenchmarkNo'">
-            <el-input v-model="dataForm.oriCodeNo" disabled  ></el-input>
+      <el-row :gutter="10">
+        <el-col :span="3">
+          <el-form-item label="BenchmarkNo">
+            <el-input v-model="dataForm.oriCodeNo" disabled></el-input>
           </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'Revision Number'">
-            <el-input v-model="dataForm.revNo" disabled  ></el-input>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item label="系统版本号">
+            <el-input v-model="dataForm.revNo" disabled></el-input>
           </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'Part Number'" v-if="searchData.buNo !== 'DBE'">
-            <el-input v-model="dataForm.testPartNo" disabled  ></el-input>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item label="Part No">
+            <el-input v-model="dataForm.finalPartNo" disabled></el-input>
           </el-form-item>
-          <el-form-item :label="'800 Number'" v-if="searchData.buNo === 'DBE'">
-            <el-input v-model="dataForm.finalPartNo" disabled  ></el-input>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="Part Desc">
+            <el-input v-model="dataForm.partDesc" disabled></el-input>
           </el-form-item>
-        </div></el-col>
-
-<!--        <el-col :span="6"><div class="grid-content bg-purple">-->
-<!--          <el-form-item :label="'P/N Rev.'">-->
-<!--            <el-input v-model="dataForm.partRevNo" disabled  ></el-input>-->
-<!--          </el-form-item>-->
-<!--        </div></el-col>-->
+        </el-col>
+        <el-col :span="3">
+          <el-form-item label="Rev No">
+            <el-input v-model="dataForm.rev" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item label="Customer Rev">
+            <el-input v-model="dataForm.customerRev" disabled></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'创建人/Creator'">
+      <el-row :gutter="10">
+        <el-col :span="3">
+          <el-form-item label="创建人/Creator">
             <el-input v-model="dataForm.createBy" disabled></el-input>
           </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
+        </el-col>
+        <el-col :span="3">
           <el-form-item :label="'创建日期/Date'">
             <el-input v-model="dataForm.createDate" disabled></el-input>
           </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'最新报价单'">
+        </el-col>
+        <el-col :span="3">
+          <el-form-item label="最新报价单">
             <el-input @focus="jumpPage('C')" ref="jumpC" class="blue-input yzz2" v-model="quotationNo" readonly></el-input>
           </el-form-item>
-        </div></el-col>
-        <el-col :span="3"><div class="grid-content bg-purple">
-          <el-form-item :label="'BU'">
-            <el-input v-model="dataForm.buNo" disabled></el-input>
+        </el-col>
+        <el-col :span="3" >
+          <el-form-item label="Process">
+            <el-input v-model="dataForm.process" disabled></el-input>
           </el-form-item>
-        </div></el-col>
-<!--        <el-col :span="12"><div class="grid-content bg-purple">-->
-<!--          <el-form-item >-->
-<!--            <span slot="label" style="" @click="quotationOfficerChooseModal()"><a herf="#">Select Quote Specialist</a></span>-->
-<!--            <el-input v-model="dataForm.quotationOfficer" readonly style=""  @focus="quotationOfficerChooseModal()" ></el-input>-->
-<!--          </el-form-item>-->
-<!--        </div></el-col>-->
+        </el-col>
+        <el-col :span="3">
+          <el-form-item label="Production Stage">
+            <el-select v-model="dataForm.stage" style="width: 100%" :disabled="ifDisableFlag">
+              <el-option label="Sample" value="Sample"></el-option>
+              <el-option label="Mass Production" value="Mass Production"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
 
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'Process'">
-            <el-input v-model="dataForm.process" disabled></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'ECN Number'">
+      <el-row :gutter="10">
+        <el-col :span="3">
+          <el-form-item label="ECN Number">
             <el-input @focus="jumpPage('A')" ref="jumpA" class="blue-input yzz2" v-model="dataForm.ecnNo" readonly></el-input>
           </el-form-item>
-        </div></el-col>
-        <el-col :span="12"><div class="grid-content bg-purple">
-          <el-form-item :label="'ECN Document Link'">
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="ECN Document Link">
             <el-input v-model="dataForm.ecnAddress" 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">-->
-<!--          <el-form-item :label="'ECN是否需要变更图纸'">-->
-<!--            <el-input v-model="dataForm.ecnFlag"  style="" ></el-input>-->
-<!--          </el-form-item>-->
-<!--        </div></el-col>-->
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'Production Stage'">
-            <el-select v-model="dataForm.stage" :disabled="ifDisableFlag">
-              <el-option label="Sample" value="Sample"></el-option>
-              <el-option label="Mass Production" value="Mass Production"></el-option>
-            </el-select>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'Sample Application No'">
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="Sample Application No">
             <el-input @focus="jumpPage('B')" ref="jumpB" class="blue-input" v-model="dataForm.proofingNo" readonly></el-input>
           </el-form-item>
-        </div></el-col>
+        </el-col>
       </el-row>
 
-      <el-row :gutter="20">
+      <el-row :gutter="10">
         <el-col :span="6">
           <div class="grid-content bg-purple">
             <el-form-item >
@@ -611,6 +611,7 @@
           //区分请求成功和失败的状况
           if (data && data.code == 0) {
             this.dataForm = data.row
+            console.log(this.dataForm)
             this.getNodeAuthority(data.row)
             let inData = {
               site: this.dataForm.site,