1.修复部门用户页面问题

2.修复耗材字典关联解绑失效问题

src/views/basic/product/product.vue

@@ -1681,6 +1681,7 @@ export default {
     },
     onAddSubmit(relSubmit) {
       this.editFormat.relSubmit = relSubmit;
+      console.log(this.editFormat)
       updatetUdiInfos(this.editFormat)
         .then((response) => {
           if (response.code == 20000) {

src/views/basic/product/productEdit.vue

@@ -648,7 +648,6 @@ export default {
     if (this.editQuery.isDateBy == 1) {
       this.editQuery.recentDateTime = this.editQuery.recentDateTime / 24;
     }
-    console.log(this.editQuery)
     this.getTreeselect();
     let ttquery = {
       id: this.relevanceEdit.id
@@ -785,12 +784,28 @@ export default {
         .then((response) => {
           this.loading = false;
           this.sysList = response.data.list || [];
+          this.resetThirdId();
         })
         .catch(() => {
           this.loading = false;
           this.sysList = [];
         });
     },
+    resetThirdId() {
+      this.sysList.forEach((item) => {
+        if (item.sysId === "thirdId") {
+          this.editQuery.thirdId = item.thirdId;
+        } else if (item.sysId === "thirdId1") {
+          this.editQuery.thirdId1 = item.thirdId;
+        } else if (item.sysId === "thirdId2") {
+          this.editQuery.thirdId2 = item.thirdId;
+        } else if (item.sysId === "thirdId3") {
+          this.editQuery.thirdId3 = item.thirdId;
+        } else if (item.sysId === "thirdId4") {
+          this.editQuery.thirdId4 = item.thirdId;
+        }
+      })
+    },
     getDetailList(detailQuery) {
       this.loading = true;
       filterByUuid(detailQuery)

src/views/system/dept/authDept.vue

@@ -320,7 +320,6 @@ import {filterList, deleteWarehouse, saveWarehouse} from "@/api/system/invWareho
 import {treeList, treeSelectedList} from "@/api/system/dataStatus";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {selectNotSelectUser} from "@/api/auth/authUser";
 import {listDeptUser, removeUser} from "@/api/system/deptUser";
 import {filterSubAll} from "@/api/system/invSubWarehouse";
 

src/views/system/dept/invRelUsers.vue

@@ -144,6 +144,7 @@
 import {addWarehouseUser, deleteWarehouseUser, warehouseUserList} from "@/api/system/invWarehouse";
 import {selectNotSelectUser} from "@/api/auth/authUser";
 import InvUserRelBusTypes from "@/views/system/dept/invUserRelBusTypes";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "invRelUsers",
@@ -222,6 +223,10 @@ export default {
     },
 
     addUser() {         //添加仓库关联用户弹窗
+      if (isBlank(this.inputQuery.parentId)) {
+        this.$message.warning("请先选择仓库");
+        return;
+      }
       this.currentCode = this.inputQuery.code;
       this.userFormVisible = true;
       this.selectUserQuery.parentId=this.inputQuery.parentId;

src/views/system/user/authUser.vue

@@ -165,7 +165,7 @@
 
               </el-form-item>
             </el-col>
-            <el-col :span="11" type="flex">
+          <!-- <el-col :span="11" type="flex">
               <el-form-item label="所属仓库" prop="locInvCode">
                 <el-select
                   v-model="formData.locInvCode"
@@ -191,7 +191,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
+            </el-col>-->
 
           </el-row>
           <el-row :gutter="20" type="flex">