From d13baee1233da7f7d93f7378605c9223651dc0a3 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 7 Nov 2024 12:07:47 +0800
Subject: [PATCH] =?UTF-8?q?11/7=20=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A21.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/product/drug/drugAdd.vue | 12 +-
src/views/inout/DialogCreateOrder.vue | 3 +-
.../distribution/DialogCreateOrder.vue | 3 +-
.../distribution/DialogSelectProduct.vue | 12 +-
.../PanelCreateOrderBizDetail.vue | 4 +-
.../supplier/drugProducts/supProductsAdd.vue | 232 +++---------------
.../drugProducts/supProductsAddDi.vue | 8 +-
7 files changed, 61 insertions(+), 213 deletions(-)
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 3e21bab..ef65b83 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -823,6 +823,8 @@ export default {
defaultSys: null,
levelUnitList: [],
maxLevel: 1,
+
+ editRowSwitch: false //产品标识编辑开关 没保存前其他编辑不能按
}
},
@@ -983,6 +985,7 @@ export default {
//层级保存
levelSave(row) {
+ this.editRowSwitch = false
if (isBlank(row.nameCode)) {
this.$message.error('层级标识不能为空')
return
@@ -1057,9 +1060,16 @@ export default {
},
rowChange(index, val) {
- this.selectedIndex = index
+
+ if(this.editRowSwitch == true ){
+ this.$message.error('请先保存当前产品标识编辑')
+ return
+ }
+
+ this.selectedIndex = index
this.isSave = false
+ this.editRowSwitch = true
},
deleteLevel(index, row) {
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 045b3b4..4fc23f0 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -451,7 +451,8 @@ export default {
code: this.orderFormData.invCode,
spUse: 2,
vueType: "supDelivery",
- enable: true
+ enable: true,
+ productType:1
};
getLocalJoinByUser(query)
.then((response) => {
diff --git a/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue b/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
index 92b259d..1bb178b 100644
--- a/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
+++ b/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
@@ -451,7 +451,8 @@ export default {
code: this.orderFormData.invCode,
spUse: 2,
vueType: "supDelivery",
- enable: true
+ enable: true,
+ productType:2,
};
getLocalJoinByUser(query)
.then((response) => {
diff --git a/src/views/pharmaceuticals/distribution/DialogSelectProduct.vue b/src/views/pharmaceuticals/distribution/DialogSelectProduct.vue
index fd48b8c..37c79da 100644
--- a/src/views/pharmaceuticals/distribution/DialogSelectProduct.vue
+++ b/src/views/pharmaceuticals/distribution/DialogSelectProduct.vue
@@ -29,7 +29,7 @@
-
@@ -95,11 +95,11 @@
prop="cpmctymc"
show-overflow-tooltip
>
-
+
+
+
+
+
diff --git a/src/views/supplier/drugProducts/supProductsAdd.vue b/src/views/supplier/drugProducts/supProductsAdd.vue
index 20c9f19..49d872d 100644
--- a/src/views/supplier/drugProducts/supProductsAdd.vue
+++ b/src/views/supplier/drugProducts/supProductsAdd.vue
@@ -38,7 +38,7 @@
-
+
@@ -56,35 +56,29 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
- {{ item.code }}
-
-
-
-
-
-
-
-
- {{ item.hsmc }}
- {{ item.hsbm }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/supplier/drugProducts/supProductsAddDi.vue b/src/views/supplier/drugProducts/supProductsAddDi.vue
index ace96fe..e9abd99 100644
--- a/src/views/supplier/drugProducts/supProductsAddDi.vue
+++ b/src/views/supplier/drugProducts/supProductsAddDi.vue
@@ -383,7 +383,7 @@