Browse Source

加了个判断

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

51
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>
@ -169,7 +170,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" style="display: block;min-height: 90px"> <el-form-item label="备注" style="display: block;min-height: 90px">
<el-input type="textarea" style="width:103%" :disabled="(modalData.canAuthFlag!=='Y') " :rows="3"
<el-input type="textarea" style="width:103%" :disabled="(modalData.canAuthFlag!=='Y') " :rows="3"
v-model="modalData.authHistRemark"></el-input> v-model="modalData.authHistRemark"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -377,7 +378,7 @@ export default {
requiredCompletionStartDate: '', requiredCompletionStartDate: '',
requiredCompletionEndDate: '', requiredCompletionEndDate: '',
status: '', status: '',
sstatus:'审核中',
sstatus: '审核中',
quoterName: '', quoterName: '',
requesterName: '', requesterName: '',
priorityLevel: '', priorityLevel: '',
@ -913,28 +914,30 @@ export default {
getIncomeList() { getIncomeList() {
console.log('this.model.projectNo', this.model.projectNo) 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() { incomeFinished() {
this.getIncomeList() this.getIncomeList()

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

@ -416,7 +416,8 @@ export default {
} }
}, },
getIncomeList() { getIncomeList() {
let obj = {
if(this.model.projectNo){
let obj = {
projectNo: this.model.projectNo, projectNo: this.model.projectNo,
} }
queryMachineProjectIncomeList(obj) queryMachineProjectIncomeList(obj)
@ -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