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

重庆审批流修改

This commit is contained in:
zhouzy062 2024-03-16 13:35:57 +08:00
parent a9de36b025
commit 85a1fe9cfb
4 changed files with 36 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sgzb-ui/src/api/claimAndRefund/receive.js
View File

@ -158,6 +158,15 @@ export function auditLeaseByCompany(params = {} ){
data:params
})
}
// 领料审核 同意
export function auditLeaseByCompanyCq(params = {} ){
return request({
url:'/base/tm_task/auditLeaseByCompanyCq',
method:'post',
data:params
})
}
// 领料审核 拒绝
export function rejectLeaseByCompany(params = {}){
return request({
@ -166,6 +175,14 @@ export function rejectLeaseByCompany(params = {}){
data: params
})
}
// 领料审核 拒绝
export function rejectLeaseByCompanyCq(params = {}){
return request({
url: '/base/tm_task/rejectLeaseByCompanyCq',
method: 'post',
data: params
})
}
// 获取 物品类型
export function getUseTypeTreee(params = {}){

6
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
View File

@ -257,7 +257,7 @@ export default {
companyId:'', //登录信息中取
createBy: '', //用户名
taskType: 29,
taskStatus: 30,
taskStatus: 31,
//领料人信息
leaseApplyInfo:{
leasePerson: '',
@ -447,7 +447,7 @@ export default {
this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
this.queryParams.agreementCode = data.agreementCode
this.queryParams.agreementId = data.agreementId
this.queryParams.leaseType = data.leaseType
// this.queryParams.leaseType = data.leaseType
this.$set(this.queryParams,'leaseType',data.leaseType)
this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
this.leaseApplyInfoList = data.leaseApplyInfoList
@ -476,7 +476,7 @@ export default {
this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
this.queryParams.agreementCode = data.agreementCode
this.queryParams.agreementId = data.agreementId
this.queryParams.leaseType = data.leaseType
// this.queryParams.leaseType = data.leaseType
this.$set(this.queryParams,'leaseType',data.leaseType)
this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
this.leaseApplyInfoList = data.leaseApplyInfoList

54
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
View File

@ -126,11 +126,8 @@
<el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
<div slot="footer" class="dialog-footer">
<el-button @click="examineVisible=false">取 消</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(9)" v-if="queryParams.taskStatus==30" v-hasPermi="['receive:examine:fgs']">确 定</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(5)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:sgb']">确 定</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(7)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:ajb']">确 定</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(1)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-jjfgs']">确 定</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(3)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-sbfgs']">确 定</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany()">确 定</el-button>
</div>
</el-dialog>
@ -139,11 +136,8 @@
<el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
<div slot="footer" class="dialog-footer">
<el-button @click="refuseVisible=false">取 消</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(10)" 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']">确 定</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(8)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:ajb']">确 定</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-jjfgs']">确 定</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(4)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-sbfgs']">确 定</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany()">确 定</el-button>
</div>
</el-dialog>
@ -152,7 +146,7 @@
<script>
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { auditLeaseByCompany, getTaskDetail,rejectLeaseByCompany } from '@/api/claimAndRefund/receive'
import { auditLeaseByCompanyCq, getTaskDetail,rejectLeaseByCompanyCq } from '@/api/claimAndRefund/receive'
import {mapState} from 'vuex'
export default {
name: "ReceiveExamine",
@ -267,17 +261,9 @@ export default {
this.examineVisible = true
this.queryParams.companyAuditRemarks = '同意'
},
// handelExamine(type){
// if(type){
// this.subAuditLeaseByCompany()
// }else {
// this.queryParams.companyAuditRemarks = ''
// }
// this.examineVisible = type
// },
//审核 同意
async subAuditLeaseByCompany(type){
console.log(type)
async subAuditLeaseByCompany(){
console.log()
const params = JSON.parse(JSON.stringify(this.queryParams))
params.taskStatus = params.taskStatus+1
@ -286,12 +272,12 @@ export default {
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,'status','')
})
params.updateTime = params.updateTimes
params.createTime = params.createTimes
console.log(params)
const res = await auditLeaseByCompany(params)
const res = await auditLeaseByCompanyCq(params)
if(res.code == 200){
this.examineVisible = false
this.$tab.closeOpenPage({ path: "/claimAndRefund/receiveByCq/receiveManage"});
@ -304,25 +290,9 @@ export default {
this.refuseVisible = true
this.queryParams.companyAuditRemarks = '驳回'
},
// handelRefuse(type){
// if (this.queryParams.companyAuditRemarks=='') {
// this.$message.error('驳回时审核意见不能为空！');
// return;
// }
// if(type){
// this.refuseAuditLeaseByCompany()
// }else {
// this.queryParams.companyAuditRemarks = ''
// }
// this.refuseVisible = type
// },
//审核 驳回
async refuseAuditLeaseByCompany(type){
async refuseAuditLeaseByCompany(){
const params = JSON.parse(JSON.stringify(this.queryParams))
if(params.taskStatus==30){
params.taskStatus=98;
params.examineStatusId=98
}
if(params.taskStatus==31){
params.taskStatus=99;
params.examineStatusId=99
@ -337,10 +307,10 @@ export default {
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,'status',type)
})
console.log(params)
const res = await rejectLeaseByCompany(params)
const res = await rejectLeaseByCompanyCq(params)
if(res.code == 200){
this.examineVisible = false
this.$tab.closeOpenPage({ path: "/claimAndRefund/receiveByCq/receiveManage"});

28
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
View File

@ -105,36 +105,16 @@
type="primary"
@click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:fgs']"
v-if="Number(scope.row.examineStatusId)==30"
v-if="Number(scope.row.examineStatusId)==31"
>审批</el-button>
<el-button
size="mini"
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')"
>审批</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')"
>审批</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')"
>审批</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-hasPermi="['receive:examine:nbs']"
v-if="Number(scope.row.examineStatusId)==32"
>审批</el-button>
<el-button
size="mini"
type="info"