From d7a906bda42e378bbb25629c2fe75a543655f066 Mon Sep 17 00:00:00 2001
From: yedejiamingshi <540057894@qq.com>
Date: Wed, 19 Feb 2025 16:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5=2002.19=20?=
 =?UTF-8?q?-2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.js                        |    8 +
 src/views/basic/businessInfo/index.vue        |    2 +-
 src/views/basic/dealerInfo/index.vue          | 1037 ++++++++++-------
 src/views/basic/vendorInfo/index.vue          |    2 +-
 src/views/basic/workersInfo/index.vue         |   14 +-
 .../configure/inspectionTemplate/index.vue    |    5 +-
 src/views/configure/traceTemplate/index.vue   |    5 +-
 src/views/goods/goodsInfo/index.vue           |    2 +-
 src/views/identity/businessRule/index.vue     |    2 +-
 src/views/identity/generateRecord/index.vue   |   14 +-
 src/views/identity/scanRecord/index.vue       |    4 +-
 src/views/production/harvestBatch/index.vue   |    1 -
 src/views/production/harvestInfo/index.vue    |    2 +-
 src/views/production/inspection/index.vue     |    4 +-
 src/views/system/tenant/index.vue             |    8 +-
 src/views/system/user/index.vue               |  524 ++++++---
 16 files changed, 1062 insertions(+), 572 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index ffa08da..5343ebd 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -26,6 +26,14 @@ export function getUser(userId) {
   })
 }
 
