From 50786ad74a3609a8ebd6ce9d0291816e65daa522 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 30 Jan 2023 10:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=93=E5=BA=93=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/sidebar.scss                |   1 +
 src/views/inventory/InvSpaceManage.vue        |  85 ++-
 src/views/system/dept/invRelBusType.vue       |  95 +++
 src/views/system/dept/invRelUsers.vue         | 312 ++++++++++
 src/views/system/dept/invUserRelBusTypes.vue  |  20 +-
 src/views/system/dept/invWarehouse.vue        | 551 ++++++------------
 .../system/dept/invWarehouseRelBusTypes.vue   | 134 -----
 src/views/thirdSys/inv/index.vue              | 148 +++--
 8 files changed, 716 insertions(+), 630 deletions(-)
 create mode 100644 src/views/system/dept/invRelBusType.vue
 create mode 100644 src/views/system/dept/invRelUsers.vue
 delete mode 100644 src/views/system/dept/invWarehouseRelBusTypes.vue

diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index ed308b8d..92bbf180 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -74,6 +74,7 @@
       overflow: hidden !important;
       text-overflow: ellipsis !important;
       white-space: nowrap !important;
+      height: 45px;     //侧边菜单栏高度
     }
 
     // menu hover
diff --git a/src/views/inventory/InvSpaceManage.vue b/src/views/inventory/InvSpaceManage.vue
index 57cff1a6..c0213bf9 100644
--- a/src/views/inventory/InvSpaceManage.vue
+++ b/src/views/inventory/InvSpaceManage.vue
@@ -8,9 +8,9 @@
         <el-form-item>
           <el-button-group>
             <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onReset"
+              type="primary"
+              icon="el-icon-refresh"
+              @click="onReset"
             ></el-button>
             <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
             <el-button type="primary" icon="el-icon-plus" @click="addSpace">新增货位</el-button>
@@ -39,34 +39,33 @@
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button
-              type="text"
-              @click.native.stop="editSpace(scope.row)"
+            type="text"
+            @click.native.stop="editSpace(scope.row)"
           >编辑
           </el-button>
           <el-button
-              type="text"
-              @click.native.stop="deleteDialog(scope.row.id)"
+            type="text"
+            @click.native.stop="deleteDialog(scope.row.id)"
           >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination
-        :current-page="filterQuery.page"
-        :page-size="filterQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
-        :total="total"
-    ></el-pagination>
-
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="filterQuery.page"
+      :limit.sync="filterQuery.limit"
+      @pagination="getList"
+    />
     <el-dialog
-        :title="formMap[formName]"
-        :visible.sync="modifySpaceVisible"
-        width="60%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        append-to-body
-        v-if="modifySpaceVisible"
+      :title="formMap[formName]"
+      :visible.sync="modifySpaceVisible"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="modifySpaceVisible"
     >
       <el-form :model="formData" :rules="rules" ref="formData" label-width="80px">
         <el-row>
@@ -76,7 +75,6 @@
                         placeholder="请输入货位编码"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="11">
             <el-form-item prop="name" label="货位名称">
               <el-input v-model="formData.name" auto-complete="off" style="width: 90%"
@@ -84,7 +82,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="11">
             <el-form-item prop="remark" label="货位分类">
@@ -99,7 +96,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col>
             <el-form-item prop="remark" label="备注">
@@ -109,7 +105,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <div style="text-align: center">
           <el-button type="primary" size="small" icon="search" @click="saveSpace"
           >提交
@@ -146,7 +141,7 @@ export default {
         invStorageCode: null,
         key: null,
         page: 1,
-        limit: 20,
+        limit: 10,
         customerId: null,
       },
       list: [],
@@ -204,7 +199,7 @@ export default {
         invWarehouseCode: this.invInfo.invWarehouseCode,
         invStorageCode: this.invInfo.invStorageCode,
         page: 1,
-        limit: 20,
+        limit: 10,
       };
       this.getList();
     },
