diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index d5177248..2f074a6f 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -1678,22 +1678,22 @@ @closePre="closeUdi" > -
- 提交 - - 取消 - -
+ + + + + + + + + + + + + + + +
- - - - - - {{ item.nameCode }} - {{ item.packLevel }} - - - - - - - - - {{ item.nameCode }} - {{ item.packLevel }} - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + {{ item.nameCode }} + {{ item.packLevel }} + + + + + + + + + {{ item.nameCode }} + {{ item.packLevel }} + + + + + + + + + + + + + + + + + + + + + + + + - +
- +
+ 提交 + + 取消 + +
@@ -920,7 +935,7 @@ import { removeDiRl, removeRl, thirdSysDetail, - updatetSingleUdiInfo + updatetSingleUdiInfo, updatetUdiInfos } from "@/api/basic/product/udiRelevance"; import {isBlank} from "@/utils/strUtil"; import {filterByUuid} from "@/api/basic/product/udiInfo"; @@ -934,7 +949,7 @@ import {getHslbs} from "@/api/thrsys/thrHsfl"; import {filterClassify} from "@/api/purchase/classifyCode" import selectmedicalSuppliesDialog from "./selectmedicalSuppliesDialog" import { - calculateDistCount,calculateUseCount + calculateDistCount, calculateUseCount } from '@/api/basic/product/drugUdiinfos' export default { @@ -999,6 +1014,7 @@ export default { }, classifyList: [], addLoading: false, + onAddLoading: false, } }, components: { @@ -1031,18 +1047,26 @@ export default { 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.distributeLevelCount = res.data.distributeLevelCount + this.editQuery = { + ...this.editQuery, + distributeLevelCount: res.data.distributeLevelCount, + } }) }, useLevelDiChange(val) { const matchingItem = this.detailList.find(item => item.nameCode == val); if (matchingItem) { this.editQuery.useLevelUnit = matchingItem.packUnit; + this.editQuery.useLevel = matchingItem.packLevel; } calculateUseCount(matchingItem).then((res) => { - this.editQuery.useLeverCount = res.data.useLeverCount + this.editQuery = { + ...this.editQuery, + useLeverCount: res.data.useLeverCount, + } }) }, classifyChange() { @@ -1185,6 +1209,7 @@ export default { this.cancelDialog(); }); }, + removeErp(row) { this.$confirm("此操作将解除该绑定产品信息, 是否继续?", "提示", { confirmButtonText: "确定", @@ -1352,7 +1377,27 @@ export default { getData(data) { this.tollProjectDialogVisible = false this.editQuery.payFeeCode = data.medCatalogCode - } + }, + onAddSubmit(relSubmit) { + this.editQuery.relSubmit = relSubmit; + this.onAddLoading = true + updatetUdiInfos(this.editQuery) + .then((response) => { + this.onAddLoading = false + if (response.code == 20000) { + this.$emit("closePre", true); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + this.onAddLoading = false + this.$emit("closePre", true); + }); + }, + cancelSubmit() { + this.$emit("closePre", true); + }, }, directives: { 'debounce-input': { diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index 64f9f391..7ce89709 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -42,31 +42,30 @@ 单据挂起 处理完成 - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -284,9 +283,9 @@
+ > -

{{ info.documentTypeCode }}

+

{{ info.remark }}

开始作业 @@ -813,6 +812,8 @@ export default { }, startDeal() { + debugger + this.$message.error("开始处理单据") this.curRow = this.formData; this.dealSplitOrder() this.formData.tagStatus = 2; diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue index 3a07f5ff..7ce89709 100644 --- a/src/views/collect/DealOrderBlank.vue +++ b/src/views/collect/DealOrderBlank.vue @@ -42,13 +42,12 @@ 单据挂起 处理完成 @@ -813,6 +812,8 @@ export default { }, startDeal() { + debugger + this.$message.error("开始处理单据") this.curRow = this.formData; this.dealSplitOrder() this.formData.tagStatus = 2;