diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index 4de8fbd..a14f923 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -493,7 +493,7 @@ tableName: "项目信息主表", columnProp: "projectId", headerAlign: "center", - align: "center", + align: "left", columnLabel: "项目号", columnHidden: false, columnImage: false, @@ -511,7 +511,7 @@ tableName: "项目信息主表", columnProp: "projectType", headerAlign: "center", - align: "left", + align: "center", columnLabel: "项目类型", columnHidden: false, columnImage: false, @@ -548,7 +548,7 @@ columnProp: "customerProjectNo", headerAlign: "center", align: "left", - columnLabel: "客户项目料号", + columnLabel: "客户项目编码", columnHidden: false, columnImage: false, columnSortable: false, @@ -575,42 +575,6 @@ fixed: '', columnWidth: 100 }, - { - userId: this.$store.state.user.name, - functionId: 101002001, - serialNumber: '101002001Table1BuNo', - tableId: "101002001Table1", - tableName: "项目信息主表", - columnProp: "buNo", - headerAlign: 'center', - align: "left", - columnLabel: "BU编码", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100 - }, - { - userId: this.$store.state.user.name, - functionId: 101002001, - serialNumber: '101002001Table1BuDesc', - tableId: "101002001Table1", - tableName: "项目信息主表", - columnProp: "buDesc", - headerAlign: "center", - align: "left", - columnLabel: "BU名称", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100 - }, { userId: this.$store.state.user.name, functionId: 101002001, @@ -637,7 +601,7 @@ tableName: "项目信息主表", columnProp: "projectSourceDesc", headerAlign: "center", - align: "left", + align: "center", columnLabel: "项目来源", columnHidden: false, columnImage: false, @@ -655,7 +619,7 @@ tableName: "项目信息主表", columnProp: "customerId", headerAlign: "center", - align: "left", + align: "center", columnLabel: "客户代码", columnHidden: false, columnImage: false, @@ -691,7 +655,7 @@ tableName: "项目信息主表", columnProp: "createDate", headerAlign: "center", - align: "left", + align: "center", columnLabel: "创建时间", columnHidden: false, columnImage: false, @@ -699,7 +663,7 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 130 }, { userId: this.$store.state.user.name, @@ -727,7 +691,7 @@ tableName: "项目信息主表", columnProp: "updateDate", headerAlign: "center", - align: "left", + align: "center", columnLabel: "修改时间", columnHidden: false, columnImage: false, @@ -735,7 +699,7 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 130 }, { userId: this.$store.state.user.name, @@ -2026,7 +1990,7 @@ this.searchData.projectId = this.$route.params.projectId this.search(); } - this.getTableUserColumn(this.$route.meta.menuId+'table1',1) + // this.getTableUserColumn(this.$route.meta.menuId+'table1',1) }, } diff --git a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue index 806e807..5bff7cd 100644 --- a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue +++ b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue @@ -290,7 +290,7 @@ export default { }, watch:{ "quotation"(newVal,oldVal){ - if (newVal && newVal !== {}){ + if (newVal && newVal.site && newVal.quotationNo){ this.handleQuery(); }else { this.dataList = []; diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index fac35b2..ae4efe2 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -2666,6 +2666,9 @@ export default { this.quotationDetailData = row; }, getPriceCheckProperties() { + if (!this.quotationCurrentRow.site || !this.quotationCurrentRow.quotationBatchNo){ + return + } let params = { site: this.quotationCurrentRow.site, quotationNo: this.quotationCurrentRow.quotationBatchNo @@ -3379,6 +3382,9 @@ export default { }) }, getPriceCheckDetailList(){ + if (!this.quotationCurrentRow.site || !this.quotationCurrentRow.quotationBatchNo){ + return + } let params = { site:this.quotationCurrentRow.site, quotationNo:this.quotationCurrentRow.quotationNo