2025-06-05

字段授权没生效
7 months ago · 120f71dc25
7 changed files with 701 additions and 549 deletions
--- a/src/views/modules/demoComponents/orderProperties.vue
+++ b/src/views/modules/demoComponents/orderProperties.vue
@ -1,14 +1,17 @@
 <template>
  <div>
    <div style="margin-top: 5px">
-      <template v-if="isAuth('103001:tab1:save')">
-        <el-button type="primary" @click="clickSaveBtn" v-if="orderNo" :disabled="disabled">新增</el-button>
-      </template>
-      <template v-if="isAuth('103001:tab1:update')">
-        <el-button type="primary" :loading="loading" v-if="orderNo" :disabled="disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
-      </template>
-      <template v-if="isAuth('103001:tab1:save')">
-        <el-button type="primary" @click="refreshPropertiesModal" :disabled="disabled" v-if="attributeDialog && orderNo">刷新属性模板</el-button>
+      {{approvalUsername}}
+      <template v-if="approvalUsername && approvalUsername.split(';').includes($store.state.user.name)">
+        <template v-if="isAuth('103001:tab1:save')">
+          <el-button type="primary" @click="clickSaveBtn" v-if="orderNo && proofingStatus === '审批中'" :disabled="disabled">新增</el-button>
+        </template>
+        <template v-if="isAuth('103001:tab1:update')">
+          <el-button type="primary" :loading="loading" v-if="orderNo && proofingStatus === '审批中'" :disabled="disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
+        </template>
+        <template v-if="isAuth('103001:tab1:save')">
+          <el-button type="primary" @click="refreshPropertiesModal" :disabled="disabled" v-if="attributeDialog && orderNo && proofingStatus === '审批中'">刷新属性模板</el-button>
+        </template>
      </template>
    </div>
    <div class="rq " v-if="attributeDialog">