+// 获得当前登录用户，所属租户可创建用户数量
+export function getUserMaxNum() {
+  return request({
+    url: '/system/user/get/maxNum',
+    method: 'get'
+  })
+}
+
 // 新增用户
 export function addUser(data) {
   return request({
diff --git a/src/views/basic/businessInfo/index.vue b/src/views/basic/businessInfo/index.vue
index 0bf23b6..4824b06 100644
--- a/src/views/basic/businessInfo/index.vue
+++ b/src/views/basic/businessInfo/index.vue
@@ -22,7 +22,7 @@
 
       <!-- 列表 -->
       <el-table v-loading="loading" :data="list" >
-        <el-table-column label="编号" align="center" type="index" width="80" >
+        <el-table-column label="序号" align="center" type="index" width="80" >
           <template v-slot="{ $index }">
             <span>{{($index+1)+ (searchFormParam.queryParams.pageNo-1)*searchFormParam.queryParams.pageSize }}</span>
           </template>
diff --git a/src/views/basic/dealerInfo/index.vue b/src/views/basic/dealerInfo/index.vue
index 966bb84..3018417 100644
--- a/src/views/basic/dealerInfo/index.vue
+++ b/src/views/basic/dealerInfo/index.vue
@@ -16,41 +16,73 @@
     <div class="app-container-list main-bgcolor main-radius shopping">
       <div class="shopping-top">
         <div class="shopping-title">经销商列表</div>
-        <el-button class="shopping-add-btn" type="primary" plain @click="handleAdd"
-          v-hasPermi="['basic:dealer-info:create']">添加经销商</el-button>
+        <el-button
+          class="shopping-add-btn"
+          type="primary"
+          plain
+          @click="handleAdd"
+          v-hasPermi="['basic:dealer-info:create']"
+          >添加经销商</el-button
+        >
       </div>
 
       <!-- 列表 -->
-      <el-table v-loading="loading" :data="list" >
-        <el-table-column label="编号" align="center" type="index" width="80" >
+      <el-table v-loading="loading" :data="list">
+        <el-table-column label="序号" align="center" type="index" width="80">
           <template v-slot="{ $index }">
-            <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
+            <span>{{
+              $index + 1 + (queryParams.pageNo - 1) * queryParams.pageSize
+            }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="经销商编码" align="center" prop="dealerId" width="220" >
+        <el-table-column
+          label="经销商编码"
+          align="center"
+          prop="dealerId"
+          width="220"
+        >
           <template slot-scope="{ row }">
             <div class="flex-allcenter">
-              <span class="more-width-20">{{row.dealerId}}</span>
-              <el-button type="text" icon="el-icon-copy-document" @click.stop="copyContent(row.dealerId)"></el-button>
+              <span class="more-width-20">{{ row.dealerId }}</span>
+              <el-button
+                type="text"
+                icon="el-icon-copy-document"
+                @click.stop="copyContent(row.dealerId)"
+              ></el-button>
             </div>
           </template>
         </el-table-column>
         <el-table-column label="经销商名称" align="center" prop="dealerName" />
-        <el-table-column label="所属商户" align="center" prop="belongBusinessName"/>
+        <el-table-column
+          label="所属商户"
+          align="center"
+          prop="belongBusinessName"
+        />
         <!-- 负责人就是联系人 -->
         <el-table-column label="负责人" align="center" prop="contactName" />
-        <el-table-column label="联系电话" align="center" prop="contactPhone" width="140" />
+        <el-table-column
+          label="联系电话"
+          align="center"
+          prop="contactPhone"
+          width="140"
+        />
         <el-table-column label="创建时间" align="center" prop="createTime">
           <template v-slot="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
         <el-table-column
-          label="操作" fixed="right"
+          label="备注"
+          align="center"
+          prop="remarks"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="操作"
+          fixed="right"
           align="center"
           class-name="small-padding fixed-width"
-		  width="150"
+          width="150"
         >
           <template v-slot="scope">
             <el-button
@@ -93,7 +125,13 @@
       append-to-body
       width="60%"
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px" label-position="top">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="110px"
+        label-position="top"
+      >
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="经销商名称" prop="dealerName">
@@ -103,8 +141,8 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="form.dealerId && form.dealerId != ' ' " >
-            <el-form-item label="经销商编码" prop="dealerId" >
+          <el-col :span="12" v-if="form.dealerId && form.dealerId != ' '">
+            <el-form-item label="经销商编码" prop="dealerId">
               <el-input
                 v-model="form.dealerId"
                 placeholder=""
@@ -114,10 +152,22 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="所属商户" prop="belongBusinessName">
-              <div style="display: flex;">
-                <el-select v-model="form.belongBusinessId" :placeholder=this.belongBusinessPlaceholder clearable filterable style="flex: 1;"  @change="businessIdChangeToSelectGooods">
-                  <el-option v-for="businessInfo in businessNameList"
-                  :key="businessInfo.index" :label="businessInfo.businessName" :value="businessInfo.id" @click.native="labelClick(businessInfo.businessName)"/>
+              <div style="display: flex">
+                <el-select
+                  v-model="form.belongBusinessId"
+                  :placeholder="this.belongBusinessPlaceholder"
+                  clearable
+                  filterable
+                  style="flex: 1"
+                  @change="businessIdChangeToSelectGooods"
+                >
+                  <el-option
+                    v-for="businessInfo in businessNameList"
+                    :key="businessInfo.index"
+                    :label="businessInfo.businessName"
+                    :value="businessInfo.id"
+                    @click.native="labelClick(businessInfo.businessName)"
+                  />
                 </el-select>
               </div>
             </el-form-item>
@@ -140,7 +190,10 @@
               <!-- <div style="display: flex;">
                 <CascaderArea  style="flex: 1;" :pca="areaList" :isValue="''+form.commonSaleAreaId" ref="cascaderArea" v-model="form.commonSaleAreaId" @transfer="getArea" @transferId="getAreaId"></CascaderArea>
               </div> -->
-              <el-input v-model="form.commonSaleArea"></el-input>
+              <el-input
+                v-model="form.commonSaleArea"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -150,23 +203,43 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="备注" prop="remarks" height="100px">
-              <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remarks"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
 
-      <div style="margin-bottom: 22px; display: flex; justify-content: flex-end;">
-        <el-button type="primary" @click="openSelectInputDialog">新增销售区域/商品</el-button>
+      <div
+        style="margin-bottom: 22px; display: flex; justify-content: flex-end"
+      >
+        <el-button type="primary" @click="openSelectInputDialog"
+          >新增销售区域/商品</el-button
+        >
       </div>
       <template v-if="inputInfoListVisible">
-        <el-table :data="inputInfoList" >
+        <el-table :data="inputInfoList">
           <!-- <el-table-column label="省级" align="center" prop="province" />
           <el-table-column label="市级" align="center" prop="city" />
           <el-table-column label="县级" align="center" prop="county" /> -->
-          <el-table-column label="商品经销商区域" align="center" prop="saleArea" />
-          <el-table-column label="绑定商品" align="center" prop="inputsGoodsName" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column
+            label="商品经销商区域"
+            align="center"
+            prop="saleArea"
+          />
+          <el-table-column
+            label="绑定商品"
+            align="center"
+            prop="inputsGoodsName"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
             <template v-slot="scope">
               <el-button
                 size="mini"
@@ -205,7 +278,6 @@
                 v-if="scope.row.newGoods == 1"
                 >新增删除</el-button
               >
-
             </template>
           </el-table-column>
           <div slot="empty">
@@ -222,18 +294,35 @@
 
     <!-- 对话框 选择商品 -->
     <!-- 正常情况，可直接销毁弹窗，这样可以不去维护状态 -->
-    <el-dialog title="新增区域商品"
-      :visible.sync="selectInputVisible" width="900px" v-dialogDrag append-to-body close-on-click-modal
+    <el-dialog
+      title="新增区域商品"
+      :visible.sync="selectInputVisible"
+      width="900px"
+      v-dialogDrag
+      append-to-body
+      close-on-click-modal
       :before-close="selectInputCancel"
     >
-      <el-form ref="formSaleArea" :model="inputCheckedAreaList" :rules="rules" label-position="top">
-        <el-form-item label="商品经销区域" prop="commonSaleArea" style="width: 47.5%;">
+      <el-form
+        ref="formSaleArea"
+        :model="inputCheckedAreaList"
+        :rules="rules"
+        label-position="top"
+      >
+        <el-form-item
+          label="商品经销区域"
+          prop="commonSaleArea"
+          style="width: 47.5%"
+        >
           <!-- <div style="display: flex;">
             <CascaderArea  style="flex: 0.43;margin-bottom: 20px;" ref="cascaderArea"
             :pca="areaList" :isValue="''+inputCheckedAreaList.commonSaleAreaId"  v-model="inputCheckedAreaList.commonSaleAreaId"
               @transfersAreaCode="getGoodsArea" @transferId="getGoodsAreaId"></CascaderArea>
           </div> -->
-          <el-input v-model="inputCheckedAreaList.commonSaleArea" placeholder="请输入商品经销区域"></el-input>
+          <el-input
+            v-model="inputCheckedAreaList.commonSaleArea"
+            placeholder="请输入商品经销区域"
+          ></el-input>
         </el-form-item>
       </el-form>
       <Transfer
@@ -253,8 +342,18 @@
       />
       <div slot="footer" class="dialog-footer">
         <el-button @click="selectInputCancel">取 消</el-button>
-        <el-button type="primary" @click="submitSelectInput" v-if="addNewAreaGoodsEnable">确 定</el-button>
-        <el-button type="primary" @click="submitSelectUpdateInput" v-if="!addNewAreaGoodsEnable">确 定</el-button>
+        <el-button
+          type="primary"
+          @click="submitSelectInput"
+          v-if="addNewAreaGoodsEnable"
+          >确 定</el-button
+        >
+        <el-button
+          type="primary"
+          @click="submitSelectUpdateInput"
+          v-if="!addNewAreaGoodsEnable"
+          >确 定</el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -270,26 +369,25 @@ import {
   getDealerInfoPage,
   createDealerAndAreaGoodsInfo,
   updateDealerAndAreaGoodsInfo,
-} from '@/api/basic/dealerInfo';
+} from "@/api/basic/dealerInfo";
 import {
   createDealerGoods,
   updateDealerGoods,
   getDealerGoods,
   getDealerGoodsQuery,
   deleteDealerGoods,
-  getDealerGoodsPage
-} from '@/api/basic/dealerGoods';
+  getDealerGoodsPage,
+} from "@/api/basic/dealerGoods";
 import { getBusinessNameList } from "@/api/basic/businessInfo";
-import { getGoodsInfoPage,getGoodsInfoQuery} from "@/api/basic/goodsInfo";
-import {getAreaTree} from "@/api/system/area";
-import EmptyTable from '@/components/EmptyTable'
-import SearchInfo from '@/components/Customer/SearchForm'
-import CascaderArea from "@/components/Customer/Cascader/areaById"
-import Transfer from '@/components/Customer/Transfer/index.vue';
-
+import { getGoodsInfoPage, getGoodsInfoQuery } from "@/api/basic/goodsInfo";
+import { getAreaTree } from "@/api/system/area";
+import EmptyTable from "@/components/EmptyTable";
+import SearchInfo from "@/components/Customer/SearchForm";
+import CascaderArea from "@/components/Customer/Cascader/areaById";
+import Transfer from "@/components/Customer/Transfer/index.vue";
 
 export default {
-  name: 'DealerInfo',
+  name: "DealerInfo",
   components: {
     SearchInfo,
     EmptyTable,
@@ -299,9 +397,9 @@ export default {
   data() {
     return {
       //所属商户下拉框提示
-      belongBusinessPlaceholder:'请选择所属商户',
+      belongBusinessPlaceholder: "请选择所属商户",
       //获取的地区信息列表
-      areaList:[],
+      areaList: [],
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -312,11 +410,11 @@ export default {
       // 经销商列表
       list: [],
       // 弹出层标题
-      title: '',
+      title: "",
       // 是否显示弹出层
       open: false,
       //商户名称列表
-      businessNameList:{},
+      businessNameList: {},
       // 查询参数
       queryGoodsPageParams: {
         pageNo: 1,
@@ -360,77 +458,98 @@ export default {
       //表单对象
       dataSource: [
         {
-          key: 'dealerId', //经销商编码
-          itemType: 'input',
-          label: '经销商编码',
-          placeholder: '请输入',
+          key: "dealerId", //经销商编码
+          itemType: "input",
+          label: "经销商编码",
+          placeholder: "请输入",
           onEnterKeyUp: this.handleQuery,
         },
         {
-          key: 'dealerName', //经销商名称
-          itemType: 'input',
-          label: '经销商名称',
-          placeholder: '请输入',
+          key: "dealerName", //经销商名称
+          itemType: "input",
+          label: "经销商名称",
+          placeholder: "请输入",
           onEnterKeyUp: this.handleQuery,
         },
         {
-          key: 'belongBusinessName', //所属商户名称
-          itemType: 'input',
-          label: '所属商户',
-          placeholder: '请输入',
+          key: "belongBusinessName", //所属商户名称
+          itemType: "input",
+          label: "所属商户",
+          placeholder: "请输入",
           onEnterKeyUp: this.handleQuery,
         },
         {
-          key: 'contactName', //负责人就是联系人
-          itemType: 'input',
-          label: '负责人',
-          placeholder: '请输入',
+          key: "contactName", //负责人就是联系人
+          itemType: "input",
+          label: "负责人",
+          placeholder: "请输入",
           onEnterKeyUp: this.handleQuery,
         },
         {
-          key: 'contactPhone', //联系电话
-          itemType: 'input',
-          label: '联系电话',
-          placeholder: '请输入',
+          key: "contactPhone", //联系电话
+          itemType: "input",
+          label: "联系电话",
+          placeholder: "请输入",
           onEnterKeyUp: this.handleQuery,
         },
         {
-          key: 'createTime', //创建时间
-          itemType: 'datePicker',
-          label: '创建时间',
+          key: "createTime", //创建时间
+          itemType: "datePicker",
+          label: "创建时间",
           onEnterKeyUp: this.handleQuery,
         },
       ],
       // 表单参数
       form: {},
-      formGoods:{},
+      formGoods: {},
       // 表单校验
       rules: {
         dealerName: [
-          { required: true, message: '经销商名称不能为空', trigger: 'blur' },
+          { required: true, message: "经销商名称不能为空", trigger: "blur" },
+          {
+            max: 64,
+            message: "经销商名称长度不能超过64个字符",
+            trigger: "blur",
+          },
         ],
         belongBusinessId: [
-          { required: true, message: '所属商户不能为空', trigger: 'blur' },
+          { required: true, message: "所属商户不能为空", trigger: "blur" },
         ],
         belongBusinessName: [
-          { required: true, message: '所属商户不能为空', trigger: 'blur' },
+          { required: true, message: "所属商户不能为空", trigger: "blur" },
         ],
         contactName: [
-          { required: true, message: '联系人姓名不能为空', trigger: 'blur' },
+          { required: true, message: "负责人姓名不能为空", trigger: "blur" },
+          {
+            max: 64,
+            message: "负责人姓名长度不能超过64个字符",
+            trigger: "blur",
+          },
         ],
         contactPhone: [
-          { required: true, message: '联系方式不能为空', trigger: 'blur' },
+          { required: true, message: "联系方式不能为空", trigger: "blur" },
           {
-            pattern:  /^1[3|4|5|7|8|9][0-9]{9}$/,
-            message: '联系电话格式有误！',
-            trigger: 'blur',
-          }
+            pattern: /^1[3|4|5|7|8|9][0-9]{9}$/,
+            message: "联系电话格式有误！",
+            trigger: "blur",
+          },
         ],
         commonSaleArea: [
-          { required: true, message: '销售区域不能为空', trigger: 'blur' },
+          { required: true, message: "销售区域不能为空", trigger: "blur" },
+          { max: 64, message: "销售区域长度不能超过64个字符", trigger: "blur" },
         ],
         saleArea: [
-          { required: true, message: '商品销售区域不能为空', trigger: 'blur' },
+          { required: true, message: "商品销售区域不能为空", trigger: "blur" },
+        ],
+        remarks: [
+          { max: 255, message: "备注长度不能超过255个字符", trigger: "blur" },
+        ],
+        businessCode: [
+          {
+            max: 20,
+            message: "统一信用代码长度不能超过20个字符",
+            trigger: "blur",
+          },
         ],
       },
 
@@ -438,10 +557,10 @@ export default {
       // 是否显示添加商品弹出框
       // addInputVisible: false,
       // 是否显示经销商所属区域商品表格
-      inputInfoListVisible:true,
+      inputInfoListVisible: true,
       // 是否显示新增经销商所属区域商品表格
       // aaddInfoTabVisible:true,
-      addNewAreaGoodsEnable:true,
+      addNewAreaGoodsEnable: true,
       // 用于存放已添加在库中的商品信息列表
       inputInfoListTemp: [],
       // 已选/已入的商品信息列表
@@ -449,28 +568,32 @@ export default {
       // 新增的区域/商品信息列表
       addInfoList: [],
       //存放非新增的经销商商品信息更新
-      addInfoUpdateList:[],
+      addInfoUpdateList: [],
       // 新增的区域/商品列表显示信息
       addInfoTabList: [],
-      dataAreaGoodsInfo:{dealerInfo:undefined,areaGoodsList:undefined,areaGoodsUpdateList:undefined},
+      dataAreaGoodsInfo: {
+        dealerInfo: undefined,
+        areaGoodsList: undefined,
+        areaGoodsUpdateList: undefined,
+      },
       //选择的商品的ID集合
       inputInfoIdList: [],
       //新增商品的临时index
-      updateNewIndex:-1,
+      updateNewIndex: -1,
       //当前所操作的新增商品的updateNewIndex
-      newIndex:undefined,
+      newIndex: undefined,
       //当前更新的经销商商品ID
-      updateDealerGoodsId:undefined,
+      updateDealerGoodsId: undefined,
       /***********************  选择商品弹窗相关参数  ************************/
       //更新商品信息操作标志
-      updateAreaGoodsDoFlag:0,
+      updateAreaGoodsDoFlag: 0,
       selectInputVisible: false,
       // 已选中的商品列表【临时】，只在弹窗时作为临时存放用
       inputCheckedIdList: [],
       //选择的销售区域
       inputCheckedAreaList: {
-        commonSaleArea:'',
-        commonSaleAreaId:undefined
+        commonSaleArea: "",
+        commonSaleAreaId: undefined,
       },
       // 商品可选列表
       inputInfoOptions: [],
@@ -479,93 +602,97 @@ export default {
       rightCurrentPage: 1,
       leftDefaultChecked: [],
       rightDefaultChecked: [],
-    }
+    };
   },
 
   created() {
-    this.getList()
-    this.getAreaList()
+    this.getList();
+    this.getAreaList();
   },
 
   methods: {
     /** 地区查询列表 */
     getAreaList() {
-      getAreaTree().then(response => {
+      getAreaTree().then((response) => {
         this.areaList = response.data;
-      })
+      });
     },
     /** 查询列表 */
     getList() {
-      this.loading = true
-      if(this.queryParams.dealerId == ''){
+      this.loading = true;
+      if (this.queryParams.dealerId == "") {
         this.queryParams.dealerId = null;
       }
-      if(this.queryParams.contactPhone == ''){
+      if (this.queryParams.contactPhone == "") {
         this.queryParams.contactPhone = null;
       }
       // 执行查询
       getDealerInfoPage(this.queryParams).then((response) => {
-        this.list = response.data.list
-        this.total = response.data.total
-        this.loading = false
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
       });
     },
     /** 获取当前分页列表 */
     getDealerInfoList() {
-      this.loading = true
+      this.loading = true;
       let queryParams = {
-          pageNo: this.queryParams.pageNo,
-          pageSize: this.queryParams.pageSize,
-      }
+        pageNo: this.queryParams.pageNo,
+        pageSize: this.queryParams.pageSize,
+      };
       // 执行查询
       getDealerInfoPage(queryParams).then((response) => {
-        this.list = response.data.list
-        this.total = response.data.total
-        this.loading = false
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
       });
     },
     /** 获取商户名称列表 */
-    getBusinessNameList(){
-      getBusinessNameList().then(response => {
+    getBusinessNameList() {
+      getBusinessNameList().then((response) => {
         this.businessNameList = response.data;
       });
     },
     /** 查询经销商商品列表 */
-    getDealerGoodsList(dealerId,belongBusinessId) {
-      this.queryGoodsListParams.belongBusinessId = null
-      this.queryDealerGoodsParams.dealerId = dealerId
-      this.queryDealerGoodsParams.belongBusinessId = belongBusinessId
+    getDealerGoodsList(dealerId, belongBusinessId) {
+      this.queryGoodsListParams.belongBusinessId = null;
+      this.queryDealerGoodsParams.dealerId = dealerId;
+      this.queryDealerGoodsParams.belongBusinessId = belongBusinessId;
       // 执行查询
-      getGoodsInfoQuery(this.queryGoodsListParams).then(response => {
-        const goodsList = response.data
+      getGoodsInfoQuery(this.queryGoodsListParams).then((response) => {
+        const goodsList = response.data;
         getDealerGoodsQuery(this.queryDealerGoodsParams).then((response) => {
-          const data = response.data
-          const addList = []
-          for(let i = 0; i < data.length; i++) {
-            let goodInfo = goodsList.filter(item => item.goodsId == data[i].goodsId)
-            let goodInfoId = goodInfo.length != 0 ? goodInfo[0].id : undefined
+          const data = response.data;
+          const addList = [];
+          for (let i = 0; i < data.length; i++) {
+            let goodInfo = goodsList.filter(
+              (item) => item.goodsId == data[i].goodsId
+            );
+            let goodInfoId = goodInfo.length != 0 ? goodInfo[0].id : undefined;
             addList.push({
-              saleArea:data[i].saleArea,
+              saleArea: data[i].saleArea,
               // province:data[i].saleArea.split('/')[0],
               // city:data[i].saleArea.split('/')[1],
               // county:data[i].saleArea.split('/')[2],
-              inputsGoodsName:data[i].goodsName,
-              id:data[i].id,
-              areaId:data[i].saleAreaId,
-              goodsId:data[i].goodsId,
-              gid:(goodInfoId == undefined ? 0 : goodInfoId),
-              newGoods:0
+              inputsGoodsName: data[i].goodsName,
+              id: data[i].id,
+              areaId: data[i].saleAreaId,
+              goodsId: data[i].goodsId,
+              gid: goodInfoId == undefined ? 0 : goodInfoId,
+              newGoods: 0,
             });
           }
-          this.inputInfoList = addList
-          this.inputInfoListTemp = addList
-          if(this.addInfoTabList.length > 0){
-            this.inputInfoList = this.addInfoTabList.concat(this.inputInfoListTemp);
+          this.inputInfoList = addList;
+          this.inputInfoListTemp = addList;
+          if (this.addInfoTabList.length > 0) {
+            this.inputInfoList = this.addInfoTabList.concat(
+              this.inputInfoListTemp
+            );
           }
-          this.totalGoods = response.data.total
-          this.queryGoodsListParams.belongBusinessId = 0
-          console.log(this.inputInfoList)
-          console.log(this.totalGoods)
+          this.totalGoods = response.data.total;
+          this.queryGoodsListParams.belongBusinessId = 0;
+          console.log(this.inputInfoList);
+          console.log(this.totalGoods);
         });
       });
     },
@@ -575,10 +702,10 @@ export default {
       this.open = false;
       this.reset();
       this.addInfoList = [];
-      this.addInfoUpdateList = []
+      this.addInfoUpdateList = [];
       this.inputInfoList = [];
       this.inputInfoIdList = [];
-      this.addInfoTabList = []
+      this.addInfoTabList = [];
     },
     /** 表单重置 */
     reset() {
@@ -593,236 +720,264 @@ export default {
         contactName: undefined,
         commonSaleArea: undefined,
         commonSaleAreaId: undefined,
-        inputCheckedAreaList: {commonSaleArea:'',commonSaleAreaId:undefined},
-        dataAreaGoodsInfo:{dealerInfo:undefined,areaGoodsList:undefined,areaGoodsUpdateList:undefined},
+        inputCheckedAreaList: {
+          commonSaleArea: "",
+          commonSaleAreaId: undefined,
+        },
+        dataAreaGoodsInfo: {
+          dealerInfo: undefined,
+          areaGoodsList: undefined,
+          areaGoodsUpdateList: undefined,
+        },
         remarks: undefined,
-      }
+      };
       this.addInfoTabList = [];
       this.addInfoList = [];
       this.inputInfoList = [];
       this.addInfoUpdateList = [];
       this.totalGoods = 0;
-      this.resetForm('form')
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNo = 1
-      this.getList()
+      this.queryParams.pageNo = 1;
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm", "searchForm")
-      this.handleQuery()
+      this.resetForm("queryForm", "searchForm");
+      this.handleQuery();
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
+      this.reset();
       this.getBusinessNameList();
-      this.open = true
-      this.inputInfoListVisible = true
-      this.belongBusinessPlaceholder = '请选择所属商户'
-      this.title = '添加经销商'
+      this.open = true;
+      this.inputInfoListVisible = true;
+      this.belongBusinessPlaceholder = "请选择所属商户";
+      this.title = "添加经销商";
       this.updateNewIndex = -1;
     },
     /** 经销商编辑按钮操作 */
     handleUpdate(row) {
-      this.reset()
-      this.addInfoTabList = []
-      const id = row.id
-      const dealerId = row.dealerId
-      const belongBusinessId = row.belongBusinessId
+      this.reset();
+      this.addInfoTabList = [];
+      const id = row.id;
+      const dealerId = row.dealerId;
+      const belongBusinessId = row.belongBusinessId;
       this.getBusinessNameList();
-      this.getDealerGoodsList(dealerId,belongBusinessId)
+      this.getDealerGoodsList(dealerId, belongBusinessId);
       this.updateNewIndex = -1;
       getDealerInfo(id).then((response) => {
-        this.form = response.data
-        this.open = true
+        this.form = response.data;
+        this.open = true;
         // this.aaddInfoTabVisible = false
-        this.inputInfoListVisible = true
+        this.inputInfoListVisible = true;
 
         //当商户被删除时，无法显示对应的商户名称，重新定义
         let isTip = true;
-        for(var x=0;x<this.businessNameList.length;x++){
-          if(this.businessNameList[x].id == this.form.belongBusinessId){
+        for (var x = 0; x < this.businessNameList.length; x++) {
+          if (this.businessNameList[x].id == this.form.belongBusinessId) {
             isTip = false;
           }
         }
-        if( isTip ) {
-          this.form.belongBusinessId = undefined
-          this.form.belongBusinessName = undefined
-          this.belongBusinessPlaceholder = '所属商户已删除，请重新选择'
-        }else{
-          this.belongBusinessPlaceholder = '请选择所属商户'
+        if (isTip) {
+          this.form.belongBusinessId = undefined;
+          this.form.belongBusinessName = undefined;
+          this.belongBusinessPlaceholder = "所属商户已删除，请重新选择";
+        } else {
+          this.belongBusinessPlaceholder = "请选择所属商户";
         }
 
-        this.title = '修改经销商'
-        console.log("---------------")
-        console.log(this.form)
-      })
+        this.title = "修改经销商";
+        console.log("---------------");
+        console.log(this.form);
+      });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs['form'].validate((valid) => {
+      this.$refs["form"].validate((valid) => {
         if (!valid) {
-          return
+          return;
         }
         // 修改的提交
         if (this.form.id != null) {
-          if(this.addInfoList.length === 0 && this.addInfoUpdateList.length === 0){
+          if (
+            this.addInfoList.length === 0 &&
+            this.addInfoUpdateList.length === 0
+          ) {
             updateDealerInfo(this.form).then((response) => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getDealerInfoList()
-            })
-          }else{
-            this.dataAreaGoodsInfo.dealerInfo = this.form
-            this.dataAreaGoodsInfo.areaGoodsList = this.addInfoList
-            this.dataAreaGoodsInfo.areaGoodsUpdateList = this.addInfoUpdateList
-            updateDealerAndAreaGoodsInfo(this.dataAreaGoodsInfo).then((response) => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getDealerInfoList()
-            })
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getDealerInfoList();
+            });
+          } else {
+            this.dataAreaGoodsInfo.dealerInfo = this.form;
+            this.dataAreaGoodsInfo.areaGoodsList = this.addInfoList;
+            this.dataAreaGoodsInfo.areaGoodsUpdateList = this.addInfoUpdateList;
+            updateDealerAndAreaGoodsInfo(this.dataAreaGoodsInfo).then(
+              (response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getDealerInfoList();
+              }
+            );
           }
-          return
+          return;
         }
         // 经销商信息添加的提交 经销商区域/商品添加的提交
-        if(this.addInfoList.length === 0){
+        if (this.addInfoList.length === 0) {
           createDealerInfo(this.form).then((response) => {
-            if(response.data){
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.getDealerInfoList()
-              this.reset()
+            if (response.data) {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getDealerInfoList();
+              this.reset();
             }
-          })
-        }else{
-          this.dataAreaGoodsInfo.dealerInfo = this.form
-          this.dataAreaGoodsInfo.areaGoodsList = this.addInfoList
-          createDealerAndAreaGoodsInfo(this.dataAreaGoodsInfo).then((response) => {
-            if(response.data){
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.getDealerInfoList()
-              this.reset()
+          });
+        } else {
+          this.dataAreaGoodsInfo.dealerInfo = this.form;
+          this.dataAreaGoodsInfo.areaGoodsList = this.addInfoList;
+          createDealerAndAreaGoodsInfo(this.dataAreaGoodsInfo).then(
+            (response) => {
+              if (response.data) {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getDealerInfoList();
+                this.reset();
+              }
             }
-          })
+          );
         }
-      })
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const dealerId = row.dealerId
-      const id = row.id
+      const dealerId = row.dealerId;
+      const id = row.id;
       this.$modal
-        .confirm('是否确认删除该经销商？')
+        .confirm("是否确认删除该经销商？")
         .then(function () {
-          return deleteDealerAreaGoods(id)
+          return deleteDealerAreaGoods(id);
         })
         .then(() => {
-          this.getDealerInfoList()
-          this.$modal.msgSuccess('删除成功')
+          this.getDealerInfoList();
+          this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {})
+        .catch(() => {});
     },
 
     /** 删除经销商商品信息 */
     handleDeleteInputInfo(row) {
-      const id = row.id
-      const dealerId = this.form.dealerId
-      const belongBusinessId = this.form.belongBusinessId
+      const id = row.id;
+      const dealerId = this.form.dealerId;
+      const belongBusinessId = this.form.belongBusinessId;
 
-      this.$modal.confirm('是否确认删除该区域商品').then(function() {
-        return deleteDealerGoods(id);
-      }).then(() => {
-        this.getDealerGoodsList(dealerId,belongBusinessId);
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("是否确认删除该区域商品")
+        .then(function () {
+          return deleteDealerGoods(id);
+        })
+        .then(() => {
+          this.getDealerGoodsList(dealerId, belongBusinessId);
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
 
     /** 删除新增经销商商品信息 */
     handleDeleteNewInputInfo(row) {
-
-      this.$modal.confirm('是否确认删除该新增区域商品').then(function() {
-
-      }).then(() => {
-        this.addInfoTabList = this.addInfoTabList.filter(item => { return item.newIndex != row.newIndex})
-        this.addInfoList = this.addInfoList.filter(item => { return item.newIndex != row.newIndex})
-        this.inputInfoList = this.addInfoTabList.concat(this.inputInfoListTemp);
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("是否确认删除该新增区域商品")
+        .then(function () {})
+        .then(() => {
+          this.addInfoTabList = this.addInfoTabList.filter((item) => {
+            return item.newIndex != row.newIndex;
+          });
+          this.addInfoList = this.addInfoList.filter((item) => {
+            return item.newIndex != row.newIndex;
+          });
+          this.inputInfoList = this.addInfoTabList.concat(
+            this.inputInfoListTemp
+          );
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
 
     /** 编辑经销商商品信息 */
-    handleEditInputInfo(row){
-      this.queryGoodsListParams.belongBusinessId = this.form.belongBusinessId
-      this.updateAreaGoodsDoFlag = 1
+    handleEditInputInfo(row) {
+      this.queryGoodsListParams.belongBusinessId = this.form.belongBusinessId;
+      this.updateAreaGoodsDoFlag = 1;
       // 查询可选择的商品信息
-      getGoodsInfoQuery(this.queryGoodsListParams).then(response => {
-        const { data } = response
-        const options = []
-        const areaId = row.areaId
+      getGoodsInfoQuery(this.queryGoodsListParams).then((response) => {
+        const { data } = response;
+        const options = [];
+        const areaId = row.areaId;
         // console.log(data)
-        for(let i in data) {
+        for (let i in data) {
           options.push({
             key: data[i].id,
             label: data[i].goodsName,
             disabled: false,
-            ...data[i]
+            ...data[i],
           });
         }
         // 每次打开之前都需要初始/重置一些参数
         this.inputCheckedAreaList = {
-          commonSaleArea: row.saleArea
+          commonSaleArea: row.saleArea,
         };
-        this.inputInfoOptions = options
-        if(row.goodsId == '未选择'){
+        this.inputInfoOptions = options;
+        if (row.goodsId == "未选择") {
           this.inputCheckedIdList = [];
-        }else{
+        } else {
           this.inputCheckedIdList = [row.gid];
-          this.disabledSelectChange(this.inputCheckedIdList)
+          this.disabledSelectChange(this.inputCheckedIdList);
         }
         //this.inputInfoListTemp = data
-        this.leftCurrentPage = 1
-        this.rightCurrentPage = 1
-        this.selectInputVisible = true
-        this.addNewAreaGoodsEnable = false
-        this.leftDefaultChecked = []
-        this.rightDefaultChecked = []
-        this.updateDealerGoodsId = row.id
+        this.leftCurrentPage = 1;
+        this.rightCurrentPage = 1;
+        this.selectInputVisible = true;
+        this.addNewAreaGoodsEnable = false;
+        this.leftDefaultChecked = [];
+        this.rightDefaultChecked = [];
+        this.updateDealerGoodsId = row.id;
       });
     },
     /** 编辑新增经销商商品信息 */
-    handleEditNewInputInfo(row){
-      this.updateAreaGoodsDoFlag = 1
-      this.newIndex = row.newIndex
-      this.queryGoodsListParams.belongBusinessId = this.form.belongBusinessId
+    handleEditNewInputInfo(row) {
+      this.updateAreaGoodsDoFlag = 1;
+      this.newIndex = row.newIndex;
+      this.queryGoodsListParams.belongBusinessId = this.form.belongBusinessId;
       // 查询可选择的商品信息
-      getGoodsInfoQuery(this.queryGoodsListParams).then(response => {
+      getGoodsInfoQuery(this.queryGoodsListParams).then((response) => {
         const { data } = response;
         const options = [];
         // console.log(data)
-        for(let i in data) {
+        for (let i in data) {
           options.push({
             key: data[i].id,
             label: data[i].goodsName,
-            ...data[i]
+            ...data[i],
           });
         }
         // 每次打开之前都需要初始/重置一些参数
-        this.inputCheckedAreaList = {commonSaleArea: [row.saleArea],commonSaleAreaId:row.areaId};
+        this.inputCheckedAreaList = {
+          commonSaleArea: [row.saleArea],
+          commonSaleAreaId: row.areaId,
+        };
         this.inputInfoOptions = options;
-        if(row.id == 0){
+        if (row.id == 0) {
           this.inputCheckedIdList = [];
-        }else{
+        } else {
           this.inputCheckedIdList = [row.id];
-          this.disabledSelectChange(this.inputCheckedIdList)
+          this.disabledSelectChange(this.inputCheckedIdList);
         }
         //this.inputInfoListTemp = data;
         this.leftCurrentPage = 1;
         this.rightCurrentPage = 1;
         this.selectInputVisible = true;
-        this.addNewAreaGoodsEnable = true
+        this.addNewAreaGoodsEnable = true;
         this.leftDefaultChecked = [];
         this.rightDefaultChecked = [];
       });
@@ -837,29 +992,29 @@ export default {
       console.log(value, direction, movedKeys);
       //进行商品信息编辑操作时，限制右侧只可以选择1个
       this.inputCheckedIdList = value;
-      if(this.updateAreaGoodsDoFlag == 1 ){
-        if(direction == 'right' && value.length >= 1){
-          const selectedKey = value.map(item => item)
-          this.inputInfoOptions.forEach(item => {
-            if(!selectedKey.includes(item.key)){
-              item.disabled = true
+      if (this.updateAreaGoodsDoFlag == 1) {
+        if (direction == "right" && value.length >= 1) {
+          const selectedKey = value.map((item) => item);
+          this.inputInfoOptions.forEach((item) => {
+            if (!selectedKey.includes(item.key)) {
+              item.disabled = true;
             }
-          })
-        }else if(direction == 'left'){
-          this.inputInfoOptions.forEach(item => {
-              item.disabled = false
-          })
+          });
+        } else if (direction == "left") {
+          this.inputInfoOptions.forEach((item) => {
+            item.disabled = false;
+          });
         }
       }
     },
     //进行商品信息编辑时，限制穿梭窗左侧选项为不可选
-    disabledSelectChange(value){
-      const selectedKey = value.map(item => item)
-      this.inputInfoOptions.forEach(item => {
-        if(!selectedKey.includes(item.key)){
-          item.disabled = true
+    disabledSelectChange(value) {
+      const selectedKey = value.map((item) => item);
+      this.inputInfoOptions.forEach((item) => {
+        if (!selectedKey.includes(item.key)) {
+          item.disabled = true;
         }
-      })
+      });
     },
 
     /*  左侧分页参数变化时  */
@@ -867,7 +1022,7 @@ export default {
     // 这里做同步修改之后，再次打开该弹窗时上面的重置数据才会被子组件监听到。。。
     // 当然如果嫌麻烦可以直接给dialog 加个if直接销毁
     handlePageChange(value, type) {
-      if(type === 'left') {
+      if (type === "left") {
         this.leftCurrentPage = value;
       } else {
         this.rightCurrentPage = value;
@@ -877,8 +1032,13 @@ export default {
     transferLeftCheckChange(values) {
       this.leftDefaultChecked = values;
       //当进行编辑时禁用全选按钮
-      if(this.leftDefaultChecked.length > 1 && this.updateAreaGoodsDoFlag == 1){
-        this.leftDefaultChecked = this.leftDefaultChecked.map(item => !this.leftDefaultChecked.includes(item))
+      if (
+        this.leftDefaultChecked.length > 1 &&
+        this.updateAreaGoodsDoFlag == 1
+      ) {
+        this.leftDefaultChecked = this.leftDefaultChecked.map(
+          (item) => !this.leftDefaultChecked.includes(item)
+        );
       }
     },
 
@@ -887,33 +1047,45 @@ export default {
     },
 
     renderTransferLabel(h, option) {
-      return <div><span style='margin-left: 20px;'>{ option.label }</span><span style='margin: 0px 30px; color: #e6ebf5'>|</span><span>{ option.goodsId }</span></div>;
+      return (
+        <div>
+          <span style="margin-left: 20px;">{option.label}</span>
+          <span style="margin: 0px 30px; color: #e6ebf5">|</span>
+          <span>{option.goodsId}</span>
+        </div>
+      );
     },
 
     /** 打开新增经销商商品信息窗口 */
     openSelectInputDialog() {
-      if(this.form.belongBusinessId == undefined || this.form.belongBusinessId == ''){
-        this.$message.error('请先选择所属商户')
+      if (
+        this.form.belongBusinessId == undefined ||
+        this.form.belongBusinessId == ""
+      ) {
+        this.$message.error("请先选择所属商户");
         // this.$modal.confirm('请先选择所属商户')
-        return
+        return;
       }
 
-      this.queryGoodsListParams.belongBusinessId = this.form.belongBusinessId
+      this.queryGoodsListParams.belongBusinessId = this.form.belongBusinessId;
 
       // 查询可选择的商品信息
-      getGoodsInfoQuery(this.queryGoodsListParams).then(response => {
+      getGoodsInfoQuery(this.queryGoodsListParams).then((response) => {
         const { data } = response;
         const options = [];
         // console.log(data)
-        for(let i in data) {
+        for (let i in data) {
           options.push({
             key: data[i].id,
             label: data[i].goodsName,
-            ...data[i]
+            ...data[i],
           });
         }
         // 每次打开之前都需要初始/重置一些参数
-        this.inputCheckedAreaList = {commonSaleArea:'',commonSaleAreaId: undefined};
+        this.inputCheckedAreaList = {
+          commonSaleArea: "",
+          commonSaleAreaId: undefined,
+        };
         this.inputInfoOptions = options;
         //this.inputInfoListTemp = data;
         this.leftCurrentPage = 1;
@@ -923,7 +1095,7 @@ export default {
         this.rightDefaultChecked = [];
         this.selectInputVisible = true;
         this.addNewAreaGoodsEnable = true;
-        this.updateAreaGoodsDoFlag = 0
+        this.updateAreaGoodsDoFlag = 0;
       });
     },
 
@@ -934,103 +1106,135 @@ export default {
 
     resetTransferQuery() {
       // 执行子组件中的重置所有搜索框的方法
-      this.$refs.inputTransfer.$emit("resetAllSearchInput")
+      this.$refs.inputTransfer.$emit("resetAllSearchInput");
     },
 
     submitSelectInput() {
-      this.$refs['formSaleArea'].validate((valid) => {
+      this.$refs["formSaleArea"].validate((valid) => {
         if (!valid) {
-          return
+          return;
         }
         this.selectInputVisible = false;
         // const addIdList = this.inputCheckedIdList.filter(item => !this.inputInfoIdList.includes(item));
         const addIdList = this.inputCheckedIdList;
-        const addGoodList = this.inputInfoOptions.filter(item => addIdList.includes(item.key));
-        if(this.form.dealerId == ' '){
-          this.form.dealerId = null
+        const addGoodList = this.inputInfoOptions.filter((item) =>
+          addIdList.includes(item.key)
+        );
+        if (this.form.dealerId == " ") {
+          this.form.dealerId = null;
         }
-        if(addIdList.length > 0) {
+        if (addIdList.length > 0) {
           //新增区域商品
           // const selectedList = this.inputInfoListTemp.filter(item => this.inputCheckedIdList.includes(item.id));
           const addList = [];
           const goodsArea = this.inputCheckedAreaList.commonSaleArea;
           const addDealerGoodsLsit = [];
-          for(let i = 0; i < addIdList.length; i++) {
-            this.updateNewIndex = this.updateNewIndex+1;
+          for (let i = 0; i < addIdList.length; i++) {
+            this.updateNewIndex = this.updateNewIndex + 1;
             addList.push({
               // province:goodsArea[0],
               // city:goodsArea[1],
               // county:goodsArea[2],
-              saleArea:goodsArea,
-              inputsGoodsName:addGoodList[i].goodsName,
-              areaId:this.inputCheckedAreaList.commonSaleAreaId,
-              id:addGoodList[i].id,
-              newIndex:this.updateNewIndex,
-              newGoods:1
+              saleArea: goodsArea,
+              inputsGoodsName: addGoodList[i].goodsName,
+              areaId: this.inputCheckedAreaList.commonSaleAreaId,
+              id: addGoodList[i].id,
+              newIndex: this.updateNewIndex,
+              newGoods: 1,
             });
             addDealerGoodsLsit.push({
-              dealerId:this.form.dealerId,
-              dealerName:this.form.dealerName,
-              goodsId:addGoodList[i].goodsId,
-              goodsName:addGoodList[i].goodsName,
-              belongBusinessName:addGoodList[i].belongBusinessName,
-              belongBusinessId:addGoodList[i].belongBusinessId,
-              saleAreaId:this.inputCheckedAreaList.commonSaleAreaId,
-              saleArea:goodsArea,
-              newIndex:this.updateNewIndex
-            })
+              dealerId: this.form.dealerId,
+              dealerName: this.form.dealerName,
+              goodsId: addGoodList[i].goodsId,
+              goodsName: addGoodList[i].goodsName,
+              belongBusinessName: addGoodList[i].belongBusinessName,
+              belongBusinessId: addGoodList[i].belongBusinessId,
+              saleAreaId: this.inputCheckedAreaList.commonSaleAreaId,
+              saleArea: goodsArea,
+              newIndex: this.updateNewIndex,
+            });
           }
-          if(this.newIndex != undefined){
-            this.addInfoTabList = addList.concat(this.addInfoTabList.filter(item => { return item.newIndex != this.newIndex}));
-            this.addInfoList = addDealerGoodsLsit.concat(this.addInfoList.filter(item => { return item.newIndex != this.newIndex}));
+          if (this.newIndex != undefined) {
+            this.addInfoTabList = addList.concat(
+              this.addInfoTabList.filter((item) => {
+                return item.newIndex != this.newIndex;
+              })
+            );
+            this.addInfoList = addDealerGoodsLsit.concat(
+              this.addInfoList.filter((item) => {
+                return item.newIndex != this.newIndex;
+              })
+            );
             // this.inputInfoList = this.inputInfoListTemp.concat(this.addInfoTabList);
-            this.inputInfoList = this.addInfoTabList.concat(this.inputInfoListTemp);
-            console.log("*****update1****")
-            console.log( this.addInfoTabList)
-            console.log("*********")
-          }else{
-            this.addInfoTabList = addList.concat(this.addInfoTabList.filter(item => { return item.newIndex != this.newIndex}));
-            this.addInfoList = addDealerGoodsLsit.concat(this.addInfoList.filter(item => { return item.newIndex != this.newIndex}));
-            this.inputInfoList = this.addInfoTabList.concat(this.inputInfoListTemp);
-            console.log("*********")
-            console.log( this.addInfoTabList)
-            console.log("*********")
+            this.inputInfoList = this.addInfoTabList.concat(
+              this.inputInfoListTemp
+            );
+            console.log("*****update1****");
+            console.log(this.addInfoTabList);
+            console.log("*********");
+          } else {
+            this.addInfoTabList = addList.concat(
+              this.addInfoTabList.filter((item) => {
+                return item.newIndex != this.newIndex;
+              })
+            );
+            this.addInfoList = addDealerGoodsLsit.concat(
+              this.addInfoList.filter((item) => {
+                return item.newIndex != this.newIndex;
+              })
+            );
+            this.inputInfoList = this.addInfoTabList.concat(
+              this.inputInfoListTemp
+            );
+            console.log("*********");
+            console.log(this.addInfoTabList);
+            console.log("*********");
           }
           // 清空一次this.inputCheckedIdList 避免vue监听不到变化
           this.inputCheckedIdList = [];
-        }else{
+        } else {
           const addList = [];
           const goodsArea = this.inputCheckedAreaList.commonSaleArea;
           const addDealerGoodsLsit = [];
-          this.updateNewIndex = this.updateNewIndex+1;
+          this.updateNewIndex = this.updateNewIndex + 1;
           addList.push({
             // province:goodsArea[0],
             // city:goodsArea[1],
             // county:goodsArea[2],
-            saleArea:goodsArea,
-            inputsGoodsName:'未选择',
-            areaId:this.inputCheckedAreaList.commonSaleAreaId,
-            id:0,
-            newGoods:1,
-            newIndex:this.updateNewIndex
+            saleArea: goodsArea,
+            inputsGoodsName: "未选择",
+            areaId: this.inputCheckedAreaList.commonSaleAreaId,
+            id: 0,
+            newGoods: 1,
+            newIndex: this.updateNewIndex,
           });
           addDealerGoodsLsit.push({
-            dealerId:this.form.dealerId,
-            dealerName:this.form.dealerName,
-            goodsId:'未选择',
-            goodsName:'未选择',
-            belongBusinessName:'未选择',
-            belongBusinessId:this.form.belongBusinessId,
-            saleAreaId:this.inputCheckedAreaList.commonSaleAreaId,
-            saleArea:goodsArea,
-            newIndex:this.updateNewIndex
-          })
-          this.addInfoTabList = addList.concat(this.addInfoTabList.filter(item => { return item.newIndex != this.newIndex}));
-            this.addInfoList = addDealerGoodsLsit.concat(this.addInfoList.filter(item => { return item.newIndex != this.newIndex}));
-            this.inputInfoList = this.addInfoTabList.concat(this.inputInfoListTemp);
-            console.log("*****update0****")
-            console.log( this.addInfoTabList)
-            console.log("*********")
+            dealerId: this.form.dealerId,
+            dealerName: this.form.dealerName,
+            goodsId: "未选择",
+            goodsName: "未选择",
+            belongBusinessName: "未选择",
+            belongBusinessId: this.form.belongBusinessId,
+            saleAreaId: this.inputCheckedAreaList.commonSaleAreaId,
+            saleArea: goodsArea,
+            newIndex: this.updateNewIndex,
+          });
+          this.addInfoTabList = addList.concat(
+            this.addInfoTabList.filter((item) => {
+              return item.newIndex != this.newIndex;
+            })
+          );
+          this.addInfoList = addDealerGoodsLsit.concat(
+            this.addInfoList.filter((item) => {
+              return item.newIndex != this.newIndex;
+            })
+          );
+          this.inputInfoList = this.addInfoTabList.concat(
+            this.inputInfoListTemp
+          );
+          console.log("*****update0****");
+          console.log(this.addInfoTabList);
+          console.log("*********");
           // if(this.newIndex != undefined){
           //   this.addInfoTabList = addList.concat(this.addInfoTabList.filter(item => { return item.newIndex != this.newIndex}));
           //   this.addInfoList = addDealerGoodsLsit.concat(this.addInfoList.filter(item => { return item.newIndex != this.newIndex}));
@@ -1049,93 +1253,100 @@ export default {
           // 清空一次this.inputCheckedIdList 避免vue监听不到变化
           this.inputCheckedIdList = [];
         }
-        this.newIndex = undefined
-        if(this.aaddInfoTabVisible == false){
+        this.newIndex = undefined;
+        if (this.aaddInfoTabVisible == false) {
           this.aaddInfoTabVisible = true;
         }
-      })
+      });
     },
 
     //更新已经在数据库中的经销商商品信息
     submitSelectUpdateInput() {
-      this.$refs['formSaleArea'].validate((valid) => {
+      this.$refs["formSaleArea"].validate((valid) => {
         if (!valid) {
-          return
+          return;
         }
         this.selectInputVisible = false;
         const addIdList = this.inputCheckedIdList;
-        const addGoodList = this.inputInfoOptions.filter(item => addIdList.includes(item.key));
-        if(addIdList.length > 0) {
+        const addGoodList = this.inputInfoOptions.filter((item) =>
+          addIdList.includes(item.key)
+        );
+        if (addIdList.length > 0) {
           //更新区域商品
           const addList = [];
           const goodsArea = this.inputCheckedAreaList.commonSaleArea;
           const addDealerGoodsLsit = [];
-          for(let i = 0; i < addIdList.length; i++) {
+          for (let i = 0; i < addIdList.length; i++) {
             addList.push({
               // province:goodsArea[0],
               // city:goodsArea[1],
               // county:goodsArea[2],
-              saleArea:goodsArea,
-              inputsGoodsName:addGoodList[i].goodsName,
-              areaId:this.inputCheckedAreaList.commonSaleAreaId,
-              goodsId:addGoodList[i].goodsId,
-              id:this.updateDealerGoodsId,
-              gid:addGoodList[i].id
+              saleArea: goodsArea,
+              inputsGoodsName: addGoodList[i].goodsName,
+              areaId: this.inputCheckedAreaList.commonSaleAreaId,
+              goodsId: addGoodList[i].goodsId,
+              id: this.updateDealerGoodsId,
+              gid: addGoodList[i].id,
             });
             addDealerGoodsLsit.push({
-              dealerId:this.form.dealerId,
-              dealerName:this.form.dealerName,
-              goodsId:addGoodList[i].goodsId,
-              goodsName:addGoodList[i].goodsName,
-              belongBusinessName:addGoodList[i].belongBusinessName,
-              belongBusinessId:addGoodList[i].belongBusinessId,
-              saleAreaId:this.inputCheckedAreaList.commonSaleAreaId,
-              saleArea:goodsArea,
-              id:this.updateDealerGoodsId,
+              dealerId: this.form.dealerId,
+              dealerName: this.form.dealerName,
+              goodsId: addGoodList[i].goodsId,
+              goodsName: addGoodList[i].goodsName,
+              belongBusinessName: addGoodList[i].belongBusinessName,
+              belongBusinessId: addGoodList[i].belongBusinessId,
+              saleAreaId: this.inputCheckedAreaList.commonSaleAreaId,
+              saleArea: goodsArea,
+              id: this.updateDealerGoodsId,
               //gid:addGoodList[i].id
-            })
+            });
           }
-          this.inputInfoList = addList.concat(this.inputInfoList.filter(item => { return item.id != this.updateDealerGoodsId}));
-          this.addInfoUpdateList = addDealerGoodsLsit.concat(this.addInfoUpdateList.filter(item => { return item.id != this.updateDealerGoodsId}));
+          this.inputInfoList = addList.concat(
+            this.inputInfoList.filter((item) => {
+              return item.id != this.updateDealerGoodsId;
+            })
+          );
+          this.addInfoUpdateList = addDealerGoodsLsit.concat(
+            this.addInfoUpdateList.filter((item) => {
+              return item.id != this.updateDealerGoodsId;
+            })
+          );
           // 清空一次this.inputCheckedIdList 避免vue监听不到变化
           this.inputCheckedIdList = [];
         }
-
-      })
+      });
     },
 
     //经销商信息进行编辑时，更改所属商户下方所属商品信息动态变更
-    businessIdChangeToSelectGooods(){
+    businessIdChangeToSelectGooods() {
       //切换商户时清空之前的添加和修改的商品
-      this.addInfoList = []
-      this.addInfoTabList = []
-      this.addInfoUpdateList = []
-      if(this.form.dealerId == undefined){
-        this.form.dealerId = " "
+      this.addInfoList = [];
+      this.addInfoTabList = [];
+      this.addInfoUpdateList = [];
+      if (this.form.dealerId == undefined) {
+        this.form.dealerId = " ";
       }
-      this.getDealerGoodsList(this.form.dealerId,this.form.belongBusinessId)
+      this.getDealerGoodsList(this.form.dealerId, this.form.belongBusinessId);
     },
 
     //父组件中获取地区组件传递参数方法
-    getArea(val){
-      this.form.commonSaleArea = val
+    getArea(val) {
+      this.form.commonSaleArea = val;
     },
-    getAreaId(val){
-      this.form.commonSaleAreaId = val
+    getAreaId(val) {
+      this.form.commonSaleAreaId = val;
     },
-    getGoodsArea(val){
-      this.inputCheckedAreaList.commonSaleArea = val
+    getGoodsArea(val) {
+      this.inputCheckedAreaList.commonSaleArea = val;
     },
-    getGoodsAreaId(val){
-      this.inputCheckedAreaList.commonSaleAreaId = val
+    getGoodsAreaId(val) {
+      this.inputCheckedAreaList.commonSaleAreaId = val;
     },
     //获取el-select选择的标签
-    labelClick(data){
+    labelClick(data) {
       this.form.belongBusinessName = data;
     },
-
-  }
-}
+  },
+};
 </script>
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/basic/vendorInfo/index.vue b/src/views/basic/vendorInfo/index.vue
index 29d725c..83352e9 100644
--- a/src/views/basic/vendorInfo/index.vue
+++ b/src/views/basic/vendorInfo/index.vue
@@ -22,7 +22,7 @@
 
       <!-- 列表 -->
       <el-table v-loading="loading" :data="list">
-        <el-table-column label="编号" align="center" type="index" width="80" >
+        <el-table-column label="序号" align="center" type="index" width="80" >
           <template v-slot="{ $index }">
             <span>{{($index+1)+ (searchFormParam.queryParams.pageNo-1)*searchFormParam.queryParams.pageSize }}</span>
           </template>
diff --git a/src/views/basic/workersInfo/index.vue b/src/views/basic/workersInfo/index.vue
index 7aeb6a6..f96b63b 100644
--- a/src/views/basic/workersInfo/index.vue
+++ b/src/views/basic/workersInfo/index.vue
@@ -16,13 +16,13 @@
     <div class="app-container-list main-bgcolor main-radius shopping">
       <div class="shopping-top">
         <div class="shopping-title">员工列表</div>
-        <el-button class="shopping-add-btn" type="primary" plain @click="handleAdd" 
+        <el-button class="shopping-add-btn" type="primary" plain @click="handleAdd"
           v-hasPermi="['basic:workers-info:create']">添加员工</el-button>
       </div>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="编号" align="center"  width="80px">
+      <el-table-column label="序号" align="center"  width="80px">
         <template slot-scope="scope">
             {{ (scope.$index+1)+(searchFormParam.queryParams.pageNo-1)*searchFormParam.queryParams.pageSize }}
         </template>
@@ -55,7 +55,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="top">
         <el-form-item label="所属商户" prop="belongBusinessName">
           <div style="display: flex;">
-            <el-select v-model="form.belongBusinessId" :placeholder=this.belongBusinessPlaceholder clearable filterable style="flex: 1;"> 
+            <el-select v-model="form.belongBusinessId" :placeholder=this.belongBusinessPlaceholder clearable filterable style="flex: 1;">
               <el-option v-for="businessInfo in businessNameList"
                :key="businessInfo.index" :label="businessInfo.businessName" :value="businessInfo.id" @click.native="labelClick(businessInfo.businessName)"/>
             </el-select>
@@ -197,7 +197,7 @@ export default {
         this.total = response.data.total;
         this.loading = false;
       });
-    },    
+    },
     /** 获取商户名称列表 */
     getBusinessNameList(){
       getBusinessNameList().then(response => {
@@ -273,7 +273,7 @@ export default {
         if (!valid) {
           return;
         }
-        
+
         // 修改的提交
         if (this.form.id != null) {
           updateWorkersInfo(this.form).then(response => {
@@ -312,11 +312,11 @@ export default {
         }).catch(() => {});
     },
 
-    //获取el-select选择的标签 
+    //获取el-select选择的标签
     labelClick(data){
       this.form.belongBusinessName = data;
     },
-    
+
   }
 };
 </script>
diff --git a/src/views/configure/inspectionTemplate/index.vue b/src/views/configure/inspectionTemplate/index.vue
index b8d5698..c9f65c6 100644
--- a/src/views/configure/inspectionTemplate/index.vue
+++ b/src/views/configure/inspectionTemplate/index.vue
@@ -20,11 +20,12 @@
       </div>
       <!-- 列表 -->
       <el-table v-loading="loading" :data="list">
-        <el-table-column label="编号" align="center" type="index" width="80" >
+        <el-table-column label="序号" align="center" type="index" width="80" >
           <template v-slot="{ $index }">
             <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="检测报告模板编号" align="center" prop="templateId" />
         <el-table-column label="检测报告模板名称" align="center" prop="templateName" />
         <el-table-column label="所属商户名称" align="center" prop="belongBusinessName" />
         <el-table-column label="创建时间" align="center" prop="createTime" >
@@ -309,7 +310,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除检测报告模板编号为"' + id + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除检测报告模板编号为"' + row.templateId + '"的数据项?').then(function() {
           return deleteInspectionTemplate(id);
         }).then(() => {
           this.getList();
diff --git a/src/views/configure/traceTemplate/index.vue b/src/views/configure/traceTemplate/index.vue
index db90f86..2a5707d 100644
--- a/src/views/configure/traceTemplate/index.vue
+++ b/src/views/configure/traceTemplate/index.vue
@@ -22,11 +22,12 @@
 
       <!-- 列表 -->
       <el-table v-loading="loading" :data="list">
-        <el-table-column label="编号" align="center" type="index" width="80" >
+        <el-table-column label="序号" align="center" type="index" width="80" >
           <template v-slot="{ $index }">
             <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="模板编号" align="center" prop="templateId" />
         <el-table-column label="模板名称" align="center" prop="templateName" />
         <el-table-column label="创建时间" align="center" prop="createTime" >
           <template v-slot="{ row }">
@@ -301,7 +302,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除溯源模板编号为"' + id + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除溯源模板编号为"' + row.templateId + '"的数据项?').then(function() {
           return deleteTraceTemplate(id);
         }).then(() => {
           this.getList();
diff --git a/src/views/goods/goodsInfo/index.vue b/src/views/goods/goodsInfo/index.vue
index 670f5bb..157e79b 100644
--- a/src/views/goods/goodsInfo/index.vue
+++ b/src/views/goods/goodsInfo/index.vue
@@ -28,7 +28,7 @@
 
       <!-- 列表 -->
       <el-table v-loading="loading" :data="list">
-        <el-table-column label="编号" align="center" type="index" width="80">
+        <el-table-column label="序号" align="center" type="index" width="80">
           <template v-slot="{ $index }">
             <span>{{
               $index + 1 + (queryParams.pageNo - 1) * queryParams.pageSize
diff --git a/src/views/identity/businessRule/index.vue b/src/views/identity/businessRule/index.vue
index 5115c03..862cb6f 100644
--- a/src/views/identity/businessRule/index.vue
+++ b/src/views/identity/businessRule/index.vue
@@ -18,7 +18,7 @@
       <h1>码仓列表  </h1>
       <br/>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="编号" align="center" type="index" width="80" >
+      <el-table-column label="序号" align="center" type="index" width="80" >
         <template v-slot="{ $index }">
           <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
         </template>
diff --git a/src/views/identity/generateRecord/index.vue b/src/views/identity/generateRecord/index.vue
index ef05337..f43e56f 100644
--- a/src/views/identity/generateRecord/index.vue
+++ b/src/views/identity/generateRecord/index.vue
@@ -17,7 +17,7 @@
     <div class="app-container-list main-bgcolor main-radius">
       <h1>生码列表</h1>
       <el-table v-loading="loading" :data="list">
-        <el-table-column label="编号" align="center" type="index" width="80" >
+        <el-table-column label="序号" align="center" type="index" width="80" >
           <template v-slot="{ $index }">
             <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
           </template>
@@ -98,7 +98,9 @@
           </el-form-item>
         </el-form>
         <div class="drawer-footer">
-          <el-button type="primary" @click="submitForm">生 成</el-button>
+          <el-button type="primary" @click="submitForm" >
+            生 成
+          </el-button>
           <el-button @click="openDraw = false">取 消</el-button>
         </div>
       </div>
@@ -275,6 +277,12 @@ export default {
         if (!valid) {
           return;
         }
+        const loading = this.$loading({
+          lock: true,
+          text: '码包生成中, 请您等待几秒, 稍微休息一下~~~~~',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
         // 添加的提交
         createGenerateRecord(this.form).then(res => {
           if(res.data){
@@ -283,6 +291,8 @@ export default {
             this.openDraw = false;
             this.getList();
           }
+        }).finally(() => {
+          loading.close();
         });
       });
     },
diff --git a/src/views/identity/scanRecord/index.vue b/src/views/identity/scanRecord/index.vue
index 4ed7fdf..f3be182 100644
--- a/src/views/identity/scanRecord/index.vue
+++ b/src/views/identity/scanRecord/index.vue
@@ -25,7 +25,7 @@
       </div>
 
       <el-table v-loading="loading" :data="list">
-        <el-table-column label="编号" align="center" type="index" width="80" >
+        <el-table-column label="序号" align="center" type="index" width="80" >
           <template v-slot="{ $index }">
             <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
           </template>
@@ -294,7 +294,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除标识码生成记录编号为"' + id + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除标识码生成记录编号为"' + row.generateRecordId + '"的数据项?').then(function() {
           return deleteGenerateRecord(id);
         }).then(() => {
           this.getList();
diff --git a/src/views/production/harvestBatch/index.vue b/src/views/production/harvestBatch/index.vue
index 30ca431..ab6b8b5 100644
--- a/src/views/production/harvestBatch/index.vue
+++ b/src/views/production/harvestBatch/index.vue
@@ -22,7 +22,6 @@
       </div>
       <!-- 列表 -->
       <el-table v-loading="loading" :data="list">
-        <el-table-column type="selection" width="55"/>
         <el-table-column label="编号" align="center" type="index" width="80" >
           <template v-slot="{ $index }">
             <span>{{($index+1)+ (searchFormParam.queryParams.pageNo-1)*searchFormParam.queryParams.pageSize }}</span>
diff --git a/src/views/production/harvestInfo/index.vue b/src/views/production/harvestInfo/index.vue
index c9b0933..bd8d874 100644
--- a/src/views/production/harvestInfo/index.vue
+++ b/src/views/production/harvestInfo/index.vue
@@ -467,7 +467,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除采收入库编号为"' + id + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除采收入库单号为"' + row.harverstId + '"的数据项?').then(function() {
           return deleteHarvestInfo(id);
         }).then(() => {
           this.getList();
diff --git a/src/views/production/inspection/index.vue b/src/views/production/inspection/index.vue
index 5766141..95abbcd 100644
--- a/src/views/production/inspection/index.vue
+++ b/src/views/production/inspection/index.vue
@@ -22,7 +22,7 @@
 
       <!-- 列表 -->
       <el-table v-loading="loading" :data="list">
-        <el-table-column label="编号" align="center" type="index" width="80" >
+        <el-table-column label="序号" align="center" type="index" width="80" >
           <template v-slot="{ $index }">
             <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
           </template>
@@ -624,7 +624,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除检验检疫编号为"' + id + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除入库批次为"' + row.harvestBatchId + '"的数据项?').then(function() {
           return deleteInspection(id);
         }).then(() => {
           this.getList();
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index ce7cb96..0ee13bc 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -113,7 +113,7 @@
       </el-table-column>
       <el-table-column label="联系人" align="center" prop="contactName" />
       <el-table-column label="联系手机" align="center" prop="contactMobile" />
-      <el-table-column label="账号额度" align="center" prop="accountCount">
+      <el-table-column label="用户上限数量" align="center" prop="accountCount">
         <template v-slot="scope">
           <el-tag> {{ scope.row.accountCount }} </el-tag>
         </template>
@@ -179,7 +179,7 @@
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="租户名" prop="name">
           <el-input v-model="form.name" placeholder="请输入租户名" maxlength="30" />
         </el-form-item>
@@ -224,10 +224,10 @@
             maxlength="20"
           />
         </el-form-item>
-        <el-form-item label="账号额度" prop="accountCount">
+        <el-form-item label="用户上限数量" prop="accountCount">
           <el-input-number
             v-model="form.accountCount"
-            placeholder="请输入账号额度"
+            placeholder="请输入用户上限数量"
             controls-position="right"
             :min="0"
             :max="999999999"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index b5e5d39..3599f69 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -7,82 +7,254 @@
     <el-row :gutter="20">
       <!--用户数据-->
       <el-col :span="24" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
           <el-form-item label="用户名称" prop="username">
-            <el-input v-model="queryParams.username" placeholder="请输入用户名称" clearable style="width: 240px"
-                      @keyup.enter.native="handleQuery"/>
+            <el-input
+              v-model="queryParams.username"
+              placeholder="请输入用户名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="手机号码" prop="mobile">
-            <el-input v-model="queryParams.mobile" placeholder="请输入手机号码" clearable style="width: 240px"
-                      @keyup.enter.native="handleQuery"/>
+            <el-input
+              v-model="queryParams.mobile"
+              placeholder="请输入手机号码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-              <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+            <el-select
+              v-model="queryParams.status"
+              placeholder="用户状态"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in statusDictDatas"
+                :key="parseInt(dict.value)"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="创建时间" prop="createTime">
-            <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+            <el-date-picker
+              v-model="queryParams.createTime"
+              style="width: 240px"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+            />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </el-form>
 
+        <div
+          style="
+            width: 300px;
+            text-align: center;
+            background-color: #ffffff;
+            padding: 5px;
+            border-radius: 3px;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+            font-size: 14px;
+            margin-bottom: 10px;
+          "
+        >
+          <i class="el-icon-info" style=""></i>
+          <span style="margin-left: 5px">
+            当前租户可创建用户数量为
+            <span style="color: #4fb8fe">{{ total }}</span>
+            /
+            <span style="color: #4fb8fe">{{ userMaxNum }}</span>
+          </span>
+        </div>
+
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                       v-hasPermi="['system:user:create']">新增</el-button>
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['system:user:create']"
+              >新增</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport"
-                       v-hasPermi="['system:user:import']">导入</el-button>
+            <el-button
+              type="info"
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="['system:user:import']"
+              >导入</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                       v-hasPermi="['system:user:export']">导出</el-button>
+            <el-button
+              type="warning"
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              :loading="exportLoading"
+              v-hasPermi="['system:user:export']"
+              >导出</el-button
+            >
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+            :columns="columns"
+          ></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="userList">
-          <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="username" prop="username" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickname" prop="nickname" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" key="status" v-if="columns[5].visible" align="center">
+          <el-table-column
+            label="用户编号"
+            align="center"
+            key="id"
+            prop="id"
+            v-if="columns[0].visible"
+          />
+          <el-table-column
+            label="用户名称"
+            align="center"
+            key="username"
+            prop="username"
+            v-if="columns[1].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="用户昵称"
+            align="center"
+            key="nickname"
+            prop="nickname"
+            v-if="columns[2].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="手机号码"
+            align="center"
+            key="mobile"
+            prop="mobile"
+            v-if="columns[4].visible"
+            width="120"
+          />
+          <el-table-column
+            label="状态"
+            key="status"
+            v-if="columns[5].visible"
+            align="center"
+          >
             <template v-slot="scope">
-              <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
+              <el-switch
+                v-model="scope.row.status"
+                :active-value="0"
+                :inactive-value="1"
+                @change="handleStatusChange(scope.row)"
+              />
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            v-if="columns[6].visible"
+            width="160"
+          >
             <template v-slot="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
             <template v-slot="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                         v-hasPermi="['system:user:update']">修改</el-button>
-              <el-dropdown  @command="(command) => handleCommand(command, scope.$index, scope.row)"
-                            v-hasPermi="['system:user:delete', 'system:user:update-password', 'system:permission:assign-user-role']">
-                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:update']"
+                >修改</el-button
+              >
+              <el-dropdown
+                @command="
+                  (command) => handleCommand(command, scope.$index, scope.row)
+                "
+                v-hasPermi="[
+                  'system:user:delete',
+                  'system:user:update-password',
+                  'system:permission:assign-user-role',
+                ]"
+              >
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right"
+                  >更多</el-button
+                >
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleDelete" v-if="scope.row.id !== 1" size="mini" type="text" icon="el-icon-delete"
-                                    v-hasPermi="['system:user:delete']">删除</el-dropdown-item>
-                  <el-dropdown-item command="handleResetPwd" size="mini" type="text" icon="el-icon-key"
-                                    v-hasPermi="['system:user:update-password']">重置密码</el-dropdown-item>
-                  <el-dropdown-item command="handleRole" size="mini" type="text" icon="el-icon-circle-check"
-                                    v-hasPermi="['system:permission:assign-user-role']">分配角色</el-dropdown-item>
+                  <el-dropdown-item
+                    command="handleDelete"
+                    v-if="scope.row.id !== 1"
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    v-hasPermi="['system:user:delete']"
+                    >删除</el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    command="handleResetPwd"
+                    size="mini"
+                    type="text"
+                    icon="el-icon-key"
+                    v-hasPermi="['system:user:update-password']"
+                    >重置密码</el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    command="handleRole"
+                    size="mini"
+                    type="text"
+                    icon="el-icon-circle-check"
+                    v-hasPermi="['system:permission:assign-user-role']"
+                    >分配角色</el-dropdown-item
+                  >
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                    @pagination="getList"/>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNo"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
@@ -97,28 +269,54 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="mobile">
-              <el-input v-model="form.mobile" placeholder="请输入手机号码" maxlength="11" />
+              <el-input
+                v-model="form.mobile"
+                placeholder="请输入手机号码"
+                maxlength="11"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input
+                v-model="form.email"
+                placeholder="请输入邮箱"
+                maxlength="50"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.id === undefined" label="用户名称" prop="username">
+            <el-form-item
+              v-if="form.id === undefined"
+              label="用户名称"
+              prop="username"
+            >
               <el-input v-model="form.username" placeholder="请输入用户名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.id === undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" show-password />
+            <el-form-item
+              v-if="form.id === undefined"
+              label="用户密码"
+              prop="password"
+            >
+              <el-input
+                v-model="form.password"
+                placeholder="请输入用户密码"
+                type="password"
+                show-password
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择">
-                <el-option v-for="dict in sexDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+                <el-option
+                  v-for="dict in sexDictDatas"
+                  :key="parseInt(dict.value)"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -126,7 +324,11 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -138,18 +340,39 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+            <el-checkbox v-model="upload.updateSupport" />
+            是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -159,7 +382,12 @@
     </el-dialog>
 
     <!-- 分配角色 -->
-    <el-dialog title="分配角色" :visible.sync="openRole" width="500px" append-to-body>
+    <el-dialog
+      title="分配角色"
+      :visible.sync="openRole"
+      width="500px"
+      append-to-body
+    >
       <el-form :model="form" label-width="80px">
         <el-form-item label="用户名称">
           <el-input v-model="form.username" :disabled="true" />
@@ -170,10 +398,10 @@
         <el-form-item label="角色">
           <el-select v-model="form.roleIds" multiple placeholder="请选择">
             <el-option
-                v-for="item in roleOptions"
-                :key="parseInt(item.id)"
-                :label="item.name"
-                :value="parseInt(item.id)"
+              v-for="item in roleOptions"
+              :key="parseInt(item.id)"
+              :label="item.name"
+              :value="parseInt(item.id)"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -183,7 +411,6 @@
         <el-button @click="cancelRole">取 消</el-button>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
@@ -197,18 +424,19 @@ import {
   importTemplate,
   listUser,
   resetUserPwd,
-  updateUser
+  updateUser,
+  getUserMaxNum,
 } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
-import {listSimplePosts} from "@/api/system/post";
+import { listSimplePosts } from "@/api/system/post";
 
-import {CommonStatusEnum} from "@/utils/constants";
-import {DICT_TYPE, getDictDatas} from "@/utils/dict";
-import {assignUserRole, listUserRoles} from "@/api/system/permission";
-import {listSimpleRoles} from "@/api/system/role";
-import {getBaseHeader} from "@/utils/request";
+import { CommonStatusEnum } from "@/utils/constants";
+import { DICT_TYPE, getDictDatas } from "@/utils/dict";
+import { assignUserRole, listUserRoles } from "@/api/system/permission";
+import { listSimpleRoles } from "@/api/system/role";
+import { getBaseHeader } from "@/utils/request";
 
 export default {
   name: "User",
@@ -241,7 +469,7 @@ export default {
       form: {},
       defaultProps: {
         children: "children",
-        label: "name"
+        label: "name",
       },
       // 用户导入参数
       upload: {
@@ -256,7 +484,7 @@ export default {
         // 设置上传的请求头部
         headers: getBaseHeader(),
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + '/admin-api/system/user/import'
+        url: process.env.VUE_APP_BASE_API + "/admin-api/system/user/import",
       },
       // 查询参数
       queryParams: {
@@ -266,7 +494,7 @@ export default {
         mobile: undefined,
         status: undefined,
         deptId: undefined,
-        createTime: []
+        createTime: [],
       },
       // 列信息
       columns: [
@@ -276,33 +504,34 @@ export default {
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `手机号码`, visible: true },
         { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true }
+        { key: 6, label: `创建时间`, visible: true },
       ],
       // 表单校验
       rules: {
         username: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" }
+          { required: true, message: "用户名称不能为空", trigger: "blur" },
         ],
         nickname: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+          { required: true, message: "用户昵称不能为空", trigger: "blur" },
         ],
         password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" }
+          { required: true, message: "用户密码不能为空", trigger: "blur" },
         ],
         email: [
           {
             type: "email",
             message: "'请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
+            trigger: ["blur", "change"],
+          },
         ],
         mobile: [
           {
-            pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
+            pattern:
+              /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
+            trigger: "blur",
+          },
+        ],
       },
       // 是否显示弹出层（角色权限）
       openRole: false,
@@ -312,34 +541,43 @@ export default {
       // 数据字典
       statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
       sexDictDatas: getDictDatas(DICT_TYPE.SYSTEM_USER_SEX),
+      // 所属租户可创建用户数量
+      userMaxNum: 0,
     };
   },
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val);
-    }
+    },
   },
   created() {
     this.getList();
+    this.getUserMaxNumFunction();
     // this.getConfigKey("sys.user.init-password").then(response => {
     //   this.initPassword = response.msg;
     // });
   },
   methods: {
+    // 获得当前登录用户，所属租户可创建用户数量
+    getUserMaxNumFunction() {
+      getUserMaxNum().then((response) => {
+        this.userMaxNum = response.data;
+      });
+    },
     // 更多操作
     handleCommand(command, index, row) {
       switch (command) {
-        case 'handleUpdate':
-          this.handleUpdate(row);//修改客户信息
+        case "handleUpdate":
+          this.handleUpdate(row); //修改客户信息
           break;
-        case 'handleDelete':
-          this.handleDelete(row);//红号变更
+        case "handleDelete":
+          this.handleDelete(row); //红号变更
           break;
-        case 'handleResetPwd':
+        case "handleResetPwd":
           this.handleResetPwd(row);
           break;
-        case 'handleRole':
+        case "handleRole":
           this.handleRole(row);
           break;
         default:
@@ -349,12 +587,11 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.queryParams).then(response => {
-          this.userList = response.data.list;
-          this.total = response.data.total;
-          this.loading = false;
-        }
-      );
+      listUser(this.queryParams).then((response) => {
+        this.userList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
     },
     // 筛选节点
     filterNode(value, data) {
@@ -369,12 +606,18 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.username + '"用户吗?').then(function() {
+      this.$modal
+        .confirm('确认要"' + text + '""' + row.username + '"用户吗?')
+        .then(function () {
           return changeUserStatus(row.id, row.status);
-        }).then(() => {
+        })
+        .then(() => {
           this.$modal.msgSuccess(text + "成功");
-        }).catch(function() {
-          row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
+        })
+        .catch(function () {
+          row.status =
+            row.status === CommonStatusEnum.ENABLE
+              ? CommonStatusEnum.DISABLE
               : CommonStatusEnum.ENABLE;
         });
     },
@@ -402,7 +645,7 @@ export default {
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: []
+        roleIds: [],
       };
       this.resetForm("form");
     },
@@ -428,7 +671,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id;
-      getUser(id).then(response => {
+      getUser(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改用户";
@@ -439,17 +682,19 @@ export default {
     handleResetPwd(row) {
       this.$prompt('请输入"' + row.username + '"的新密码', "提示", {
         confirmButtonText: "确定",
-        cancelButtonText: "取消"
-      }).then(({ value }) => {
-          resetUserPwd(row.id, value).then(response => {
+        cancelButtonText: "取消",
+      })
+        .then(({ value }) => {
+          resetUserPwd(row.id, value).then((response) => {
             this.$modal.msgSuccess("修改成功，新密码是：" + value);
           });
-        }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 分配用户角色操作 */
     handleRole(row) {
       this.reset();
-      const id = row.id
+      const id = row.id;
       // 处理了 form 的用户 username 和 nickname 的展示
       this.form.id = id;
       this.form.username = row.username;
@@ -457,29 +702,29 @@ export default {
       // 打开弹窗
       this.openRole = true;
       // 获得角色列表
-      listSimpleRoles().then(response => {
+      listSimpleRoles().then((response) => {
         // 处理 roleOptions 参数
         this.roleOptions = [];
         this.roleOptions.push(...response.data);
       });
       // 获得角色拥有的菜单集合
-      listUserRoles(id).then(response => {
+      listUserRoles(id).then((response) => {
         // 设置选中
         this.form.roleIds = response.data;
-      })
+      });
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id !== undefined) {
-            updateUser(this.form).then(response => {
+            updateUser(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addUser(this.form).then(response => {
+            addUser(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -489,12 +734,12 @@ export default {
       });
     },
     /** 提交按钮（角色权限） */
-    submitRole: function() {
+    submitRole: function () {
       if (this.form.id !== undefined) {
         assignUserRole({
           userId: this.form.id,
           roleIds: this.form.roleIds,
-        }).then(response => {
+        }).then((response) => {
           this.$modal.msgSuccess("分配角色成功");
           this.openRole = false;
           this.getList();
@@ -504,26 +749,34 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项?').then(function() {
+      this.$modal
+        .confirm('是否确认删除用户编号为"' + ids + '"的数据项?')
+        .then(function () {
           return delUser(ids);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.$modal.confirm('是否确认导出所有用户数据项?').then(() => {
+      this.$modal
+        .confirm("是否确认导出所有用户数据项?")
+        .then(() => {
           // 处理查询参数
-          let params = {...this.queryParams};
+          let params = { ...this.queryParams };
           params.pageNo = undefined;
           params.pageSize = undefined;
           this.exportLoading = true;
           return exportUser(params);
-        }).then(response => {
-          this.$download.excel(response, '用户数据.xls');
+        })
+        .then((response) => {
+          this.$download.excel(response, "用户数据.xls");
           this.exportLoading = false;
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -532,8 +785,8 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      importTemplate().then(response => {
-        this.$download.excel(response, '用户导入模板.xls');
+      importTemplate().then((response) => {
+        this.$download.excel(response, "用户导入模板.xls");
       });
     },
     // 文件上传中处理
@@ -543,7 +796,7 @@ export default {
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
       if (response.code !== 0) {
-        this.$modal.msgError(response.msg)
+        this.$modal.msgError(response.msg);
         return;
       }
       this.upload.open = false;
@@ -551,17 +804,22 @@ export default {
       this.$refs.upload.clearFiles();
       // 拼接提示语
       let data = response.data;
-      let text = '创建成功数量：' + data.createUsernames.length;
+      let text = "创建成功数量：" + data.createUsernames.length;
       for (const username of data.createUsernames) {
-        text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username;
+        text += "<br />&nbsp;&nbsp;&nbsp;&nbsp;" + username;
       }
-      text += '<br />更新成功数量：' + data.updateUsernames.length;
+      text += "<br />更新成功数量：" + data.updateUsernames.length;
       for (const username of data.updateUsernames) {
-        text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username;
+        text += "<br />&nbsp;&nbsp;&nbsp;&nbsp;" + username;
       }
-      text += '<br />更新失败数量：' + Object.keys(data.failureUsernames).length;
+      text +=
+        "<br />更新失败数量：" + Object.keys(data.failureUsernames).length;
       for (const username in data.failureUsernames) {
-        text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username + '：' + data.failureUsernames[username];
+        text +=
+          "<br />&nbsp;&nbsp;&nbsp;&nbsp;" +
+          username +
+          "：" +
+          data.failureUsernames[username];
       }
       this.$alert(text, "导入结果", { dangerouslyUseHTMLString: true });
       this.getList();
@@ -575,9 +833,11 @@ export default {
       return {
         id: node.id,
         label: node.name,
-        children: node.children
-      }
-    }
-  }
+        children: node.children,
+      };
+    },
+  },
 };
 </script>
+
+<style lang="scss" scoped></style>