From 6a867c07e6b5a25443d18603c953473056b4d981 Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Mon, 19 May 2025 13:21:28 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/partner/file/file.vue | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/views/partner/file/file.vue b/src/views/partner/file/file.vue
index 1f69d52..dab8348 100644
--- a/src/views/partner/file/file.vue
+++ b/src/views/partner/file/file.vue
@@ -76,7 +76,7 @@
         </div>
         <div class="bjandshanchu">
           <div class="one" @click="handleE(item)">编辑</div>
-          <!--          <div class="two" v-if="item.type == '2'" @click="downloadFile(item)">下载</div>-->
+          <div class="two" v-if="item.type == '2'" @click="downloadFile(item)">下载</div>
           <div class="two" v-if="item.type == '2'" @click="preview(item)">预览</div>
           <div class="two" @click="clickStaff(item.id)" v-hasPermi="['inspectionFile:inspectionFilePermis:edit']">
             分配权限
@@ -175,6 +175,7 @@
             <template #description>
               <div class="step-content">
                 <div class="step-file-name">文件名称：{{ item.fileName }}</div>
+                <div class="step-time">修改人：{{ item.nickname }}</div>
                 <div class="step-time">修改时间：{{ formatDate(item.createTime) }}</div>
                 <div class="step-time">提醒时间：{{ formatDate(item.warnTime) }}</div>
                 <div class="step-download" @click="downloadFile(item)" v-if="item.type == '2'">📂 下载历史文件</div>
@@ -337,18 +338,23 @@ export default {
       number: 0,
       uploadList: [],
       totalUploadCount: 0,
+      servicePackageId: "jiance",
+      dictType:"ins_file_role",
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        servicePackageId: "jiance",
         type: null,
         fatherId: null,
+        dictType: 'ins_file_role'
       },
       fatherId: '',
       oldFatherId: '',
       // 表单参数
-      form: {},
+      form: {servicePackageId: this.servicePackageId},
       isShowFile: false,
