2024.11.4 文档收集更新

审批业务类型、是否同时

src/views/modules/eam/com_project_proof_record.vue

@@ -1225,6 +1225,12 @@
                 } else {
                   this.proofDocumentList[i].projectLeader = ''
                 }
+              } else if (this.proofDocumentList[i].responsibleDepartment === 'IQC'){
+                if (this.searchData.cQualityEngineer6 !== null && this.searchData.cQualityEngineer6 !== ''){
+                  this.proofDocumentList[i].projectLeader = this.searchData.cQualityEngineer6.split("-")[1]
+                } else {
+                  this.proofDocumentList[i].projectLeader = ''
+                }
               }
             }
             if (this.totalPage > 0) {

src/views/modules/eam/eamProjectInfo.vue

@@ -2686,6 +2686,7 @@ import {searchBusinessInfo7} from "../../../api/factory/site";
 
       agencyMatter(){
         this.agencyMatters = false
+        this.projectPartCurrentRow = null
         this.getDataList()
       },
 
@@ -2729,10 +2730,19 @@ import {searchBusinessInfo7} from "../../../api/factory/site";
 
               // 判断是否全部存在数据
               if (this.totalPage > 0) {
-                // 设置选中行
-                this.$refs.mainTable.setCurrentRow(this.dataList[0])
-                // 加载当前的页签的table
-                this.refreshCurrentTabTable()
+                console.log(this.projectPartCurrentRow)
+                if (this.projectPartCurrentRow === null || this.projectPartCurrentRow === undefined) {
+                  // 设置选中行
+                  this.$refs.mainTable.setCurrentRow(this.dataList[0])
+                  // 加载当前的页签的table
+                  this.refreshCurrentTabTable()
+                } else {
+                  let index = this.dataList.findIndex(item => item.projectId === this.projectPartCurrentRow.projectId)
+                  // 设置选中行
+                  this.$refs.mainTable.setCurrentRow(this.dataList[index])
+                  // 加载当前的页签的table
+                  this.refreshCurrentTabTable()
+                }
               }
             } else {
               this.$alert(data.msg, '提示', {

src/views/modules/eam/eamProjectPartInfo.vue

@@ -2794,6 +2794,11 @@ import {EventBus} from "../../../main";
       this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
       if (!this.authSearch) {
         if (!this.agencyMatters){
+          if (this.$route.query.projectNo || this.$route.query.testPartNo) {
+            this.searchData1.projectNo = this.$route.query.projectNo;
+            this.searchData1.testPartNo = this.$route.query.testPartNo;
+            this.agencyMatters = true;
+          }
           // 获取数据列表
           this.getDataList()
         }

src/views/modules/part/partCostInformation.vue

@@ -831,6 +831,18 @@ export default {
         createBy: row.createBy,
         createDate: row.createDate,
       }
+      if (this.modalData.standardCost === null || this.modalData.standardCost === ''){
+        this.modalData.standardCost = 0
+      }
+      if (this.modalData.standardCostCurrency === null || this.modalData.standardCostCurrency === ''){
+        this.modalData.standardCostCurrency = 'CNY'
+      }
+      if (this.modalData.actualCost === null || this.modalData.actualCost === ''){
+        this.modalData.actualCost = 0
+      }
+      if (this.modalData.actualCostCurrency === null || this.modalData.actualCostCurrency === ''){
+        this.modalData.actualCostCurrency = 'CNY'
+      }
       this.originalData = JSON.parse(JSON.stringify(this.modalData))
       this.modalFlag = true
     },

src/views/modules/part/standardRoutingOperation.vue

@@ -675,15 +675,16 @@ export default {
             strVal = this.modalData.setupLaborClassNo?this.modalData.setupLaborClassNo:''
           }
         }
-        if (val === 216) {
-          strVal = this.modalData.workCenterNo?this.modalData.workCenterNo:''
-        }
         if (this.modalData.bu === null || this.modalData.bu === '') {
           this.$message.warning("请选择BU!")
           return
         } else {
           conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
         }
+        if (val === 216) {
+          strVal = this.modalData.workCenterNo?this.modalData.workCenterNo:''
+          conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'"
+        }
         this.$refs.baseList.init(val, strVal, conSql)
       })
     },