From 2faeba9fc7e71dec94a2becb1c55bf472f08d75d Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 3 Dec 2024 16:37:20 +0800 Subject: [PATCH] =?UTF-8?q?12/3=20=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD=20?= =?UTF-8?q?=20=E9=80=89=E5=85=A5=E9=98=BF=E9=87=8C=E5=8D=95=E6=8D=AE=20?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/collect/relCode/operateRelCode.vue | 8 + src/views/inout/InvoiceCkeck.vue | 197 +++++------ src/views/inout/InvoiceRegByOrder.vue | 7 +- .../distribution/DialogCreateOrder.vue | 28 +- .../distribution/retraceCodeDetailDialog.vue | 160 +++++++++ .../distribution/selectMsfxOrderDialog.vue | 322 ++++++++++++++++++ 6 files changed, 621 insertions(+), 101 deletions(-) create mode 100644 src/views/pharmaceuticals/distribution/retraceCodeDetailDialog.vue create mode 100644 src/views/pharmaceuticals/distribution/selectMsfxOrderDialog.vue diff --git a/src/views/collect/relCode/operateRelCode.vue b/src/views/collect/relCode/operateRelCode.vue index bf7683b..37f9acd 100644 --- a/src/views/collect/relCode/operateRelCode.vue +++ b/src/views/collect/relCode/operateRelCode.vue @@ -205,6 +205,7 @@ import {enterCodeWeb} from "@/api/inout/order"; import {addRelCode, scanCodeRelCode, deleteDetail, deleteAllDetail} from "@/api/collect/relCode"; import sonRelCode from './sonRelCode.vue'; import A from "@/plugins/KeyScaner"; +import { isBlank } from '@/utils/strUtil' export default { name: "operateRelCode", @@ -425,6 +426,13 @@ export default { this.relFormData.workShop = data.workShop; this.relFormData.lineName = data.lineName; this.relFormData.lineManager = data.lineManager; + // if (!isBlank(data.batchNo)){ + // this.relFormData.batchNo = data.batchNo + // this.relFormData.madeDate = data.madeDate + // this.relFormData.validateDate = data.validateDate + // this.detailList = data.detailList + // this.syxjsl = data.syxjsl + // } this.parentCode = data.curCode; this.bhxjsl = data.bhxjsl; diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue index f0688f0..ffeaee9 100644 --- a/src/views/inout/InvoiceCkeck.vue +++ b/src/views/inout/InvoiceCkeck.vue @@ -155,99 +155,99 @@ - - - - 单据 {{ input.billNo }}-单据详情 - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + let query = { + list : this.inputQuery.list + } + updateorderBiz(query).then((res) => { this.closeDialog(); }); }, diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue index cb4bef5..9461bd8 100644 --- a/src/views/inout/InvoiceRegByOrder.vue +++ b/src/views/inout/InvoiceRegByOrder.vue @@ -794,11 +794,13 @@ :close-on-click-modal="false" :close-on-press-escape="false" v-if="checkInvoice" + @close="closecheckInvoice" > @@ -1061,6 +1063,7 @@ export default { acceptQuery: null, acceptOrderVisible: false, subRow: null, + detailList:[], }; }, components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice}, @@ -1090,11 +1093,13 @@ export default { this.getList(); }, InvoiceRegister1(_this,row) { - _this.savebillno = row.billNo + _this.savebillno = _this.currentRow.billNo _this.inputInv = row; + _this.detailList.push(row) _this.checkInvoice = true; }, closecheckInvoice() { + this.detailList = [] this.checkInvoice = false; this.getList(); this.currentRow.billNo = this.savebillno; diff --git a/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue b/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue index 1bb178b..a53e12d 100644 --- a/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue +++ b/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue @@ -5,6 +5,10 @@ style="margin-bottom: -15px"> + 选入阿里单据 + + + + + + + + @@ -254,6 +271,7 @@ import {selectAuthMenuByMenuKeys} from '@/api/system/sysMenuHelp' import codesPanel from "./PanelCreateOrderCodes" import codeDetailPanel from "./PanelCreateOrderCodeDetail" import bizDetailPanel from "./PanelCreateOrderBizDetail" +import selectMsfxOrderDialog from "./selectMsfxOrderDialog" import A from "@/plugins/KeyScaner" import {findByInvUser, getLocalJoinByUser, getBusTypeList} from '@/api/basic/busType' import {deleteRe} from "@/api/auth/register"; @@ -347,6 +365,7 @@ export default { editCodeVisible: false, actionEnable: false, editOriginCodeVisible: false, + selectOrderVisible:false, curId: null, storageList: [], @@ -394,7 +413,7 @@ export default { }; }, components: { - codesPanel, codeDetailPanel, bizDetailPanel, editCodeDialog + codesPanel, codeDetailPanel, bizDetailPanel, editCodeDialog,selectMsfxOrderDialog }, methods: { //获取查看帮助url @@ -846,9 +865,12 @@ export default { } this.loading = false; }); - } - , + }, + //查询msfx单据 + selectOrder(){ + this.selectOrderVisible = true + }, // 刷新表单 resetForm() { diff --git a/src/views/pharmaceuticals/distribution/retraceCodeDetailDialog.vue b/src/views/pharmaceuticals/distribution/retraceCodeDetailDialog.vue new file mode 100644 index 0000000..34c79fd --- /dev/null +++ b/src/views/pharmaceuticals/distribution/retraceCodeDetailDialog.vue @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + 显示/隐藏搜索栏 + 重置 + 查询 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/pharmaceuticals/distribution/selectMsfxOrderDialog.vue b/src/views/pharmaceuticals/distribution/selectMsfxOrderDialog.vue new file mode 100644 index 0000000..09d67e5 --- /dev/null +++ b/src/views/pharmaceuticals/distribution/selectMsfxOrderDialog.vue @@ -0,0 +1,322 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 显示/隐藏搜索栏 + 重置 + 查询 + 确定 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 详情 + + 追溯码明细 + + + + + + + + + + + + + + + + + + + +