+
       // 表单校验
       rules: {
         fileList: [
@@ -421,6 +427,8 @@ export default {
           this.queryParams.pageNum = 1
           const data = {
             fatherId: this.fatherId,
+            servicePackageId: this.servicePackageId,
+            dictType: this.dictType,
             fileName: this.fatherId === '' || this.fatherId == null || this.fatherId === undefined ? this.queryParams.fileName : ''
           }
           this.getFolderList(data)
@@ -451,7 +459,10 @@ export default {
     handleFileClick(row) {
       if (row.type === '2') {
         // this.fileUrl = 'https://view.xdocin.com/view?src=' + this.imageUrl + row.filePath
-        this.fileUrl = 'https://view.officeapps.live.com/op/view.aspx?src=' + this.imageUrl + row.filePath
+        this.fileUrl = 'https://view.officeapps.live.com/op/view.aspx?src=' +
+          (row.filePath.includes('http')
+            ? this.inspectionFileUrl + row.filePath.replace(/^.*?uploads\//, 'uploads/')
+            : this.previewUrl + row.filePath);
         this.$nextTick(() => {
           // this.$refs.filePreview.show()
           this.selectFile = row
@@ -530,7 +541,9 @@ export default {
       const data = {
         pageNum: 1,
         pageSize: 10,
-        fatherId: id
+        fatherId: id,
+        servicePackageId: this.servicePackageId,
+        dictType: this.dictType
       }
       this.getFolderList(data)
     },
@@ -592,7 +605,8 @@ export default {
         createTime: null,
         createBy: null,
         updateTime: null,
-        updateBy: null
+        updateBy: null,
+        servicePackageId: this.servicePackageId
       };
       this.resetForm("form");
     },
@@ -650,14 +664,14 @@ export default {
       this.title = "修改";
       console.log(item)
       //判断文件夹树中是否有item的id或者item子类的id如果有禁用
-       this.folderList = this.disableIfExistsInTree(this.folderList, item.id)
+      this.folderList = this.disableIfExistsInTree(this.folderList, item.id)
     },
     disableIfExistsInTree(treeData, targetId) {
       console.log(treeData, targetId, '执行');
 
       function traverse(nodes, parentDisabled = false) {
         return nodes.map(node => {
-          let newNode = { ...node };
+          let newNode = {...node};
 
           // 递归处理子节点，同时传递父级的禁用状态
           if (newNode.children && newNode.children.length > 0) {
@@ -723,6 +737,7 @@ export default {
         item.fileName = this.getFileNameWithoutExtension(item.name)
         item.filePath = item.url
         item.warnTime = this.form.warnTime
+        item.servicePackageId = "jiance"
       })
       addBatchInspectionFile(this.fileList).then(res => {
         this.$modal.msgSuccess("新增成功");

From a11039d4d1fa73cce07283087c1d59f77d310fd2 Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Tue, 27 May 2025 17:55:21 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/businessChannel/api/index.js   |  52 ++++
 .../inspection/businessChannel/index.vue      | 284 ++++++++++++++++++
 src/views/inspection/staff/index.vue          |   4 +-
 3 files changed, 338 insertions(+), 2 deletions(-)
 create mode 100644 src/views/inspection/businessChannel/api/index.js
 create mode 100644 src/views/inspection/businessChannel/index.vue

diff --git a/src/views/inspection/businessChannel/api/index.js b/src/views/inspection/businessChannel/api/index.js
new file mode 100644
index 0000000..ba4ba61
--- /dev/null
+++ b/src/views/inspection/businessChannel/api/index.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询菜单列表
+export function listBusiness(query) {
+  return request({
+    url: '/channel/tree',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询菜单（精简)列表
+export function listSimpleMenus() {
+  return request({
+    url: '/system/menu/list-all-simple',
+    method: 'get'
+  })
+}
+
+// 查询菜单详细
+export function getBusiness(id) {
+  return request({
+    url: '/channel/' + id,
+    method: 'get'
+  })
+}
+
+// 新增菜单
+export function addBusiness(data) {
+  return request({
+    url: '/channel/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改菜单
+export function updateBusiness(data) {
+  return request({
+    url: '/channel/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除菜单
+export function delBusiness(id) {
+  return request({
+    url: '/channel/delete/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/views/inspection/businessChannel/index.vue b/src/views/inspection/businessChannel/index.vue
new file mode 100644
index 0000000..d143486
--- /dev/null
+++ b/src/views/inspection/businessChannel/index.vue
@@ -0,0 +1,284 @@
+<template>
+  <div class="app-container">
+    <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission"/>
+    <doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/"/>
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+      <el-form-item label="菜单名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery"/>
+      </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-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-if="refreshTable" v-loading="loading" :data="menuList" row-key="id" :default-expand-all="isExpandAll"
+              :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <el-table-column prop="name" label="名称" :show-overflow-tooltip="true" width="250"></el-table-column>
+      <el-table-column prop="type" label="类型" width="100">
+        <template v-slot="scope">
+          <span>
+            {{ scope.row.type === 0 ? '业务渠道' : scope.row.type === 1 ? '客户来源' : '未知类型' }}
+          </span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改
+          </el-button>
+          <el-button size="mini" v-if="scope.row.pid == 0" type="text" icon="el-icon-plus"
+                     @click="handleAdd(scope.row)">新增
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改菜单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="上级菜单">-->
+<!--              <treeselect v-model="form.pid" :options="menuOptions" :normalizer="normalizer" :show-count="true"-->
+<!--                          placeholder="选择上级菜单"/>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+          <el-col :span="12">
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {listMenu, getMenu, delMenu, addMenu, updateMenu} from "@/api/system/menu";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import IconSelect from "@/components/IconSelect";
+
+import {SystemMenuTypeEnum, CommonStatusEnum} from '@/utils/constants'
+import {getDictDatas, DICT_TYPE} from '@/utils/dict'
+import {isExternal} from "@/utils/validate";
+import {
+  addBusiness,
+  delBusiness,
+  getBusiness,
+  listBusiness,
+  updateBusiness
+} from "@/views/inspection/businessChannel/api";
+
+export default {
+  name: "BusinessChannel",
+  components: {Treeselect, IconSelect},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 菜单表格树数据
+      menuList: [],
+      // 菜单树选项
+      menuOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部折叠
+      isExpandAll: false,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        name: undefined,
+        visible: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          {required: true, message: "菜单名称不能为空", trigger: "blur"}
+        ],
+        sort: [
+          {required: true, message: "菜单顺序不能为空", trigger: "blur"}
+        ],
+        path: [
+          {required: true, message: "路由地址不能为空", trigger: "blur"}
+        ],
+        status: [
+          {required: true, message: "状态不能为空", trigger: "blur"}
+        ]
+      },
+
+      // 枚举
+      MenuTypeEnum: SystemMenuTypeEnum,
+      CommonStatusEnum: CommonStatusEnum,
+      // 数据字典
+      menuTypeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_MENU_TYPE),
+      statusDictDatas: getDictDatas("ins_business")
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 选择图标
+    selected(name) {
+      this.form.icon = name;
+    },
+    /** 查询菜单列表 */
+    getList() {
+      this.loading = true;
+      listBusiness(this.queryParams).then(response => {
+        this.menuList = this.handleTree(response.data, "id", "pid");
+        this.loading = false;
+      });
+    },
+    /** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
+    },
+    /** 查询菜单下拉树结构 */
+    getTreeselect() {
+      listBusiness().then(response => {
+        this.menuOptions = [];
+        const menu = {id: 0, name: '主类目', children: []};
+        if (!Array.isArray(response.data)) {
+          console.warn("handleTree error: data 不是数组", response.data);
+          return;
+        }
+
+        if (response.data.length === 0) {
+          console.warn("handleTree warning: data 是空数组");
+          return;
+        }
+
+// data 合法，继续处理
+        debugger
+        menu.children = this.handleTree(response.data, "id", 'pid');
+        this.menuOptions.push(menu);
+
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        pid: 0,
+        name: undefined,
+        type: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.id) {
+        this.form.pid = row.id;
+        this.form.type = 1;
+        this.title = "添加客户来源";
+      } else {
+        this.form.pid = 0;
+        this.form.type = 0;
+        this.title = "添加业务渠道";
+      }
+      this.open = true;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      getBusiness(row.id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          // 提交
+          if (this.form.id !== undefined) {
+            updateBusiness(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBusiness(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除名称为"' + row.name + '"的数据项?').then(function () {
+        return delBusiness(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    }
+  }
+};
+</script>
diff --git a/src/views/inspection/staff/index.vue b/src/views/inspection/staff/index.vue
index d100a60..2a1a04b 100644
--- a/src/views/inspection/staff/index.vue
+++ b/src/views/inspection/staff/index.vue
@@ -571,10 +571,10 @@ export default {
       if (!this.form.folderId) {
         addFolder(this.form.id).then(response => {
           this.form.folderId = response.data
-          this.$router.push({path: '/jc/shop/partner/file/file', query: {"folderId": this.form.folderId}})
+          this.$router.push({path: '/jc/shop/nbgl/partner/file/file', query: {"folderId": this.form.folderId}})
         })
       } else {
-        this.$router.push({path: '/jc/shop/partner/file/file', query: {"folderId": this.form.folderId}})
+        this.$router.push({path: '/jc/shop/nbgl/partner/file/file', query: {"folderId": this.form.folderId}})
       }
     },
     // 查询驾驶证类型

From 6afa9dc6f4db45819e6c49615f0e9e53044749a3 Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Fri, 13 Jun 2025 17:08:45 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/businessChannel/index.vue      | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/views/inspection/businessChannel/index.vue b/src/views/inspection/businessChannel/index.vue
index d143486..fd55297 100644
--- a/src/views/inspection/businessChannel/index.vue
+++ b/src/views/inspection/businessChannel/index.vue
@@ -52,17 +52,24 @@
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-<!--          <el-col :span="24">-->
-<!--            <el-form-item label="上级菜单">-->
-<!--              <treeselect v-model="form.pid" :options="menuOptions" :normalizer="normalizer" :show-count="true"-->
-<!--                          placeholder="选择上级菜单"/>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!--          <el-col :span="24">-->
+          <!--            <el-form-item label="上级菜单">-->
+          <!--              <treeselect v-model="form.pid" :options="menuOptions" :normalizer="normalizer" :show-count="true"-->
+          <!--                          placeholder="选择上级菜单"/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="名称" prop="name">
               <el-input v-model="form.name" placeholder="请输入名称"/>
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="form.pid !=  0">
+            <el-form-item label="人员" prop="postId">
+              <el-select multiple filterable v-model="form.userIdList" placeholder="请选择人员">
+                <el-option v-for="item in staffList" :key="item.id" :label="item.nickname" :value="item.id"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -89,6 +96,7 @@ import {
   listBusiness,
   updateBusiness
 } from "@/views/inspection/businessChannel/api";
+import {listUser} from "@/views/inspection/staff/api/staff";
 
 export default {
   name: "BusinessChannel",
@@ -101,6 +109,7 @@ export default {
       showSearch: true,
       // 菜单表格树数据
       menuList: [],
+      staffList: [],
       // 菜单树选项
       menuOptions: [],
       // 弹出层标题
@@ -144,6 +153,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getStaff();
   },
   methods: {
     // 选择图标
@@ -158,6 +168,15 @@ export default {
         this.loading = false;
       });
     },
+    getStaff() {
+      const params = {
+        pageNo: 1,
+        pageSize: 99999
+      }
+      listUser(params).then(response => {
+        this.staffList = response.data.records;
+      });
+    },
     /** 转换菜单数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {

From e5c6e235ae60d90f075b24c5d87c5d2902a42171 Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Wed, 18 Jun 2025 17:49:21 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.js    |  8 +++++---
 src/views/login.vue | 43 +++++++++++++++++++++++++++++++++++++------
 2 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/src/api/login.js b/src/api/login.js
index 4be9d0d..7026f28 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -150,8 +150,10 @@ export class socialBindLogin {
 
 export function getUserTenant(data) {
   return request({
-    url: '/system/auth/getTenant',
-    method: 'post',
-    data: data
+    url: '/system/auth/getListByPhone',
+    method: 'get',
+    params: {
+      phone: data
+    }
   })
 }
diff --git a/src/views/login.vue b/src/views/login.vue
index d8cb2d7..8f148ee 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -96,6 +96,18 @@
         </div>
       </div>
     </div>
+    <el-dialog
+      title="提示"
+      :visible.sync="showTenantList"
+      width="30%">
+      <el-radio-group v-model="tenant">
+        <el-radio-button :label="item"  v-for="item in tenantList">{{item.name}}</el-radio-button>
+      </el-radio-group>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="showTenantList = false">取 消</el-button>
+    <el-button type="primary" @click="selectTenant">确 定</el-button>
+  </span>
+    </el-dialog>
 
     <!-- 图形验证码 -->
     <Verify ref="verify" :captcha-type="'blockPuzzle'" :img-size="{width:'400px',height:'200px'}"
@@ -136,6 +148,8 @@ export default {
       // tenantCode:"lighting",
       tenantCode:"lanan",
       codeUrl: "",
+      showTenantList:false,
+      tenant:undefined,
       //是否开启图形验证码
       captchaEnable: false,
       tenantEnable: true,
@@ -150,6 +164,7 @@ export default {
         rememberMe: false,
         tenantName: "租户管理员",
       },
+      tenantList:[],
       scene: 21,
 
       LoginRules: {
@@ -221,7 +236,8 @@ export default {
     getCode() {
       // 情况一，未开启：则直接登录
       if (!this.captchaEnable) {
-        this.handleLogin({})
+        // this.handleLogin({})
+        this.getTenantList()
         return;
       }
 
@@ -242,6 +258,14 @@ export default {
         tenantName: tenantName ? tenantName : this.loginForm.tenantName,
       };
     },
+    selectTenant(){
+      if (!this.tenant) {
+        this.$message.error("请选择租户")
+      }
+      console.log('当前租户',this.tenant)
+      setTenantId(this.tenant.id)
+      this.handleLogin()
+    },
     handleLogin(captchaParams) {
       this.$refs.loginForm.validate(async valid => {
         console.log("登录", this.loginForm)
@@ -259,12 +283,11 @@ export default {
             removeRememberMe()
             removeTenantName()
           }
-          this.loginForm.captchaVerification = captchaParams.captchaVerification
+          if (captchaParams){
+            this.loginForm.captchaVerification = captchaParams.captchaVerification
+          }
           //获取当前登陆人的租户
-          await getUserTenant(this.loginForm).then(res => {
-            console.log('当前登陆人信息', res)
-            setTenantId(res.data.tenant_id)
-          });
+
           // 发起登陆
           // console.log("发起登录", this.loginForm);
           this.$store.dispatch(this.loginForm.loginType === "sms" ? "SmsLogin" : "Login", this.loginForm).then(() => {
@@ -276,6 +299,14 @@ export default {
         }
       });
     },
+    async getTenantList(){
+      await getUserTenant(this.loginForm.username).then(res => {
+        console.log('当前登陆人信息', res)
+        // setTenantId(res.data.tenant_id)
+        this.tenantList = res.data
+      });
+      this.showTenantList = true
+    },
     async doSocialLogin(socialTypeEnum) {
       // 设置登录中
       this.loading = true;

From 3f715f361b95fbb30a426038107c9721c0a05b46 Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Thu, 19 Jun 2025 15:28:27 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tenantSelect/tenantSelect.vue | 206 +++++++++++++++++++
 src/views/inspection/staff/api/staff.js      |   2 +-
 src/views/login.vue                          |  49 +++--
 src/views/partner/delWorkOrder.vue           |   2 +-
 src/views/partner/workOrder.vue              |   6 +-
 5 files changed, 244 insertions(+), 21 deletions(-)
 create mode 100644 src/components/tenantSelect/tenantSelect.vue

diff --git a/src/components/tenantSelect/tenantSelect.vue b/src/components/tenantSelect/tenantSelect.vue
new file mode 100644
index 0000000..32b1356
--- /dev/null
+++ b/src/components/tenantSelect/tenantSelect.vue
@@ -0,0 +1,206 @@
+<template>
+  <div class="tenant-selector">
+    <!-- 添加返回按钮 -->
+    <div class="back-button" @click="handleBack">
+      <i class="el-icon-arrow-left"></i> 返回
+    </div>
+
+    <div class="login-header">
+      <h2>选择租户登录</h2>
+      <p>请选择您要登录的租户</p>
+    </div>
+
+    <div class="tenant-list">
+      <div
+        v-for="tenant in tenants"
+        :key="tenant.id"
+        class="tenant-item"
+        :class="{ 'active': selectedTenant === tenant.id }"
+        @click="selectTenant(tenant)"
+      >
+        <div class="tenant-avatar">
+          {{ tenant.name.charAt(0).toUpperCase() }}
+        </div>
+        <div class="tenant-info">
+          <h3>{{ tenant.name }}</h3>
+          <p>{{ tenant.description || '暂无描述' }}</p>
+        </div>
+      </div>
+    </div>
+
+    <div class="login-actions">
+      <button
+        class="login-btn"
+        :disabled="!selectedTenant"
+        @click="confirmLogin"
+      >
+        确认登录
+      </button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    tenants: {
+      type: Array,
+      required: true,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      selectedTenant: null
+    }
+  },
+  methods: {
+    selectTenant(tenant) {
+      this.selectedTenant = tenant.id;
+    },
+    confirmLogin() {
+      if (this.selectedTenant) {
+        this.$emit('tenant-selected', this.selectedTenant);
+      }
+    },
+    handleBack() {
+      this.$emit('back');
+    }
+  }
+}
+</script>
+
+<style scoped>
+.tenant-selector {
+  max-width: 400px;
+  margin: 0 auto;
+  padding: 20px;
+  background: #fff;
+  border-radius: 8px;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+}
+
+.login-header {
+  text-align: center;
+  margin-bottom: 24px;
+}
+
+.login-header h2 {
+  font-size: 20px;
+  color: #333;
+  margin-bottom: 8px;
+}
+
+.login-header p {
+  font-size: 14px;
+  color: #999;
+}
+
+.tenant-list {
+  margin-bottom: 24px;
+}
+
+.tenant-item {
+  display: flex;
+  align-items: center;
+  padding: 12px 16px;
+  border: 1px solid #eaeaea;
+  border-radius: 6px;
+  margin-bottom: 12px;
+  cursor: pointer;
+  transition: all 0.3s;
+}
+
+.tenant-item:hover {
+  border-color: #1890ff;
+}
+
+.tenant-item.active {
+  border-color: #1890ff;
+  background-color: #f0f7ff;
+}
+
+.tenant-avatar {
+  width: 40px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  background-color: #1890ff;
+  color: white;
+  border-radius: 50%;
+  margin-right: 12px;
+  font-weight: bold;
+}
+
+.tenant-info h3 {
+  font-size: 16px;
+  color: #333;
+  margin-bottom: 4px;
+}
+
+.tenant-info p {
+  font-size: 12px;
+  color: #999;
+}
+
+.login-actions {
+  text-align: center;
+}
+
+.login-btn {
+  width: 100%;
+  height: 40px;
+  background-color: #1890ff;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  font-size: 14px;
+  cursor: pointer;
+  transition: background-color 0.3s;
+}
+
+.login-btn:hover {
+  background-color: #40a9ff;
+}
+
+.login-btn:disabled {
+  background-color: #d9d9d9;
+  cursor: not-allowed;
+}
+
+.tenant-selector {
+  max-width: 500px;
+  margin: 0 auto;
+  padding: 20px;
+  background: #fff;
+  border-radius: 8px;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+  position: relative;
+}
+
+.back-button {
+  position: absolute;
+  top: 20px;
+  left: 20px;
+  color: #1890ff;
+  cursor: pointer;
+  font-size: 14px;
+  display: flex;
+  align-items: center;
+}
+
+.back-button:hover {
+  color: #40a9ff;
+}
+
+.back-button i {
+  margin-right: 4px;
+}
+
+.login-header {
+  text-align: center;
+  margin-bottom: 24px;
+  padding-top: 10px; /* 为返回按钮留出空间 */
+}
+
+</style>
diff --git a/src/views/inspection/staff/api/staff.js b/src/views/inspection/staff/api/staff.js
index 336092c..4bd7add 100644
--- a/src/views/inspection/staff/api/staff.js
+++ b/src/views/inspection/staff/api/staff.js
@@ -70,7 +70,7 @@ export function updateUser(data) {
 // 删除用户
 export function delUser(userId) {
   return request({
-    url: '/system/user/delete?id=' + userId,
+    url: '/inspectionStaff/delete?id=' + userId,
     method: 'delete'
   })
 }
diff --git a/src/views/login.vue b/src/views/login.vue
index 8f148ee..ab6f26f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -2,7 +2,7 @@
   <div class="container">
 <!--    <div class="logo"></div>-->
     <!-- 登录区域 -->
-    <div class="content">
+    <div class="content" v-show="!showTenantList">
       <!-- 配图 -->
       <div class="pic"></div>
       <!-- 表单 -->
@@ -13,7 +13,7 @@
         </h2>
 
         <!-- 表单 -->
-        <div class="form-cont">
+        <div class="form-cont" >
           <el-tabs class="form" v-model="loginForm.loginType" style=" float:none;">
             <el-tab-pane label="账号密码登录" name="uname">
             </el-tab-pane>
@@ -94,25 +94,35 @@
             </el-form>
           </div>
         </div>
+
       </div>
     </div>
-    <el-dialog
-      title="提示"
-      :visible.sync="showTenantList"
-      width="30%">
-      <el-radio-group v-model="tenant">
-        <el-radio-button :label="item"  v-for="item in tenantList">{{item.name}}</el-radio-button>
-      </el-radio-group>
-      <span slot="footer" class="dialog-footer">
-    <el-button @click="showTenantList = false">取 消</el-button>
-    <el-button type="primary" @click="selectTenant">确 定</el-button>
-  </span>
-    </el-dialog>
+    <div v-if="showTenantList" style="width: 500px; position: relative;">
+      <tenant-select
+        :tenants="tenantList"
+        @tenant-selected="selectTenant"
+        @back="showTenantList = false"
+      ></tenant-select>
+    </div>
+<!--    <el-dialog-->
+<!--      title="提示"-->
+<!--      :visible.sync="showTenantList"-->
+<!--      width="30%">-->
+<!--      <el-radio-group v-model="tenant">-->
+<!--        <el-radio-button :label="item"  v-for="item in tenantList">{{item.name}}</el-radio-button>-->
+<!--      </el-radio-group>-->
+<!--      <span slot="footer" class="dialog-footer">-->
+<!--    <el-button @click="showTenantList = false">取 消</el-button>-->
+<!--    <el-button type="primary" @click="selectTenant">确 定</el-button>-->
+<!--  </span>-->
+<!--    </el-dialog>-->
 
     <!-- 图形验证码 -->
     <Verify ref="verify" :captcha-type="'blockPuzzle'" :img-size="{width:'400px',height:'200px'}"
             @success="handleLogin" />
 
+
+
     <!-- footer -->
     <div class="footer">
 <!--      Copyright © 2020-2022 iocoder.cn All Rights Reserved.-->
@@ -136,12 +146,14 @@ import {
 } from "@/utils/auth";
 
 import Verify from '@/components/Verifition/Verify';
+import TenantSelect from "@/components/tenantSelect/tenantSelect.vue";
 import {resetUserPwd} from "@/api/system/user";
 
 export default {
   name: "Login",
   components: {
-    Verify
+    Verify,
+    TenantSelect
   },
   data() {
     return {
@@ -258,15 +270,17 @@ export default {
         tenantName: tenantName ? tenantName : this.loginForm.tenantName,
       };
     },
-    selectTenant(){
+    selectTenant(tenant){
+      this.tenant = tenant
       if (!this.tenant) {
         this.$message.error("请选择租户")
       }
       console.log('当前租户',this.tenant)
-      setTenantId(this.tenant.id)
+      setTenantId(this.tenant)
       this.handleLogin()
     },
     handleLogin(captchaParams) {
+      // 加载动画
       this.$refs.loginForm.validate(async valid => {
         console.log("登录", this.loginForm)
         if (valid) {
@@ -295,6 +309,7 @@ export default {
             });
           }).catch(() => {
             this.loading = false;
+            this.showTenantList = false
           });
         }
       });
diff --git a/src/views/partner/delWorkOrder.vue b/src/views/partner/delWorkOrder.vue
index bb09510..7895c54 100644
--- a/src/views/partner/delWorkOrder.vue
+++ b/src/views/partner/delWorkOrder.vue
@@ -409,7 +409,7 @@
           this.$set(this.dict.type,this.$options.dicts[i],res.data)
         })
       }
-     this.getpid()
+      this.getList();
       this.customerSource();
     },
     methods: {
diff --git a/src/views/partner/workOrder.vue b/src/views/partner/workOrder.vue
index 7eabaa9..a79dfcd 100644
--- a/src/views/partner/workOrder.vue
+++ b/src/views/partner/workOrder.vue
@@ -26,7 +26,7 @@
       </el-form-item>
       <el-form-item label="角色" prop="status">
         <el-select v-model="queryParams.roleId" placeholder="角色" clearable style="width: 240px">
-          <el-option v-for="dict in dict.type.inspection_use_role.slice(0, 3)" :key="dict.value" :label="dict.label"
+          <el-option v-for="dict in dict.type.inspection_use_role" :key="dict.value" :label="dict.label"
             :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -463,7 +463,8 @@ export default {
         this.$set(this.dict.type, this.$options.dicts[i], res.data)
       })
     }
-    this.getpid()
+    // this.getpid()
+    this.getList();
     this.customerSource();
   },
   methods: {
@@ -640,6 +641,7 @@ export default {
           this.BankAccountList.push(temp)
         })
       })
+      this.loading = false;
     },
     // 取消按钮
     cancel() {