cloud-web-corejs 1.0.54-dev.783 → 1.0.54-dev.784

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.783",
+  "version": "1.0.54-dev.784",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",

package/src/views/user/user/edit.vue

@@ -430,7 +430,7 @@
               <div
                 class="d-item"
                 v-for="(item, index1) in user.userCompanyInfoDTOs"
-                :key="index1"
+                :key="item.companyCode"
               >
                 <div class="title">
                   <b>{{ item.companyName }}</b>
@@ -438,7 +438,7 @@
                     class="button-sty"
                     icon="el-icon-delete"
                     v-if="isCurrentCompany(item.companyCode)"
-                    @click="deleteCompany(item, index1)"
+                    @click="deleteCompany(item)"
                     >{{ $t1("删除") }}
                   </el-button>
                 </div>
@@ -490,24 +490,19 @@
                         @resizable-change="$vxeTableUtil.onColumnWitchChange"
                         @custom="$vxeTableUtil.customHandle"
                       >
-                        <template #position="{ row, rowIndex, $table }">
+                        <template #position="{ row }">
                           <el-input
                             class="search-input"
                             :value="getSelectPositionName(row)"
                             clearable
-                            @clear="
-                              row.userSaleOrgPositionDTOs = [];
-                              $forceUpdate();
-                            "
+                            @clear="clearSaleOrgPosition(row)"
                             v-el-readonly
                             v-if="companyInfo.companyCode == row.companyCode"
                           >
                             <i
                               slot="suffix"
                               class="el-input__icon el-icon-search"
-                              @click="
-                                openSelectPositionDialog(row, rowIndex, $table)
-                              "
+                              @click="openSelectPositionDialog(row)"
                             ></i>
                           </el-input>
                           <template v-else>
@@ -551,11 +546,6 @@
       @confirm="confirmRole"
       :param="roleDialogParam"
     />
-    <companyDialog
-      v-if="showCompanyDialog"
-      :visiable.sync="showCompanyDialog"
-      @confirm="confirmInsertCompany"
-    />
     <saleOrgDialog
       v-if="showSaleOrgDialog"
       :visiable.sync="showSaleOrgDialog"
@@ -585,14 +575,12 @@
 </template>
 
 <script>
-import xeUtils from "xe-utils";
 import tempStorageButton from "@base/components/tempStorage/index.vue";
 
 export default {
   name: "UserEdit",
   components: {
     roleDialog: () => import("../../../views/user/role/dialog.vue"),
-    companyDialog: () => import("../../../views/user/company_info/dialog.vue"),
     saleOrgDialog: () => import("../../../views/user/sale_org/dialog.vue"),
     positionDialog: () => import("../../../views/user/position/dialog.vue"),
     countryDialog: () => import("../../../views/user/country/dialog.vue"),
@@ -627,7 +615,7 @@ export default {
 
     return {
       dataId: "",
-      hBtn: true,
+      isEdit: false,
       user: {
         userCompanyInfoDTOs: [],
         userSaleOrgDTOs: [],
@@ -640,27 +628,17 @@ export default {
         areaName: null,
         areaId: null,
       },
-      companyTableData: [],
-      vxeOption: {},
-      companyInfoOption: {},
-      userRoleOption: {},
       showRoleDialog: false,
-      showCompanyDialog: false,
       showSaleOrgDialog: false,
       showPositionDialog: false,
-      saleOrgPositionIndex: 0,
+      positionDialogDatas: [],
+      positionDialogRow: null,
       passRules: [
         { validator: validatePass, trigger: "blur", required: false },
       ],
       pass2Rules: [
         { validator: validatePass2, trigger: "blur", required: false },
       ],
-      activeName: "first",
-      userCustomerListDTO: {
-        userCustomerDTOs: [],
-      },
-      customerOption: {},
-      showCustomerDialog: false,
       exportOption: {
         prefix: USER_PREFIX,
         title: this.$t1("用户"),
@@ -669,11 +647,9 @@ export default {
           return [{ id: this.dataId }];
         },
       },
-      showExtendedProperties: false,
-      radio1: "0",
       companyInfo: {},
-      distributorCode: "distributor",
       distributorRole: null,
+      unassignedTipShown: false,
       outUserCodes: [],
       roleDialogParam: { queryAll: true },
       tempStorageOption: {
@@ -684,11 +660,9 @@ export default {
         },
         chooseConfirm: (tempStorageData) => {
           this.user = tempStorageData;
-          let map = xeUtils.groupBy(this.user.userRoleDTOs, "companyCode");
-          Object.keys(map).forEach((key) => {
-            let comapnyDTO = this.getCompanyDTO(key);
-            comapnyDTO.roleData = map[key];
-          });
+          // 暂存时 getReqFormData 把表格数据和表格配置都置空了，这里必须整体还原，
+          // 否则机构信息丢失、表格无列，且保存时 handleData 展开 null 会直接报错
+          this.restoreCompanyGrids();
         },
         saveConfirm: () => {},
       },
@@ -734,14 +708,11 @@ export default {
             user.userRoleDTOs = this.user.userRoleDTOs;
             this.user = user;
             this.user.password = "";
-
-            this.showExtendedProperties = true;
           },
         });
       } else {
         this.user.gender = 1;
         this.isEdit = false;
-        this.showExtendedProperties = true;
       }
     },
     getReqFormData() {
@@ -758,6 +729,11 @@ export default {
         ...this.user,
         userCompanyInfoDTOs,
       };
+      //编辑态不修改密码时不下发密码字段，避免被空值覆盖
+      if (this.isEdit && !formData.password) {
+        delete formData.password;
+        delete formData.rePassword;
+      }
       return formData;
     },
     saveData() {
@@ -821,16 +797,8 @@ export default {
           isLoading: true,
           modalStrictly: true,
           success: (res) => {
-            // this.$refs.saleOrgGrid.loadData(res.objx || []);
-            let rows = res.objx || [];
-            if (rows.length) {
-              let map = xeUtils.groupBy(rows, "companyCode");
-              Object.keys(map).forEach((key) => {
-                let companyDTO = this.getCompanyDTO(key);
-                companyDTO.saleOrgData = map[key];
-              });
-            }
-            this.user.userSaleOrgDTOs = rows;
+            this.user.userSaleOrgDTOs = res.objx || [];
+            this.initCompanyGrids(this.syncCompanyGrids());
           },
         });
       }
