1.仓库字典关联用户和单据类型

src/api/auth/authUser.js

@@ -0,0 +1,10 @@
+import axios from "../../utils/axios";
+
+//获取医院用户列表
+export function getHospitalUserList(query) {
+    return axios({
+        url: '/admin/auth/admin/hospitalUserList',
+        method: 'get',
+        params: query
+    })
+}

src/api/basic/invWarehouse.js

@@ -59,3 +59,49 @@ export function exportJson(query){
         responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
     });
 }
+
+//加载仓库字典关联用户数据
+export function warehouseUserList(query) {
+    return axios({
+        url: '/warehouse/inout/warehouseUserList',
+        method: 'get',
+        params: query
+    });
+}
+
+//加载仓库字段关联单据类型数据
+export function warehouseBussinessTypeList(query) {
+    return axios({
+        url: '/warehouse/inout/warehouseBussniessTypeList',
+        method: 'get',
+        params: query
+    });
+}
+
+//添加用户
+export function saveWarehouseUser(query) {
+    return axios({
+        url: '/warehouse/inout/saveWarehouseUser',
+        method: 'post',
+        data: query
+    });
+}
+
+//添加单据类型
+export function saveWarehouseBussinessType(query) {
+    return axios({
+        url: '/warehouse/inout/saveWarehouseBussinessType',
+        method: 'post',
+        data: query
+    });
+}
+
+//设置主管
+export function updateDirector(query) {
+    return axios({
+        url: '/warehouse/inout/updateDirector',
+        method: 'post',
+        params: query
+    });
+}
+

src/views/basic/invWarehouse.vue

@@ -48,6 +48,8 @@
                 row-key="id"
                 border
                 default-expand-all
+                highlight-current-row
+                @row-click="loadLinkData"
                 :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
                 <el-table-column
                     prop="code"
@@ -115,6 +117,71 @@
                 </el-table-column>
             </el-table>
 
