|
|
@ -50,7 +50,7 @@ |
|
|
getDetailAndApproveOption, |
|
|
getDetailAndApproveOption, |
|
|
getDetailAndApprovePassAndApproveNoOption, |
|
|
getDetailAndApprovePassAndApproveNoOption, |
|
|
getDetailAndHandleOption, |
|
|
getDetailAndHandleOption, |
|
|
getDetailAndCloseOption, |
|
|
getDetailAndAddAndCloseOption, |
|
|
getAddAgainOption |
|
|
getAddAgainOption |
|
|
} from '@/common/array.js'; |
|
|
} from '@/common/array.js'; |
|
|
|
|
|
|
|
|
@ -69,19 +69,19 @@ |
|
|
requestList: [], |
|
|
requestList: [], |
|
|
pageNo: 1, |
|
|
pageNo: 1, |
|
|
pageSize: 10, |
|
|
pageSize: 10, |
|
|
status: "", |
|
|
status: "1,2,3,4,5,6", |
|
|
totalCount: 0, |
|
|
totalCount: 0, |
|
|
checkedWaitTask: false, |
|
|
checkedWaitTask: false, |
|
|
detailOptions: [], |
|
|
detailOptions: [], |
|
|
detailAndApproveOptions: [], |
|
|
detailAndApproveOptions: [], |
|
|
detailAndApprovePassAndApproveNoOption: [], |
|
|
detailAndApprovePassAndApproveNoOption: [], |
|
|
detailAndHandleOption: [], |
|
|
detailAndHandleOption: [], |
|
|
detailAndCloseOption: [], |
|
|
detailAndAddAndCloseOption: [], |
|
|
addAgainOption:[], |
|
|
addAgainOption: [], |
|
|
showOptions: [], |
|
|
showOptions: [], |
|
|
loadingType: "nomore", |
|
|
loadingType: "nomore", |
|
|
title:"", |
|
|
title: "", |
|
|
fromType:"" |
|
|
fromType: "" |
|
|
|
|
|
|
|
|
}; |
|
|
}; |
|
|
}, |
|
|
}, |
|
|
@ -109,8 +109,8 @@ |
|
|
this.addAgainOption = getAddAgainOption(); |
|
|
this.addAgainOption = getAddAgainOption(); |
|
|
this.detailAndApproveOptions = getDetailAndApproveOption() |
|
|
this.detailAndApproveOptions = getDetailAndApproveOption() |
|
|
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), |
|
|
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), |
|
|
this.detailAndHandleOption = getDetailAndHandleOption() |
|
|
this.detailAndHandleOption = getDetailAndHandleOption() |
|
|
this.detailAndCloseOption = getDetailAndCloseOption() |
|
|
this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption() |
|
|
this.updateTitle(); |
|
|
this.updateTitle(); |
|
|
this.getList('refresh'); |
|
|
this.getList('refresh'); |
|
|
|
|
|
|
|
|
@ -120,15 +120,15 @@ |
|
|
updateTitle() { |
|
|
updateTitle() { |
|
|
if (this.businessType == 'ReturnToStore') { |
|
|
if (this.businessType == 'ReturnToStore') { |
|
|
this.title = "生产合格退料申请" |
|
|
this.title = "生产合格退料申请" |
|
|
this.fromType ="ReturnToStore" |
|
|
this.fromType = "ReturnToStore" |
|
|
} else if (this.businessType == 'ReturnToHold') { |
|
|
} else if (this.businessType == 'ReturnToHold') { |
|
|
this.title = "生产隔离退料申请" |
|
|
this.title = "生产隔离退料申请" |
|
|
this.fromType ="ReturnToHold" |
|
|
this.fromType = "ReturnToHold" |
|
|
} |
|
|
} |
|
|
updateTitle(this.title) |
|
|
updateTitle(this.title) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
onShow(){ |
|
|
onShow() { |
|
|
this.getList('refresh'); |
|
|
this.getList('refresh'); |
|
|
}, |
|
|
}, |
|
|
onReachBottom() { |
|
|
onReachBottom() { |
|
|
@ -163,13 +163,11 @@ |
|
|
this.requestList = []; |
|
|
this.requestList = []; |
|
|
} |
|
|
} |
|
|
var filters = [] |
|
|
var filters = [] |
|
|
if (this.checkedWaitTask) { |
|
|
filters.push({ |
|
|
filters.push({ |
|
|
column: "status", |
|
|
column: "status", |
|
|
action: "in", |
|
|
action: "==", |
|
|
value: this.status |
|
|
value: this.status |
|
|
}) |
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
filters.push({ |
|
|
filters.push({ |
|
|
column: "business_type", |
|
|
column: "business_type", |
|
|
action: "==", |
|
|
action: "==", |
|
|
@ -201,7 +199,7 @@ |
|
|
this.requestList = type === "refresh" ? list : this.requestList.concat(list); |
|
|
this.requestList = type === "refresh" ? list : this.requestList.concat(list); |
|
|
|
|
|
|
|
|
this.pageNo++; |
|
|
this.pageNo++; |
|
|
updateTitle(this.title+"("+this.totalCount + ")") |
|
|
updateTitle(this.title + "(" + this.totalCount + ")") |
|
|
|
|
|
|
|
|
}).catch(error => { |
|
|
}).catch(error => { |
|
|
if (type === "refresh") { |
|
|
if (type === "refresh") { |
|
|
@ -223,10 +221,10 @@ |
|
|
} else if (status == "3") { |
|
|
} else if (status == "3") { |
|
|
this.showOptions = this.detailAndHandleOption; |
|
|
this.showOptions = this.detailAndHandleOption; |
|
|
} else if (status == "4") { |
|
|
} else if (status == "4") { |
|
|
this.showOptions = this.detailAndCloseOption; |
|
|
this.showOptions = this.detailAndAddAndCloseOption; |
|
|
} else if(status == "5"){ |
|
|
} else if (status == "5") { |
|
|
this.showOptions = this.addAgainOption; |
|
|
this.showOptions = this.addAgainOption; |
|
|
}else { |
|
|
} else { |
|
|
this.showOptions = this.detailOptions; |
|
|
this.showOptions = this.detailOptions; |
|
|
} |
|
|
} |
|
|
return this.showOptions |
|
|
return this.showOptions |
|
|
@ -237,7 +235,7 @@ |
|
|
url: "./returnRequestCreate?fromType=" + this.fromType |
|
|
url: "./returnRequestCreate?fromType=" + this.fromType |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
openFilter(){ |
|
|
openFilter() { |
|
|
this.$refs.filter.openFilter(); |
|
|
this.$refs.filter.openFilter(); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
@ -246,33 +244,33 @@ |
|
|
if (e.content.text == "详情") { |
|
|
if (e.content.text == "详情") { |
|
|
this.openRequestInfoPopup(dataContent); |
|
|
this.openRequestInfoPopup(dataContent); |
|
|
} else if (e.content.text == "处理") { |
|
|
} else if (e.content.text == "处理") { |
|
|
this.showQuestionMessage("确定要处理当前申请吗?",res=>{ |
|
|
this.showQuestionMessage("确定要处理当前申请吗?", res => { |
|
|
this.productionReturnRequestHandle(dataContent.id) |
|
|
this.productionReturnRequestHandle(dataContent.id) |
|
|
}) |
|
|
}) |
|
|
} else if (e.content.text == "审批") { |
|
|
} else if (e.content.text == "审批") { |
|
|
this.showQuestionMessage("确定要审批当前申请吗?",res=>{ |
|
|
this.showQuestionMessage("确定要审批当前申请吗?", res => { |
|
|
this.productionReturnRequestSubmitApprove(dataContent.id) |
|
|
this.productionReturnRequestSubmitApprove(dataContent.id) |
|
|
}) |
|
|
}) |
|
|
} else if (e.content.text == "审批通过") { |
|
|
} else if (e.content.text == "审批通过") { |
|
|
this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{ |
|
|
this.showQuestionMessage("确定要审批通过当前申请吗?", res => { |
|
|
this.productionReturnRequestSubmitApproveAgree(dataContent.id) |
|
|
this.productionReturnRequestSubmitApproveAgree(dataContent.id) |
|
|
}) |
|
|
}) |
|
|
} else if (e.content.text == "审批驳回") { |
|
|
} else if (e.content.text == "审批驳回") { |
|
|
this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{ |
|
|
this.showQuestionMessage("确定要审批驳回当前申请吗?", res => { |
|
|
this.productionReturnRequestSubmitApproveRefused(dataContent.id) |
|
|
this.productionReturnRequestSubmitApproveRefused(dataContent.id) |
|
|
}) |
|
|
}) |
|
|
} else if (e.content.text == "关闭") { |
|
|
} else if (e.content.text == "关闭") { |
|
|
this.showQuestionMessage("确定要关闭当前申请吗?",res=>{ |
|
|
this.showQuestionMessage("确定要关闭当前申请吗?", res => { |
|
|
this.productionReturnRequestClose(dataContent.id) |
|
|
this.productionReturnRequestClose(dataContent.id) |
|
|
}) |
|
|
}) |
|
|
}else if(text == "重新添加"){ |
|
|
} else if (text == "重新添加") { |
|
|
this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{ |
|
|
this.showQuestionMessage("确定要重新添加当前申请吗?", res => { |
|
|
this.productionReturnRequestAddAgain(dataContent.id) |
|
|
this.productionReturnRequestAddAgain(dataContent.id) |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
showQuestionMessage(hint,callBack){ |
|
|
showQuestionMessage(hint, callBack) { |
|
|
this.$refs.comMessage.showQuestionMessage(hint, |
|
|
this.$refs.comMessage.showQuestionMessage(hint, |
|
|
res => { |
|
|
res => { |
|
|
if (res) { |
|
|
if (res) { |
|
|
|
