diff --git a/src/views/modules/auth/authMachineProject.vue b/src/views/modules/auth/authMachineProject.vue index 6ae95dc..dac5ca7 100644 --- a/src/views/modules/auth/authMachineProject.vue +++ b/src/views/modules/auth/authMachineProject.vue @@ -134,7 +134,8 @@ + :disabled="false" :orderRef1="model.site" :orderRef2="model.objectId" :rfqNo="model.projectNo" + :orderRef4="model.buNo" :orderRef5="model.id"> @@ -169,7 +170,7 @@ - @@ -377,7 +378,7 @@ export default { requiredCompletionStartDate: '', requiredCompletionEndDate: '', status: '', - sstatus:'审核中', + sstatus: '审核中', quoterName: '', requesterName: '', priorityLevel: '', @@ -913,28 +914,30 @@ export default { getIncomeList() { console.log('this.model.projectNo', this.model.projectNo) - let obj = { - projectNo: this.model.projectNo, + if (this.model.projectNo) { + let obj = { + projectNo: this.model.projectNo, + } + queryMachineProjectIncomeList(obj) + .then(({ data }) => { + if (data && data.code === 0) { + this.projectIncome = data.list + //判断是否全部存在数据 + //if (this.totalPage > 0) { + // this.$refs.mainTable.setCurrentRow(this.dataList[0]) + // this.refreshCurrentTabTable() + // this.inquiryClickRow(this.dataList[0]) + //} + } else { + this.$message.warning(data.msg) + } + this.queryLoading = false + }) + .catch((error) => { + this.$message.error(error) + this.queryLoading = false + }) } - queryMachineProjectIncomeList(obj) - .then(({ data }) => { - if (data && data.code === 0) { - this.projectIncome = data.list - //判断是否全部存在数据 - //if (this.totalPage > 0) { - // this.$refs.mainTable.setCurrentRow(this.dataList[0]) - // this.refreshCurrentTabTable() - // this.inquiryClickRow(this.dataList[0]) - //} - } else { - this.$message.warning(data.msg) - } - this.queryLoading = false - }) - .catch((error) => { - this.$message.error(error) - this.queryLoading = false - }) }, incomeFinished() { this.getIncomeList() diff --git a/src/views/modules/machine/machineProjectDetail.vue b/src/views/modules/machine/machineProjectDetail.vue index 3db6669..9a6a5e6 100644 --- a/src/views/modules/machine/machineProjectDetail.vue +++ b/src/views/modules/machine/machineProjectDetail.vue @@ -416,7 +416,8 @@ export default { } }, getIncomeList() { - let obj = { + if(this.model.projectNo){ + let obj = { projectNo: this.model.projectNo, } queryMachineProjectIncomeList(obj) @@ -438,6 +439,8 @@ export default { this.$message.error(error) this.queryLoading = false }) + } + }, incomeFinished() { this.getIncomeList() diff --git a/src/views/modules/oss/ossComponents.vue b/src/views/modules/oss/ossComponents.vue index a1d4751..050dd3e 100644 --- a/src/views/modules/oss/ossComponents.vue +++ b/src/views/modules/oss/ossComponents.vue @@ -194,6 +194,7 @@ export default { const blob = new Blob([data], { type: type }); // 创建URL来生成预览 const fileURL = URL.createObjectURL(blob); + if (type === 'xls' || type === 'docx' || type === 'xlsx'){ const { href } = this.$router.resolve({ name: 'pre',