diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue index cbc6665..d4cb08e 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -961,8 +961,7 @@ class="message-item" :key="index"> {{ message.split(':')[0] }}: - - {{ message.split(':')[1] }} + {{ message.split(':').slice(1).join(':') }} @@ -3948,24 +3947,25 @@ import CodeGeneration from "../../code/generation.vue"; diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue index 53cea5f..447fb8f 100644 --- a/src/views/modules/tooling/searchToolApply.vue +++ b/src/views/modules/tooling/searchToolApply.vue @@ -1463,6 +1463,78 @@ export default { fixed: '', columnWidth: 120 }, + { + userId: this.$store.state.user.name, + functionId: 106002, + serialNumber: '106002Table1PrNo', + tableId: "106002Table1", + tableName: "刀具申请主表", + columnProp: "prNo", + headerAlign: "center", + align: "left", + columnLabel: "IFS PR编号", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + userId: this.$store.state.user.name, + functionId: 106002, + serialNumber: '106002Table1PoNo', + tableId: "106002Table1", + tableName: "刀具申请主表", + columnProp: "poNo", + headerAlign: "center", + align: "left", + columnLabel: "采购订单号", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + userId: this.$store.state.user.name, + functionId: 106002, + serialNumber: '106002Table1SupplierName', + tableId: "106002Table1", + tableName: "刀具申请主表", + columnProp: "supplierName", + headerAlign: "center", + align: "left", + columnLabel: "厂商名称", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150 + }, + { + userId: this.$store.state.user.name, + functionId: 106002, + serialNumber: '106002Table1AllCost', + tableId: "106002Table1", + tableName: "刀具申请主表", + columnProp: "allCost", + headerAlign: "center", + align: "right", + columnLabel: "总成本(元)", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, functionId: 106002, @@ -3216,7 +3288,7 @@ export default { fieldColumn() { if (!this.accessField('10601001')) { this.columnList2 = this.columnList2.filter(item => item.columnProp !== 'standardCost'); - this.columnList1 = this.columnList1.filter(item => item.columnProp !== 'totalCost'); + this.columnList1 = this.columnList1.filter(item => !['totalCost', 'allCost'].includes(item.columnProp)); } },