diff --git a/public/config.json b/public/config.json
index e6d6315..0080774 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,5 +1,5 @@
{
- "BASE_URL": "http://192.168.0.109:9906",
- "SERVER_IP": "http://192.168.0.109:9906",
+ "BASE_URL": "http://127.0.0.1:9906",
+ "SERVER_IP": "http://127.0.0.1:9906",
"hosp_name": "诏安县总医院(测试)"
}
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index df1ac03..7cf17f5 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -86,7 +86,7 @@
内部进出平衡补单:
-
@@ -372,6 +372,7 @@ import {getCandidateBussinessType} from "../../api/receipts/bussinessType";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {findConfig} from "@/api/thrsys/spsSyncStatus";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
export default {
name: "inputQuery",
@@ -411,6 +412,7 @@ export default {
}],
twoCheck: false,
configParms: {},
+ mutiInvMode: true,
}
},
@@ -498,6 +500,19 @@ export default {
})
.catch(() => {
});
+
+ let query = {
+ paramKey: "muti_inv_mode",
+ };
+ selectSysParamByKey(query).then((response) => {
+ if (response.code == 20000) {
+ if (response.data.paramValue == "1") {
+ this.mutiInvMode = true;
+ } else {
+ this.mutiInvMode = false;
+ }
+ }
+ });
},
findDefaultSubInv() {
this.subInvList = [];
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 3cb246b..b1038e5 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -531,7 +531,8 @@
-
+
@@ -543,6 +544,7 @@
d.id === data.id);
- // }
this.getParentInv(this.formData.level);
-
this.getThrsysDetailData();
},
getThrsysDetailData() {
@@ -1662,6 +1661,20 @@ export default {
})
.catch(() => {
});
+
+
+ let query = {
+ paramKey: "muti_inv_mode",
+ };
+ selectSysParamByKey(query).then((response) => {
+ if (response.code == 20000) {
+ if (response.data.paramValue == "1") {
+ this.mutiInvMode = true;
+ } else {
+ this.mutiInvMode = false;
+ }
+ }
+ });
},
}
,
diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue
index f8bd49f..b0e5f00 100644
--- a/src/views/userManage/admin/authAdmin.vue
+++ b/src/views/userManage/admin/authAdmin.vue
@@ -37,6 +37,8 @@
+
+
{{
@@ -145,9 +147,35 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
-
+
+
@@ -201,6 +229,7 @@ import {
import store from "../../../store/index";
import {findConfig} from "@/api/thrsys/spsSyncStatus";
import {isBlank} from "@/utils/strUtil";
+import {filterDepts} from "@/api/auth/authDept";
const formJson = {
id: "",
@@ -210,6 +239,7 @@ const formJson = {
employeeName: "",
userFlag: 1,
comments: '',
+ dept: null,
roles: []
};
export default {
@@ -252,6 +282,7 @@ export default {
formLoading: false,
formVisible: false,
formData: formJson,
+ fromDeptOptions: [],
configParms: {},
formRules: {},
addRules: {
@@ -367,7 +398,8 @@ export default {
employeeName: row.employeeName,
userFlag: 1,
comments: row.comments,
- roles: row.roles
+ roles: row.roles,
+ dept: row.dept,
};
}
this.formName = "add";
@@ -416,6 +448,8 @@ export default {
}
// 刷新表单
this.resetForm();
+
+ this.getList();
});
}
});
@@ -459,6 +493,28 @@ export default {
.catch(() => {
});
},
+
+
+ findDeptMethod() {
+ let query = {
+ flag: 1
+ };
+ filterDepts(query)
+ .then((response) => {
+ this.loading = false;
+ this.fromDeptOptions = response.data.list || [];
+ })
+ .catch(() => {
+ this.loading = false;
+ this.fromDeptOptions = [];
+ });
+ },
+
+ deptChange(row) {
+ this.formData.corpId = row.code;
+ this.formData.corpName = row.name;
+ },
+
},
filters: {
statusFilterType(status) {
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index 5df3dd4..89fc0a4 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -213,7 +213,7 @@
{{ item.name }}
@@ -516,6 +516,7 @@ export default {
fromSubInvCode: null,
codeFillCheck: null,
vailInv: null,
+ deptCode: null,
},
editOriginCodeVisible: false,
@@ -580,6 +581,7 @@ export default {
fromCorpId: this.formData.fromCorpId,
outChangeEnable: this.formData.outChangeEnable,
preCheck: this.formData.preCheck,
+ deptCode: this.formData.deptCode,
}
submitOrderWeb(tQuery)
.then((response) => {