+            <div>
+                <el-card style="width: 49%; float: left; margin-right: 0px;">
+                    <div slot="header" class="clearfix" style="margin-bottom: 20px;">
+                        <el-button style="float: right;" type="primary" @click="addUser()">添加用户</el-button>
+                    </div>
+                    <el-table
+                        :data="userData"
+                        stripe
+                        style="width: 100%">
+                        <el-table-column
+                            prop="userid"
+                            label="用户ID"
+                            min-width="20%">
+                        </el-table-column>
+                        <el-table-column
+                            prop="username"
+                            label="用户名"
+                            min-width="40%">
+                        </el-table-column>
+                        <el-table-column
+                            prop="isDirector"
+                            label="主管"
+                            min-width="30%">
+                            <template slot-scope="scope">
+                                <span>{{ isDirectorMap[scope.row.director] }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            label="操作"
+                            min-width="10%"
+                        >
+                            <template slot-scope="scope">
+                                <el-button
+                                    type="text"
+                                    size="small"
+                                    @click.native="updateDirector(scope.row)">
+                                    设为主管
+                                </el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-card>
+
+                <el-card style="width: 49%; float: right; margin-left: 0px;">
+                    <div slot="header" class="clearfix" style="margin-bottom: 20px;">
+                        <el-button style="float: right;" @click="addBussinessType()" type="primary">添加单据类型</el-button>
+                    </div>
+                    <el-table
+                        :data="bussinessTypeData"
+                        stripe
+                        style="width: 100%">
+                        <el-table-column
+                            prop="action"
+                            label="单据类型编码"
+                            min-width="50%">
+                        </el-table-column>
+                        <el-table-column
+                            prop="name"
+                            label="单据类型名称"
+                            min-width="50%">
+                        </el-table-column>
+                    </el-table>
+                </el-card>
+            </div>
+
 
             <!--            <el-tree-->
             <!--                :data="mergeList"-->
@@ -127,6 +194,76 @@
             <!--            >-->
             <!--            </el-tree>-->
         </el-card>
+
+
+        <!--添加用户弹窗-->
+        <el-dialog
+            title="用户列表"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :visible.sync="userFormVisible"
+            class="dialog"
+        >
+            <el-table v-loading="loading" :data="userList" ref="checkUserList"
+                      @selection-change="handleUserSelectionChange"
+                      style="width: 100%">
+                <el-table-column
+                    type="selection"
+                    :reserve-selection="false"
+                    width="55">
+                </el-table-column>
+                <el-table-column label="用户ID" prop="id" fixed></el-table-column>
+                <el-table-column label="用户名" prop="userName" fixed></el-table-column>
+            </el-table>
+
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="userFormVisible = !userFormVisible"
+                >取消
+                </el-button
+                >
+                <el-button
+                    type="primary"
+                    @click.native="addUserData()"
+                >提交
+                </el-button>
+            </div>
+
+        </el-dialog>
+
+        <!--添加单据类型弹窗-->
+        <el-dialog
+            title="单据类型"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :visible.sync="bussinessTypeFormVisible"
+            class="dialog"
+        >
+            <el-table v-loading="loading" :data="bussinessTypeList" ref="typeList"
+                      @selection-change="handleBussinessTypeSelectionChange"
+                      style="width: 100%">
+                <el-table-column
+                    type="selection"
+                    :reserve-selection="false"
+                    width="55">
+                </el-table-column>
+                <el-table-column label="单据类型编码" prop="action" fixed></el-table-column>
+                <el-table-column label="单据类型名称" prop="name" fixed></el-table-column>
+            </el-table>
+
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="bussinessTypeFormVisible = !bussinessTypeFormVisible"
+                >取消
+                </el-button
+                >
+                <el-button
+                    type="primary"
+                    @click.native="addBussinessTypeData()"
+                >提交
+                </el-button>
+            </div>
+
+        </el-dialog>
+
         <!--表单界面-->
         <el-dialog
             :title="formMap[formName]"
@@ -301,8 +438,13 @@
 import {
     filterList, filterAll,
     saveWarehouse,
-    deleteWarehouse, exportJson
+    deleteWarehouse, exportJson,
+    warehouseUserList, warehouseBussinessTypeList,
+    saveWarehouseUser, saveWarehouseBussinessType,
+    updateDirector
 } from "../../api/basic/invWarehouse";
+import {getHospitalUserList} from "../../api/auth/authUser";
+import {getJoinBussinessType} from "../../api/basic/bussinessType";
 import {formatDate} from "@/utils/date";
 import axios from "axios";
 import store from "@/store";
@@ -351,6 +493,10 @@ export default {
                 true: "寄售",
                 false: "仓库",
             },
+            isDirectorMap: {
+                true: "是",
+                false: "否",
+            },
             formLoading: false,
             subFormVisible: false,
             formVisible: false,
@@ -363,12 +509,19 @@ export default {
                     {required: true, message: "请输入仓库货位代码", trigger: "blur"}
                 ]
             },
-            pidData: {}
+            pidData: {},
-            ,
             deleteLoading: false,
             uploadFileUrl: null,
