Browse Source

加了个判断

java8
shenzhouyu 7 months ago
parent
commit
3a2d61b39c
  1. 5
      src/views/modules/auth/authMachineProject.vue
  2. 3
      src/views/modules/machine/machineProjectDetail.vue
  3. 1
      src/views/modules/oss/ossComponents.vue

5
src/views/modules/auth/authMachineProject.vue

@ -134,7 +134,8 @@
<el-tab-pane label="相关文档" name="inquiryDocument"> <el-tab-pane label="相关文档" name="inquiryDocument">
<div style="height: 100%;overflow: auto;"> <div style="height: 100%;overflow: auto;">
<oss-components ref="inquiryDocument" label="申请单号" style="margin-top: 5px" height="44vh" :columns="ossColumns" <oss-components ref="inquiryDocument" label="申请单号" style="margin-top: 5px" height="44vh" :columns="ossColumns"
:disabled="false" :orderRef1="model.site" :orderRef2="model.objectId" :rfqNo="model.projectNo" :orderRef4="model.buNo" :orderRef5="model.id">
:disabled="false" :orderRef1="model.site" :orderRef2="model.objectId" :rfqNo="model.projectNo"
:orderRef4="model.buNo" :orderRef5="model.id">
</oss-components> </oss-components>
</div> </div>
</el-tab-pane> </el-tab-pane>
@ -913,6 +914,7 @@ export default {
getIncomeList() { getIncomeList() {
console.log('this.model.projectNo', this.model.projectNo) console.log('this.model.projectNo', this.model.projectNo)
if (this.model.projectNo) {
let obj = { let obj = {
projectNo: this.model.projectNo, projectNo: this.model.projectNo,
} }
@ -935,6 +937,7 @@ export default {
this.$message.error(error) this.$message.error(error)
this.queryLoading = false this.queryLoading = false
}) })
}
}, },
incomeFinished() { incomeFinished() {
this.getIncomeList() this.getIncomeList()

3
src/views/modules/machine/machineProjectDetail.vue

@ -416,6 +416,7 @@ export default {
} }
}, },
getIncomeList() { getIncomeList() {
if(this.model.projectNo){
let obj = { let obj = {
projectNo: this.model.projectNo, projectNo: this.model.projectNo,
} }
@ -438,6 +439,8 @@ export default {
this.$message.error(error) this.$message.error(error)
this.queryLoading = false this.queryLoading = false
}) })
}
}, },
incomeFinished() { incomeFinished() {
this.getIncomeList() this.getIncomeList()

1
src/views/modules/oss/ossComponents.vue

@ -194,6 +194,7 @@ export default {
const blob = new Blob([data], { type: type }); const blob = new Blob([data], { type: type });
// URL // URL
const fileURL = URL.createObjectURL(blob); const fileURL = URL.createObjectURL(blob);
if (type === 'xls' || type === 'docx' || type === 'xlsx'){ if (type === 'xls' || type === 'docx' || type === 'xlsx'){
const { href } = this.$router.resolve({ const { href } = this.$router.resolve({
name: 'pre', name: 'pre',

Loading…
Cancel
Save