diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 7f6a3a4..4b6a76e 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -70,8 +70,8 @@
:disabled="true"
style="width: 90%" placeholder="选择标识类型" clearable>
-
-
+
+
@@ -1328,7 +1328,6 @@ export default {
},
methods: {
distributeLevelDiChange(val) {
- console.log("gdgdgdgdgd",this.editQuery.distributeLevel)
const matchingItem = this.detailList.find(item => item.nameCode == val);
if (matchingItem) {
this.editQuery.distributeLevelUnit = matchingItem.packUnit;
@@ -1399,6 +1398,7 @@ export default {
},
addDrugLevel() {
+ console.log('this.detailList',this.detailList)
this.detailList.push({
nameCode: '',
packLevel: null,
diff --git a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
index 97c4f60..b495076 100644
--- a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
+++ b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
@@ -144,106 +144,105 @@
-
- 流通时采用的计量单位设置
-
-
-
-
+
+
+
+
+
+
-
-
- 单位:{{ item.packUnit }}
- 层级:{{ item.packLevel }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- 单位:{{ item.packUnit }}
- 层级:{{ item.packLevel }}
-
-
-
-
-
-
-
- 使用时采用的计量单位设置
-
-
-
-
-
-
-
- 单位:{{ item.packUnit }}
- 层级:{{ item.packLevel }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- 单位:{{ item.packUnit }}
- 层级:{{ item.packLevel }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -925,16 +924,16 @@ export default {
return
}
}
- const isLevel1 = this.detailList.some(item => item.packLevel === 1)
- if (!isLevel1) {
- this.$message.error('药品层级缺少一级标识!')
- }
+ // const isLevel1 = this.detailList.some(item => item.packLevel === 1)
+ // if (!isLevel1) {
+ // this.$message.error('药品层级缺少一级标识!')
+ // }
this.newProductData.drugLevelLists = this.detailList
}
this.saveLoading = true
-
- addDrug(this.newProductData).then((res) => {
+ this.newProductData.relId = this.newProductData.rlId
+ updatetDrug(this.newProductData).then((res) => {
this.saveLoading = false
if (res.code == 20000) {
this.$message.success('添加成功')
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 3f152fa..69009e6 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -450,9 +450,13 @@ export default {
handleDelete(row) {
this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?').then(function () {
return delMenu(row.menuId);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("删除成功");
+ }).then((res) => {
+ if (res.code == 20000) {
+ this.getList();
+ this.$modal.msgSuccess("删除成功");
+ } else {
+ this.$modal.msgSuccess(res.message);
+ }
}).catch(() => {
});
}