From a8eec2cc49df25b078babcb3f989db5379130e37 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 15 Oct 2024 18:10:03 +0800
Subject: [PATCH] =?UTF-8?q?10-15=20=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=20?=
=?UTF-8?q?=E5=99=A8=E6=A2=B0=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/product/UdiInfoSelectRel.vue | 4 +++
src/views/basic/product/bindProduct.vue | 6 ++--
src/views/basic/product/product.vue | 31 ++++++++++++++++++-
src/views/basic/product/productCategory.vue | 28 +++++++++++++++--
src/views/basic/product/productEdit.vue | 1 -
.../product/selectmedicalSuppliesDialog.vue | 10 +++---
6 files changed, 69 insertions(+), 11 deletions(-)
diff --git a/src/views/basic/product/UdiInfoSelectRel.vue b/src/views/basic/product/UdiInfoSelectRel.vue
index dd672889..d5d6d2d0 100644
--- a/src/views/basic/product/UdiInfoSelectRel.vue
+++ b/src/views/basic/product/UdiInfoSelectRel.vue
@@ -310,6 +310,7 @@ export default {
registerNo: null,
page: 1,
limit: 10,
+ productType:1
},
thirdSys: [],
thirdSysFk: null,
@@ -371,6 +372,7 @@ export default {
registerNo: null,
page: 1,
limit: 10,
+ productType:1
};
this.getErpList();
},
@@ -609,6 +611,7 @@ export default {
this.thirdSys = response.data.list || [];
this.thirdSysFk = this.thirdSys[0].thirdId;
+ this.getErpList();
})
.catch(() => {
this.loading = false;
@@ -635,6 +638,7 @@ export default {
},
created() {
this.getBasicThirdSys();
+
},
components: {
selectDiDetail,
diff --git a/src/views/basic/product/bindProduct.vue b/src/views/basic/product/bindProduct.vue
index 42096dde..83022cbb 100644
--- a/src/views/basic/product/bindProduct.vue
+++ b/src/views/basic/product/bindProduct.vue
@@ -131,7 +131,8 @@ export default {
thrPiId: null,
filterType: null,
diType: 1,
- bindType: 1
+ bindType: 1,
+ productsType: 1
},
productList: [],
loading: false,
@@ -171,7 +172,8 @@ export default {
addType: 1,
diType: 1,
bindType: 1,
- parentCode:this.rId
+ parentCode:this.rId,
+ productsType: 1
};
this.getList();
},
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 2f074a6f..b7079245 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -689,11 +689,18 @@
highlight-current-row
@current-change="handleDetail"
>
+
+
+
+ {{ diTypes[scope.row.diType] }}
+
+
+
+
+
@@ -1968,7 +1990,10 @@ export default {
1: "已上传",
2: "上传失败",
},
-
+ diTypes: {
+ 1: '最小销售标识',
+ 4: '外包装标识'
+ },
pId: 0,
productRemarkSet: {
@@ -2502,6 +2527,10 @@ export default {
isAdavence: row.isAdavence,
};
_this.editFormat = JSON.parse(JSON.stringify(row));
+ let ttquery = {
+ id: _this.relId,
+ };
+ _this.getDetailList(ttquery)
_this.editDiDialogVisible = true;
},
closeDialog() {
diff --git a/src/views/basic/product/productCategory.vue b/src/views/basic/product/productCategory.vue
index 1a159f6f..891671cb 100644
--- a/src/views/basic/product/productCategory.vue
+++ b/src/views/basic/product/productCategory.vue
@@ -1716,7 +1716,7 @@ export default {
} else {
_this.$message.error(res.message);
}
- _thisgetList();
+ _this.getList();
})
})
.catch(() => {
@@ -1865,6 +1865,7 @@ export default {
/** 查询菜单下拉树结构 */
getTreeselect(row) {
+ console.log("dkdkkldjkdlkjd",row)
if (row != null) {
var data = {
code: row.code,
@@ -1876,7 +1877,7 @@ export default {
getListMenu(data).then(response => {
this.fromDeptOptions = [];
menu.children = this.handleTree(response.data, "code", "parentCode");
- console.log(menu)
+ console.log("shhshshshshshhs",menu)
this.fromDeptOptions.push(menu);
console.log(this.fromDeptOptions)
});
@@ -1900,6 +1901,29 @@ export default {
getListTree(this.query)
.then((response) => {
var invlist = response.data || [];
+ if (invlist.length == 0){
+ invlist = [
+ {
+ code: 10000,
+ parentCode: null,
+ label: '全部'
+ }
+ ]
+ let query = {
+ code: 10000,
+ parentCode: null,
+ name: '全部',
+ deptCode: this.$store.getters.locDeptCode,
+ invCode: this.$store.getters.locInvCode
+ }
+ saveBasicHospType(query).then(res => {
+ if (res.code == 20000){
+ // this.$message.success("success")
+ }else {
+ // this.$message.error("新增失败")
+ }
+ })
+ }
this.treeList = this.handleTree(invlist, "code", "parentCode");
})
.catch(() => {
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 604e69b7..b7ced52d 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -1284,7 +1284,6 @@ export default {
selectmedicalSuppliesDialog
},
created() {
- // console.log("dayinshshhs", this.editQuery)
this.useMutiChange(true)
this.getThirdSysDetail();
if (this.editQuery.isDateBy == 1) {
diff --git a/src/views/basic/product/selectmedicalSuppliesDialog.vue b/src/views/basic/product/selectmedicalSuppliesDialog.vue
index a6f67a62..e7a5708d 100644
--- a/src/views/basic/product/selectmedicalSuppliesDialog.vue
+++ b/src/views/basic/product/selectmedicalSuppliesDialog.vue
@@ -114,15 +114,15 @@
-
+
+
-
-
+
+
-
+
-