@@ -844,21 +812,20 @@ export default {
           isLoading: true,
           modalStrictly: true,
           success: (res) => {
-            let rows = res.objx || [];
-            if (rows.length) {
-              let map = xeUtils.groupBy(rows, "companyCode");
-              Object.keys(map).forEach((key) => {
-                let companyDTO = this.getCompanyDTO(key);
-                companyDTO.roleData = map[key];
-              });
-            }
-            this.user.userRoleDTOs = rows;
+            this.user.userRoleDTOs = res.objx || [];
+            this.initCompanyGrids(this.syncCompanyGrids());
           },
         });
       }
     },
-    deleteSaleOrgItem(row, index, $table) {
-      this.getCompanyDTO(row.companyCode).saleOrgData.splice(index, 1);
+    deleteSaleOrgItem(row) {
+      const companyDTO = this.getCompanyDTO(row.companyCode);
+      const rows = (companyDTO && companyDTO.saleOrgData) || [];
+      // 用行对象定位，rowIndex 是渲染序，排序/过滤后会删错行
+      const index = rows.indexOf(row);
+      if (index > -1) {
+        rows.splice(index, 1);
+      }
     },
     getCompanyInfoData(callback) {
       if (this.dataId) {
@@ -870,7 +837,6 @@ export default {
           modalStrictly: true,
           success: (res) => {
             let rows = res.objx || [];
-            let companyTableData = [];
             rows.forEach((row) => {
               Object.assign(row, {
                 saleOrgGridOption: {},
@@ -888,7 +854,10 @@ export default {
     },
     initSaleOrg(companyCode) {
       let companyDTO = this.getCompanyDTO(companyCode);
-      if (Object.keys(companyDTO.saleOrgGridOption).length) {
+      if (!companyDTO) {
+        return;
+      }
+      if (Object.keys(companyDTO.saleOrgGridOption || {}).length) {
         return;
       }
       let tableRef = "saleOrgGrid-" + companyCode;
@@ -914,23 +883,14 @@ export default {
             field: "defaults",
             width: 120,
             slots: {
-              default: ({ row, $table, rowIndex }) => {
-                var isDefault = row.defaults || false;
+              default: ({ row }) => {
                 let disabled = this.companyInfo.companyCode != row.companyCode;
                 return [
                   <el-checkbox
-                    v-model={isDefault}
+                    value={!!row.defaults}
                     disabled={disabled}
-                    onchange={() => {
-                      let companyDTO = this.getCompanyDTO(row.companyCode);
-                      companyDTO.saleOrgData.forEach((item, index) => {
-                        if (index !== rowIndex) {
-                          item.defaults = false;
-                        }
-                      });
-                      this.$nextTick(() => {
-                        row.defaults = true;
-                      });
+                    onchange={(checked) => {
+                      this.changeSaleOrgDefault(row, checked);
                     }}
                   />,
                 ];
@@ -943,14 +903,14 @@ export default {
             title: "",
             sortable: false,
             slots: {
-              default: ({ row, rowIndex, $table }) => {
+              default: ({ row }) => {
                 if (this.companyInfo.companyCode == row.companyCode) {
                   return [
                     <a
                       href="javascript:void(0);"
                       class="a-link"
                       onclick={() => {
-                        this.deleteSaleOrgItem(row, rowIndex, $table);
+                        this.deleteSaleOrgItem(row);
                       }}
                     >
                       <el-tooltip
@@ -976,10 +936,12 @@ export default {
     },
     initUserRole(companyCode) {
       let companyDTO = this.getCompanyDTO(companyCode);
-      if (Object.keys(companyDTO.roleGridOption).length) {
+      if (!companyDTO) {
+        return;
+      }
+      if (Object.keys(companyDTO.roleGridOption || {}).length) {
         return;
       }
-      let userType = this.userType;
       const tableOption = {
         vue: this,
         tableRef: "userRoleGrid-" + companyCode,
@@ -991,13 +953,7 @@ export default {
             field: "name",
             width: 200,
             slots: {
-              default: ({ row }) => {
-                if (!row.isAdd) {
-                  return row.roleName;
-                } else {
-                  return row.name;
-                }
-              },
+              default: ({ row }) => row.roleName || row.name,
             },
           },
           {
@@ -1006,14 +962,14 @@ export default {
             title: "",
             sortable: false,
             slots: {
-              default: ({ row, rowIndex, $table }) => {
+              default: ({ row }) => {
                 if (this.companyInfo.companyCode == row.companyCode) {
                   return [
                     <a
                       href="javascript:void(0);"
                       class="a-link"
                       onclick={() => {
-                        this.deleteRoleItem(row, rowIndex, $table);
+                        this.deleteRoleItem(row);
                       }}
                     >
                       <el-tooltip
@@ -1041,17 +997,24 @@ export default {
       if (rows.length > 0) {
         let companyCode = this.companyInfo.companyCode;
         let companyDTO = this.getCompanyDTO(companyCode);
+        if (!companyDTO) {
+          return;
+        }
         let outUserCodes = this.outUserCodes;
-        if (this.userType === 1) {
+        // 由机构带出的角色没有 code，不参与内外部过滤，否则会被整批丢弃
+        if (this.userType == 1) {
           //组织用户
-          rows = rows.filter((row) => !outUserCodes.includes(row.code));
-        } else if (this.userType === 2) {
+          rows = rows.filter(
+            (row) => !row.code || !outUserCodes.includes(row.code)
+          );
+        } else if (this.userType == 2) {
           //外部用户
-          rows = rows.filter((row) => outUserCodes.includes(row.code));
+          rows = rows.filter(
+            (row) => !row.code || outUserCodes.includes(row.code)
+          );
         }
 
-        const $grid = this.$refs["userRoleGrid-" + companyCode][0];
-        const tableData = companyDTO.roleData;
+        const tableData = companyDTO.roleData || [];
         const map = {};
         tableData.forEach(function (item) {
           map[item.roleId] = 1;
@@ -1069,22 +1032,26 @@ export default {
           }
         });
 
-        companyDTO.roleData.push(...items);
+        tableData.push(...items);
+        companyDTO.roleData = tableData;
       }
     },
-    deleteRoleItem(row, index, $table) {
-      let companyDTO = this.getCompanyDTO(row.companyCode);
-      $table.remove(row);
-      companyDTO.roleData.splice(index, 1);
+    deleteRoleItem(row) {
+      const companyDTO = this.getCompanyDTO(row.companyCode);
+      const rows = (companyDTO && companyDTO.roleData) || [];
+      const index = rows.indexOf(row);
+      if (index > -1) {
+        rows.splice(index, 1);
+      }
     },
     confirmInsertCompany(rows, callback) {
+      const items = [];
       if (rows.length > 0) {
         const tableData = this.user.userCompanyInfoDTOs;
         const map = {};
         tableData.forEach(function (item) {
           map[item.companyCode] = 1;
         });
-        var items = [];
         rows.forEach((row) => {
           const item = {
             companyCode: row.companyCode,
@@ -1100,25 +1067,29 @@ export default {
             items.push(item);
           }
         });
-        // $grid.insertAt(items, -1);
         this.user.userCompanyInfoDTOs.splice(0, 0, ...items);
         if (this.user.userCompanyInfoDTOs.length == 1) {
           this.user.userCompanyInfoDTOs[0].defaults = true;
         }
-        // this.user.userCompanyInfoDTOs = this.user.userCompanyInfoDTOs.concat(items);
+        // 该企业可能已经加载过角色/机构（组织数据缺失时尤其如此），需要回填，
+        // 否则新建的卡片是两张空表，保存时 handleData 会把已有数据清掉
+        items.forEach((item) => this.fillCompanyGrids(item));
       }
       callback && callback();
+      return items;
     },
-    deleteCompany(row, index) {
+    deleteCompany(row) {
       let companyCode = row.companyCode;
-      let companyDTO = this.getCompanyDTO(companyCode);
-      this.user.userCompanyInfoDTOs.splice(index, 1);
-      companyDTO.roleData = [];
-      companyDTO.saleOrgData = [];
-      this.user.userSaleOrgDTOs = this.user.userSaleOrgDTOs.filter(
+      let index = this.user.userCompanyInfoDTOs.indexOf(row);
+      if (index > -1) {
+        this.user.userCompanyInfoDTOs.splice(index, 1);
+      }
+      row.roleData = [];
+      row.saleOrgData = [];
+      this.user.userSaleOrgDTOs = (this.user.userSaleOrgDTOs || []).filter(
         (item) => item.companyCode != companyCode
       );
-      this.user.userRoleDTOs = this.user.userRoleDTOs.filter(
+      this.user.userRoleDTOs = (this.user.userRoleDTOs || []).filter(
         (item) => item.companyCode != companyCode
       );
     },
@@ -1126,7 +1097,9 @@ export default {
       if (rows.length > 0) {
         let companyCode = this.companyInfo.companyCode;
         let companyDTO = this.getCompanyDTO(companyCode);
-        const $grid = this.$refs["saleOrgGrid-" + companyCode][0];
+        if (!companyDTO) {
+          return;
+        }
         const tableData = companyDTO.saleOrgData || [];
         const map = {};
         tableData.forEach(function (item) {
@@ -1137,7 +1110,7 @@ export default {
         let newUserRoleDTOs = [];
         var items = [];
 
-        rows.forEach((row, index) => {
+        rows.forEach((row) => {
           const item = {
             companyCode: companyCode,
             companyName: row.companyName,
@@ -1167,11 +1140,12 @@ export default {
           items[0].defaults = true;
         }
 
-        companyDTO.saleOrgData.push(...items);
+        tableData.push(...items);
+        companyDTO.saleOrgData = tableData;
         this.confirmRole(newUserRoleDTOs);
       }
     },
-    openSelectPositionDialog(row, rowIndex, $table) {
+    openSelectPositionDialog(row) {
       const userSaleOrgPositionDTOs = row.userSaleOrgPositionDTOs || [];
       const items = [];
       userSaleOrgPositionDTOs.forEach((userSaleOrgPositionDTO) => {
@@ -1186,17 +1160,17 @@ export default {
       });
 
       this.positionDialogDatas = items;
-      this.saleOrgPositionIndex = rowIndex;
+      // 保存行对象而不是 rowIndex，避免排序/过滤后岗位写到别的机构上
+      this.positionDialogRow = row;
       this.showPositionDialog = true;
     },
     confirmInsertPosition(rows) {
-      let companyCode = this.companyInfo.companyCode;
-      const saleOrgPositionIndex = this.saleOrgPositionIndex;
-      let companyDTO = this.getCompanyDTO(companyCode);
-      const tableData = companyDTO.saleOrgData || [];
+      const saleOrgRow = this.positionDialogRow;
+      if (!saleOrgRow) {
+        return;
+      }
       if (rows.length > 0) {
-        const oldPositions =
-          tableData[saleOrgPositionIndex].userSaleOrgPositionDTOs || [];
+        const oldPositions = saleOrgRow.userSaleOrgPositionDTOs || [];
         const map = {};
         oldPositions.forEach(function (item) {
           map[item.positionId] = item;
@@ -1218,23 +1192,15 @@ export default {
             oItems.push(map[item.positionId]);
           }
         });
-        tableData[saleOrgPositionIndex].userSaleOrgPositionDTOs =
-          oItems.concat(items);
+        this.$set(saleOrgRow, "userSaleOrgPositionDTOs", oItems.concat(items));
       } else {
-        tableData[saleOrgPositionIndex].userSaleOrgPositionDTOs = [];
+        this.$set(saleOrgRow, "userSaleOrgPositionDTOs", []);
       }
       this.$forceUpdate();
     },
     getSelectPositionName(row) {
-      var userSaleOrgPositions = row.userSaleOrgPositionDTOs || [];
-      var allName = "";
-      userSaleOrgPositions.forEach(function (pItem, pIndex) {
-        allName = allName + "," + pItem.positionName;
-      });
-      if (allName) {
-        allName = allName.substr(1);
-      }
-      return allName;
+      const userSaleOrgPositions = row.userSaleOrgPositionDTOs || [];
+      return userSaleOrgPositions.map((item) => item.positionName).join(",");
     },
     getConpanyInfo() {
       this.$http({
@@ -1243,19 +1209,13 @@ export default {
         isLoading: true,
         success: (res) => {
           this.companyInfo = res.objx || {};
-          let companyCode = this.companyInfo.companyCode;
           if (!this.isEdit) {
             this.addCurrentCompany();
           } else {
             this.getCompanyInfoData(() => {
               this.getUserRoleData();
               this.getSaleOrgData();
-              setTimeout(() => {
-                this.user.userCompanyInfoDTOs.forEach((userCompanyInfoDTO) => {
-                  this.initSaleOrg(userCompanyInfoDTO.companyCode);
-                  this.initUserRole(userCompanyInfoDTO.companyCode);
-                });
-              }, 100);
+              this.initCompanyGrids(this.user.userCompanyInfoDTOs);
             });
           }
         },
@@ -1265,26 +1225,19 @@ export default {
       return this.companyInfo.companyCode == companyCode;
     },
     addCurrentCompany(callback) {
-      this.confirmInsertCompany([this.companyInfo], callback);
-      setTimeout(() => {
-        this.initSaleOrg(this.companyInfo.companyCode);
-        this.initUserRole(this.companyInfo.companyCode);
-        setTimeout(() => {
-          if (this.userType === 2) {
-            //经销商
-            if (this.distributorRole) {
-              this.confirmRole([this.distributorRole]);
-            }
-          }
-        }, 100);
-      }, 100);
+      const items = this.confirmInsertCompany([this.companyInfo], callback);
+      if (this.userType == 2 && this.distributorRole) {
+        //经销商，默认带出经销商角色
+        this.confirmRole([this.distributorRole]);
+      }
+      this.initCompanyGrids(items);
     },
     handleData() {
       let saleOrgs = [];
       let roles = [];
       this.user.userCompanyInfoDTOs.forEach((companyDTO) => {
-        saleOrgs.push(...companyDTO.saleOrgData);
-        roles.push(...companyDTO.roleData);
+        saleOrgs.push(...(companyDTO.saleOrgData || []));
+        roles.push(...(companyDTO.roleData || []));
       });
 
       this.user.userRoleDTOs = roles;
@@ -1372,7 +1325,148 @@ export default {
         this.user.userCompanyInfoDTOs.forEach((row) => {
           row.defaults = row.companyCode == companyCode;
         });
+      } else {
+        // 至少保留一个默认组织，取消唯一的默认项时回填
+        let hasDefault = this.user.userCompanyInfoDTOs.some(
+          (row) => row.defaults
+        );
+        if (!hasDefault) {
+          item.defaults = true;
+        }
+      }
+    },
+    changeSaleOrgDefault(row, checked) {
+      const companyDTO = this.getCompanyDTO(row.companyCode);
+      const rows = (companyDTO && companyDTO.saleOrgData) || [];
+      rows.forEach((item) => {
+        if (item === row) {
+          this.$set(item, "defaults", !!checked);
+        } else if (checked) {
+          this.$set(item, "defaults", false);
+        }
+      });
+    },
+    clearSaleOrgPosition(row) {
+      this.$set(row, "userSaleOrgPositionDTOs", []);
+      this.$forceUpdate();
+    },
+    normalizeSaleOrgRow(row) {
+      //后端返回的机构行可能缺字段，先补齐保证响应式
+      if (row.defaults === undefined) {
+        this.$set(row, "defaults", false);
+      }
+      if (!row.userSaleOrgPositionDTOs) {
+        this.$set(row, "userSaleOrgPositionDTOs", []);
+      }
+      return row;
+    },
+    // userRoleDTOs / userSaleOrgDTOs 是唯一事实源，这里统一分发到各组织卡片。
+    // handleData 保存时只认组织卡片里的数据，所以任何没有归属组织的行都必须
+    // 补出一张组织卡片，否则用户点一次保存就被静默删掉了。
+    // 返回本次补建的组织卡片，交给调用方决定何时初始化表格。
+    syncCompanyGrids() {
+      this.dropUnassignedRows();
+      const items = this.getLackCompanyCodes().map((companyCode) => {
+        return {
+          companyCode: companyCode,
+          companyName: this.getRowCompanyName(companyCode),
+          guid: null,
+          defaults: false,
+          saleOrgGridOption: {},
+          roleGridOption: {},
+          saleOrgData: [],
+          roleData: [],
+        };
+      });
+      if (items.length) {
+        this.user.userCompanyInfoDTOs.push(...items);
+      }
+      this.user.userCompanyInfoDTOs.forEach((companyDTO) =>
+        this.fillCompanyGrids(companyDTO)
+      );
+      return items;
+    },
+    fillCompanyGrids(companyDTO) {
+      const companyCode = companyDTO.companyCode;
+      const saleOrgData = (this.user.userSaleOrgDTOs || []).filter(
+        (row) => row.companyCode == companyCode
+      );
+      saleOrgData.forEach((row) => this.normalizeSaleOrgRow(row));
+      this.$set(companyDTO, "saleOrgData", saleOrgData);
+      this.$set(
+        companyDTO,
+        "roleData",
+        (this.user.userRoleDTOs || []).filter(
+          (row) => row.companyCode == companyCode
+        )
+      );
+    },
+    getLackCompanyCodes() {
+      //有角色/机构数据、但没有对应组织的企业编码
+      const rows = (this.user.userSaleOrgDTOs || []).concat(
+        this.user.userRoleDTOs || []
+      );
+      const codes = [];
+      rows.forEach((row) => {
+        const companyCode = row.companyCode;
+        if (codes.includes(companyCode) || this.getCompanyDTO(companyCode)) {
+          return;
+        }
+        codes.push(companyCode);
+      });
+      return codes;
+    },
+    getRowCompanyName(companyCode) {
+      const rows = (this.user.userSaleOrgDTOs || []).concat(
+        this.user.userRoleDTOs || []
+      );
+      const row = rows.find(
+        (item) => item.companyCode == companyCode && item.companyName
+      );
+      return row ? row.companyName : companyCode;
+    },
+    dropUnassignedRows() {
+      //companyCode 为空的行补不出有效组织，保留会往提交体里塞一条空组织关系
+      const isUnassigned = (row) => {
+        const code = row.companyCode;
+        return code === null || code === undefined || code === "";
+      };
+      const roles = this.user.userRoleDTOs || [];
+      const saleOrgs = this.user.userSaleOrgDTOs || [];
+      const badRows = roles.filter(isUnassigned).concat(
+        saleOrgs.filter(isUnassigned)
+      );
+      if (!badRows.length) {
+        return;
+      }
+      this.user.userRoleDTOs = roles.filter((row) => !isUnassigned(row));
+      this.user.userSaleOrgDTOs = saleOrgs.filter((row) => !isUnassigned(row));
+      console.warn("[UserEdit] 忽略未归属组织的角色/机构数据", badRows);
+      if (this.unassignedTipShown) {
+        return;
+      }
+      this.unassignedTipShown = true;
+      this.$baseAlert(this.$t1("存在未归属组织的角色/机构数据，已忽略"));
+    },
+    initCompanyGrids(companyDTOs) {
+      if (!companyDTOs || !companyDTOs.length) {
+        return;
       }
+      this.$nextTick(() => {
+        companyDTOs.forEach((companyDTO) => {
+          this.initSaleOrg(companyDTO.companyCode);
+          this.initUserRole(companyDTO.companyCode);
+        });
+      });
+    },
+    restoreCompanyGrids() {
+      //暂存恢复：表格配置被置空过，需要连同表格一起重建
+      (this.user.userCompanyInfoDTOs || []).forEach((companyDTO) => {
+        this.$set(companyDTO, "saleOrgGridOption", {});
+        this.$set(companyDTO, "roleGridOption", {});
+      });
+      this.syncCompanyGrids();
+      this.initCompanyGrids(this.user.userCompanyInfoDTOs);
     },
     getCompanyDTO(companyCode) {
       return this.user.userCompanyInfoDTOs.find(