From 56d8be01be42821d8e03484350d36398506d4f47 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 25 Oct 2024 14:33:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=A4=9A=E7=A0=81=E8=9E=8D?= =?UTF-8?q?=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/productEdit.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue index efdc1abc..4503e733 100644 --- a/src/views/basic/product/productEdit.vue +++ b/src/views/basic/product/productEdit.vue @@ -1749,11 +1749,12 @@ export default { //如果都为空 进行补充 if (!this.$isNotBlank(this.editQuery.sptm) && !this.$isNotBlank(this.editQuery.ybbm)) { - getCodeRelDetail({drugcode:row.nameCode}).then((response) => { + getCodeRelDetail({drugCode:row.nameCode}).then((response) => { if (response.code == 20000) { - if (this.response.data != null && this.response.data.length > 0) { - this.editQuery.sptm = this.response.data[0].sptm; - this.editQuery.ybbm = this.response.data[0].ybbm; + if (response.data != null && response.data.length > 0) { + this.editQuery.sptm = response.data[0].sptm; + this.editQuery.ybbm = response.data[0].ybbm; + this.getYbHcData() } } }).catch(() => { From e54251abf4b4782ba6ca7225427aaf0a92b29b28 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 25 Oct 2024 15:57:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?10/25=20bug=E4=BC=98=E5=8C=96=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/product.vue | 58 +++++++++---------- src/views/basic/product/productEdit.vue | 24 ++++---- .../prescribe/prescribeDownloadDialog.vue | 6 +- .../purchase/purApply/purApplyEditDiaolog.vue | 2 +- .../purchase/purOrder/purOrderEditDialog.vue | 1 + 5 files changed, 48 insertions(+), 43 deletions(-) diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index fc8927c8..c64f9319 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -1717,35 +1717,35 @@ - - - -
- 提交 - - 取消 - -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { - this.editQuery = { - ...this.editQuery, - distributeLevelCount: res.data.distributeLevelCount, - } - }) + // calculateDistCount(matchingItem).then((res) => { + // this.editQuery = { + // ...this.editQuery, + // distributeLevelCount: res.data.distributeLevelCount, + // } + // }) }, useLevelDiChange(val) { const matchingItem = this.detailList.find(item => item.nameCode == val); @@ -1330,12 +1330,12 @@ export default { this.editQuery.useLevelUnit = matchingItem.packUnit; this.editQuery.useLevel = matchingItem.packLevel; } - calculateUseCount(matchingItem).then((res) => { - this.editQuery = { - ...this.editQuery, - useLeverCount: res.data.useLeverCount, - } - }) + // calculateUseCount(matchingItem).then((res) => { + // this.editQuery = { + // ...this.editQuery, + // useLeverCount: res.data.useLeverCount, + // } + // }) }, classifyChange() { this.classifyChange(this.editQuery.flbm) diff --git a/src/views/collect/prescribe/prescribeDownloadDialog.vue b/src/views/collect/prescribe/prescribeDownloadDialog.vue index 3a75e76e..6586befe 100644 --- a/src/views/collect/prescribe/prescribeDownloadDialog.vue +++ b/src/views/collect/prescribe/prescribeDownloadDialog.vue @@ -431,7 +431,11 @@ export default { this.loading = false if (res.code == 20000){ this.list = res.data.list || [] - this.total = res.data.total || 0 + if (res.data.list.length === 0){ + this.total = 0 + }else + this.total = res.data.total + }else { this.$message.error(res.message) } diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue index 45997b94..7d8528a1 100644 --- a/src/views/purchase/purApply/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue @@ -116,7 +116,7 @@ - +