Browse Source

发料申请审批

wms3.0_pda
lijuncheng 11 months ago
parent
commit
97735dd32d
  1. 61
      api/request2.js
  2. 8
      common/array.js
  3. 4
      pages/customerReturn/job/returnDetail.vue
  4. 2
      pages/inventoryMove/coms/comInventoryDetailCard.vue
  5. 134
      pages/issue/request/issueRequest.vue
  6. 12
      pages/purchaseReturn/request/returnRequest.vue
  7. 1
      pages/putaway/job/putawayDetail.vue

61
api/request2.js

@ -2107,6 +2107,67 @@ export function issueRequestSubmit(params) {
});
}
/**
* 发料申请 处理
* @param {*} params
*/
export function issueRequestHandle(id) {
return request({
url: baseApi + "/wms/issue-request-main/handle?id="+id,
method: "put",
data: {},
});
}
/**
* 发料申请 提交审批
* @param {*} params
*/
export function issueRequestSubmitApprove(id) {
return request({
url: baseApi + "/wms/issue-request-main/submit?id="+id,
method: "put",
data: {},
});
}
/**
* 发料申请 审批通过
* @param {*} params
*/
export function issueRequestSubmitApproveAgree(id) {
return request({
url: baseApi + "/wms/issue-request-main/agree?id="+id,
method: "put",
data: {},
});
}
/**
* 发料申请 审批驳回
* @param {*} params
*/
export function issueRequestSubmitApproveRefused(id) {
return request({
url: baseApi + "/wms/issue-request-main/refused?id="+id,
method: "put",
data: {},
});
}
/**
* 发料申请 申请关闭
* @param {*} params
*/
export function issueRequestClose(id) {
return request({
url: baseApi + "/wms/issue-request-main/close?id="+id,
method: "put",
data: {},
});
}
/**
* 发料记录 提交
* @param {*} params

8
common/array.js

@ -7,10 +7,16 @@ export function getDetailAndApproveOption() {
}
},
{
text: '审批',
text: '提交\n审批',
style: {
backgroundColor: '#00CC33'
}
},
{
text: '关闭',
style: {
backgroundColor: '#ff0000'
}
}
];
return option_detail;

4
pages/customerReturn/job/returnDetail.vue

@ -14,8 +14,6 @@
</scroll-view>
</view>
<view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
@ -97,6 +95,8 @@
};
},
onLoad(option) {
console.log("任务id",option.id)
console.log("任务状态",option.status)
this.id = option.id;
if (this.id != undefined) {
//

2
pages/inventoryMove/coms/comInventoryDetailCard.vue

@ -13,8 +13,8 @@
<recommend :detail="item" :isShowFromLocation="true" :isShowToLocation="true"></recommend>
</uni-swipe-action-item>
</uni-swipe-action>
<u-line />
</view>
<u-line />
</uni-collapse-item>
</uni-collapse>
<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>

134
pages/issue/request/issueRequest.vue

@ -32,7 +32,8 @@
import requestButton from '@/mycomponents/button/requestButton.vue'
import {
goHome,
updateTitle
updateTitle,
clearTirmAndWrap
} from '@/common/basic.js';
import {
@ -40,6 +41,11 @@
} from '@/common/record.js';
import {
getIssueRequestList,
issueRequestClose,
issueRequestSubmitApproveRefused,
issueRequestSubmitApproveAgree,
issueRequestSubmitApprove,
issueRequestHandle
} from '@/api/request2.js';
import {
getDetailOption,
@ -200,24 +206,42 @@
url: "../record/issueRecord?fromType=" + this.fromType
})
},
swipeClick(e, dataContent) {
if (e.content.text == "详情") {
console.log("详情", dataContent.id)
var text = clearTirmAndWrap(e.content.text)
if (text == "详情") {
this.openRequestInfoPopup(dataContent);
} else if (e.content.text == "处理") {
console.log("处理")
} else if (e.content.text == "审批") {
console.log("审批")
} else if (e.content.text == "审批通过") {
console.log("审批通过")
} else if (e.content.text == "审批驳回") {
console.log("审批驳回")
} else if (e.content.text == "关闭") {
console.log("关闭")
} else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?",res=>{
this.issueRequestHandle(dataContent.id)
})
} else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?",res=>{
this.issueRequestSubmitApprove(dataContent.id)
})
} else if (text.includes("审批通过")) {
this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
this.issueRequestSubmitApproveAgree(dataContent.id)
})
} else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
this.issueRequestSubmitApproveRefused(dataContent.id)
})
} else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
this.issueRequestClose(dataContent.id)
})
}
},
showQuestionMessage(hint,callBack){
this.$refs.comMessage.showQuestionMessage(hint,
res => {
if (res) {
callBack()
}
});
},
switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state;
this.status = jobStatus;
@ -266,6 +290,86 @@
}
});
},
issueRequestSubmitApprove(id) {
issueRequestSubmitApprove(id).then(res => {
if (res.data) {
this.getList("refresh")
uni.showToast({
title: "申请提交审批成功"
})
} else {
this.showMessage("申请提交审批失败")
}
}).catch(error => {
this.showMessage(error)
})
},
issueRequestClose(id) {
issueRequestClose(id).then(res => {
if (res.data) {
this.getList("refresh")
uni.showToast({
title: "申请关闭成功"
})
} else {
this.showMessage("申请关闭失败")
}
}).catch(error => {
this.showMessage(error)
})
},
issueRequestSubmitApproveAgree(id) {
issueRequestSubmitApproveAgree(id).then(res => {
if (res.data) {
this.getList("refresh")
uni.showToast({
title: "申请审批通过成功"
})
} else {
this.showMessage("申请审批通过失败")
}
}).catch(error => {
this.showMessage(error)
})
},
issueRequestSubmitApproveRefused(id) {
issueRequestSubmitApproveRefused(id).then(res => {
if (res.data) {
this.getList("refresh")
uni.showToast({
title: "申请审批驳回成功"
})
} else {
this.showMessage("申请审批驳回失败")
}
}).catch(error => {
this.showMessage(error)
})
},
issueRequestHandle(id) {
issueRequestHandle(id).then(res => {
if (res.data) {
this.getList("refresh")
uni.showToast({
title: "申请处理成功"
})
} else {
this.showMessage("申请处理失败")
}
}).catch(error => {
this.showMessage(error)
})
},
}
}

12
pages/purchaseReturn/request/returnRequest.vue

@ -213,11 +213,11 @@
this.showQuestionMessage("确定要处理当前申请吗?",res=>{
this.purchaseReturnRequestHandle(dataContent.id)
})
} else if (text == "审批") {
} else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?",res=>{
this.purchaseReturnRequestSubmitApprove(dataContent.id)
})
} else if (text.includes("审批通过")) {
} else if (text=="审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
this.purchaseReturnRequestSubmitApproveAgree(dataContent.id)
})
@ -296,10 +296,10 @@
if (res.data) {
this.getList("refresh")
uni.showToast({
title: "申请审批成功"
title: "申请提交审批成功"
})
} else {
this.showMessage("申请审批失败")
this.showMessage("申请提交审批失败")
}
}).catch(error => {
@ -358,10 +358,10 @@
if (res.data) {
this.getList("refresh")
uni.showToast({
title: "申请审批驳回成功"
title: "申请处理成功"
})
} else {
this.showMessage("申请审批驳回失败")
this.showMessage("申请处理失败")
}
}).catch(error => {

1
pages/putaway/job/putawayDetail.vue

@ -170,6 +170,7 @@
} else {
if (res.data.subList.length > 0) {
that.jobContent = res.data;
that.jobContent.outInventoryStatuses='INSP'
that.subList = res.data.subList;
that.detailSource = getDataSource(that.subList)

Loading…
Cancel
Save