From 5d29037a858d8375b86205925434b1997865f1bd Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 17 Oct 2024 10:07:54 +0800 Subject: [PATCH] =?UTF-8?q?10/17=20=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/busType/bussinessType.vue | 16 +- .../basic/busType/bussinessTypeModify.vue | 16 + src/views/basic/business/drug/stockOrder.vue | 1 + .../basic/product/UdiInfoSelectLocalUdi.vue | 14 +- src/views/basic/product/UdiInfoSelectRel.vue | 7 +- src/views/basic/product/product.vue | 91 ++- src/views/inout/InvoiceRegByOrder.vue | 1 + src/views/inout/IoCheckErrorOrder.vue | 1 + src/views/inout/IoCreateBusOrder.vue | 1 + src/views/inout/IoCreateOrder.vue | 1 + src/views/inout/IoCreateScanOrder.vue | 1 + src/views/inout/IoDealOrder.vue | 1 + src/views/inout/IoDeliveryAuditOrder.vue | 1 + src/views/inout/IoDeliverySearchOrder.vue | 1 + src/views/inout/IoSupAduitOrder.vue | 1 + src/views/inout/IoSupSearchOrder.vue | 1 + src/views/inout/IoSupSecAuditOrder.vue | 1 + .../distribution/IoCheckErrorOrder.vue | 1 + .../distribution/IoCreateBusOrder.vue | 1 + .../distribution/IoCreateOrder.vue | 1 + .../distribution/IoCreateScanOrder.vue | 1 + .../distribution/IoDealOrder.vue | 1 + .../distribution/IoSupAduitOrder.vue | 1 + .../distribution/IoSupSearchOrder.vue | 1 + .../distribution/IoSupSecAuditOrder.vue | 1 + .../inout/IoDeliveryAuditOrderDrug.vue | 1 + .../inout/IoDeliverySearchOrder.vue | 1 + .../supplier/company/basicCompanyProducts.vue | 2 + .../company/basicCompanyproductEdit.vue | 698 +++++++++++++----- .../companyDrug/basicCompanyDrugProducts.vue | 69 +- .../companyDrug/basicCompanyproductEdit.vue | 10 +- .../products/supAddDiProductSelectUdi.vue | 1 + src/views/thirdSys/product/thrProducts.vue | 8 +- src/views/thirdSys/product/thrProductsAdd.vue | 12 +- 34 files changed, 709 insertions(+), 257 deletions(-) diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue index c67a6a3..6d440a7 100644 --- a/src/views/basic/busType/bussinessType.vue +++ b/src/views/basic/busType/bussinessType.vue @@ -59,6 +59,14 @@ + + + + + + + + @@ -168,7 +176,7 @@ top="5vh" > -
+
提交 @@ -200,7 +208,6 @@ >提交 + + + + + + + + + { diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue index 489b6b9..96d0463 100644 --- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue +++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue @@ -764,19 +764,7 @@ export default { this.combineLoading = false; if (response.code == 20000) { this.combine(); - // combineUdi(this.combineQuery) - // .then((response) => { - // this.combineLoading = false; - // if (response.code == 20000) { - // this.$emit("closeUdi", true); - // } else { - // this.$emit("closeUdi", false); - // } - // }) - // .catch(() => { - // this.combineLoading = false; - // this.$emit("closeUdi", false); - // }); + } else if (response.code == 499) { this.$confirm(response.message, {type: "warning"}) .then(_ => { diff --git a/src/views/basic/product/UdiInfoSelectRel.vue b/src/views/basic/product/UdiInfoSelectRel.vue index 61e2698..76b012e 100644 --- a/src/views/basic/product/UdiInfoSelectRel.vue +++ b/src/views/basic/product/UdiInfoSelectRel.vue @@ -310,6 +310,7 @@ export default { registerNo: null, page: 1, limit: 10, + productType:1 }, thirdSys: [], thirdSysFk: null, @@ -427,14 +428,15 @@ export default { ylqxzcrbarmc: null, ggxh: "", zczbhhzbapzbh: "", - isCheck: 1 + isCheck: 1, + productType:1 }; this.getErpList(); }, serchList() { this.unionQuery.page = 1; - this.getList(); + this.getErpList(); }, getSuperSeaech() { @@ -635,6 +637,7 @@ export default { }, created() { this.getBasicThirdSys(); + this.getErpList(); }, components: { selectDiDetail, diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 9acfb30..98dda7d 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -639,11 +639,18 @@ highlight-current-row @current-change="handleDetail" > + + + + + + + @@ -820,8 +842,27 @@
- + +
+
+ 产品录入来源:  +
+ + + +
+
@@ -838,10 +879,7 @@
- - - @@ -940,7 +978,7 @@ splaceholder="请输入内容" :disabled="useNumEnable" type="number" - v-model="editQuery.useNum" + v-model="editQuery.zdcfsycs" >
@@ -1246,17 +1284,7 @@
- - -
-
- 产品货号或编号:  -
- -
- - +

国家DI标识数据库版本信息

+
@@ -1586,27 +1615,15 @@ splaceholder="请输入内容" v-model="editQuery.versionNumber" > + 切换版本 +
- - 切换版本 - - - - 更新为当前发布版本 - - @@ -1957,6 +1974,10 @@ export default { activeNames: ["1"], useNumEnable: true, updateLoading: false, + diTypes: { + 1: '最小销售标识', + 4: '外包装标识' + }, }; }, filters: { diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue index ce726b4..ad17f51 100644 --- a/src/views/inout/InvoiceRegByOrder.vue +++ b/src/views/inout/InvoiceRegByOrder.vue @@ -1190,6 +1190,7 @@ export default { code: _this.filterQuery.invCode, enable: true, vueType: "supInvoice", + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue index d07fcba..fd45557 100644 --- a/src/views/inout/IoCheckErrorOrder.vue +++ b/src/views/inout/IoCheckErrorOrder.vue @@ -1329,6 +1329,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, vueType: "supDelivery", + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue index b1bbac0..8b41aab 100644 --- a/src/views/inout/IoCreateBusOrder.vue +++ b/src/views/inout/IoCreateBusOrder.vue @@ -553,6 +553,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, vueType: "supDelivery", + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue index e891e67..e9a4213 100644 --- a/src/views/inout/IoCreateOrder.vue +++ b/src/views/inout/IoCreateOrder.vue @@ -568,6 +568,7 @@ export default { code: _this.filterQuery.invCode, enable: true, vueType: "supDelivery", + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue index 570ba29..f373343 100644 --- a/src/views/inout/IoCreateScanOrder.vue +++ b/src/views/inout/IoCreateScanOrder.vue @@ -510,6 +510,7 @@ export default { code: this.filterQuery.invCode, enabled: true, vueType: "supDelivery", + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue index a5f7d72..66dfd7e 100644 --- a/src/views/inout/IoDealOrder.vue +++ b/src/views/inout/IoDealOrder.vue @@ -679,6 +679,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, vueType: "supDelivery", + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue index abfd59e..c14e829 100644 --- a/src/views/inout/IoDeliveryAuditOrder.vue +++ b/src/views/inout/IoDeliveryAuditOrder.vue @@ -1633,6 +1633,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, vueType: "supDelivery", + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue index 151b8b1..aa440e7 100644 --- a/src/views/inout/IoDeliverySearchOrder.vue +++ b/src/views/inout/IoDeliverySearchOrder.vue @@ -1688,6 +1688,7 @@ export default { let query = { code: _this.filterQuery.invCode, enabled: true, + productType:1 // busType: 2,//默认只能选择送货单 }; getLocalJoinByUserOptimize(query) diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue index 2ac8ff0..0734472 100644 --- a/src/views/inout/IoSupAduitOrder.vue +++ b/src/views/inout/IoSupAduitOrder.vue @@ -1135,6 +1135,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, vueType: "supDelivery", + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue index a36f20d..2ad494a 100644 --- a/src/views/inout/IoSupSearchOrder.vue +++ b/src/views/inout/IoSupSearchOrder.vue @@ -1340,6 +1340,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, viewType: 'supInout', + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue index 0cfff50..e1b4c9d 100644 --- a/src/views/inout/IoSupSecAuditOrder.vue +++ b/src/views/inout/IoSupSecAuditOrder.vue @@ -1300,6 +1300,7 @@ export default { code: this.filterQuery.invCode, enabled: true, vueType: "supDelAudit", + productType:1 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/pharmaceuticals/distribution/IoCheckErrorOrder.vue b/src/views/pharmaceuticals/distribution/IoCheckErrorOrder.vue index d8567ce..49cc724 100644 --- a/src/views/pharmaceuticals/distribution/IoCheckErrorOrder.vue +++ b/src/views/pharmaceuticals/distribution/IoCheckErrorOrder.vue @@ -1333,6 +1333,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, vueType: "supDelivery", + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/pharmaceuticals/distribution/IoCreateBusOrder.vue b/src/views/pharmaceuticals/distribution/IoCreateBusOrder.vue index f54eb31..6fbc913 100644 --- a/src/views/pharmaceuticals/distribution/IoCreateBusOrder.vue +++ b/src/views/pharmaceuticals/distribution/IoCreateBusOrder.vue @@ -554,6 +554,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, vueType: "supDelivery", + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/pharmaceuticals/distribution/IoCreateOrder.vue b/src/views/pharmaceuticals/distribution/IoCreateOrder.vue index a341f4e..50b44a6 100644 --- a/src/views/pharmaceuticals/distribution/IoCreateOrder.vue +++ b/src/views/pharmaceuticals/distribution/IoCreateOrder.vue @@ -565,6 +565,7 @@ export default { code: _this.filterQuery.invCode, enable: true, vueType: "supDelivery", + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/pharmaceuticals/distribution/IoCreateScanOrder.vue b/src/views/pharmaceuticals/distribution/IoCreateScanOrder.vue index 10a7236..cf8f84f 100644 --- a/src/views/pharmaceuticals/distribution/IoCreateScanOrder.vue +++ b/src/views/pharmaceuticals/distribution/IoCreateScanOrder.vue @@ -511,6 +511,7 @@ export default { code: this.filterQuery.invCode, enabled: true, vueType: "supDelivery", + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/pharmaceuticals/distribution/IoDealOrder.vue b/src/views/pharmaceuticals/distribution/IoDealOrder.vue index 8494fa6..1cd3f0b 100644 --- a/src/views/pharmaceuticals/distribution/IoDealOrder.vue +++ b/src/views/pharmaceuticals/distribution/IoDealOrder.vue @@ -502,6 +502,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, vueType: "supDelivery", + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/pharmaceuticals/distribution/IoSupAduitOrder.vue b/src/views/pharmaceuticals/distribution/IoSupAduitOrder.vue index 6ce8cef..95012ad 100644 --- a/src/views/pharmaceuticals/distribution/IoSupAduitOrder.vue +++ b/src/views/pharmaceuticals/distribution/IoSupAduitOrder.vue @@ -1137,6 +1137,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, vueType: "supDelivery", + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/pharmaceuticals/distribution/IoSupSearchOrder.vue b/src/views/pharmaceuticals/distribution/IoSupSearchOrder.vue index 80cfae9..2da1d65 100644 --- a/src/views/pharmaceuticals/distribution/IoSupSearchOrder.vue +++ b/src/views/pharmaceuticals/distribution/IoSupSearchOrder.vue @@ -1341,6 +1341,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, viewType: 'supInout', + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/pharmaceuticals/distribution/IoSupSecAuditOrder.vue b/src/views/pharmaceuticals/distribution/IoSupSecAuditOrder.vue index 8de651c..4232c40 100644 --- a/src/views/pharmaceuticals/distribution/IoSupSecAuditOrder.vue +++ b/src/views/pharmaceuticals/distribution/IoSupSecAuditOrder.vue @@ -1301,6 +1301,7 @@ export default { code: this.filterQuery.invCode, enabled: true, vueType: "supDelAudit", + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/pharmaceuticals/inout/IoDeliveryAuditOrderDrug.vue b/src/views/pharmaceuticals/inout/IoDeliveryAuditOrderDrug.vue index 6bc087e..a21c2f1 100644 --- a/src/views/pharmaceuticals/inout/IoDeliveryAuditOrderDrug.vue +++ b/src/views/pharmaceuticals/inout/IoDeliveryAuditOrderDrug.vue @@ -1638,6 +1638,7 @@ export default { code: _this.filterQuery.invCode, enabled: true, vueType: "supDelivery", + productType:2 }; getLocalJoinByUserOptimize(query) .then((response) => { diff --git a/src/views/pharmaceuticals/inout/IoDeliverySearchOrder.vue b/src/views/pharmaceuticals/inout/IoDeliverySearchOrder.vue index d941dcb..a18dfa2 100644 --- a/src/views/pharmaceuticals/inout/IoDeliverySearchOrder.vue +++ b/src/views/pharmaceuticals/inout/IoDeliverySearchOrder.vue @@ -1689,6 +1689,7 @@ export default { let query = { code: _this.filterQuery.invCode, enabled: true, + productType:2 // busType: 2,//默认只能选择送货单 }; getLocalJoinByUserOptimize(query) diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue index 222af10..323a662 100644 --- a/src/views/supplier/company/basicCompanyProducts.vue +++ b/src/views/supplier/company/basicCompanyProducts.vue @@ -524,6 +524,7 @@ export default { thrPiId: null, filterType: null, auditStatus: null, + productType: 1 }, idSpliUdi: false, newType: 2, @@ -613,6 +614,7 @@ export default { page: 1, limit: 20, addType: 1, + productType:1 }; this.getList(); }, diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue index 2f37d0e..25e7053 100644 --- a/src/views/supplier/company/basicCompanyproductEdit.vue +++ b/src/views/supplier/company/basicCompanyproductEdit.vue @@ -1,89 +1,336 @@ @@ -406,6 +692,8 @@ import selectErp from "./udiInfoselectErpUdi"; import selectUdiVersion from '@/views/basic/product/UdiinfoSelectVersion' import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl"; import {filterClassify} from '@/api/purchase/classifyCode' +import { calculateDistCount } from '@/api/basic/product/drugUdiinfos' +import { levelByUuid } from '@/api/basic/product/udiInfo' export default { name: 'productEdit', @@ -433,7 +721,7 @@ export default { sysList: {}, relId: null, defaultSys: null, - detailList: {}, + // detailList: {}, isImport: null, thisData: { nameCode: null, @@ -455,10 +743,62 @@ export default { hsflOptions: [], thrTypeOptions: [], classifyList: [], + selectedIndex: null, + detailList: [ + // 初始化一个空对象或包含默认值的对象 + { + productId: null, + nameCode: '', + packLevel: null, + bhxjsl: null, + isDisabled: false, + isUpDisabled: true, + rowDisabled: false + } + ], + levelUnitList: [], } }, methods: { + distributeLevelDiChange(val) { + const matchingItem = this.detailList.find(item => item.nameCode == val); + if (matchingItem) { + this.editQuery.distributeLevelUnit = matchingItem.packUnit; + this.editQuery.distributeLevel = matchingItem.packLevel + } + calculateDistCount(matchingItem).then((res) => { + this.editQuery = { + ...this.editQuery, + distributeLevelCount: res.data.distributeLevelCount, + } + }) + }, + getDiLevel() { + let query = { + id: this.editQuery.rlId + } + this.loading = true + levelByUuid(query) + .then((response) => { + this.loading = false + this.levelUnitList = response.data || [] + this.findMaxLevelObject() + }) + .catch(() => { + this.loading = false + this.levelUnitList = [] + }) + }, + findMaxLevelObject() { + this.maxLevel = 1; + for (const obj of this.levelUnitList) { + if (obj.packLevel > this.maxLevel) { + this.maxLevel = Number(obj.packLevel); + } + } + }, + classifyChange() { this.classifySearch(this.editQuery.flbm) let item = this.classifyList.find(item => item.code == this.editQuery.flbm) @@ -689,6 +1029,7 @@ export default { selectErp }, created() { + this.getDiLevel() this.getThirdSysDetail(); var ttquery = { id: this.editQuery.rlId, @@ -721,6 +1062,27 @@ export default { diff --git a/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue b/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue index 8e19773..389ca9a 100644 --- a/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue +++ b/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue @@ -352,7 +352,7 @@ --> - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - +