重庆领料审批修改
This commit is contained in:
parent
602e46037c
commit
634820a657
|
|
@ -273,7 +273,14 @@ export function submitNumOut(params){
|
|||
})
|
||||
}
|
||||
|
||||
|
||||
// 领料确认
|
||||
export function updateLeaseTaskStatusConfirmByCq(params){
|
||||
return request({
|
||||
url: '/base/tm_task/updateLeaseTaskStatusConfirmByCq',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -586,7 +586,9 @@ export default {
|
|||
this.queryParams.createBy = this.user.userName
|
||||
this.queryParams.companyId = this.user.companyId
|
||||
let res;
|
||||
|
||||
if(this.queryParams.leaseType==1){
|
||||
this.queryParams.taskStatus = 117
|
||||
}
|
||||
if(this.taskId){
|
||||
this.leaseApplyInfoList.forEach(v => {
|
||||
v = Object.assign(v,this.queryParams.leaseApplyInfo)
|
||||
|
|
|
|||
|
|
@ -124,6 +124,9 @@
|
|||
<el-button type="primary" @click="agree">同意</el-button>
|
||||
<el-button @click="refuse">驳回</el-button>
|
||||
</div>
|
||||
<div slot="footer" class="dialog-footer" style="text-align: right;margin-right: 200px;" v-if="queryParams.taskStatus==117&&!this.isView">
|
||||
<el-button type="primary" @click="confirm">确认</el-button>
|
||||
</div>
|
||||
|
||||
<!-- 同意 -->
|
||||
<el-dialog title="审核意见" :visible.sync="examineVisible" width="600px" :close-on-click-modal="false">
|
||||
|
|
@ -136,7 +139,7 @@
|
|||
</div>
|
||||
</el-dialog>
|
||||
<!-- 驳回 -->
|
||||
<el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px" :close-on-click-modal="false">
|
||||
<el-dialog title="审核意见" :visible.sync="refuseVisib1le" width="600px" :close-on-click-modal="false">
|
||||
<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>
|
||||
|
|
@ -150,7 +153,7 @@
|
|||
|
||||
<script>
|
||||
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
|
||||
import { auditLeaseByCompanyCq, getLeaseListAllCq,rejectLeaseByCompanyCq } from '@/api/claimAndRefund/receive'
|
||||
import { auditLeaseByCompanyCq, getLeaseListAllCq,rejectLeaseByCompanyCq,updateLeaseTaskStatusConfirmByCq } from '@/api/claimAndRefund/receive'
|
||||
import {mapState} from 'vuex'
|
||||
export default {
|
||||
name: "ReceiveExamine",
|
||||
|
|
@ -177,6 +180,13 @@ export default {
|
|||
authorKey:'directAuditBy',
|
||||
timeKey:'directAuditTime'
|
||||
}
|
||||
,{
|
||||
id:117,
|
||||
name:'机具分公司确认',
|
||||
remarkKey:'directAuditRemark',
|
||||
authorKey:'directAuditBy',
|
||||
timeKey:'directAuditTime'
|
||||
}
|
||||
],
|
||||
isView:false,
|
||||
examineVisible:false,
|
||||
|
|
@ -269,10 +279,13 @@ export default {
|
|||
async subAuditLeaseByCompany(type){
|
||||
console.log()
|
||||
const params = JSON.parse(JSON.stringify(this.queryParams))
|
||||
params.taskStatus = params.taskStatus+1
|
||||
|
||||
if(params.taskStatus==31){
|
||||
params.taskStatus = 32
|
||||
}else if(params.taskStatus==32){
|
||||
params.taskStatus=117
|
||||
}
|
||||
params.leaseApplyInfoList.forEach(v => {
|
||||
console.log(v)
|
||||
// console.log(v)
|
||||
this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
|
||||
this.$set(v,'companyAuditBy',this.user.id)
|
||||
this.$set(v,'examineStatusId',Number(params.examineStatusId))
|
||||
|
|
@ -288,7 +301,19 @@ export default {
|
|||
}
|
||||
console.log('subAuditLeaseByCompany ==================',res)
|
||||
},
|
||||
//确认
|
||||
confirm(){
|
||||
const taskData = JSON.parse(JSON.stringify(this.queryParams))
|
||||
console.log(data)
|
||||
// let param = {
|
||||
// taskId
|
||||
// }
|
||||
// updateLeaseTaskStatusConfirmByCq(param).then(response => {
|
||||
|
||||
// });
|
||||
|
||||
|
||||
},
|
||||
//审核 驳回
|
||||
refuse(){
|
||||
this.refuseVisible = true
|
||||
|
|
@ -321,6 +346,7 @@ export default {
|
|||
}
|
||||
console.log('subAuditLeaseByCompany ==================',res)
|
||||
},
|
||||
|
||||
/** 修改按钮操作 */
|
||||
handleBack(row) {
|
||||
this.$tab.closeOpenPage({ path: "/claimAndRefund/receiveByCq/receiveManage"});
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@
|
|||
type="primary"
|
||||
@click="handleExamine(scope.row)"
|
||||
v-hasPermi="['receive:examine:fgs']"
|
||||
v-if="Number(scope.row.examineStatusId)==31"
|
||||
v-if="Number(scope.row.examineStatusId)==31||Number(scope.row.examineStatusId)==117"
|
||||
>审批</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
|
|
|
|||
|
|
@ -235,7 +235,7 @@ import {
|
|||
submitLeaseApply,
|
||||
getUseTypeTreee
|
||||
} from '@/api/claimAndRefund/receive'
|
||||
import { ApiSubmitBackApply } from "@/api/claimAndRefund/return"
|
||||
import { submitBackApplyApi } from "@/api/claimAndRefund/return"
|
||||
import { submitBackApplyApiByCq,materialReturnNoteByApply,submitRefuseBackApply } from "@/api/claimAndRefund/return.js"
|
||||
import { mapState } from 'vuex'
|
||||
import {
|
||||
|
|
@ -682,7 +682,7 @@ export default {
|
|||
backApplyInfo: this.queryParams.backApplyInfo,
|
||||
backApplyDetails: this.queryParams.leaseApplyDetails,
|
||||
}
|
||||
const res = await submitBackApplyApiByCq(params)
|
||||
const res = await submitBackApplyApi(params)
|
||||
if (res.code == 200) {
|
||||
this.$message({ type: 'success', message: '申请成功'})
|
||||
setTimeout(() => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue