bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:f42b926b713946f3a671a2e48e8c9f6ee4c6930e
Branches Tags
bonus:main
bonus:dev-nx
bonus:dev-nwcc
bonus:dev-nx-sx20240821b
bonus:macode20240820
bonus:dev-nx-sx20240821
bonus:dev-nw
bonus:dev-cq
bonus:dev-cq-rudy20240806b
bonus:dev-cq-rudy20240806
bonus:dev-nx-rudy20240806
bonus:dev-nx-rudy20240805
bonus:dev-nwcc-test
bonus:dev
bonus:flow_dev
bonus:test
bonus:master
..
compare: bonus:cb2d8a551a3705be14f30983d03ed7eef442bc49
Branches Tags
bonus:dev-nx
bonus:main
bonus:dev-nwcc
bonus:dev-nx-sx20240821b
bonus:macode20240820
bonus:dev-nx-sx20240821
bonus:dev-nw
bonus:dev-cq
bonus:dev-cq-rudy20240806b
bonus:dev-cq-rudy20240806
bonus:dev-nx-rudy20240806
bonus:dev-nx-rudy20240805
bonus:dev-nwcc-test
bonus:dev
bonus:flow_dev
bonus:test
bonus:master

No commits in common. "f42b926b713946f3a671a2e48e8c9f6ee4c6930e" and "cb2d8a551a3705be14f30983d03ed7eef442bc49" have entirely different histories.
f42b926b71 ... cb2d8a551a

2 changed files with 30 additions and 19 deletions
Show Stats Expand all files Collapse all files

19
sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
View File

@ -140,10 +140,10 @@
<div slot="footer" class="dialog-footer">
<el-button @click="refuseVisible=false">取 消</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany()" v-if="queryParams.taskStatus==30" v-hasPermi="['receive:examine:fgs']">确 定</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(6)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:sgb']">确 定6</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(8)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:ajb']">确 定8</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-jjfgs']">确 定2</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(4)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-sbfgs']">确 定4</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(6)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:sgb']">确 定5</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(8)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:ajb']">确 定7</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-jjfgs']">确 定1</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(4)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-sbfgs']">确 定3</el-button>
</div>
</el-dialog>
@ -335,8 +335,15 @@ export default {
params.leaseApplyInfoList.forEach(v => {
this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
this.$set(v,'companyAuditBy',this.user.id)
this.$set(v,'examineStatusId',Number(params.examineStatusId))
this.$set(v,'status',type)
this.$set(v,'examineStatusId',params.examineStatusId)
if(params.examineStatusId=='32'){
if(v.companyId==101){
this.$set(v,'status',2)
}
if(v.companyId==102){
this.$set(v,'status',4)
}
}
})
console.log(params)
const res = await rejectLeaseByCompany(params)

30
sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
View File

@ -112,28 +112,28 @@
type="primary"
@click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:sgb']"
v-if="Number(scope.row.examineStatusId)==31 && (scope.row.leaseApplyInfoList[0].status=='0'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='8'||scope.row.leaseApplyInfoList[0].status=='6')"
v-if="Number(scope.row.examineStatusId)==31"
>施管审批</el-button>
<el-button
size="mini"
type="primary"
@click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:ajb']"
v-if="Number(scope.row.examineStatusId)==31 && (scope.row.leaseApplyInfoList[0].status=='0'||scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='6'||scope.row.leaseApplyInfoList[0].status=='8')"
v-if="Number(scope.row.examineStatusId)==31"
>安监审批</el-button>
<el-button
size="mini"
type="primary"
@click="handleExamine(scope.row,'jjfgs')"
v-hasPermi="['receive:examine:nbry-jjfgs']"
v-if="Number(scope.row.examineStatusId)==32 && (scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='4'||scope.row.leaseApplyInfoList[0].status=='2')"
v-if="Number(scope.row.examineStatusId)==32 && scope.row.showExamineBtn"
>机具审批</el-button>
<el-button
size="mini"
type="primary"
@click="handleExamine(scope.row,'sbfgs')"
v-hasPermi="['receive:examine:nbry-sbfgs']"
v-if="Number(scope.row.examineStatusId)==32 && (scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='4'||scope.row.leaseApplyInfoList[0].status=='2')"
v-if="Number(scope.row.examineStatusId)==32 && scope.row.showExamineBtn"
>调试审批</el-button>
<el-button
size="mini"
@ -328,16 +328,20 @@ export default {
this.loading = false;
console.log('getList ============',res)
this.leaseAuditList = res.data.rows;
// this.leaseAuditList.forEach((item,index)=>{
// console.log(item.leaseApplyInfoList)
// if(item.leaseApplyInfoList.length>0){
// // item.showExamineBtn = true;
// if(item.leaseApplyInfoList[0].status=="0"||item.leaseApplyInfoList[0].status=="5"||item.leaseApplyInfoList[0].status=="7"||item.leaseApplyInfoList[0].status=="8"){
// item.showExamineBtn = true;
// }
// }
this.leaseAuditList.forEach((item,index)=>{
console.log(item.leaseApplyInfoList)
if(item.leaseApplyInfoList.length>0){
if(item.leaseApplyInfoList[0].leaseApplyDetails.length>0){
// if(item.leaseApplyInfoList[0].companyId==101){
if(item.leaseApplyInfoList[0].leaseApplyDetails[0].status=="0"){
item.showExamineBtn = true
}
// }
}
}
// })
})
console.log(this.leaseAuditList)
this.total = res.data.total;
},