@ -111,16 +114,22 @@ export default {
  name: "orderAttribute",
  components: {TransferTable},
  props:{
-    orderNo:{
+    orderNo: {
+      type:String,
+    },
+    codeNo: {
+      type:String,
+    },
+    approvalUsername: {
      type:String,
    },
-    codeNo:{
+    proofingStatus: {
      type:String,
    },
-    functionType:{
+    functionType: {
      type:String,
    },
-    disabled:{
+    disabled: {
      type:Boolean,
      default:false,
    }
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@ -84,8 +84,8 @@
        width="150"
        label="操作">
        <template slot-scope="scope">
-          <el-link v-if="isAuth('104002001:details')" style="cursor: pointer" @click="detailsModal(scope.row)">详情</el-link>
          <el-link v-if="isAuth('104002001:update')" style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
+          <el-link v-if="isAuth('104002001:details')" style="cursor: pointer" @click="detailsModal(scope.row)">详情</el-link>
          <el-link style="cursor: pointer" @click="checkOutToRouting(scope.row.plmPartNo)">切换Routing</el-link>
        </template>
      </el-table-column>
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@ -121,8 +121,8 @@
        width="100"
        label="操作">
        <template slot-scope="scope">
-          <el-link v-if="isAuth('104001001:details')" style="cursor: pointer" @click="detailsModal(scope.row)">详情</el-link>
          <el-link v-if="isAuth('104001001:update')" style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
+          <el-link v-if="isAuth('104001001:details')" style="cursor: pointer" @click="detailsModal(scope.row)">详情</el-link>
          <el-dropdown trigger="click">
            <el-link style="cursor: pointer;font-size: 12px">
              更多
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@ -85,8 +85,8 @@
        width="135"
        label="操作">
        <template slot-scope="scope">
-          <el-link v-if="isAuth('104003001:details')" style="cursor: pointer" @click="detailsModal(scope.row)">详情</el-link>
          <el-link v-if="isAuth('104003001:update')" style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
+          <el-link v-if="isAuth('104003001:details')" style="cursor: pointer" @click="detailsModal(scope.row)">详情</el-link>
          <el-link style="cursor: pointer" @click="checkOutToBom(scope.row.plmPartNo)">切换BOM</el-link>
        </template>
      </el-table-column>
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@ -532,10 +532,16 @@
    </el-dialog>

    <!-- 页签 -->
-    <el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 300px;" type="border-card"
-             @tab-click="tabClick" class="customer-tab">
+    <el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 300px;" type="border-card" @tab-click="tabClick" class="customer-tab">
      <el-tab-pane label="基本信息" name="attribute">
-        <proofing-attribute ref="dialogAttribute" :disabled="proofingCurrentRow.proofingStatus === '已完成'" :order-no="proofingCurrentRow.proofingNo" :code-no="'Proofing'" :function-type="'order'"></proofing-attribute>
+        <proofing-attribute ref="dialogAttribute"
+                            :disabled="proofingCurrentRow.proofingStatus === '已完成'"
+                            :order-no="proofingCurrentRow.proofingNo"
+                            :approval-username="proofingCurrentRow.approvalUsername"
+                            :proofing-status="proofingCurrentRow.proofingStatus"
+                            :code-no="'Proofing'"
+                            :function-type="'order'">
+        </proofing-attribute>
      </el-tab-pane>
      <!-- 项目信息页签 -->
      <el-tab-pane label="项目信息" name="project_information">
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@ -56,18 +56,22 @@
          <span slot="label" @click="getUserList(8)"><a herf="#">Select Artwork</a></span>
          <el-input v-model="dataForm.technician" readonly style="width: 130px" placeholder="请选择人员" ></el-input>
        </el-form-item>
-        <el-form-item >
-          <span slot="label" @click="getUserList(6)"><a herf="#">Select Technical</a></span>
-          <el-input v-model="dataForm.mpOperatorName" ref="mpOperatorName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
+<!--        <el-form-item >-->
+<!--          <span slot="label" @click="getUserList(6)"><a herf="#">Select Technical</a></span>-->
+<!--          <el-input v-model="dataForm.mpOperatorName" ref="mpOperatorName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>-->
+<!--        </el-form-item>-->
+        <el-form-item>
+          <span slot="label" @click="handleMpOperator"><a>Select Technical</a></span>
+          <el-input v-model="dataForm.mpOperatorName" @focus="handleMpOperator()" ref="mpOperatorName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
        </el-form-item>
        <el-form-item>
 <!--          <span slot="label" @click="getUserList(1)"><a herf="#">Select CQC</a></span>-->
-          <span slot="label" @click="handleCqcOperator"><a >Select CQC</a></span>
+          <span slot="label" @click="handleCqcOperator"><a>Select CQC</a></span>
          <el-input v-model="dataForm.cqcOperatorName" @focus="handleCqcOperator()" ref="cqcOperatorName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
        </el-form-item>
        <el-form-item>
 <!--          <span slot="label" @click="getUserList(2)"><a herf="#">Select FAI</a></span>-->
-          <span slot="label" @click="handleFaiOperator"><a >Select FAI</a></span>
+          <span slot="label" @click="handleFaiOperator"><a>Select FAI</a></span>
          <el-input v-model="dataForm.faiOperatorName" @focus="handleFaiOperator" ref="faiOperatorName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
        </el-form-item>
 <!--        <el-form-item >-->
@ -97,14 +101,14 @@
 <!--        </el-form-item>-->
        <el-form-item >
          <span slot="label" @click="dccChooseModal()"><a herf="#">Select DCC</a></span>
-          <el-input v-model="dataForm.dcc"  ref="dcc" readonly @focus="dccChooseModal()" style="width: 130px"></el-input>
+          <el-input v-model="dataForm.dcc" ref="dcc" readonly @focus="dccChooseModal()" style="width: 130px"></el-input>
        </el-form-item>
      </el-form>
-      <el-form :inline="true" label-position="top" label-width="100px" >
+      <el-form :inline="true" label-position="top" label-width="100px">
        <el-form-item :label="'备注'">
          <el-input
            type="textarea"
-            v-model="dataForm.remark "
+            v-model="dataForm.remark"
            :rows="3"
            resize='none'
            maxlength="120"
@ -121,11 +125,8 @@

    <el-dialog width="530px" title="报价员" :close-on-click-modal="false" :visible.sync="quotationOfficerFlag">
      <el-transfer
-        v-model="quotationOfficerList"
-        class="rq"
-        filterable
-        :props="{key: 'operatorId', label: 'operatorName'}"
-        :data="operatorList"
+        v-model="quotationOfficerList" class="rq" filterable
+        :props="operatorProp" :data="operatorList"
        :titles="['未选择', '已选择']">
      </el-transfer>
      <span slot="footer" class="dialog-footer">
@ -138,11 +139,8 @@

    <el-dialog width="530px" title="工程师" :close-on-click-modal="false" :visible.sync="engineerFlag">
      <el-transfer
-        v-model="engineerList"
-        class="rq"
-        filterable
-        :props="{key: 'operatorId', label: 'operatorName'}"
-        :data="operatorList"
+        v-model="engineerList" class="rq" filterable
+        :props="operatorProp" :data="operatorList"
        :titles="['未选择', '已选择']">
      </el-transfer>
      <span slot="footer" class="dialog-footer">
@ -153,17 +151,10 @@
      </span>
    </el-dialog>

-    <el-dialog
-      width="530px"
-      title="项目负责人"
-      :close-on-click-modal="false"
-      :visible.sync="ownerFlag">
+    <el-dialog width="530px" title="项目负责人" :close-on-click-modal="false" :visible.sync="ownerFlag">
      <el-transfer
-        v-model="technicianList"
-        class="rq"
-        filterable
-        :props="{key: 'operatorId',label: 'operatorName'}"
-        :data="operatorList"
+        v-model="technicianList" class="rq" filterable
+        :props="operatorProp" :data="operatorList"
        :titles="['未选择', '已选择']">
      </el-transfer>
      <span slot="footer" class="dialog-footer">
@ -345,37 +336,24 @@
      </el-pagination>
    </el-dialog>

-    <el-dialog
-      width="530px"
-      title="DCC人员"
-      :close-on-click-modal="false"
-      :visible.sync="dccFlag">
+    <el-dialog width="530px" title="DCC人员" :close-on-click-modal="false" :visible.sync="dccFlag">
      <el-transfer
-        v-model="dccList"
-        class="rq"
-        filterable
-        :props="{key: 'operatorId',label: 'operatorName'}"
-        :data="operatorList"
+        v-model="dccList" class="rq" filterable
+        :props="operatorProp" :data="operatorList"
        :titles="['未选择', '已选择']">
      </el-transfer>
      <span slot="footer" class="dialog-footer">
        <div style="margin-top: 5px">
-          <el-button type="primary" @click="savetDccList()">确定</el-button>
+          <el-button type="primary" @click="saveDccList()">确定</el-button>
          <el-button @click="dccFlag = false" type="primary">取消</el-button>
        </div>
      </span>
    </el-dialog>

-    <el-dialog title="CQC人员"
-               :visible.sync="cqcVisible"
-               :close-on-click-modal="false"
-               width="530px">
+    <el-dialog title="CQC人员" :visible.sync="cqcVisible" :close-on-click-modal="false" width="530px">
      <el-transfer
-        v-model="dataForm.cqcOperatorList"
-        class="rq"
-        filterable
-        :props="operatorProp"
-        :data="cqcOperatorList"
+        v-model="dataForm.cqcOperatorList" class="rq" filterable
+        :props="operatorProp" :data="cqcOperatorList"
        :titles="['未选择', '已选择']">
      </el-transfer>
      <div slot="footer" class="dialog-footer">
@ -383,16 +361,11 @@
        <el-button type="primary" @click="cqcVisible = false">取消</el-button>
      </div>
    </el-dialog>
-    <el-dialog title="FAI人员"
-               :visible.sync="faiVisible"
-               :close-on-click-modal="false"
-               width="530px">
+
+    <el-dialog title="FAI人员" :visible.sync="faiVisible" :close-on-click-modal="false" width="530px">
      <el-transfer
-        v-model="dataForm.faiOperatorList"
-        class="rq"
-        filterable
-        :props="operatorProp"
-        :data="faiOperatorList"
+        v-model="dataForm.faiOperatorList" class="rq" filterable
+        :props="operatorProp" :data="faiOperatorList"
        :titles="['未选择', '已选择']">
      </el-transfer>
      <div slot="footer" class="dialog-footer">
@ -401,6 +374,18 @@
      </div>
    </el-dialog>

+    <el-dialog title="Technical人员" :visible.sync="mpVisible" :close-on-click-modal="false" width="530px">
+      <el-transfer
+        v-model="dataForm.mpOperatorList" class="rq" filterable
+        :props="operatorProp" :data="mpOperatorList"
+        :titles="['未选择', '已选择']">
+      </el-transfer>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleSaveMpOperator">确定</el-button>
+        <el-button type="primary" @click="mpVisible = false">取消</el-button>
+      </div>
+    </el-dialog>
+
    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>

    <ChooseUser ref="userList"  @getBaseData="getUserData"></ChooseUser>
@ -476,7 +461,9 @@
          dcc: '',
          dccList: [],
          rev: '',
-          customerRev: ''
+          customerRev: '',
+          mpOperatorList: [],
+          csOperatorList: [],
        },
        dccList:'',
        dccFlag:false,
@ -541,7 +528,6 @@
              trigger: 'change'
            }
          ],
-
        },
        proofingList:[],
        proofingModelFlag:false,
@ -555,10 +541,12 @@
          key: 'operatorId',
          label: 'operatorName'
        },
-        cqcVisible:false,
-        cqcOperatorList:[],
-        faiVisible:false,
-        faiOperatorList:[],
+        cqcVisible: false,
+        faiVisible: false,
+        mpVisible: false,
+        cqcOperatorList: [],
+        faiOperatorList: [],
+        mpOperatorList: []
      }
    },
    created () {
@ -749,43 +737,52 @@
          }
        }
      },
