diff --git a/src/api/basic/workPlace/sysWorkplaceManage.js b/src/api/basic/workPlace/sysWorkplaceManage.js index 41e6094d..2f170007 100644 --- a/src/api/basic/workPlace/sysWorkplaceManage.js +++ b/src/api/basic/workPlace/sysWorkplaceManage.js @@ -77,6 +77,16 @@ export function printWorkLabel(query) { +export function printQueues(query) { + return axios({ + url: "/udiwms/sysWorkplace/printQueues", + method: "post", + data: query, + headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}, + responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf + }); +} + export function getWorkplaces(query) { return axios({ url: "/udiwms/sysWorkplace/getWorkplaces", diff --git a/src/views/basic/workplace/cargowWorkplaceManage.vue b/src/views/basic/workplace/cargowWorkplaceManage.vue index c8fd0f59..73985184 100644 --- a/src/views/basic/workplace/cargowWorkplaceManage.vue +++ b/src/views/basic/workplace/cargowWorkplaceManage.vue @@ -164,7 +164,7 @@ type="text" size="small" @click.native.stop="printQueueList(scope.row)" - >分格标签 + >货位标签 { + printQueueLabel(row).then(res => { const binaryData = [] binaryData.push(res) let url = window.URL.createObjectURL( @@ -1271,8 +1271,20 @@ export default { this.loading = false }) }, - printQueueList(row){ + printQueueList(row) { + row.labelId = 8 + printQueues(row).then(res => { + const binaryData = [] + binaryData.push(res) + let url = window.URL.createObjectURL( + new Blob(binaryData, { type: 'application/pdf' }) + ) + this.loading = false + window.open(url) + }).catch((error) => { + this.$message.error('工位未绑定货位') + }) } }, created() { diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index f34f9947..88bda9df 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -408,7 +408,7 @@ import { vailOrderFinish } from "@/api/collect/splitCreateOrder"; import {selectCorpList} from "@/api/basic/basicUnitMaintain"; -import {getCurOrder, getNextOrder, findByBill, findFromCorp, orderDetail} from "@/api/collect/collectOrder"; +import {getCurOrder, getNextOrder, findByBill, findFromCorp, orderDetail,removeByScanCode} from "@/api/collect/collectOrder"; import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail"; import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getInvListByUser} from "@/api/system/invWarehouse"; @@ -708,6 +708,14 @@ export default { _this.getBizDetailList(); _this.vailOrderFinish(); }, + refreshCodesPanelBank(_this) { + _this.panelALive = false; + _this.$nextTick(() => { + _this.panelALive = true; + }); + // _this.getBizDetailList(); + _this.vailOrderFinish(); + }, refreshCodesPanelP() { let _this = this _this.panelALive = false; @@ -759,6 +767,8 @@ export default { this.scanSplit = true return; } else { + //没有需要确认的 + this.scanSplit = false this.overdeleteCode(); } @@ -1028,9 +1038,7 @@ export default { }, saveDraftOrder() { - if (this.scanStatus == 1) { - this.overdeleteCode() - } + this.$confirm('此操作将挂起当前正在处理单据，是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1039,7 +1047,10 @@ export default { draftOrder(this.formData).then(res => { this.loading = false if (res.code == 20000) { - this.resetWork() + if (this.scanStatus == 1) { + this.overdeleteCode() + } + this.reset() } }).catch(() => { this.loading = false @@ -1057,7 +1068,8 @@ export default { cancelOrder(this.formData).then(res => { this.loading = false if (res.code == 20000) { - this.resetWork() + this.overdeleteCode() + this.reset() } }).catch(() => { this.loading = false @@ -1081,7 +1093,7 @@ export default { finishOrder(this.formData).then(res => { this.loading = false if (res.code == 20000) { - this.resetWork() + this.reset() this.findCurOrder() } else if (res.code == 502) { this.$confirm(res.message, '提示', { @@ -1363,6 +1375,19 @@ export default { this.$refs.inputRef.focus(); this.$refs.inputRef.select(); }, + reset(){ + this.formData = { + tagStatus: -1, + workPlaceCode: this.formData.workPlaceCode, + busType: this.formData.busType + }; + this.curRow = null + this.formData.confirmFinish = false; + this.refreshCodesPanelBank(this) + this.clearCode() + this.$refs.inputRef.focus(); + this.$refs.inputRef.select(); + }, toggleBusType() { //隐藏下拉框内容 // this.$refs.selectHeadEmpId.blur(); @@ -1469,16 +1494,11 @@ export default { }) this.result = '' }else if (res.code == 501){ - this.warnVisible = true - this.warnResult = res.data - this.panelALive = false - this.$nextTick(() => { - this.panelALive = true - }) + }else { - this.result = '' - this.scanCode = '' - this.$message.error(res.message) + this.result = '' + this.scanCode = '' + this.$message.error(res.message) } }) }, @@ -1605,6 +1625,10 @@ export default { this.labelName = 2 this.placeholder = "请点击输入框进行扫码剔除" this.scanStatus = 1 + this.scanCode = '' + if (!isBlank(this.warnResult)){ + this.warnResult = "" + } }, overdeleteCode() { this.labelName = 1 diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index 49fcc276..06b06168 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -15,7 +15,7 @@ > 扫码剔除 { if (val == 1) { @@ -1638,6 +1643,7 @@ export default { if (this.$route.query.busType != null) { this.orderFormData.busType = this.$route.query.busType } + this.overdeleteCode() this.selectPrescriptionVisible = true }, deleteCode() { @@ -1663,6 +1669,7 @@ export default { this.$message.warning('请选择工位！') return } + this.overdeleteCode() this.rowData.workPlaceCode = this.orderFormData.workPlaceCode this.rowData.fifoSplit = this.orderFormData.fifoSplit this.$router.push({query: {...this.$route.query, splitType: this.splitType}, path: this.$route.path}) @@ -1720,6 +1727,7 @@ export default { } else { tQuery.inoutType = 1 } + this.overdeleteCode() saveOrderWeb(tQuery).then((response) => { this.saveLoading = false if (response.code === 20000) { @@ -1943,12 +1951,20 @@ export default { console.log('字符串不是有效的 JSON 格式') } } else if (str.includes("DMQ")) { - + if (!isBlank(this.curQueueName)){ + this.scanCode = '' + return this.$message.warning("上货未完成") + } + if (!isBlank(this.orderFormData.billNo)){ + this.scanCode = '' + return this.$message.warning("上货未完成") + } let query = { code: this.scanCode } if (str != null) { query.code = str + query.workPlaceIdFk = this.workplaceId } getByCode(query).then((response) => { this.loading = false; @@ -1957,6 +1973,9 @@ export default { this.curQueueName = "当前货位:" + this.curQueue.name + "(" + this.curQueue.code + ")" this.orderFormData.workPlaceQueueCode = this.curQueue.code this.scanCode = ''; + }else { + this.scanCode = '' + this.$message.error(response.message) } }).catch(() => { }) diff --git a/src/views/drugInventory/InvProducts.vue b/src/views/drugInventory/InvProducts.vue index 56091acd..d44458bb 100644 --- a/src/views/drugInventory/InvProducts.vue +++ b/src/views/drugInventory/InvProducts.vue @@ -487,10 +487,11 @@ export default { supId: null, zczbhhzbapzbh: null, ylqxzcrbarmc: null, - invCode: null, productsType: 2, page: 1, limit: 10, + invCode: this.$store.getters.locInvCode, + filterNoInv: '1', }; this.getList(); this.findMethod(this); diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 736fd0b1..3690ed7f 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -2018,7 +2018,7 @@ export default { this.curAction.genUnit = true this.curAction.inputSick = true } - + this.findMethod("") // this.$refs.inputRef.focus(); // this.$refs.inputRef.select(); diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue index d777b63b..026ee7f0 100644 --- a/src/views/inout/DialogSelectInvProduct.vue +++ b/src/views/inout/DialogSelectInvProduct.vue @@ -225,7 +225,9 @@ export default { type: Object, required: true, }, - orderQuery: {}, + orderQuery: { + productType: 1 + }, type: { //1.领用选入，2：业务单据选入 type: Object, required: true, @@ -431,6 +433,7 @@ export default { ids.push(data); }); + this.orderQuery.productType = 1 if (this.type == 2) { //新增业务单据选入 let data = { datas: ids, diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue index 243587a4..21df10e3 100644 --- a/src/views/inout/IoCheckAuditOrder.vue +++ b/src/views/inout/IoCheckAuditOrder.vue @@ -1278,6 +1278,7 @@ export default { fromCorp: null, keyWords: null, invCode: this.$store.getters.locInvCode, + productType: 1 }, customerId: this.$store.getters.customerId, checkStatus: { @@ -1430,6 +1431,7 @@ export default { startTime: null, endTime: null, invCode: this.$store.getters.locInvCode, + productType: 1 }; this.actDateRange = []; this.getList(); diff --git a/src/views/inoutDrug/DialogCreateDrugOrder.vue b/src/views/inoutDrug/DialogCreateDrugOrder.vue index 4d761554..99d38d3d 100644 --- a/src/views/inoutDrug/DialogCreateDrugOrder.vue +++ b/src/views/inoutDrug/DialogCreateDrugOrder.vue @@ -588,7 +588,7 @@ import DialogSelectSpace from "../inout/DialogSelectSpace"; import {isBlank} from "@/utils/strUtil"; import {filterNoPage, page, remoteFilter} from "@/api/basic/sicker/skPersonApi"; import {selectSysParamByKey} from "@/api/param/systemParamConfig"; -import dialogInvProduct from "@/views/inout/DialogSelectInvProduct"; +import dialogInvProduct from "@/views/inoutDrug/DialogSelectInvProduct"; import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage"; export default { @@ -1820,6 +1820,7 @@ export default { this.curAction.genUnit = true this.curAction.inputSick = true } + this.findMethod("") }, }; diff --git a/src/views/inoutDrug/DialogSelectInvProduct.vue b/src/views/inoutDrug/DialogSelectInvProduct.vue index 26d79ab2..abb5200f 100644 --- a/src/views/inoutDrug/DialogSelectInvProduct.vue +++ b/src/views/inoutDrug/DialogSelectInvProduct.vue @@ -129,7 +129,9 @@ export default { type: Object, required: true, }, - orderQuery: {}, + orderQuery: { + productType: 2 + }, type: { //1.领用选入，2：业务单据选入 type: Object, required: true, @@ -318,6 +320,7 @@ export default { ids.push(data); }); + this.orderQuery.productType = 2 if (this.type == 2) { //新增业务单据选入 let data = { datas: ids, diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue index 2fd6d654..b4e0cb13 100644 --- a/src/views/inventory/inner/innerOrderEditDialog.vue +++ b/src/views/inventory/inner/innerOrderEditDialog.vue @@ -116,7 +116,7 @@ + + + + + + + + @@ -47,6 +55,7 @@ +
@@ -69,17 +78,17 @@ - + - - - + + + + + 0) {