From 16e57a6a836690cf6512d411acc002faaf7d5695 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Wed, 26 Mar 2025 15:01:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=EF=BC=9A=E4=BC=98=E5=8C=96=E9=A2=84?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E5=85=A5=E5=BA=93=E6=8F=90=E5=89=8D=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=8F=E5=A4=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/DialogCreateOrderSelect.vue | 33 +++++++++++++++++---- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue index 1b321fc9..40e8c03d 100644 --- a/src/views/inout/DialogCreateOrderSelect.vue +++ b/src/views/inout/DialogCreateOrderSelect.vue @@ -22,6 +22,7 @@ { + // this.fromInvOptions = response.data || []; + // }) + // .catch(() => { + // }); + // }, + //获取往来单位候选列表 + findMethod(query) { + this.fromOptions = []; + let cQuery = { + key: query, + corpType: null, + page: 1, + limit: 20, + }; + + getBasicUnitMaintains(cQuery) .then((response) => { - this.fromInvOptions = response.data || []; + this.loading = false; + this.fromInvOptions = response.data.list || []; }) .catch(() => { + this.loading = false; }); }, getResultDetailList() { @@ -827,7 +850,7 @@ export default { }, created() { this.getInvList(); - this.findFromInvList(); + // this.findFromInvList(); this.getBusType(); this.getList(); }, From dc1c872c5c89a9f661a7ac87d099ee61687ade30 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 28 Mar 2025 09:51:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?3/14=20=E5=A4=84=E7=90=86=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=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/DealOrder.vue | 106 ++++++++++----------------- src/views/collect/PannelOrderBiz.vue | 102 ++++++++++++++++++++------ 2 files changed, 120 insertions(+), 88 deletions(-) diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index f118e522..7e0316a0 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -100,8 +100,11 @@ + + + - - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - {{ formData.billNo }} - {{ formData.shipperName }} - {{ formData.fromCorpName }} - {{ formData.billTime }} - + + {{ formData.billNo }} + {{ formData.shipperName }} + {{ formData.fromCorpName }} + {{ formData.billTime }} + - + - - - - - - - 未赋码 - - - - - - - 预赋码 - - - - - - - - 已赋码 - - - - @@ -1871,6 +1839,10 @@ export default { } +.custom-input-height { + height: 40px !important; /* 设置高度 */ +} + .barcode-wrapper { display: flex; flex-direction: column; diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue index 51344f21..eea0f13e 100644 --- a/src/views/collect/PannelOrderBiz.vue +++ b/src/views/collect/PannelOrderBiz.vue @@ -112,36 +112,62 @@ - - - - - + + + + + + {{ codingStatus }} + + + + + + + {{ scope.row.cpmctymc }} + + + {{ scope.row.count }} - + - {{ scope.row.scanActCount }} + {{scope.row.scanCount}}/{{ scope.row.shouldCount }} + + + + + {{ scope.row.prepnSpec }} + + + + + {{ scope.row.spec }} - - - - - - - - - - - - - + + + + {{ scope.row.ybbm }} + + + + + {{ scope.row.batchNo }} + + - +> + 扫码明细({{scope.row.scanCount == null ? 0 : scope.row.scanCount }}) @@ -233,6 +259,7 @@ export default { countVisible: false, scanDetailVisible: false, bizId: null, + codingStatus: '已赋码', } }, methods: { @@ -348,6 +375,38 @@ export default { return rowBackground; }, + getCellStyle(row){ + let cellStyle = { + fontSize: '32px' + }; + if (row.shouldCount == 0){ + cellStyle.fontSize = '30px' + cellStyle.color = '#F56C6C' + return cellStyle; + } + if (row.scanCount < row.shouldCount) { + cellStyle.color = '#F56C6C'; + } else if (row.scanCount === row.shouldCount) { + cellStyle.color = '#56a717'; + } + return cellStyle; + }, + // cellStyle({ row, column, rowIndex, columnIndex }) { + // return { height: '60px' }; + // }, + getTagColor(row) { + if (row.scanActCount < row.count) { + this.codingStatus = '未赋码' + return 'danger'; // 红色 + } else if (row.autoTagStatus == 2) { + this.codingStatus = '预赋码' + return 'warning'; // 黄色 + } else if (row.scanActCount >= row.count) { + this.codingStatus = '已赋码' + return 'success'; // 绿色 + } + } + }, @@ -379,4 +438,5 @@ export default { From 5fd0749dac1ad26eb28c4c7142fdf0f0c8ba074e Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 28 Mar 2025 14:28:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=EF=BC=9A=E9=98=B3=E9=87=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/views/inoutDrug/DialogCreateDrugOrder.vue | 82 ++++++++++++++++++- 2 files changed, 79 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 44df32ce..c7d81fc0 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src", "server": "SET NODE_OPTIONS=--openssl-legacy-provider && webpack-dev-server --env.server --env.develop --inline --max-old-space-size=3000", - "dev": "vue-cli-service serve --open" + "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --open" }, "husky": { "hooks": { diff --git a/src/views/inoutDrug/DialogCreateDrugOrder.vue b/src/views/inoutDrug/DialogCreateDrugOrder.vue index 9926d889..0b15a714 100644 --- a/src/views/inoutDrug/DialogCreateDrugOrder.vue +++ b/src/views/inoutDrug/DialogCreateDrugOrder.vue @@ -12,7 +12,7 @@ - 上传阳采单据 @@ -361,7 +361,7 @@ - + - + 下载码上放心追溯码 - + 导入阳采追溯码 + + + + + { + if (!response.ok) { + throw new Error(`HTTP error! Status: ${response.status}`); + } + return response.json(); + }) + .then(data => { + if (data.code === 20000) { + // 更新单据号 + if (data.data && data.data.billNo) { + this.orderFormData.billNo = data.data.billNo; + } + + // 强制刷新组件 + this.isCodeAlive = false; + this.isBizDetailAlive = false; + this.isCodeDetailAlive = false; + + this.$nextTick(() => { + this.isCodeAlive = true; + this.isBizDetailAlive = true; + this.isCodeDetailAlive = true; + this.$refs.inputRef.focus(); + this.$refs.inputRef.select(); + this.$message.success("上传成功!"); + }); + } else { + this.$message.error(data.message); + } + }) + .catch(error => { + console.error('File upload failed:', error); + this.$message.error('文件上传失败:' + error.message); + }); + } + + // 清空文件输入框的值 + event.target.value = ''; + }, handleFileUpload2(event) { const file = event.target.files[0]; const uploadUrl = process.env.VUE_APP_BASE_API + '/udiwms/inout/order/yc/orderFileUpload'; From 76b855b28796b9ab72726fc2ac482175e481ed6e Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 28 Mar 2025 14:31:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=EF=BC=9A=E9=98=B3=E9=87=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inoutDrug/DialogCreateDrugOrder.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/inoutDrug/DialogCreateDrugOrder.vue b/src/views/inoutDrug/DialogCreateDrugOrder.vue index 0b15a714..d150f7a4 100644 --- a/src/views/inoutDrug/DialogCreateDrugOrder.vue +++ b/src/views/inoutDrug/DialogCreateDrugOrder.vue @@ -635,6 +635,7 @@ import {filterNoPage, page, remoteFilter} from "@/api/basic/sicker/skPersonApi"; import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import dialogInvProduct from "@/views/inoutDrug/DialogSelectInvProduct"; import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage"; +import store from "@/store"; export default { name: "ioCreateOrder", From f2a0d4d6f937ba8347de7b9bd06b4e61278c3c28 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 28 Mar 2025 17:42:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix=EF=BC=9A=E9=98=B3=E9=87=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inoutDrug/DialogCreateDrugOrder.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/inoutDrug/DialogCreateDrugOrder.vue b/src/views/inoutDrug/DialogCreateDrugOrder.vue index d150f7a4..61ddf8bd 100644 --- a/src/views/inoutDrug/DialogCreateDrugOrder.vue +++ b/src/views/inoutDrug/DialogCreateDrugOrder.vue @@ -863,6 +863,7 @@ export default { method: 'POST', headers: { ADMIN_ID: store.getters.adminId, + ADMINID: store.getters.adminId, ADMIN_TOKEN: store.getters.token, }, body: formData, @@ -919,6 +920,7 @@ export default { fetch(uploadUrl, { method: 'POST', headers: { + ADMINID: store.getters.adminId, ADMIN_ID: store.getters.adminId, ADMIN_TOKEN: store.getters.token, },
未赋码
预赋码
已赋码