+
      init (id) {
        this.jumpFlag = true
        this.dataForm.id = id || 0
        if (this.dataForm.id !== 0) {
-          let inData={
+          let inData = {
            page: 1,
            limit: 10,
-            id:id,
-            userName:this.$store.state.user.name,
-            site:this.$store.state.user.site,
+            id: id,
+            userName: this.$store.state.user.name,
+            site: this.$store.state.user.site,
          }
          technicalSpecificationListSearch(inData).then(({data}) => {
-            if(data.page.list.length>0){
-              this.dataForm= data.page.list[0];
-              let inData={
-                site:this.dataForm.site,
-                codeNo:this.dataForm.codeNo,
-                type:'quotationOfficer',
+            if (data.page.list.length > 0) {
+              this.dataForm = data.page.list[0]
+              let inData = {
+                site: this.dataForm.site,
+                codeNo: this.dataForm.codeNo,
+                type: 'cs',
              }
              searchTechnicalSpecificationTeamStr(inData).then(({data}) => {
-                this.dataForm.quotationOfficerList=data.rows
+                this.dataForm.csOperatorList = data.rows
              })
-              let inData2={
-                site:this.dataForm.site,
-                codeNo:this.dataForm.codeNo,
-                type:'technician',
+              let inData2 = {
+                site: this.dataForm.site,
+                codeNo: this.dataForm.codeNo,
+                type: 'engineer',
              }
              searchTechnicalSpecificationTeamStr(inData2).then(({data}) => {
-                this.dataForm.technicianList=data.rows
+                this.dataForm.engineerList = data.rows
              })
-              let inData3={
-                site:this.dataForm.site,
-                codeNo:this.dataForm.codeNo,
-                type:'engineer',
+              let inData3 = {
+                site: this.dataForm.site,
+                codeNo: this.dataForm.codeNo,
+                type: 'technician',
              }
              searchTechnicalSpecificationTeamStr(inData3).then(({data}) => {
-                this.dataForm.engineerList=data.rows
+                this.dataForm.technicianList = data.rows
+              })
+              let inData4 = {
+                site: this.dataForm.site,
+                codeNo: this.dataForm.codeNo,
+                type: 'mp',
+              }
+              searchTechnicalSpecificationTeamStr(inData4).then(({data}) => {
+                this.dataForm.mpOperatorList = data.rows
              })
              let inData5 = {
                site: this.dataForm.site,
@ -795,8 +792,24 @@
              searchTechnicalSpecificationTeamStr(inData5).then(({data}) => {
                this.dataForm.dccList = data.rows
              })
+              let inData6 = {
+                site: this.dataForm.site,
+                codeNo: this.dataForm.codeNo,
+                type: 'cqc',
+              }
+              searchTechnicalSpecificationTeamStr(inData6).then(({data}) => {
+                this.dataForm.cqcOperatorList = data.rows
+              })
+              let inData7 = {
+                site: this.dataForm.site,
+                codeNo: this.dataForm.codeNo,
+                type: 'fai',
+              }
+              searchTechnicalSpecificationTeamStr(inData7).then(({data}) => {
+                this.dataForm.faiOperatorList = data.rows
+              })
              this.visible = true
-            }else {
+            } else {
              this.$message.error('技术参数卡数据有误！')
            }
          })
@ -839,30 +852,32 @@
            buNo: '',
            dcc: '',
            dccList: [],
-            rev:'',
-            customerRev:''
+            rev: '',
+            customerRev: '',
+            mpOperatorList: [],
+            csOperatorList: [],
          }
          // 获取DCCList
          this.visible = true
        }
      },
+
      chooseProofingModel () {
        if (this.dataForm.id !== 0 ) {
          return false;
        }
-        this.proofingSearch={
-            projectId:'',
-            proofingNo:'',
-            customerId:'',
-            finalCustomerId:'',
-            site:this.$store.state.user.site,
-            username:this.$store.state.user.name,
+        this.proofingSearch = {
+            projectId: '',
+            proofingNo: '',
+            customerId: '',
+            finalCustomerId: '',
+            site: this.$store.state.user.site,
+            username: this.$store.state.user.name,
        }
        getProofingDataByUserRole(this.proofingSearch).then(({data}) => {
-          this.proofingList=data.rows
+          this.proofingList = data.rows
        })
-
-        this.proofingModelFlag=true
+        this.proofingModelFlag = true
      },

      choosePartModel () {
@ -898,6 +913,7 @@
          this.proofingList=data.rows
        })
      },
+
      changeProofingNoChange(){
        let inData={
          site:this.dataForm.site,
@ -929,11 +945,12 @@
            this.$nextTick(() => {
              this.operatorList = data.rows
              this.dccList = data.rows.map(item=>item.operatorId)
-              this.savetDccList()
+              this.saveDccList()
              this.operatorList = []
            })
          }
        })
+
        // CQC
        this.queryUserInfoByBM('R008').then(({data}) => {
          if (data && data.code === 0){
@ -945,6 +962,7 @@
            })
          }
        })
+
        // FAI
        this.queryUserInfoByBM('R009').then(({data}) => {
          if (data && data.code === 0){
@ -1035,6 +1053,7 @@
        this.dataForm.engineerList=JSON.parse(JSON.stringify(this.engineerList));
        this.engineerFlag=false
      },
+
      technicianModal(){
        let inData={
          site:this.dataForm.site,
@ -1045,66 +1064,57 @@
        this.technicianList = JSON.parse(JSON.stringify(this.dataForm.technicianList));
        this.ownerFlag=true
      },
-      savetechnicianList(){
-        let technicianName='';
+
+      savetechnicianList () {
+        let technicianName = ''
        for (let i = 0; i < this.technicianList.length; i++) {
-          let select= this.operatorList.filter(item => item.operatorId === this.technicianList[i])
-          if(select.length>0){
-            technicianName+=select[0].operatorName+';'
-          }
-        }
-        this.dataForm.technician=technicianName
-        this.dataForm.technicianList=JSON.parse(JSON.stringify(this.technicianList));
-        this.ownerFlag=false
-      },
-      savetDccList(){
-        let dccName='';
-        for (let i = 0; i < this.dccList.length; i++) {
-          let select= this.operatorList.filter(item => item.operatorId === this.dccList[i])
-          if(select.length>0){
-            dccName+=select[0].operatorName+';'
+          let select = this.operatorList.filter(item => item.operatorId === this.technicianList[i])
+          if (select.length > 0) {
+            technicianName += select[0].operatorName + ';'
          }
        }
-        this.dataForm.dcc=dccName
-        this.dataForm.dccList=JSON.parse(JSON.stringify(this.dccList));
-        this.dccFlag=false
+        this.dataForm.technician = technicianName
+        this.dataForm.technicianList = JSON.parse(JSON.stringify(this.technicianList))
+        this.ownerFlag = false
      },
+
      // 表单提交
      dataFormSubmit () {
-        if(this.dataForm.testPartNo===''){
+        if (this.dataForm.testPartNo === '') {
          this.$message.error('请输入测试料号！')
          return false
        }
-        if(this.dataForm.revNo===''){
+        if (this.dataForm.revNo === '') {
          this.$message.error('请输入版本号！')
          return false
        }
-        this.dataForm.engineerList = [];
-        this.dataForm.engineerList.push(this.dataForm.engineerNo);
-        this.dataForm.technicianList = [];
-        this.dataForm.technicianList.push(this.dataForm.technicianNo);
+        this.dataForm.engineerList = []
+        this.dataForm.engineerList.push(this.dataForm.engineerNo) // Engineer
+        this.dataForm.technicianList = []
+        this.dataForm.technicianList.push(this.dataForm.technicianNo) // Artwork
+        this.dataForm.csOperatorList = []
+        this.dataForm.csOperatorList.push(this.dataForm.csOperater) // CS
        this.saveLoading = true
        saveTechnicalSpecificationSheet(this.dataForm).then(({data}) => {
          if (data && data.code === 0) {
            this.$message.success( '操作成功')
            this.visible = false
            this.$emit('refreshDataList')
-            if(this.jumpFlag){
+            if (this.jumpFlag) {
              setTimeout(() => {
-                let now = Date.now();
+                let now = Date.now()
                let inData = {
                  site: this.$store.state.user.site,
                  codeNo: data.row.codeNo,
                  buNo: data.row.buNo,
                  username: this.$store.state.user.name,
-                  uuid:now+'',
-                  activeName:'baseInfo'
-                };
+                  uuid: now + '',
+                  activeName: 'baseInfo'
+                }
                localStorage.setItem('tsfData', JSON.stringify(inData))
                window.open('#/BMPage/'+now);
              },500)
            }
-
          } else {
            this.$message.error(data.msg)
          }
@ -1114,117 +1124,166 @@
          this.saveLoading = false
        })
      },
-      changeTestDesc(){
-        this.dataForm.proofingNo="";
-        let inData={
-          site:this.$store.state.user.site,
+
+      changeTestDesc () {
+        this.dataForm.proofingNo = ""
+        let inData = {
+          site: this.$store.state.user.site,
          testPartNo: this.dataForm.testPartNo
        }
        getTestPartChangeData(inData).then(({data}) => {
          if (data && data.code === 0) {
-            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=''
+            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 = ''
            }
-
          }
        })
      },
+
      // 每页数
      sizeChangeHandle (val) {
        this.pageSize = val
        this.pageIndex = 1
        this.refreshPartList()
      },
+
      // 当前页
      currentChangeHandle (val) {
        this.pageIndex = val
        this.refreshPartList()
      },
-      dccChooseModal(){
-        // let inData={
-        //   site:this.dataForm.site,
-        //   buNo:this.dataForm.buNo,
-        //   roleNo:'R015'
-        // }
-        this.operatorList = [];
-        this.queryUserInfoByBM('R015').then(({data}) => {
-          this.operatorList = data.rows
-        })
-        this.dccList = JSON.parse(JSON.stringify(this.dataForm.dccList));
-        this.dccFlag=true
-      },
-      queryUserInfoByBM(roleNo){
+
+      queryUserInfoByBM (roleNo) {
        let params = {
-          site:this.dataForm.site,
-          buNo:this.dataForm.buNo,
-          roleNo:roleNo,
+          site: this.dataForm.site,
+          buNo: this.dataForm.buNo,
+          roleNo: roleNo,
        }
        return searchBMUser(params)
      },
-      handleCqcOperator(){
-        this.cqcVisible = true;
+
+      // Select Technical
+      handleMpOperator () {
+        this.mpVisible = true
+        this.mpOperatorList = []
+        this.queryUserInfoByBM('R021').then(({data}) => {
+          if (data && data.code === 0) {
+            this.mpOperatorList = data.rows
+          } else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      },
+
+      // Select CQC
+      handleCqcOperator () {
+        this.cqcVisible = true
        this.cqcOperatorList = []
        this.queryUserInfoByBM('R008').then(({data}) => {
-          if (data && data.code === 0){
+          if (data && data.code === 0) {
            this.cqcOperatorList = data.rows
-          }else {
+          } else {
            this.$message.warning(data.msg)
          }
        }).catch((error)=>{
-          this.$message.error(error);
+          this.$message.error(error)
        })
      },
-      handleFaiOperator(){
-        this.faiVisible = true;
+
+      // Select FAI
+      handleFaiOperator () {
+        this.faiVisible = true
        this.faiOperatorList = []
        this.queryUserInfoByBM('R009').then(({data}) => {
-          if (data && data.code === 0){
+          if (data && data.code === 0) {
            this.faiOperatorList = data.rows
-          }else {
+          } else {
            this.$message.warning(data.msg)
          }
        }).catch((error)=>{
-          this.$message.error(error);
+          this.$message.error(error)
        })
      },
-      handleSaveCqcOperator(){
-        this.dataForm.cqcOperatorName = this.cqcOperatorList.filter(item => this.dataForm.cqcOperatorList.includes(item.operatorId)).map(item=> item.operatorName).join(';');
-        this.cqcVisible = false;
+
+      // Select DCC
+      dccChooseModal () {
+        this.operatorList = []
+        this.queryUserInfoByBM('R015').then(({data}) => {
+          this.operatorList = data.rows
+        })
+        this.dccList = JSON.parse(JSON.stringify(this.dataForm.dccList))
+        this.dccFlag = true
+      },
+
+      handleSaveMpOperator () {
+        this.dataForm.mpOperatorName = this.mpOperatorList.filter(item => this.dataForm.mpOperatorList.includes(item.operatorId)).map(item=> item.operatorName).join(';')
+        this.mpVisible = false
+      },
+
+      handleSaveCqcOperator () {
+        this.dataForm.cqcOperatorName = this.cqcOperatorList.filter(item => this.dataForm.cqcOperatorList.includes(item.operatorId)).map(item=> item.operatorName).join(';')
+        this.cqcVisible = false
+      },
+
+      handleSaveFaiOperator () {
+        this.dataForm.faiOperatorName = this.faiOperatorList.filter(item => this.dataForm.faiOperatorList.includes(item.operatorId)).map(item=> item.operatorName).join(';')
+        this.faiVisible = false
      },
-      handleSaveFaiOperator(){
-        this.dataForm.faiOperatorName = this.faiOperatorList.filter(item => this.dataForm.faiOperatorList.includes(item.operatorId)).map(item=> item.operatorName).join(';');
-        this.faiVisible = false;
+
+      saveDccList () {
+        let dccName = ''
+        for (let i = 0; i < this.dccList.length; i++) {
+          let select= this.operatorList.filter(item => item.operatorId === this.dccList[i])
+          if (select.length > 0) {
+            dccName += select[0].operatorName + ';'
+          }
+        }
+        this.dataForm.dcc = dccName
+        this.dataForm.dccList = JSON.parse(JSON.stringify(this.dccList))
+        this.dccFlag = false
      },
    },
-    watch:{
-      saveLoading(newVal,oldVal){
-        if (newVal){
+
+    watch: {
+      saveLoading (newVal,oldVal) {
+        if (newVal) {
          setTimeout(()=>{
            this.saveLoading = false
          },30000)
        }
      },
-      visible(newVal,oldVal){
-        if (!newVal){
+
+      visible (newVal,oldVal) {
+        if (!newVal) {
          this.dataForm.cqcOperatorList = []
          this.dataForm.faiOperatorList = []
        }
      },
-      cqcVisible(newVal,oldVal){
+
+      cqcVisible (newVal,oldVal) {
        if (!newVal){
          this.cqcOperatorList = []
        }
      },
-      faiVisible(newVal,oldVal){
-        if (!newVal){
+
+      faiVisible (newVal,oldVal) {
+        if (!newVal) {
          this.faiOperatorList = []
        }
      },
+
+      mpVisible (newVal,oldVal) {
+        if (!newVal) {
+          this.mpOperatorList = []
+        }
+      },
    },
  }
 </script>
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue