Merge remote-tracking branch 'origin/master'

src/views/system/dept/invRelUsers.vue

@@ -205,12 +205,14 @@ export default {
         limit: 10
       };
     },
-    loadUserList(val) {   //获取仓库用户列表
-      if (val != null) {
-        this.userQuery.page = val;
-      }
+    loadUserList() {   //获取仓库用户列表
+
+      // if (val != null) {
+      //   this.userQuery.page = val;
+      // }
       //加载用户数据
       warehouseUserList(this.userQuery).then((res) => {
+
         this.userData = res.data.list;
         this.userTotal = res.data.total;
       }).catch((error) => {

src/views/system/dept/invWarehouse.vue

@@ -33,7 +33,7 @@
         :default-expand-all="isExpandAll"
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       >
-        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
         <el-table-column
           prop="name"
           label="仓库名称"
@@ -93,13 +93,13 @@
 
         </el-table-column>
       </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="query.page"
-        :limit.sync="query.limit"
-        @pagination="getList"
-      />
+      <!--<pagination-->
+      <!--  v-show="total>0"-->
+      <!--  :total="total"-->
+      <!--  :page.sync="query.page"-->
+      <!--  :limit.sync="query.limit"-->
+      <!--  @pagination="getList"-->
+      <!--/>-->
       <!--仓库编辑对话框-->
       <el-dialog
         :title="formMap[formName]"
@@ -131,7 +131,7 @@
 
             <el-col :span="12" class="el-col">
               <el-form-item label="上级仓库" prop="parentCode">
-                <treeselect v-model="subData.parentCode" :options="invOptions" :normalizer="normalizer"
+                <treeselect v-model="subData.parentInvName" :options="invOptions" :normalizer="normalizer"
                             :disabled="isShow"
                             style="width: 80%"
                             placeholder="选择上级仓库"/>
@@ -263,7 +263,7 @@
           :total="subTotal"
           :page.sync="thirdSubQuery.page"
           :limit.sync="thirdSubQuery.limit"
-          @pagination="getList"
+          @pagination="intentSubSelect"
         />
 
         <div slot="footer" class="dialog-footer">
@@ -327,7 +327,7 @@
 <script>
 import {
   filterSubAll, saveSubWarehouse, deleteSubWarehouse,
-  getSubThrsysDetail, bindThrSubWarehouse, unbindSubThrWarehouse
+  getSubThrsysDetail, bindThrSubWarehouse, unbindSubThrWarehouse,
 } from "@/api/system/invSubWarehouse";
 import {getHospitalUserList, selectNotSelectUser} from "@/api/auth/authUser";
 import {getJoinBussinessType} from "@/api/basic/bussinessType";
@@ -353,8 +353,8 @@ export default {
         name: null,
         code: null,
         status: "1",
-        page: 1,
-        limit: 10,
+        // page: 1,
+        // limit: 10,
       },
       isShow: null,
       loading: true,
@@ -417,20 +417,20 @@ export default {
         name: "",
         status: "",
       };
-      this.busQuery.page = 1;
       this.getList();
     },
 
     onSubmit() { //提交查询
       this.getList();
     },
+
     getList() { //获取仓库信息
       this.loading = true;
       filterSubAll(this.query)
         .then((response) => {
           this.loading = false;
-          this.total = response.data.total;
-          let invlist = response.data.list || [];
+          //this.total = response.data.total;
+          let invlist = response.data || [];
           this.list = this.handleTree(invlist, "code", "parentCode");
 
         })
@@ -458,13 +458,25 @@ export default {
         })
         .catch(() => {
         });
-
+         this.sysSubList=null;
     },
+
     hideForm() {    // 新增，编辑---取消
       this.formVisible = false;
       this.subFormVisible = false;
+      this.resetForm();
       return true;
     },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
     forInvSubmit() {    // 新增，编辑---提交
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
@@ -567,6 +579,8 @@ export default {
     hideThrWarehouseTable() {
       this.thrWareHouseVisible = false;
       this.thrSubWareHouseVisible = false;
+      //刷新表单
+      this.thirdSubQuery.name="";
     },
     //绑定第三方分库
     bindSubThrWarehouse() {

src/views/thirdSys/inv/index.vue

@@ -495,6 +495,7 @@ export default {
         this.subData.thirdSysFk = data.thirdSysFk;
       }
       this.subFormVisible = true;
+      localStorage.setItem("code", JSON.stringify(this.subData.code));
     },
 
     handleSubDel(row) {
@@ -539,7 +540,9 @@ export default {
         this.$message.error("分库名称不能为空！");
         return;
       }
+
       saveSubWarehouse(this.subData, this.subFromName).then((response) => {
+
         if (response.code == 20000) {
           let row = {
             code: this.subData.parentId,
@@ -552,6 +555,7 @@ export default {
           this.subFormVisible = false;
         }
       }).catch(() => {
+        this.subData.code=JSON.parse(localStorage.getItem("code"));
         this.subFormVisible = false;
       });
       this.resetForm();
@@ -605,7 +609,8 @@ export default {
             })
             .catch(() => {
               this.formLoading = false;
-              this.$refs["dataForm"].resetFields();
+              // 刷新表单
+              this.resetForm();
             });
         }
       });