diff --git a/src/api/request2.js b/src/api/request2.js index 6e0081bc..d2ef667f 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -4883,7 +4883,15 @@ export function inventoryMoveRecordReceive(id) { }); } - +/** + * 获取全部部门 + */ +export function deptList() { + return request({ + url: baseApi + "/system/dept/list", + method: "get", + }); +} diff --git a/src/mycomponents/dept/dept.vue b/src/mycomponents/dept/dept.vue new file mode 100644 index 00000000..7b5a1d80 --- /dev/null +++ b/src/mycomponents/dept/dept.vue @@ -0,0 +1,449 @@ + + + + + \ No newline at end of file diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index c1d98622..e62d5805 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -363,7 +363,8 @@ "inventory_status", "container_type", "pack_unit", "unplanned_receipt_reason", "unplanned_issue_reason", "scrap_reason", "inspect_failed_reason", "request_status", "inspect_type", "next_action", "sample_method", "transfer_mode", - "count_stage", "inspect_result", "area_type","count_scope_type","priority","receive_status",'deliver_method' + "count_stage", "inspect_result", "area_type","count_scope_type","priority", + "receive_status",'deliver_method','duty','duty_details' ] } getDictionaryItem(params).then(res => { diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index b03cc8bd..8ebdd3e5 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -38,7 +38,9 @@ + + @@ -82,6 +84,7 @@ import detailInfoPopup from '@/pages/inventoryMove/coms/detailInfoPopup.vue' import jobTop from '@/mycomponents/job/jobTop.vue' import locationCompare from '@/mycomponents/location/locationCompare.vue' + import dept from '@/mycomponents/dept/dept.vue' export default { @@ -93,7 +96,8 @@ winScanPackAndLocation, detailInfoPopup, jobTop, - locationCompare + locationCompare, + dept }, data() { return { @@ -112,7 +116,8 @@ jobStatus: "", title: '', toLocationAreaTypeList: [], - jobToLocationCode:'' + jobToLocationCode:'', + deptObj:{} }; }, props: { @@ -120,7 +125,6 @@ }, onLoad(option) { this.title = option.title - this.id = option.id; this.businessTypeCode = option.businessTypeCode; if (this.id != undefined) { @@ -134,6 +138,7 @@ } this.initData(); } + }, //返回首页 onNavigationBarButtonTap(e) { @@ -547,11 +552,11 @@ str = '任务明细未全部完成,是否提交?\n' + str this.$refs.comMessage.showQuestionMessage1(str, 'red', res => { if (res) { - this.submitJob() + // this.submitJob() } }); } else { - this.submitJob() + // this.submitJob() } }, checkCountBatch() { @@ -592,11 +597,27 @@ str = '任务明细未全部完成,是否提交?\n' + str this.$refs.comMessage.showQuestionMessage1(str, 'red', res => { if (res) { - this.submitJob() + // 物料隔离 + if(this.businessTypeCode == "OkToHold"){ + this.$refs.deptPopup.deptShow = true + this.$refs.deptPopup.chooseDutyItem={} + this.$refs.deptPopup.chooseDeptItem={} + this.$refs.deptPopup.chooseDetailItem={} + }else{ + this.submitJob() + } } }); } else { - this.submitJob() + // 物料隔离 + if(this.businessTypeCode == "OkToHold"){ + this.$refs.deptPopup.deptShow = true + this.$refs.deptPopup.chooseDutyItem={} + this.$refs.deptPopup.chooseDeptItem={} + this.$refs.deptPopup.chooseDetailItem={} + }else{ + this.submitJob() + } } }, submitJob() { @@ -605,6 +626,10 @@ mask: true }); var params = this.setParams() + params = { + ...params, + ...this.deptObj + } console.log("提交",params) inventoryMoveSubmit(params).then(res => { uni.hideLoading() @@ -748,7 +773,10 @@ }) }) }, - + dutyConfirm(obj){ + this.deptObj = obj + this.submitJob() + } } }