From 03163a1fe71f513ba59a7ee9d7b1bc52e0bdb50f Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 5 Aug 2022 09:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json                       |  4 +-
 src/views/basic/BussinessTypeModify.vue  | 17 ++++++-
 src/views/basic/invWarehouse.vue         | 27 ++++++++---
 src/views/userManage/admin/authAdmin.vue | 60 +++++++++++++++++++++++-
 src/views/warehouse/addHosOrder.vue      |  6 ++-
 5 files changed, 100 insertions(+), 14 deletions(-)

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 @@
                     <div class="itemTag">
                         <span>内部进出平衡补单:&nbsp;</span>
                     </div>
-                    <el-select :disabled="inputQuery.corpType !=1"
+                    <el-select :disabled="inputQuery.corpType !=1 || !mutiInvMode"
                                v-model="inputQuery.supplementOrderType"
                                clearable
                                placeholder="单据类型">
@@ -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 @@
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="12" class="el-col">
                         <el-form-item class="query-form-item" label="仓库等级:">
-                            <el-select v-model="formData.level" placeholder="仓库等级" clearable @change="changeLevel">
+                            <el-select v-model="formData.level" placeholder="仓库等级" clearable @change="changeLevel"
+                                       :disabled="!mutiInvMode">
                                 <el-option label="1 级库" :value='1'></el-option>
                                 <el-option label="2 级库" :value='2'></el-option>
                                 <el-option label="3 级库" :value='3'></el-option>
@@ -543,6 +544,7 @@
                     <el-col :span="12" class="el-col">
                         <el-form-item class="query-form-item" label="上级仓库:">
                             <el-select v-model="formData.pcode" placeholder="请选择当前仓库"
+                                       :disabled="!mutiInvMode"
                                        clearable="true" size="mini" @change="pcodeChange">
                                 <el-option
                                     v-for="item in pCodes"
@@ -759,6 +761,7 @@ import store from "@/store";
 import {findConfig} from "@/api/thrsys/spsSyncStatus";
 import {isBlank} from "@/utils/strUtil";
 import relBusUserDialog from "./invWarehouseRelBusTypes";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 
 const formJson = {
     id: null,
@@ -867,6 +870,8 @@ export default {
                 thirdSysFk: "thirdId",
             },
             configParms: {},
+
+            mutiInvMode: true,
             subData: {},
             subFromName: "add",
             userQuery: {
@@ -943,7 +948,6 @@ export default {
         },
         // 显示表单
         handleForm(data, formName) {
-            // let no = this.getProjectNum() + Math.floor(Math.random() * 10000)
             if (null != data) {
                 this.currentId = data.id;
                 this.thirdSysVisible = true;
@@ -962,15 +966,10 @@ export default {
 
                 this.formData = Object.assign({}, data);
             } else {
-                // this.formData.code = no;
                 this.formVisible = true;
             }
             this.formName = formName;
-            // if (data && data.id) {
-            //     this.index = this.mergeList.findIndex((d) => 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 @@
                 <el-table-column label="用户账号" prop="userName" fixed></el-table-column>
                 <el-table-column label="用户名称" prop="employeeName" fixed>
                 </el-table-column>
+                <el-table-column label="所属部门" prop="deptName" fixed>
+                </el-table-column>
                 <el-table-column label="状态" fixed="">
                     <template slot-scope="scope">
                         <el-tag :type="scope.row.userFlag | statusFilterType">{{
@@ -145,9 +147,35 @@
                         </el-col>
                     </el-row>
                     <el-row :gutter="20" class="el-row" type="flex">
+                        <el-col :span="10" class="el-col" type="flex">
+                            <el-form-item class="text item" prop="dept" label="所属部门"
+                            >
+                                <el-select
+                                    v-model="formData.dept"
+                                    filterable
+                                    clearable="true"
+                                    reserve-keyword
+                                    placeholder="请选择部门信息"
+                                    :remote-method="findDeptMethod"
+                                    :loading="loading"
+                                    @focus="findDeptMethod('')"
+                                    @change="deptChange"
+                                >
+                                    <el-option
+                                        v-for="item in fromDeptOptions"
+                                        :key="item.code"
+                                        :label="item.name"
+                                        :value="item.code"
+                                    >
+                                        <span style="float: left">{{ item.name }}</span>
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="10" class="el-col" type="flex">
                             <div class="text item">
-                                <el-form-item label="备&nbsp&nbsp注" prop="comments">
+                                <el-form-item prop="comments">
+                                    <label slot="label">备&emsp;&emsp;注</label>
                                     <el-input v-model="formData.comments" size="small" style="width: 80%"></el-input>
                                 </el-form-item>
                             </div>
@@ -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 @@
                     <el-form-item class="query-form-item" prop="corpName"
                     >
                         <el-select
-                            v-model="formData.corpName"
+                            v-model="formData.deptCode"
                             filterable
                             clearable="true"
                             reserve-keyword
@@ -227,7 +227,7 @@
                                 v-for="item in fromDeptOptions"
                                 :key="item.id"
                                 :label="item.name"
-                                :value="item"
+                                :value="item.code"
                             >
                                 <span style="float: left">{{ item.name }}</span>
                             </el-option>
@@ -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) => {