@@ -239,19 +234,19 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       })
-          .then(() => {
-            let params = {id: rowId};
-            deleteSpace(params).then((res) => {
-              if (res.code === 20000) {
-                this.$message.success("删除成功！");
-                this.getList();
-              } else {
-                this.$message.error(res.message);
-              }
-            })
+        .then(() => {
+          let params = {id: rowId};
+          deleteSpace(params).then((res) => {
+            if (res.code === 20000) {
+              this.$message.success("删除成功！");
+              this.getList();
+            } else {
+              this.$message.error(res.message);
+            }
           })
-          .catch(() => {
-          });
+        })
+        .catch(() => {
+        });
     },
     cancelDialog() {
       this.modifySpaceVisible = false
@@ -260,11 +255,11 @@ export default {
     getStorage() {
       this.storageList = [];
       filterUplLocInv()
-          .then((response) => {
-            this.storageList = response.data || [];
-          })
-          .catch(() => {
-          });
+        .then((response) => {
+          this.storageList = response.data || [];
+        })
+        .catch(() => {
+        });
     },
     resetForm() {
       if (this.$refs["formData"]) {
diff --git a/src/views/system/dept/invRelBusType.vue b/src/views/system/dept/invRelBusType.vue
new file mode 100644
index 00000000..9fb46a27
--- /dev/null
+++ b/src/views/system/dept/invRelBusType.vue
@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="busQuery" class="query-form" size="mini">
+      <el-form-item class="query-form-item" label="单据类型名称:">
+        <el-input
+          v-model="busQuery.key"
+          placeholder="请输入单据类型名称"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button-group>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="selsectBussinessType"
+          >重置
+          </el-button>
+          <el-button type="primary" @click="selsectBussinessType"
+                     icon="el-icon-search"
+          >查询
+          </el-button
+          >
+          <el-button type="primary" @click="addBussinessType()"
+                     icon="el-icon-document-add"
+          >选入单据类型
+          </el-button
+          >
+        </el-button-group>
+      </el-form-item>
+    </el-form>
+    <el-table :data="userBussinessTypeList" ref="typeList"
+              border
+              style="width: 100%">
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column label="单据类型名称" prop="name"></el-table-column>
+      <el-table-column label="单据类型编码" prop="action"></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            :disabled="!configParms.basicInv"
+            @click.native.stop="delWarehouseBussinessType(scope.row.id)"
+          >移除
+          </el-button
+          >
+        </template>
+
+      </el-table-column>
+    </el-table>
+    <el-dialog
+      title="仓库信息-选入单据类型"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :visible.sync="bussinessTypeFormVisible"
+    >
+      <el-table v-loading="loading" :data="bussinessTypeList" ref="typeList"
+                border
+                style="width: 100%">
+        <el-table-column
+          type="selection"
+          :reserve-selection="true"
+          width="55">
+        </el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="单据类型编码" prop="action"></el-table-column>
+        <el-table-column label="单据类型名称" prop="name"></el-table-column>
+      </el-table>
+      <pagination
+        v-show="bussinessTypeTotal>0"
+        :total="bussinessTypeTotal"
+        :page.sync="bussinessTypeQuery.page"
+        :limit.sync="bussinessTypeQuery.limit"
+        @pagination="getSelectUser"
+      />
+      <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>
+  </div>
+</template>
+
+<script></script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/system/dept/invRelUsers.vue b/src/views/system/dept/invRelUsers.vue
new file mode 100644
index 00000000..a9fe949f
--- /dev/null
+++ b/src/views/system/dept/invRelUsers.vue
@@ -0,0 +1,312 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="userQuery" class="query-form" size="mini">
+      <el-form-item class="query-form-item" label="用户名称/账号:">
+        <el-input
+          v-model="userQuery.key"
+          placeholder="请输入用户名称或用户账号"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button-group>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onUserReset"
+          >重置
+          </el-button>
+          <el-button type="primary" @click="loadUserList"
+                     icon="el-icon-search"
+          >查询
+          </el-button
+          >
+          <el-button type="primary" @click="addUser()"
+                     icon="el-icon-document-add"
+          >选入用户
+          </el-button
+          >
+        </el-button-group>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="userData"
+      key="row.id"
+      border
+      style="width: 100%"
+      highlight-current-row
+    >
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column
+        prop="employeeName"
+        label="用户名"
+        min-width="30%">
+      </el-table-column>
+      <el-table-column
+        prop="username"
+        label="账号"
+        min-width="20%">
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        min-width="30%"
+      >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            :disabled="!configParms.basicInv"
+            @click.native="rmInvUser(scope.row)">
+            移除
+          </el-button>
+
+          <!--              <el-button-->
+          <!--                type="text"-->
+          <!--                size="small" :disabled="!configParms.basicInv"-->
+          <!--                @click.native="rmInvUser(scope.row)">-->
+          <!--                授权-->
+          <!--              </el-button>-->
+          <el-button
+            type="text"
+            :disabled="!configParms.basicInv"
+            @click.native="relBusttype(scope.row)">
+            管理单据类型
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="userTotal>0"
+      :total="userTotal"
+      :page.sync="userQuery.page"
+      :limit.sync="userQuery.limit"
+      @pagination="loadUserList"
+    />
+
+    <!--添加用户弹窗-->
+    <el-dialog
+      v-if="userFormVisible"
+      title="仓库信息-选入用户"
+      :close-on-click-modal="false"
+      width="45%"
+      append-to-body
+      :close-on-press-escape="false"
+      :visible.sync="userFormVisible"
+    >
+      <el-table v-loading="userloading" :data="selectUserList"
+                ref="selectUserList"
+                @selection-change="handleUserSelectionChange"
+                border
+                style="width: 100%">
+        <el-table-column
+          type="selection"
+          :reserve-selection="false"
+          width="55">
+        </el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="账号" prop="userName"></el-table-column>
+        <el-table-column label="用户名" prop="employeeName"></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>
+      <pagination
+        v-show="selectUserToatl>0"
+        :total="selectUserToatl"
+        :page.sync="selectUserQuery.page"
+        :limit.sync="selectUserQuery.limit"
+        @pagination="getSelectUser"
+      />
+    </el-dialog>
+    <!--    用户业务单据类型关联-->
+    <el-dialog
+      title="仓库-用户单据类型管理"
+      :visible.sync="relBusUserVisile"
+      width="45%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="relBusUserVisile"
+    >
+      <inv-user-rel-bus-types :inputQuery="curSeleUser" :closeDialog="cancelRelBusDiaolog"></inv-user-rel-bus-types>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {addWarehouseUser, deleteWarehouseUser, warehouseUserList} from "@/api/system/invWarehouse";
+import {selectNotSelectUser} from "@/api/auth/authUser";
+import InvUserRelBusTypes from "@/views/system/dept/invUserRelBusTypes";
+
+export default {
+  name: "invRelUsers",
+  components: {InvUserRelBusTypes},
+  props: {
+    configParms: {
+      type: Object,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+
+  data() {
+    return {
+      //---------------仓库-用户相关---------------------
+      userQuery: {
+        code: null,
+        page: 1,
+        limit: 10
+      },
+      userData: [],
+      userTotal: 0,
+
+
+      //---------------仓库添加用户-----
+      selectUserQuery: {
+        code: null,
+        page: 1,
+        limit: 10
+      },
+      userFormVisible: false,
+      userloading: false,
+      selectUserList: [],
+      selectUserToatl: 0,
+      selectAddUser: [],
+
+
+      //------用户-单据类型相关-----------------------
+      curSeleUser: null,
+      relBusUserVisile: false,
+    }
+
+
+  },
+
+  methods: {
+    //用户相关
+    onUserReset() {
+      this.userQuery = {
+        code: null,
+        page: 1,
+        limit: 10
+      };
+    },
+    loadUserList(val) {   //获取仓库用户列表
+      if (val != null) {
+        this.userQuery.page = val;
+      }
+      //加载用户数据
+      warehouseUserList(this.userQuery).then((res) => {
+        this.userData = res.data.list;
+        this.userTotal = res.data.total;
+      }).catch((error) => {
+        this.$message.error("用户数据加载失败")
+      });
+    },
+
+    addUser() {         //添加仓库关联用户弹窗
+      this.currentCode = this.inputQuery.code;
+      this.userFormVisible = true;
+      this.selectUserQuery.code = this.inputQuery.code;
+      this.selectUserQuery.page = 1;
+      this.getSelectUser();
+    },
+
+    rmInvUser(row) { //移除仓库关联用户
+      this.$confirm("确定移除该仓库关联用户?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let params = {id: row.id};
+          deleteWarehouseUser(params).then((res) => {
+            if (res.code == 20000) {
+              this.loadUserList();
+            } else {
+              this.$message.error(res.message);
+            }
+          }).catch((error) => {
+          });
+        })
+        .catch(() => {
+        });
+    },
+
+    handleUserSelectionChange(val) {
+      this.selectAddUser = val;
+    },
+
+    getSelectUser() {
+      selectNotSelectUser(this.selectUserQuery).then((res) => {
+        this.selectUserList = res.data.list;
+        this.selectUserToatl = res.data.total;
+      }).catch((error) => {
+        this.$message.error("用户数据加载失败")
+      });
+    },
+
+    addUserData() {     //提交选入用户
+      let query = {
+        code: this.currentCode,
+        userList: JSON.stringify(this.selectAddUser)
+      };
+      addWarehouseUser(query).then((res) => {
+        if (res.code === 20000) {
+          this.userFormVisible = false;
+          this.$message.success("添加成功");
+          this.userQuery = {
+            code: this.currentCode,
+            page: 1,
+            limit: 10
+          }
+          //重新加载数据
+          warehouseUserList(this.userQuery).then((res) => {
+            this.userData = res.data.list;
+            this.userTotal = res.data.total;
+          }).catch((error) => {
+            this.userData = [];
+            this.userTotal = 0;
+          });
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.$message.error("添加失败");
+      });
+    },
+
+    //用户-单据类型 相关
+    relBusttype(row) {
+      this.curSeleUser = row;
+      this.relBusUserVisile = true;
+    },
+    cancelRelBusDiaolog() {
+      this.relBusUserVisile = false;
+    },
+  },
+
+  created() {
+    this.userQuery.code = this.inputQuery.code;
+    this.loadUserList();
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/system/dept/invUserRelBusTypes.vue b/src/views/system/dept/invUserRelBusTypes.vue
index 2b8458a6..a1b0109e 100644
--- a/src/views/system/dept/invUserRelBusTypes.vue
+++ b/src/views/system/dept/invUserRelBusTypes.vue
@@ -1,9 +1,17 @@
 <template>
   <div style="margin-left: 15px">
     <el-transfer v-model="value" :data="data"
+                 class="edit_dev"
                  :titles="['未选入单据类型', '已选入单据类型']"
-                 :button-texts="['移除', '选入']"
-    ></el-transfer>
+    >
+
+      <template slot-scope="scope">
+        <span>
+          <span>{{ scope.option.label }}</span>
+        </span>
+      </template>
+
+    </el-transfer>
     <div style="text-align: center;margin-top: 20px">
       <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
       >提交
@@ -115,5 +123,13 @@ export default {
 </script>
 
 <style scoped>
+/*.edit_dev >>> .el-transfer__button {*/
+/*  display: flex;*/
+/*}*/
+
+/*.edit_dev >>> .el-transfer__button {*/
+/*  display: flex;*/
+/*  width: 50px;*/
+/*}*/
 
 </style>
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index f3dfb187..c78f7275 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -54,8 +54,9 @@
           label="上级仓库"
         >
         </el-table-column>
-        <el-table-column label="操作"  class-name="small-padding fixed-width">
+        <el-table-column label="操作" class-name="small-padding fixed-width">
           <template slot-scope="scope">
+
             <el-button
               type="text"
               :disabled="!configParms.basicInv"
@@ -63,6 +64,24 @@
             >编辑
             </el-button
             >
+
+            <el-button
+              type="text"
+              :disabled="!configParms.basicInv"
+              @click.native.stop="popInvRelUser( scope.row)"
+            >用户管理
+            </el-button
+            >
+
+
+            <el-button
+              type="text"
+              :disabled="!configParms.basicInv"
+              @click.native.stop="popInvRelBustype(scope.row)"
+            >单据类型
+            </el-button
+            >
+
             <el-button
               type="text"
               :disabled="!configParms.basicInv"
@@ -81,7 +100,7 @@
         :limit.sync="query.limit"
         @pagination="getList"
       />
-      <!--仓库编辑界面-->
+      <!--仓库编辑对话框-->
       <el-dialog
         :title="formMap[formName]"
         :close-on-click-modal="false"
@@ -195,235 +214,109 @@
           >
         </div>
       </el-dialog>
-    </el-card>
-    <el-tabs type="border-card" style="margin: 15px">
-      <el-tab-pane>
-        <span slot="label">{{ currentRow.name }}-用户列表</span>
-        <el-form :inline="true" :model="userQuery" class="query-form" size="mini">
-          <el-form-item class="query-form-item" label="用户名称/账号:">
+      <!-- 仓库关联第三方分库对话框-->
+      <el-dialog title="仓库信息-关联第三方仓库" :visible.sync="thrSubWareHouseVisible">
+        <el-form :inline="true" :model="thirdSubQuery" class="query-form" size="mini">
+          <el-form-item class="query-form-item">
             <el-input
-              v-model="userQuery.key"
-              placeholder="请输入用户名称或用户账号"
+              v-model="thirdSubQuery.name"
               clearable
+              placeholder="仓库名称"
+              style="width: 400px"
             ></el-input>
           </el-form-item>
           <el-form-item>
             <el-button-group>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onUserReset"
-              >重置
-              </el-button>
-              <el-button type="primary" @click="onUserReset"
-                         icon="el-icon-search"
-              >查询
-              </el-button
-              >
-              <el-button type="primary" @click="addUser()"
-                         icon="el-icon-document-add"
-              >选入用户
-              </el-button
-              >
+              <el-button type="primary" icon="search" @click="intentSubSelect">查询</el-button>
             </el-button-group>
           </el-form-item>
         </el-form>
         <el-table
-          :data="userData"
-          key="row.id"
+          :data="thrSubWarehouseData"
+          style="width: 100%;margin-top: 10px;"
+          row-key="id"
           border
-          style="width: 100%"
           highlight-current-row
+          @current-change="changeSubThrWarehouse"
         >
-          <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-            prop="employeeName"
-            label="用户名"
-            min-width="30%">
+            type="index"
+            label="序号"
+          >
           </el-table-column>
           <el-table-column
-            prop="username"
-            label="账号"
-            min-width="20%">
+            prop="code"
+            label="仓库编码"
+          >
           </el-table-column>
           <el-table-column
-            label="操作"
-            min-width="30%"
+            prop="name"
+            label="仓库名称"
           >
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                :disabled="!configParms.basicInv"
-                @click.native="rmInvUser(scope.row)">
-                移除
-              </el-button>
-
-              <!--              <el-button-->
-              <!--                type="text"-->
-              <!--                size="small" :disabled="!configParms.basicInv"-->
-              <!--                @click.native="rmInvUser(scope.row)">-->
-              <!--                授权-->
-              <!--              </el-button>-->
-              <el-button
-                type="text"
-                :disabled="!configParms.basicInv"
-                @click.native="relBusttype(scope.row)">
-                管理单据类型
-              </el-button>
-            </template>
           </el-table-column>
         </el-table>
-      </el-tab-pane>
-      <el-tab-pane>
-        <span slot="label">{{ currentRow.name }}-单据类型</span>
-        <el-form :inline="true" :model="userQuery" class="query-form" size="mini">
-          <el-form-item class="query-form-item" label="单据类型名称:">
-            <el-input
-              v-model="userQuery.key"
-              placeholder="请输入单据类型名称"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="selsectBussinessType"
-              >重置
-              </el-button>
-              <el-button type="primary" @click="selsectBussinessType"
-                         icon="el-icon-search"
-              >查询
-              </el-button
-              >
-              <el-button type="primary" @click="addBussinessType()"
-                         icon="el-icon-document-add"
-              >选入单据类型
-              </el-button
-              >
-            </el-button-group>
-          </el-form-item>
-        </el-form>
 
-        <el-table :data="userBussinessTypeList" ref="typeList"
-                  border
-                  style="width: 100%">
-          <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column label="单据类型名称" prop="name"></el-table-column>
-          <el-table-column label="单据类型编码" prop="action"></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                :disabled="!configParms.basicInv"
-                @click.native.stop="delWarehouseBussinessType(scope.row.id)"
-              >移除
-              </el-button
-              >
-            </template>
+        <pagination
+          v-show="subTotal>0"
+          :total="subTotal"
+          :page.sync="thirdSubQuery.page"
+          :limit.sync="thirdSubQuery.limit"
+          @pagination="getList"
+        />
 
-          </el-table-column>
-        </el-table>
-      </el-tab-pane>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click.native="hideThrWarehouseTable()">取消</el-button>
+          <el-button
+            type="primary"
+            @click.native="bindSubThrWarehouse()"
+          >提交
+          </el-button>
+        </div>
+      </el-dialog>
+
+      <!-- 仓库关联用户对话框-->
+      <el-dialog
+        title="仓库-用户管理"
+        :visible.sync="relUserVisible"
+        width="60%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="relUserVisible"
+      >
+        <inv-rel-users :inputQuery="currentRow"
+                       :configParms="configParms"
+                       :closeDialog="cancelRelUser"
+        ></inv-rel-users>
+      </el-dialog>
+
+      <!-- 仓库关联单据类型对话框-->
+      <el-dialog
+        title="仓库-单据类型"
+        :visible.sync="relBusTypeVisible"
+        width="45%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="relBusTypeVisible"
+      >
+        <inv-rel-bus-type :inputQuery="currentRow"
+                          :configParms="configParms"
+                          :closeDialog="cancelRelBustype"
+        ></inv-rel-bus-type>
+      </el-dialog>
+
+    </el-card>
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--      <el-tab-pane>-->
+      <!--        <span slot="label">{{ currentRow.name }}-用户列表</span>-->
+      <!--      </el-tab-pane>-->
+      <!--      <el-tab-pane>-->
+      <!--        <span slot="label">{{ currentRow.name }}-单据类型</span>-->
+      <!--      </el-tab-pane>-->
       <el-tab-pane>
         <span slot="label">{{ currentRow.name }}-货位信息</span>
         <invSpaceManage :invInfo="currentInvInfo"></invSpaceManage>
       </el-tab-pane>
     </el-tabs>
-    <!--添加用户弹窗-->
-    <el-dialog
-      v-if="userFormVisible"
-      title="仓库信息-选入用户"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :visible.sync="userFormVisible"
-    >
-      <el-table v-loading="userloading" :data="selectUserList"
-                ref="selectUserList"
-                @selection-change="handleUserSelectionChange"
-                border
-                style="width: 100%">
-        <el-table-column
-          type="selection"
-          :reserve-selection="false"
-          width="55">
-        </el-table-column>
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="账号" prop="userName"></el-table-column>
-        <el-table-column label="用户名" prop="employeeName"></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>
-      <pagination
-        v-show="selectUserToatl>0"
-        :total="selectUserToatl"
-        :page.sync="selectUserQuery.page"
-        :limit.sync="selectUserQuery.limit"
-        @pagination="getSelectUser"
-      />
-    </el-dialog>
-
-    <!--选入单据类型弹窗-->
-    <el-dialog
-      title="仓库信息-选入单据类型"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :visible.sync="bussinessTypeFormVisible"
-    >
-      <el-table v-loading="loading" :data="bussinessTypeList" ref="typeList"
-                border
-                style="width: 100%">
-        <el-table-column
-          type="selection"
-          :reserve-selection="true"
-          width="55">
-        </el-table-column>
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="单据类型编码" prop="action"></el-table-column>
-        <el-table-column label="单据类型名称" prop="name"></el-table-column>
-      </el-table>
-      <pagination
-        v-show="bussinessTypeTotal>0"
-        :total="bussinessTypeTotal"
-        :page.sync="bussinessTypeQuery.page"
-        :limit.sync="bussinessTypeQuery.limit"
-        @pagination="getSelectUser"
-      />
-      <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="仓库-用户单据类型管理"
-      :visible.sync="relBusUserVisile"
-      width="45%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="relBusUserVisile"
-    >
-      <relBusUserDialog :inputQuery="curSeleUser" :closeDialog="cancelRelBusDiaolog"></relBusUserDialog>
-    </el-dialog>
 
 
   </div>
@@ -437,16 +330,17 @@ import {
 import {getHospitalUserList, selectNotSelectUser} from "@/api/auth/authUser";
 import {getJoinBussinessType} from "@/api/basic/bussinessType";
 import {findConfig} from "@/api/thrsys/spsSyncStatus";
-import relBusUserDialog from "./invUserRelBusTypes";
 import {selectSysParamByKey} from "@/api/system/param/systemParamConfig";
 import invSpaceManage from "@/views/inventory/InvSpaceManage";
 import {
-  addWarehouseUser, deleteWarehouseBussinessType, deleteWarehouseUser, filterList,
+  addWarehouseUser, deleteWarehouseBussinessType, deleteWarehouseUser, filterList, filterThridSubByInv,
   warehouseBussinessTypeList,
   warehouseUserList
 } from "@/api/system/invWarehouse";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
+import InvRelBusType from "@/views/system/dept/invRelBusType";
+import InvRelUsers from "@/views/system/dept/invRelUsers";
 
 export default {
   data() {
@@ -484,47 +378,20 @@ export default {
       subData: {},
       fromDeptOptions: [],
       invOptions: [],
-
-
-      //---------------仓库-用户相关---------------------
-      userQuery: {
-        code: null,
-        page: 1,
-        limit: 10
-      },
-      userData: [],
-      userTotal: 0,
-      //---------------仓库添加用户-----
-      selectUserQuery: {
-        code: null,
-        page: 1,
-        limit: 10
-      },
-      userFormVisible: false,
-      userloading: false,
-      selectUserList: [],
-      selectUserToatl: 0,
-      selectAddUser: [],
-      //------用户-单据类型相关-----------------------
-      curSeleUser: null,
-      relBusUserVisile: false,
-      userBussinessTypeList: [],
-
-      bussinessTypeTotal: 0,
-      bussinessTypeQuery: {
-        enabled: true,
+      thirdSubQuery: {
+        parentId: null,
+        name: null,
         page: 1,
         limit: 10,
-        ids: ""
+        thirdSysFk: "thirdId",
       },
+      thrSubWareHouseVisible: false,
+      thrSubWarehouseData: [],
+      checkSubThrWarehouseRow: null,
+      subTotal: 0,
 
-      busQuery: {
-        code: null,
-        page: 1,
-        limit: 10
-      },
-      selectBussinessTypeList: [],
-      bussinessTypeFormVisible: false,
+      relBusTypeVisible: false,
+      relUserVisible: false,
 
       //管理货位
       currentInvInfo: {
@@ -546,7 +413,6 @@ export default {
         name: "",
         status: "",
       };
-      this.userQuery.page = 1;
       this.busQuery.page = 1;
       this.getList();
     },
@@ -571,7 +437,6 @@ export default {
         });
     },
     handleSubForm(data, formName) {   //新增，编辑
-
       this.formName = formName;
       if (formName === "edit") {
         this.subData = JSON.parse(JSON.stringify(data));
@@ -661,165 +526,104 @@ export default {
       this.currentCode = row.code;
       this.currentRow = row;
       this.curSeleUser = null;
-      //加载用户信息
-      this.loadLinkData(row)
       //加载单据类型
       this.selsectBussinessType(row);
       //加载货位信息
       this.invSpaceManage(row);
     },
-
-
-    //------仓库-用户相关------------------
-    loadUserList(val) {   //获取仓库用户列表
-      if (val != null) {
-        this.userQuery.page = val;
+    //关联第三方仓库信息
+    intentSubSelect(row) {
+      if (row != null) {
+        if (row.sysId != null && row.sysId != undefined) {
+          this.thirdSubQuery.thirdSysFk = row.sysId;
+        }
       }
-      //加载用户数据
-      warehouseUserList(this.userQuery).then((res) => {
-        this.userData = res.data.list;
-        this.userTotal = res.data.total;
+      this.thrSubWarehouseData = [];
+      this.thrSubWareHouseVisible = true;
+      filterThridSubByInv(this.thirdSubQuery).then((res) => {
+        if (res.code == 20000) {
+          this.thrSubWarehouseData = res.data.list;
+          this.subTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+        }
+
       }).catch((error) => {
-        this.$message.error("用户数据加载失败")
+        this.thrWarehouseData = [];
+        this.subTotal = 0;
+        this.$message.error("第三方分库库数据加载失败");
       });
     },
-    rmInvUser(row) { //移除仓库关联用户
-      this.$confirm("确定移除该仓库关联用户?", "提示", {
+    changeSubThrWarehouse(row) {
+      this.checkSubThrWarehouseRow = row;
+    },
+    hideThrWarehouseTable() {
+      this.thrWareHouseVisible = false;
+      this.thrSubWareHouseVisible = false;
+    },
+    //绑定第三方分库
+    bindSubThrWarehouse() {
+      let params = {
+        id: this.subData.id,
+        thridWarehouseId: this.checkSubThrWarehouseRow.code,
+        sysId: this.checkSubThrWarehouseRow.thirdSysFk
+      }
+      bindThrSubWarehouse(params).then((res) => {
+        if (res.code == 20000) {
+          this.$message.success("绑定成功")
+          this.getSubThrsysDetailData();
+        }
+        this.thrSubWareHouseVisible = false;
+      }).catch((error) => {
+        this.$message.error("绑定失败");
+        this.thrSubWareHouseVisible = false;
+      })
+    },
+    //解绑第三方分库
+    unbindSubThrWarehouse(row) {
+
+      this.$confirm("确定解绑已关联第三方仓库信息?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          let params = {id: row.id};
-          deleteWarehouseUser(params).then((res) => {
-            if (res.code == 20000) {
-              this.loadUserList();
-            } else {
-              this.$message.error(res.message);
-            }
+          let params = {
+            id: this.subData.id,
+            sysId: row.sysId
+          };
+          unbindSubThrWarehouse(params).then((res) => {
+            this.$message.success("解绑成功");
+            this.getSubThrsysDetailData();
           }).catch((error) => {
-          });
-
-
+            this.$message.error("解绑失败");
+          })
         })
         .catch(() => {
         });
-    },
-
-
-    loadLinkData(row) {
-      this.userQuery.page = 1;
-      this.userQuery.code = row.code;
-      this.curSeleUser = null;
-      //加载用户数据
-      this.loadUserList();
-    },
-
 
-    //添加仓库关联用户
-    addUser() {
-      this.currentCode = this.currentRow.code;
-      this.userFormVisible = true;
-      this.selectUserQuery.code = this.currentRow.code;
-      this.selectUserQuery.page = 1;
-      this.getSelectUser();
-    },
-
-    handleUserSelectionChange(val) {
-      this.selectAddUser = val;
-    },
 
-    getSelectUser() {
-      selectNotSelectUser(this.selectUserQuery).then((res) => {
-        this.selectUserList = res.data.list;
-        this.selectUserToatl = res.data.total;
-      }).catch((error) => {
-        this.$message.error("用户数据加载失败")
-      });
     },
 
-    addUserData() {
-      let query = {
-        code: this.currentCode,
-        userList: JSON.stringify(this.selectAddUser)
-      };
-      addWarehouseUser(query).then((res) => {
-        if (res.code === 20000) {
-          this.userFormVisible = false;
-          this.$message.success("添加成功");
-          this.userQuery = {
-            code: this.currentCode,
-            page: 1,
-            limit: 10
-          }
-          //重新加载数据
-          warehouseUserList(this.userQuery).then((res) => {
-            this.userData = res.data.list;
-            this.userTotal = res.data.total;
-          }).catch((error) => {
-            this.userData = [];
-            this.userTotal = 0;
-          });
-        } else {
-          this.$message.error(res.message);
-        }
-      }).catch((error) => {
-        this.$message.error("添加失败");
-      });
+    popInvRelBustype(row) {
+      this.relBusTypeVisible = true;
+      this.currentRow = row;
     },
 
-
-    relBusttype(row) {
-      this.curSeleUser = row;
-      this.relBusUserVisile = true;
+    cancelRelBustype() {
+      this.relBusTypeVisible = false;
     },
 
-    cancelRelBusDiaolog() {
-      this.relBusUserVisile = false;
-      this.getUserBusTypeList(1);
+    popInvRelUser(row) {
+      this.relUserVisible = true;
+      this.currentRow = row;
     },
 
-
-    selsectBussinessType() {
-      var busQuery = {
-        code: this.currentCode,
-        page: 1,
-        limit: 50
-      }
-      warehouseBussinessTypeList(busQuery).then((res) => {
-        this.userBussinessTypeList = res.data.list;
-      }).catch((error) => {
-        this.$message.error("单据类型数据加载失败")
-      });
+    cancelRelUser() {
+      this.relUserVisible = false;
     },
 
 
-    delWarehouseBussinessType(id) {
-      let params = {id: id};
-      deleteWarehouseBussinessType(params).then((res) => {
-        if (res.code == 20000) {
-          this.$message.success("已移除");
-          this.bussinessTypeData = [];
-          this.selectWhouseBussinessType();
-          var busQuerys = {
-            code: this.currentCode,
-            page: 1,
-            limit: 10
-          }
-          warehouseBussinessTypeList(busQuerys).then((res) => {
-            this.bussinessTypeData = res.data.list;
-          }).catch((error) => {
-            this.$message.error("单据类型数据加载失败")
-          });
-
-        } else {
-          this.$message.error(res.message);
-        }
-      }).catch((error) => {
-        this.$message.error("移除失败");
-      })
-    },
-
     addBussinessType(row) {
       var action = [];
       for (var i = 0; i < this.userBussinessTypeList.length; i++) {
@@ -885,7 +689,8 @@ export default {
   mounted() {
   },
   components: {
-    relBusUserDialog,
+    InvRelUsers,
+    InvRelBusType,
     invSpaceManage, Treeselect
   },
   created() {
diff --git a/src/views/system/dept/invWarehouseRelBusTypes.vue b/src/views/system/dept/invWarehouseRelBusTypes.vue
deleted file mode 100644
index f91619b4..00000000
--- a/src/views/system/dept/invWarehouseRelBusTypes.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <div>
-    <el-table
-      :data="bussinessTypeData"
-      key="row.id"
-      ref="fileTable"
-      @selection-change="handleSelectionChange"
-      style="width: 100%">
-
-      <el-table-column type="selection" width="55"
-      ></el-table-column>
-
-      <el-table-column label="序号" type="index"></el-table-column>
-      <el-table-column
-        prop="action"
-        label="单据类型编码"
-        min-width="30%">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="单据类型名称"
-        min-width="30%">
-      </el-table-column>
-    </el-table>
-    <div style="text-align: center;margin-top: 20px">
-      <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
-      >提交
-      </el-button
-      >
-      <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-      >取消
-      </el-button
-      >
-    </div>
-  </div>
-</template>
-
-<script>
-
-import {
-  filterSelectInvUser, updateInvUser
-} from "@/api/basic/invRelBusTypes";
-
-
-export default {
-  name: "inputQuery",
-  props: {
-    inputQuery: {
-      type: Object,
-      required: true,
-    },
-    closeDialog: {
-      type: Function,
-      required: true,
-    },
-  },
-
-  data() {
-    return {
-      filterQuery: {
-        subInvCode: null,
-        userId: null,
-      },
-      bussinessTypeData: null,
-      multipleSelection: []
-    }
-  },
-  methods: {
-    getList() {
-      this.filterQuery = {
-        subInvCode: this.inputQuery.code,
-        userId: this.inputQuery.userid,
-      };
-      filterSelectInvUser(this.filterQuery).then((res) => {
-        if (res.code == 20000) {
-          this.bussinessTypeData = res.data;
-          this.$nextTick(() => {
-            for (let i = 0; i < this.bussinessTypeData.length; i++) {
-              this.$refs.fileTable.toggleRowSelection(this.bussinessTypeData[i], this.bussinessTypeData[i].select)
-            }
-          });
-
-        } else {
-          this.$message.error(res.message);
-        }
-      }).catch((error) => {
-      });
-    },
-
-    checkSelectable(row) {
-      return !row.select;
-    },
-
-    cancelDialog() {
-      this.closeDialog();
-    },
-
-
-    onAddSubmit() {
-
-      let postRequesty = {
-        subInvCode: this.inputQuery.code,
-        userId: this.inputQuery.userid,
-        invBusUserEntities: [],
-
-      };
-
-
-      let datas = [];
-      this.multipleSelection.forEach((obj) => {
-        datas.push(obj);
-      });
-      postRequesty.invBusUserEntities = datas;
-      updateInvUser(postRequesty).then((res) => {
-        if (res.code == 20000) {
-          this.closeDialog();
-        } else {
-          this.$message.error(res.message);
-        }
-
-      });
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    }
-
-  },
-
-  created() {
-    this.getList();
-  },
-};
-</script>
-
diff --git a/src/views/thirdSys/inv/index.vue b/src/views/thirdSys/inv/index.vue
index e974d1ee..b8a062b8 100644
--- a/src/views/thirdSys/inv/index.vue
+++ b/src/views/thirdSys/inv/index.vue
@@ -9,13 +9,6 @@
             placeholder="关键字搜索"
           ></el-input>
         </el-form-item>
-        <el-form-item class="query-form-item" label="仓库类型:">
-          <el-select v-model="query.advanceType" placeholder="请选择仓库类型" clearable>
-            <el-option label="全部" value=""></el-option>
-            <el-option label="寄售" value=true></el-option>
-            <el-option label="仓库" value=false></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item class="query-form-item" label="第三方系统:">
           <el-select v-model="query.thirdSysFk" placeholder="请选择第三方系统"
                      @change="thirdSysFkChange()">
@@ -33,7 +26,7 @@
             <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
             <el-button type="primary" @click.native="handleForm(null, null,'addTop')"
                        icon="el-icon-plus" :disabled="!configParms.basicThirdInv"
-            >添加仓库
+            >添加部门/科室
             </el-button>
             <el-button type="primary" @click.native="downloadWarehouse()"
                        icon="el-icon-download"
@@ -54,21 +47,21 @@
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column
           prop="code"
-          label="仓库编码"
+          label="部门编码"
         >
         </el-table-column>
         <el-table-column
           prop="name"
-          label="仓库名称"
+          label="部门名称"
         >
         </el-table-column>
-        <el-table-column
-          prop="advanceType"
-          label="仓库类型">
-          <template slot-scope="scope">
-            <span>{{ enableMap[scope.row.advanceType] }}</span>
-          </template>
-        </el-table-column>
+<!--        <el-table-column-->
+        <!--          prop="advanceType"-->
+        <!--          label="仓库类型">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{ enableMap[scope.row.advanceType] }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column prop="thirdName" label="第三方系统名称">
           <template slot-scope="scope">
             <span>{{ getThirdSysFkName(scope.row.thirdSysFk) }}</span>
@@ -82,7 +75,7 @@
               size="small"
               @click.native.stop="handleSubForm( scope.row, 'add')"
               :disabled="!configParms.basicThirdInv"
-            >添加分库
+            >添加仓库
             </el-button
             >
 
@@ -112,56 +105,59 @@
         :limit.sync="query.limit"
         @pagination="getList"
       />
-<!--      <el-table-->
-<!--        :data="subList"-->
-<!--        border-->
-<!--        highlight-current-row-->
-<!--        style="width: 100%;margin-top: 35px">-->
-<!--        <el-table-column type="index" label="序号" width="50"></el-table-column>-->
-<!--        <el-table-column-->
-<!--          prop="code"-->
-<!--          label="分库编码"-->
-<!--        >-->
-<!--        </el-table-column>-->
-<!--        <el-table-column-->
-<!--          prop="name"-->
-<!--          label="分库名称"-->
-<!--        >-->
-<!--        </el-table-column>-->
-<!--        <el-table-column-->
-<!--          prop="parentName"-->
-<!--          label="所属仓库"-->
-<!--        >-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              :disabled="!configParms.basicThirdInv"-->
-<!--              @click.native.stop="handleSubForm( scope.row, 'edit')"-->
-<!--            >编辑-->
-<!--            </el-button-->
-<!--            >-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              :disabled="!configParms.basicThirdInv"-->
-<!--              @click.native.stop="handleSubDel(scope.row)"-->
-<!--            >删除-->
-<!--            </el-button-->
-<!--            >-->
-<!--          </template>-->
 
-<!--        </el-table-column>-->
-<!--      </el-table>-->
-<!--      <pagination-->
-<!--        v-show="subTotal>0"-->
-<!--        :total="subTotal"-->
-<!--        :page.sync="subQuery.page"-->
-<!--        :limit.sync="subQuery.limit"-->
-<!--        @pagination="getSubList"-->
-<!--      />-->
+    </el-card>
+    <el-card>
+      <el-table
+        :data="subList"
+        border
+        highlight-current-row
+        style="width: 100%;margin-top: 35px">
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column
+          prop="code"
+          label="仓库编码"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="仓库名称"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="parentName"
+          label="所属部门"
+        >
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              :disabled="!configParms.basicThirdInv"
+              @click.native.stop="handleSubForm( scope.row, 'edit')"
+            >编辑
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              :disabled="!configParms.basicThirdInv"
+              @click.native.stop="handleSubDel(scope.row)"
+            >删除
+            </el-button
+            >
+          </template>
+
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="subTotal>0"
+        :total="subTotal"
+        :page.sync="subQuery.page"
+        :limit.sync="subQuery.limit"
+        @pagination="getSubList"
+      />
     </el-card>
     <!--仓库弹窗编辑页面-->
     <el-dialog
@@ -186,12 +182,12 @@
             auto-complete="off"
           ></el-input>
         </el-form-item>
-        <el-form-item class="query-form-item" prop="advanceType" label="仓库类型" label-width="100px">
-          <el-select v-model="formData.advanceType" placeholder="仓库类型" clearable style="width: 80%">
-            <el-option label="寄售" :value='true'></el-option>
-            <el-option label="仓库" :value='false'></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item class="query-form-item" prop="advanceType" label="仓库类型" label-width="100px">-->
+<!--          <el-select v-model="formData.advanceType" placeholder="仓库类型" clearable style="width: 80%">-->
+<!--            <el-option label="寄售" :value='true'></el-option>-->
+<!--            <el-option label="仓库" :value='false'></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item class="query-form-item" prop="thirdSysFk" label="第三方系统" label-width="100px">
           <el-select v-model="formData.thirdSysFk" placeholder="请选择第三方系统" clearable style="width: 80%">
             <el-option
@@ -337,9 +333,9 @@ export default {
         add: "添加货位",
         edit: "仓库信息-编辑"
       },
-      subMap:{
-        add: "分库信息-添加",
-        edit: "分库信息-编辑"
+      subMap: {
+        add: "仓库信息-添加",
+        edit: "仓库信息-编辑"
       },
       enableMap: {
         true: "寄售",