From 5c2a11fd114a8e856f1bcd7cd613e7860aae595a Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 30 Apr 2024 22:23:30 +0800
Subject: [PATCH] plm BM

---
 .../com_technical-add-or-update.vue           | 14 ++++--
 .../com_tsd_basicInformation.vue              | 48 +++++++++++++++++++
 2 files changed, 58 insertions(+), 4 deletions(-)

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 260a1a0..fa1b195 100644
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@@ -13,12 +13,15 @@
         <el-form-item label=" " >
         <el-checkbox v-model="jumpFlag">保存后跳转至详情</el-checkbox>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole">
-        <el-form-item prop="testPartNo" :rules="dataRole.testPartNo">
+        <el-form-item prop="testPartNo" :rules="dataRole.testPartNo" style="margin-left: 12px">
           <span slot="label" style="" @click="getBaseList(134,1)" ><a herf="#">项目料号</a></span>
           <el-input v-model="dataForm.testPartNo" @change="changeTestDesc" style="width: 130px"  ></el-input>
         </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole">
+        <el-form-item :label="'正式料号'">
+          <el-input v-model="dataForm.finalPartNo" style="width: 130px" disabled></el-input>
+        </el-form-item>
         <el-form-item :label="'项目号'">
           <el-input v-model="dataForm.projectId" style="width: 130px" disabled></el-input>
         </el-form-item>
@@ -218,6 +221,7 @@
         operatorList:[],
         dataForm: {
           id: 0,
+          finalPartNo:'',
           site:this.$store.state.user.site,
           proofingNo:'',
           projectId:'',
@@ -317,7 +321,7 @@
       getBaseData (val) {
         if (this.tagNo === 134) {
           if(this.tagNo1==1) {
-            this.dataForm.testPartNo = val.PART_NO
+            this.dataForm.testPartNo = val.Test_part_no
             this.dataForm.proofingNo = ''
             this.changeTestDesc();
           }
@@ -383,6 +387,7 @@
         }else {
           this.dataForm={
             id: 0,
+            finalPartNo: '',
             site:this.$store.state.user.site,
             proofingNo:'',
             projectId:'',
@@ -570,6 +575,7 @@
             if(data.row!=null){
               this.dataForm.projectId=data.row.projectId
               this.dataForm.partDesc=data.row.partDesc
+              this.dataForm.finalPartNo=data.row.finalPartNo
             }else {
               this.dataForm.projectId=''
               this.dataForm.partDesc=''
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index 5f7d1fa..2ef9f86 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -125,6 +125,27 @@
         </div></el-col>
       </el-row>
 
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item >
+            <span slot="label" style="" @click="getBaseList(103,3)"><a herf="#">PE人员</a></span>
+            <el-input v-model="dataForm.peOperaterName" placeholder="请选择人员" readonly style="" ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item >
+            <span slot="label" style="" @click="getBaseList(103,4)"><a herf="#">CS人员</a></span>
+            <el-input v-model="dataForm.csOperaterName" placeholder="请选择人员" readonly style="" ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+           <el-form-item >
+          <span slot="label" style="" @click="getBaseList(103,5)"><a herf="#">DCC人员</a></span>
+          <el-input v-model="dataForm.dccOperaterName" placeholder="请选择人员" readonly style="" ></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">
@@ -260,6 +281,12 @@
           faiOperator:'',
           cqcOperatorName:'',
           faiOperatorName:'',
+          peOperater:'',
+          peOperaterName:'',
+          csOperater:'',
+          csOperaterName:'',
+          dccOperater:'',
+          dccOperaterName:'',
         },
         dataRole: {
           partTypeDesc: [
@@ -293,6 +320,15 @@
             if(type==2) {
               strVal = this.dataForm.faiOperator
             }
+            if(type==3) {
+              strVal = this.dataForm.peOperater
+            }
+            if(type==4) {
+              strVal = this.dataForm.csOperater
+            }
+            if(type==5) {
+              strVal = this.dataForm.dccOperater
+            }
           }
           this.$refs.baseList.init(val, strVal)
         })
@@ -308,6 +344,18 @@
             this.dataForm.faiOperator = val.username
             this.dataForm.faiOperatorName = val.user_display
           }
+          if(this.tagNo1==3) {
+            this.dataForm.peOperater = val.username
+            this.dataForm.peOperaterName = val.user_display
+          }
+          if(this.tagNo1==4) {
+            this.dataForm.csOperater = val.username
+            this.dataForm.csOperaterName = val.user_display
+          }
+          if(this.tagNo1==5) {
+            this.dataForm.dccOperater = val.username
+            this.dataForm.dccOperaterName = val.user_display
+          }
         }
       },
       //初始化组件的参数