SQE-ME SQE-EE

src/views/modules/eam/eamProjectInfo.vue

@@ -2996,20 +2996,6 @@ import {updateColumnSize} from "../../../api/table";
         }
         return ''
       },
-      getSqeEngineerValue (row, camelField) {
-        if (!row) {
-          return ''
-        }
-        return row[camelField] || ''
-      },
-      normalizeSqeEngineerFields (target) {
-        if (!target) {
-          return target
-        }
-        target.sqemeEngineer = this.getSqeEngineerValue(target, 'sqemeEngineer')
-        target.sqeeeEngineer = this.getSqeEngineerValue(target, 'sqeeeEngineer')
-        return target
-      },
       handleColumnResize(newWidth, oldWidth, column, event){
         let inData= this.columnList.filter(item => item.columnProp === column.property)[0]
         inData.columnWidth=newWidth
@@ -3459,7 +3445,6 @@ import {updateColumnSize} from "../../../api/table";
         await eamProjectInfoSearch(this.searchData).then(({data}) => {
           this.exportList = data.page.list
           this.exportList.forEach((item) => {
-            this.normalizeSqeEngineerFields(item)
             item.projectManagerName = this.getUserDisplayName(item.projectManager);
             item.projectOwnerName = this.getUserDisplayName(item.projectOwner);
             item.engineerName = this.getUserDisplayName(item.engineer);
@@ -3583,7 +3568,6 @@ import {updateColumnSize} from "../../../api/table";
               this.totalPage = data.page.totalCount
               // 遍历dataList
               this.dataList.forEach((item) => {
-                this.normalizeSqeEngineerFields(item)
                 item.projectManagerName = this.getUserDisplayName(item.projectManager)
                 item.projectOwnerName = this.getUserDisplayName(item.projectOwner)
                 item.engineerName = this.getUserDisplayName(item.engineer)
@@ -3669,7 +3653,6 @@ import {updateColumnSize} from "../../../api/table";
             this.totalPage = data.page.totalCount
             // 遍历dataList
             this.dataList.forEach((item) => {
-              this.normalizeSqeEngineerFields(item)
               item.projectManagerName = this.getUserDisplayName(item.projectManager)
               item.projectOwnerName = this.getUserDisplayName(item.projectOwner)
               item.engineerName = this.getUserDisplayName(item.engineer)
@@ -3924,8 +3907,8 @@ import {updateColumnSize} from "../../../api/table";
           qcEngineer: row.qcEngineer,
           peEngineer: row.peEngineer,
           eeEngineer: row.eeEngineer,
-          sqemeEngineer: this.getSqeEngineerValue(row, 'sqemeEngineer'),
-          sqeeeEngineer: this.getSqeEngineerValue(row, 'sqeeeEngineer'),
+          sqemeEngineer: row.sqemeEngineer || '',
+          sqeeeEngineer: row.sqeeeEngineer || '',
           projectCreationDate: row.projectCreationDate,
           status: row.status,
           remark: row.remark,
@@ -4018,7 +4001,6 @@ import {updateColumnSize} from "../../../api/table";
         this.clearModalFlag = false
       },
       saveData () {
-        this.normalizeSqeEngineerFields(this.modalData)
         this.modalData.oriProjectId = this.modalData.projectNo
         this.modalData.finalCustomerId = this.modalData.customerNo
         if (this.modalData.projectNo === '' || this.modalData.projectNo == null) {
@@ -4758,7 +4740,6 @@ import {updateColumnSize} from "../../../api/table";
             this.projectPartList = data.page.list
             // 遍历dataList
             this.projectPartList.forEach((item) => {
-              this.normalizeSqeEngineerFields(item)
               item.projectManagerName = this.getUserDisplayName(item.projectManager)
               item.projectOwnerName = this.getUserDisplayName(item.projectOwner)
               item.engineerName = this.getUserDisplayName(item.engineer)
@@ -4838,8 +4819,8 @@ import {updateColumnSize} from "../../../api/table";
           qcEngineer: row.qcEngineer,
           peEngineer: row.peEngineer,
           eeEngineer: row.eeEngineer,
-          sqemeEngineer: this.getSqeEngineerValue(row, 'sqemeEngineer'),
-          sqeeeEngineer: this.getSqeEngineerValue(row, 'sqeeeEngineer'),
+          sqemeEngineer: row.sqemeEngineer || '',
+          sqeeeEngineer: row.sqeeeEngineer || '',
           projectCreationDate: row.projectCreationDate,
           status: '草稿',
           partType: 'Active',
@@ -4951,8 +4932,8 @@ import {updateColumnSize} from "../../../api/table";
           qcEngineer: row.qcEngineer,
           peEngineer: row.peEngineer,
           eeEngineer: row.eeEngineer,
-          sqemeEngineer: this.getSqeEngineerValue(row, 'sqemeEngineer'),
-          sqeeeEngineer: this.getSqeEngineerValue(row, 'sqeeeEngineer'),
+          sqemeEngineer: row.sqemeEngineer || '',
+          sqeeeEngineer: row.sqeeeEngineer || '',
           projectCreationDate: row.buildDate,
           status: row.status,
           partType: row.partType,

src/views/modules/eam/eamProjectPartInfo.vue

@@ -3907,14 +3907,6 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
         }
         return this.$store.state.user.site
       },
-      normalizeSqeEngineerFields (target) {
-        if (!target) {
-          return target
-        }
-        target.sqemeEngineer = target.sqemeEngineer || ''
-        target.sqeeeEngineer = target.sqeeeEngineer || ''
-        return target
-      },
       splitUserDisplayName (userValue) {
         if (userValue === null || userValue === undefined || userValue === '') {
           return ''
@@ -4221,7 +4213,6 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
               this.totalPage = data.page.totalCount
               // 遍历dataList
               this.dataList.forEach((item) => {
-                this.normalizeSqeEngineerFields(item)
                 item.projectManagerName = item.projectManager.split('-')[1]
                 item.projectOwnerName = item.projectOwner.split('-')[1]
                 item.engineerName = item.engineer.split('-')[1]
@@ -4270,7 +4261,6 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
               this.totalPage = data.page.totalCount
               // 遍历dataList
               this.dataList.forEach((item) => {
-                this.normalizeSqeEngineerFields(item)
                 item.projectManagerName = item.projectManager.split('-')[1]
                 item.projectOwnerName = item.projectOwner.split('-')[1]
                 item.engineerName = item.engineer.split('-')[1]
@@ -4338,7 +4328,6 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
             this.totalPage = data.page.totalCount
             // 遍历dataList
             this.dataList.forEach((item) => {
-              this.normalizeSqeEngineerFields(item)
               item.projectManagerName = item.projectManager.split('-')[1]
               item.projectOwnerName = item.projectOwner.split('-')[1]
               item.engineerName = item.engineer.split('-')[1]
@@ -4458,7 +4447,6 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
       proofingClickRow(row){
         row.proofingId = -1
         this.proofingCurrentRow=JSON.parse(JSON.stringify(row));
-        this.normalizeSqeEngineerFields(this.proofingCurrentRow)
         this.searchProjectDocumentTypeData.site = this.resolveCurrentPartSite(row.site)
       },
       /**
@@ -4471,7 +4459,6 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
         // 判断是否是获取焦点的事件
         if (row) {
           this.proofingCurrentRow = JSON.parse(JSON.stringify(row))
-          this.normalizeSqeEngineerFields(this.proofingCurrentRow)
           this.searchProjectDocumentTypeData.site = this.resolveCurrentPartSite(row.site)
         }
       },
@@ -5099,7 +5086,6 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
         this.activeModalTab = 'proofRecord'
         // 保存当前行数据
         this.proofingCurrentRow = JSON.parse(JSON.stringify(row));
-        this.normalizeSqeEngineerFields(this.proofingCurrentRow)
         // 打开模态框
         this.dialogVisible = true;
         // 模态框打开后刷新 proofRecord 组件的数据