From 367fa6386662343af4b4e4c733733edb2830211a Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 1 Apr 2025 09:51:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?4/1=20=E6=89=8B=E5=8A=A8=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/collect/IoReturnOrderBiz.vue | 6 +---- src/views/collect/IoReturncllectOrder.vue | 7 ++++-- src/views/collect/PannelOrderBiz.vue | 28 +++++++++++++++-------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/views/collect/IoReturnOrderBiz.vue b/src/views/collect/IoReturnOrderBiz.vue index 4fe205d2..479e2037 100644 --- a/src/views/collect/IoReturnOrderBiz.vue +++ b/src/views/collect/IoReturnOrderBiz.vue @@ -26,11 +26,7 @@ diff --git a/src/views/collect/IoReturncllectOrder.vue b/src/views/collect/IoReturncllectOrder.vue index f1ca6455..e7194306 100644 --- a/src/views/collect/IoReturncllectOrder.vue +++ b/src/views/collect/IoReturncllectOrder.vue @@ -533,7 +533,6 @@ export default { item => /^YPCFTF/.test(item.documentTypeCode || "") // 正则匹配前缀 ); this.formData.busType = this.formDataVisible.documentTypeCode - console.log("djdjjdj",this.formData.busType) //scanType // 1.扫码生成业务单 // 2.按单校验三期 @@ -932,7 +931,9 @@ export default { this.curRow = this.formData this.$refs.inputRef.focus() this.refreshCodesPanel(this) - }else { + }else if(res.code == 502){ + return this.$message.error("非此单追溯码") + } else{ return this.$message.error(res.message) } }).catch(() => { @@ -1000,6 +1001,7 @@ export default { const audio = new Audio(require('@/assets/audioFiles/order.mp3')) audio.play() this.reset() + return this.$message.success("退货成功") if (this.formDataVisible.scanType != 1) { this.findCurOrder() } @@ -1112,6 +1114,7 @@ export default { this.formData = row this.formData.workPlaceCode = this.workplaceId this.startDeal() + this.selectPrescriptionVisible = false // this.generateBarcode() }, diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue index bc3e3d8d..afdb3747 100644 --- a/src/views/collect/PannelOrderBiz.vue +++ b/src/views/collect/PannelOrderBiz.vue @@ -137,12 +137,11 @@ @@ -384,6 +383,14 @@ export default { return rowBackground }, + getCellStyle1(row) { + let cellStyle = {} + if (row.autoTagStatus == 2) { + cellStyle.fontSize = '30px' + cellStyle.color = '#E6A23C' + return cellStyle + } + }, getCellStyle(row) { let cellStyle = { fontSize: '50px' @@ -404,13 +411,14 @@ export default { // return { height: '60px' }; // }, getTagColor(row) { + if (row.autoTagStatus == 2) { + this.codingStatus = '预赋码' + return 'warning' // 黄色 + } if (row.scanActCount < row.count) { this.codingStatus = '未赋码' return 'danger' // 红色 - } else if (row.autoTagStatus == 2) { - this.codingStatus = '预赋码' - return 'warning' // 黄色 - } else if (row.scanActCount >= row.count) { + } else if (row.scanActCount >= row.count) { this.codingStatus = '已赋码' return 'success' // 绿色 } From 15c8f6c98429d9d5e441c8d4f72eeb1f10d1fee3 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 1 Apr 2025 13:12:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E4=BC=98=E5=8C=96loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inoutDrug/DialogCreateDrugOrder.vue | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/views/inoutDrug/DialogCreateDrugOrder.vue b/src/views/inoutDrug/DialogCreateDrugOrder.vue index 7fb718bb..78f4a30a 100644 --- a/src/views/inoutDrug/DialogCreateDrugOrder.vue +++ b/src/views/inoutDrug/DialogCreateDrugOrder.vue @@ -394,7 +394,7 @@ - 导入阳采追溯码 @@ -848,14 +848,26 @@ export default { this.$refs.fileInput.click(); }, triggerFileUpload2() { + this.$refs.fileInput2.click(); }, handleFileUpload(event) { + + // 显示加载状态 + const loading = this.$loading({ + lock: true, + text: '数据提交中，请稍候', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); + const file = event.target.files[0]; const billNo = this.orderFormData.billNo; const uploadUrl = process.env.VUE_APP_BASE_API + '/udiwms/inout/order/yc/fileUpload'; if (this.$isBlank(this.orderFormData.billNo)) { + // 关闭加载状态 + loading.close(); this.$message.error("单据编号不可以为空!"); return; } @@ -876,12 +888,16 @@ export default { }) .then(response => { if (!response.ok) { + // 关闭加载状态 + loading.close(); throw new Error(`HTTP error! Status: ${response.status}`); } return response.json(); }) .then(data => { if (data.code === 20000) { + // 关闭加载状态 + loading.close(); // 更新单据号 if (data.data && data.data.billNo) { this.orderFormData.billNo = data.data.billNo; @@ -895,6 +911,8 @@ export default { } }) .catch(error => { + // 关闭加载状态 + loading.close(); console.error('File upload failed:', error); this.$message.error('文件上传失败：' + error.message); }); @@ -902,8 +920,19 @@ export default { // 清空文件输入框的值 event.target.value = ''; + // 关闭加载状态 + loading.close(); }, handleFileUpload2(event) { + + // 显示加载状态 + const loading = this.$loading({ + lock: true, + text: '数据提交中，请稍候', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); + const file = event.target.files[0]; const uploadUrl = process.env.VUE_APP_BASE_API + '/udiwms/inout/order/yc/orderFileUpload'; @@ -925,12 +954,16 @@ export default { }) .then(response => { if (!response.ok) { + // 关闭加载状态 + loading.close(); throw new Error(`HTTP error! Status: ${response.status}`); } return response.json(); }) .then(data => { if (data.code === 20000) { + // 关闭加载状态 + loading.close(); // 更新单据号 if (data.data && data.data.billNo) { this.orderFormData.billNo = data.data.billNo; @@ -954,15 +987,21 @@ export default { } }) .catch(error => { + // 关闭加载状态 + loading.close(); console.error('File upload failed:', error); this.$message.error('文件上传失败：' + error.message); }); } else { + // 关闭加载状态 + loading.close(); this.$message.warning('请选择要上传的文件'); } // 清空文件输入框的值 event.target.value = ''; + // 关闭加载状态 + loading.close(); }, //获取用户仓库列表 findInvListByUser() { @@ -2034,6 +2073,7 @@ export default {