diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 5dc6758..8a4e77f 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -12,9 +12,10 @@
平潭协和医院
({{ inv }})
+
+ {{this.companyName}}
+ ({{this.userName}})
- {{this.companyName}}
- ({{this.userName}})
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index a4ac96f..f023df6 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -98,7 +98,7 @@
+ border>
@@ -438,7 +438,6 @@ export default {
handleSelectionChange(val) {
this.multipleSelection = val;
},
-
cancelDialog() {
this.editDialogVisible = false;
},
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index a396511..d6fa014 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -669,7 +669,7 @@ export default {
let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
tQuery.billNo = this.orderFormData.billNo;
if (this.orderFormData.billNo == null) {
- this.$message.error("请先添加业务详情!");
+ this.$message.error("请先录入单据信息!");
return;
}
saveOrderWeb(tQuery).then((response) => {
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index c4c3a73..bf5c8a7 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -430,7 +430,7 @@ import {
} from "../../api/inout/order";
import {filterAllByUser} from "@/api/system/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType";
-import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {filterSubAll} from "@/api/system/invSubWarehouse";
import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {getBizDetailList} from "@/api/inout/orderDetailBiz";
@@ -732,7 +732,7 @@ export default {
let query = {
pcode: this.filterQuery.locStorageCode
};
- filterSubByInv(query)
+ filterSubAll(query)
.then((response) => {
this.subInvList = response.data || [];
})
@@ -743,7 +743,7 @@ export default {
let query = {
filter: 3,
};
- filterSubByInv(query)
+ filterSubAll(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index dd954b6..c366bd0 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -373,6 +373,7 @@ export default {
});
},
addOrders(row) {
+ this.errView = 0;
this.idQuery = {};
this.idQuery = row;
if (row.status === 4) {
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 420290f..8fdaaf3 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -97,7 +97,7 @@
prop="manufacturer"
show-overflow-tooltip
>
-
+
-
+
{
this.loading = false;
- //this.total = response.data.total;
let invlist = response.data || [];
this.list = this.handleTree(invlist, "code", "parentCode");
-
})
.catch(() => {
this.loading = false;
@@ -502,19 +494,17 @@ export default {
this.$refs["dataForm"].validate(valid => {
if (valid) {
saveSubWarehouse(this.subData, this.formName).then((response) => {
+ this.subFormVisible = false;
if (response.code == 20000) {
- this.loadSubData(this.subData.parentId);
- this.subFormVisible = false;
+ this.getList();
} else {
this.$message.error(response.message);
- this.subFormVisible = false;
}
}).catch(() => {
this.subFormVisible = false;
});
}
});
- this.getList();
},
findDeptMethod() { //新增,编辑---获取部门信息
let query = {
@@ -745,7 +735,6 @@ export default {
}
this.getList();
this.$message.success("删除成功");
- this.loadSubData(row.parentId);
})
.catch(() => {
this.deleteLoading = false;
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 2d884cd..5f3a681 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -121,7 +121,7 @@
-
+
-
+
- 否
- 是
+ 否
+ 是
展开/折叠
- 全选/全不选
+ 全选/全不选
+
展开/折叠
- 全选/全不选
+ 全选/全不选
+
父子联动
-
+
-->
-
+
查看用户
查看联系人
@@ -110,7 +112,7 @@
-
+