From 63f6a01374630e59acd0618da081011ed244cb0b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 20 Dec 2024 09:45:23 +0800
Subject: [PATCH] =?UTF-8?q?12/20=20=E8=8D=AF=E5=93=81=E5=8F=91=E7=A5=A8=20?=
=?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=98=BE=E7=A4=BA=E5=8C=85=E8=A3=85=E6=AF=94?=
=?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/product/drug/drugAdd.vue | 27 ++++-
.../collect/IocCollectOrderCheckCode.vue | 1 +
src/views/inout/InvoiceCkeck.vue | 2 +-
src/views/inoutDrug/InvoiceCkeck.vue | 106 +-----------------
src/views/inoutDrug/InvoiceRegByOrder.vue | 7 +-
5 files changed, 37 insertions(+), 106 deletions(-)
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index d2e98a7a..4b6e77a3 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -79,6 +79,13 @@
>
+
+
+
+
+
-
+
@@ -830,6 +837,7 @@ export default {
productId: null,
nameCode: '',
packLevel: null,
+ packRatio: null,
bhxjsl: null,
isDisabled: false,
isUpDisabled: true,
@@ -849,7 +857,8 @@ export default {
levelUnitList: [],
maxLevel: 1,
- editRowSwitch: false //产品标识编辑开关 没保存前其他编辑不能按
+ editRowSwitch: false, //产品标识编辑开关 没保存前其他编辑不能按
+ isSpecial:false
}
},
@@ -1061,7 +1070,8 @@ export default {
uuid: this.newProductData.uuid,
productId: row.productId,
diType: row.diType,
- xjdw: row.xjdw
+ xjdw: row.xjdw,
+ packRatio: row.packRatio
}
updateLevelDrug(editQuery).then(res => {
this.saveLoading = false
@@ -1150,6 +1160,7 @@ export default {
.then((response) => {
this.loading = false
this.detailList = response.data || []
+ this.checkIsSpecial()
})
.catch(() => {
this.loading = false
@@ -1157,7 +1168,15 @@ export default {
})
}
},
-
+ checkIsSpecial(){
+ if (this.detailList.length > 0){
+ this.detailList.forEach(item => {
+ if (item.nameCode.startsWith('89')) {
+ this.isSpecial = true
+ }
+ })
+ }
+ },
distributeLevelDiChange(val) {
const matchingItem = this.detailList.find(item => item.nameCode == val)
if (matchingItem) {
diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index e4afc661..8dadd2e6 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -163,6 +163,7 @@
+
diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index 3701a049..203a9309 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -504,7 +504,7 @@ export default {
this.inputQuery.list = this.invoiceRow;
let mount = 0;
for (var i = 0; i < this.invoiceRow.length; i++) {
- mount += this.invoiceRow[i].amount
+ mount += this.invoiceRow[i].price
}
if (mount != this.inputQuery.price) {
this.$confirm("价格不匹配，是否确定提交?", "提示", {
diff --git a/src/views/inoutDrug/InvoiceCkeck.vue b/src/views/inoutDrug/InvoiceCkeck.vue
index 75e2ba35..c122117a 100644
--- a/src/views/inoutDrug/InvoiceCkeck.vue
+++ b/src/views/inoutDrug/InvoiceCkeck.vue
@@ -155,100 +155,6 @@
-
-
-
- 单据 {{ input.billNo }}-单据详情
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -708,6 +710,7 @@ export default {
acceptQuery: null,
acceptOrderVisible: false,
subRow: null,
+ detaillist:[],
};
},
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice},
@@ -737,11 +740,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;