-        }
+            userData: null,
-            ;
+            bussinessTypeData: null,
+            userList: null,
+            bussinessTypeList: null,
+            userFormVisible: false,
+            currentCode: null,
+            selectUserList: [],
+            selectBussinessTypeList: [],
+            bussinessTypeFormVisible: false,
+        };
     },
     methods: {
         /*eslint-disable */
@@ -647,6 +800,148 @@ export default {
         changeLevel(row) {
             this.getParentInv(this.formData.level);
         },
+        loadLinkData(row) {
+            let query = {
+                code: row.code
+            }
+            this.currentCode = row.code;
+            //加载用户数据
+            warehouseUserList(query).then((res) => {
+                this.userData = res.data;
+            }).catch((error) => {
+                console.log(error)
+            });
+
+            //加载单据类型数据
+            warehouseBussinessTypeList(query).then((res) => {
+                this.bussinessTypeData = res.data;
+            }).catch((error) => {
+                console.log(error);
+            });
+        },
+        addUser() {
+            if (this.currentCode == null || this.currentCode == '') {
+                this.$message.error("请先选择仓库");
+            } else {
+                this.userFormVisible = true;
+                getHospitalUserList().then((res) => {
+                    this.selectUserList = this.userData;
+                    this.userList = res.data;
+                    this.userData.forEach(data => {
+                        this.userList.forEach(user => {
+                            if (user.id == data.userid) {
+                                this.$refs.checkUserList.toggleRowSelection(user, true);
+                                console.log(this.$refs.checkUserList)
+                            } else {
+                                this.$refs.checkUserList.toggleRowSelection(user, false);
+                            }
+                        });
+                    });
+                });
+            }
+        },
+        handleUserSelectionChange(row) {
+            let _this = this;
+            _this.selectUserList = [];
+            row.forEach((item) => {
+                _this.selectUserList.push(item);
+            })
+        },
+        handleBussinessTypeSelectionChange(row) {
+            let _this = this;
+            _this.selectBussinessTypeList = [];
+            row.forEach((item) => {
+                _this.selectBussinessTypeList.push(item);
+            })
+        },
+        addUserData() {
+            this.userFormVisible = false;
+            let query = {
+                code: this.currentCode,
+                userList: JSON.stringify(this.selectUserList)
+            };
+            saveWarehouseUser(query).then((res) => {
+                this.$message.success("添加成功");
+                let loadParam = {
+                    code: this.currentCode
+                };
+                //重新加载数据
+                warehouseUserList(loadParam).then((res) => {
+                    this.userData = res.data;
+                }).catch((error) => {
+                    console.log(error)
+                });
+            }).catch((error) => {
+                console.log(error);
+                this.$message.error("添加失败");
+            });
+        },
+        addBussinessType() {
+            if (this.currentCode == null || this.currentCode == '') {
+                this.$message.error('请先选择仓库');
+            } else {
+                this.bussinessTypeFormVisible = true;
+                let query = {
+                    enabled: true
+                };
+                getJoinBussinessType(query).then((res) => {
+                    this.bussinessTypeList = res.data.list;
+                    this.bussinessTypeList.forEach(type => {
+                        this.bussinessTypeData.forEach(data => {
+                            if (type.action == data.action) {
+                                this.$refs.typeList.toggleRowSelection(type, true);
+                            } else {
+                                //未匹配上取消勾选，清除数据缓存
+                                this.$refs.typeList.toggleRowSelection(type, false);
+                            }
+                        });
+                    });
+                }).catch((error) => {
+                });
+            }
+        },
+        addBussinessTypeData() {
+            if (this.selectBussinessTypeList.length == 0) {
+                this.$message.error("请选择单据类型")
+            } else {
+                this.bussinessTypeFormVisible = false;
+                let query = {
+                    code: this.currentCode,
+                    bussinessTypes: JSON.stringify(this.selectBussinessTypeList)
+                };
+                saveWarehouseBussinessType(query).then((res) => {
+                    this.$message.success("添加成功");
+                    //重新加载数据表格
+                    let loadParam = {
+                        code: this.currentCode
+                    }
+                    warehouseBussinessTypeList(loadParam).then((res) => {
+                        this.bussinessTypeData = res.data;
+                    }).catch((error) => {
+                    });
+                }).catch((error) => {
+                });
+            }
+        },
+        updateDirector(row) {
+            console.log(row)
+            let params = {id: row.id};
+            updateDirector(params).then((res) => {
+                this.$message.success("设置成功");
+                //重新加载表格数据
+                let loadParam = {
+                    code: this.currentCode
+                };
+                //重新加载数据
+                warehouseUserList(loadParam).then((res) => {
+                    this.userData = res.data;
+                }).catch((error) => {
+                    console.log(error)
+                });
+            }).catch((error) => {
+                this.$message.error("设置失败");
+            });
+        }
     },
     filters: {
         statusFilterType(status) {
@@ -675,4 +970,5 @@ export default {
 </script>
 
 <style type="text/scss" lang="scss">
+
 </style>

src/views/userManage/admin/authRole.vue

@@ -529,7 +529,6 @@ export default {
             let query = {'roleId': row.id};
             getBussinessTypeRole(query).then((res) => {
                 this.multipleSelection = [];
-                let count = 0;
                 if (res.data.length > 0) {
                     this.bussinessTypeList.forEach(type => {
                         res.data.forEach(data => {