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 b568688..20adadf 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 @@ -90,10 +90,10 @@ - + - + @@ -360,7 +360,7 @@ projectName:'', projectDesc:'', needDate:'', - priority:'', + priority:'Standard', projectSource:'', industry:'', priorityDesc:'', @@ -641,7 +641,7 @@ projectName: '', projectDesc: '', needDate: '', - priority: '', + priority: 'Standard', projectSource: '', industry: '', priorityDesc: '', @@ -1169,7 +1169,7 @@ missing.push('直接客户') } if (!this.dataForm.customerRemark || String(this.dataForm.customerRemark).trim() === '') { - missing.push('客户应用/要求') + missing.push('客户产品应用') } if (missing.length) { this.$message.warning('项目经理不为空时,' + missing.join('、') + '不能为空') diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index 5ad17b1..5bd0c76 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -184,10 +184,10 @@ - + - + @@ -656,6 +656,43 @@ fixed: '', columnWidth: 120 }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table1ProjectAmount', + tableId: "101002001Table1", + tableName: "项目信息主表", + columnProp: "projectAmount", + headerAlign: "center", + align: "right", + columnLabel: "项目年销售额CNY(K)", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 170 + }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table1ProductCategory', + tableId: "101002001Table1", + tableName: "项目信息主表", + columnProp: "productCategory", + headerAlign: "center", + align: "left", + columnLabel: "产品类别", + columnHidden: false, + columnImage: false, + columnSortable: false, + showOverflowTooltip: true, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 180 + }, { userId: this.$store.state.user.name, functionId: 101002001, @@ -2118,6 +2155,55 @@ if(!this.accessField('10202002')){ this.columnList1=this.columnList1.filter(item => item.columnProp !== 'projectSource'); } + this.ensureProjectListColumns() + }, + ensureProjectListColumns () { + const columns = Array.isArray(this.columnList1) ? this.columnList1.slice() : [] + const extras = [ + { + columnProp: 'projectAmount', + columnLabel: '项目年销售额CNY(K)', + align: 'right', + columnWidth: 170, + serialNumber: '101002001Table1ProjectAmount' + }, + { + columnProp: 'productCategory', + columnLabel: '产品类别', + align: 'left', + columnWidth: 180, + serialNumber: '101002001Table1ProductCategory' + } + ] + let anchor = columns.findIndex(item => item.columnProp === 'customerProjectNo') + extras.forEach(extra => { + if (columns.some(item => item.columnProp === extra.columnProp)) { + return + } + const column = { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: extra.serialNumber, + tableId: '101002001Table1', + tableName: '项目信息主表', + columnProp: extra.columnProp, + headerAlign: 'center', + align: extra.align, + columnLabel: extra.columnLabel, + columnHidden: false, + columnImage: false, + columnSortable: false, + showOverflowTooltip: extra.columnProp === 'productCategory', + sortLv: 0, + status: true, + fixed: '', + columnWidth: extra.columnWidth + } + const insertAt = anchor >= 0 ? anchor + 1 : columns.length + columns.splice(insertAt, 0, column) + anchor = insertAt + }) + this.columnList1 = columns }, toChangeMenu(changeNo){ @@ -2276,7 +2362,7 @@ missing.push('直接客户') } if (!source.customerRemark || String(source.customerRemark).trim() === '') { - missing.push('客户应用/要求') + missing.push('客户产品应用') } if (missing.length) { this.$message.warning('项目经理不为空时,' + missing.join('、') + '不能为空') diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index 4fd8e11..3018ac3 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -224,7 +224,7 @@ 客户编码 - @@ -659,10 +659,10 @@ - + - + diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index e3163b3..1d010cd 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -684,10 +684,10 @@ - + - + diff --git a/src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue b/src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue index 5dfa970..bea565d 100644 --- a/src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue +++ b/src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue @@ -64,10 +64,10 @@ - + - + diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index ad39f20..c4d5c01 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -799,10 +799,10 @@ - + - +