feat:修改默认头像 ,创建订单去掉保存地址，部门增加导入，用户增加导入

jd-logistics-ui-v3/src/views/logistics/banner/index.vue

@@ -177,7 +177,7 @@
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item label="跳转链接">
+        <el-form-item label="跳转链接" v-if="form.sysType == 0">
           <el-input v-model="form.linkUrl" placeholder="请输入跳转链接" />
         </el-form-item>
         <!--        <el-form-item label="备注" prop="remark">

jd-logistics-ui-v3/src/views/logistics/order/components/PickupTimeCascader.vue

@@ -77,7 +77,7 @@ const props = defineProps({
   // 开始时间
   startTime: {
     type: Number,
-    default: 8
+    default: 9
   },
   // 结束时间
   endTime: {

jd-logistics-ui-v3/src/views/logistics/order/createOrder.vue

@@ -74,26 +74,26 @@
             </el-form-item>
 
             <div class="default-address-footer">
-              <div class="default-address-wrapper">
-                <label class="checkbox-label">
-                  <el-checkbox
-                      v-model="sender.defaultFlag"
-                      :true-label="'1'"
-                      :false-label="'0'"
-                      size="large"
-                      class="default-address-radio"
-                  />
-                  <span class="checkbox-text">设为默认寄件地址</span>
-                </label>
-              </div>
-
-              <el-button
-                  type="primary"
-                  @click="addToAddressBook('sender')"
-                  class="add-address-btn"
-              >
-                加入地址簿
-              </el-button>
+<!--              <div class="default-address-wrapper">-->
+<!--                <label class="checkbox-label">-->
+<!--                  <el-checkbox-->
+<!--                      v-model="sender.defaultFlag"-->
+<!--                      :true-label="'1'"-->
+<!--                      :false-label="'0'"-->
+<!--                      size="large"-->
+<!--                      class="default-address-radio"-->
+<!--                  />-->
+<!--                  <span class="checkbox-text">设为默认寄件地址</span>-->
+<!--                </label>-->
+<!--              </div>-->
+
+<!--              <el-button-->
+<!--                  type="primary"-->
+<!--                  @click="addToAddressBook('sender')"-->
+<!--                  class="add-address-btn"-->
+<!--              >-->
+<!--                加入地址簿-->
+<!--              </el-button>-->
             </div>
           </el-form>
         </div>
@@ -170,15 +170,15 @@
               />
             </el-form-item>
 
-            <div class="form-footer">
-              <el-button
-                  type="primary"
-                  @click="addToAddressBook('receiver')"
-                  class="add-address-btn"
-              >
-                加入地址簿
-              </el-button>
-            </div>
+<!--            <div class="form-footer">-->
+<!--              <el-button-->
+<!--                  type="primary"-->
+<!--                  @click="addToAddressBook('receiver')"-->
+<!--                  class="add-address-btn"-->
+<!--              >-->
+<!--                加入地址簿-->
+<!--              </el-button>-->
+<!--            </div>-->
           </el-form>
         </div>
       </div>

jd-logistics-ui-v3/src/views/system/dept/index.vue

@@ -1,184 +1,248 @@
 <template>
-   <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="供应商名称" prop="deptName">
-            <el-input
-               v-model="queryParams.deptName"
-               placeholder="请输入供应商名称"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="供应商状态" clearable style="width: 200px">
-               <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
-      </el-form>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="供应商名称" prop="deptName">
+        <el-input
+            v-model="queryParams.deptName"
+            placeholder="请输入供应商名称"
+            clearable
+            style="width: 200px"
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="供应商状态" clearable style="width: 200px">
+          <el-option
+              v-for="dict in sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button 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="Plus"
-               @click="handleAdd"
-               v-hasPermi="['system:dept:add']"
-            >新增</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="info"
-               plain
-               icon="Sort"
-               @click="toggleExpandAll"
-            >展开/折叠</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+            type="primary"
+            plain
+            icon="Plus"
+            @click="handleAdd"
+            v-hasPermi="['system:dept:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="info"
+            plain
+            icon="Sort"
+            @click="toggleExpandAll"
+        >展开/折叠
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="Download"
+            @click="handleDownloadTemplate"
+            v-hasPermi="['system:dept:add']">
+          模板下载
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="Upload"
+            @click="handleImport"
+            v-hasPermi="['system:dept:add']">
+          导入
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-      <el-table
-         v-if="refreshTable"
-         v-loading="loading"
-         :data="deptList"
-         row-key="deptId"
-         :default-expand-all="isExpandAll"
-         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      >
-         <el-table-column prop="deptName" label="供应商名称" width="230" :show-overflow-tooltip="true"></el-table-column>
-<!--         <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>-->
-        <el-table-column prop="rateValue" label="费率" width="50"></el-table-column>
-        <el-table-column prop="status" label="状态" width="100">
-           <template #default="scope">
-              <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
-            </template>
-         </el-table-column>
-        <el-table-column prop="invoiceName" label="开票名称(抬头)" width="120" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="invoiceNum" label="税号" width="100" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="bankAccount" label="银行账号" width="100" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="openBank" label="开户银行" width="100" :show-overflow-tooltip="true"></el-table-column>
-         <el-table-column prop="companyAddress" label="公司地址" width="150" :show-overflow-tooltip="true"></el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']">修改</el-button>
-               <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
-               <el-button v-if="scope.row.parentId != 0" link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
-            </template>
-         </el-table-column>
-      </el-table>
+    <el-table
+        v-if="refreshTable"
+        v-loading="loading"
+        :data="deptList"
+        row-key="deptId"
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
+      <el-table-column prop="deptName" label="供应商名称" width="230" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="deptCode" label="供应商编码" width="200" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="rateValue" label="费率" width="50"></el-table-column>
+      <el-table-column prop="status" label="状态" width="100">
+        <template #default="scope">
+          <dict-tag :options="sys_normal_disable" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column prop="invoiceName" label="开票名称(抬头)" width="120"
+                       :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="invoiceNum" label="税号" width="100" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="bankAccount" label="银行账号" width="100" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="openBank" label="开户银行" width="100" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="companyAddress" label="公司地址" width="150"
+                       :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']">
+            修改
+          </el-button>
+          <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">
+            新增
+          </el-button>
+          <el-button v-if="scope.row.parentId != 0" link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['system:dept:remove']">删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
-      <!-- 添加或修改供应商对话框 -->
-      <el-dialog :title="title" v-model="open" width="700px" append-to-body>
-         <el-form ref="deptRef" :model="form" :rules="rules" label-width="110px">
-            <el-row>
-               <el-col :span="24" v-if="form.parentId !== 0">
-                  <el-form-item label="上级组织" prop="parentId">
-                     <el-tree-select
-                        v-model="form.parentId"
-                        :data="deptOptions"
-                        :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
-                        value-key="deptId"
-                        placeholder="选择上级组织"
-                        check-strictly
-                     />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="供应商名称" prop="deptName">
-                     <el-input v-model="form.deptName" placeholder="请输入供应商名称" />
-                  </el-form-item>
-               </el-col>
-<!--               <el-col :span="12">
-                  <el-form-item label="显示排序" prop="orderNum">
-                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
-                  </el-form-item>
-               </el-col>-->
-               <el-col :span="12">
-                  <el-form-item label="负责人" prop="leader">
-                     <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="联系电话" prop="phone">
-                     <el-input v-model="form.phone" 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-form-item>
-               </el-col>
-              <el-col :span="12">
-                <el-form-item label="费率" prop="rateValue">
-                  <el-input-number v-model="form.rateValue" controls-position="right" :min="0" :max="100" :precision="2" placeholder="请输入费率(%)" />
-                </el-form-item>
-              </el-col>
-               <el-col :span="12">
-                  <el-form-item label="供应商状态">
-                     <el-radio-group v-model="form.status">
-                        <el-radio
-                           v-for="dict in sys_normal_disable"
-                           :key="dict.value"
-                           :value="dict.value"
-                        >{{ dict.label }}</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="开票名称(抬头)" prop="invoiceName">
-                     <el-input v-model="form.invoiceName" placeholder="请输入开票名称" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="税号" prop="invoiceNum">
-                     <el-input v-model="form.invoiceNum" placeholder="请输入税号" />
-                  </el-form-item>
-               </el-col>
+    <!-- 添加或修改供应商对话框 -->
+    <el-dialog :title="title" v-model="open" width="700px" append-to-body>
+      <el-form ref="deptRef" :model="form" :rules="rules" label-width="110px">
+        <el-row>
+          <el-col :span="24" v-if="form.parentId !== 0">
+            <el-form-item label="上级组织" prop="parentId">
+              <el-tree-select
+                  v-model="form.parentId"
+                  :data="deptOptions"
+                  :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
+                  value-key="deptId"
+                  placeholder="选择上级组织"
+                  check-strictly
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="供应商名称" prop="deptName">
+              <el-input v-model="form.deptName" placeholder="请输入供应商名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="leader">
+              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="phone">
+              <el-input v-model="form.phone" 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-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="费率" prop="rateValue">
+              <el-input-number v-model="form.rateValue" controls-position="right" :min="0" :max="100" :precision="2"
+                               placeholder="请输入费率(%)"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="供应商状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                    v-for="dict in sys_normal_disable"
+                    :key="dict.value"
+                    :value="dict.value"
+                >{{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="开票名称(抬头)" prop="invoiceName">
+              <el-input v-model="form.invoiceName" placeholder="请输入开票名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="税号" prop="invoiceNum">
+              <el-input v-model="form.invoiceNum" placeholder="请输入税号"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="开户银行" prop="openBank">
+              <el-input v-model="form.openBank" placeholder="请输入开户银行"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="银行账号" prop="bankAccount">
+              <el-input v-model="form.bankAccount" placeholder="请输入银行账号"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="公司地址" prop="companyAddress">
+              <el-input v-model="form.companyAddress" placeholder="请输入公司地址" type="textarea" :rows="2"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
 
-               <el-col :span="24">
-                  <el-form-item label="开户银行" prop="openBank">
-                     <el-input v-model="form.openBank" placeholder="请输入开户银行" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="银行账号" prop="bankAccount">
-                     <el-input v-model="form.bankAccount" placeholder="请输入银行账号" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="公司地址" prop="companyAddress">
-                     <el-input v-model="form.companyAddress" placeholder="请输入公司地址" type="textarea" :rows="2" />
-                  </el-form-item>
-               </el-col>
-            </el-row>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">确 定</el-button>
-               <el-button @click="cancel">取 消</el-button>
-            </div>
-         </template>
-      </el-dialog>
-   </div>
+    <!-- 供应商导入对话框 -->
+    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+      <el-upload
+          ref="uploadRef"
+          :limit="1"
+          accept=".xlsx, .xls"
+          :headers="upload.headers"
+          :action="upload.url"
+          :disabled="upload.isUploading"
+          :on-progress="handleFileUploadProgress"
+          :on-success="handleFileSuccess"
+          :on-change="handleFileChange"
+          :on-remove="handleFileRemove"
+          :auto-upload="false"
+          drag
+      >
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="handleDownloadTemplate">
+              下载模板
+            </el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup name="Dept">
 import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept"
+import { getToken } from "@/utils/auth"
+import { download } from '@/utils/request'
+import { UploadFilled } from '@element-plus/icons-vue'
 
 const { proxy } = getCurrentInstance()
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable")
@@ -192,6 +256,22 @@ const deptOptions = ref([])
 const isExpandAll = ref(true)
 const refreshTable = ref(true)
 
+/*** 供应商导入参数 */
+const upload = reactive({
+  // 是否显示弹出层（导入）
+  open: false,
+  // 弹出层标题
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 设置上传的请求头部
+  headers: { Authorization: "Bearer " + getToken() },
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/system/dept/importData",
+  // 当前选中的文件
+  selectedFile: null
+})
+
 const data = reactive({
   form: {},
   queryParams: {
@@ -201,18 +281,63 @@ const data = reactive({
   rules: {
     parentId: [{ required: true, message: "上级组织不能为空", trigger: "blur" }],
     deptName: [{ required: true, message: "供应商名称不能为空", trigger: "blur" }],
-    orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
     email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
     phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
     rateValue: [
       { required: true, message: "费率不能为空", trigger: "blur" },
       { pattern: /^\d+(\.\d{1,2})?$/, message: "请输入正确的费率格式，最多两位小数", trigger: "blur" }
     ]
-  },
+  }
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
+/** 下载模板 */
+const handleDownloadTemplate = () => {
+  download('/system/dept/importTemplate', {}, '供应商模板.xlsx')
+}
+
+/** 导入按钮操作 */
+function handleImport() {
+  upload.title = "供应商导入"
+  upload.open = true
+  upload.selectedFile = null
+}
+
+/** 文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true
+}
+
+/** 文件选择处理 */
+const handleFileChange = (file, fileList) => {
+  upload.selectedFile = file
+}
+
+/** 文件删除处理 */
+const handleFileRemove = (file, fileList) => {
+  upload.selectedFile = null
+}
+
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false
+  upload.isUploading = false
+  proxy.$refs["uploadRef"].handleRemove(file)
+  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+  getList()
+}
+
+/** 提交上传文件 */
+function submitFileForm() {
+  const file = upload.selectedFile
+  if (!file || file.length === 0 || !file.name.toLowerCase().endsWith('.xls') && !file.name.toLowerCase().endsWith('.xlsx')) {
+    proxy.$modal.msgError("请选择后缀为 “xls”或“xlsx”的文件。")
+    return
+  }
+  proxy.$refs["uploadRef"].submit()
+}
+
 /** 查询部门列表 */
 function getList() {
   loading.value = true
@@ -318,7 +443,7 @@ function submitForm() {
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() {
+  proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function () {
     return delDept(row.deptId)
   }).then(() => {
     getList()

jd-logistics-ui-v3/src/views/system/user/index.vue

@@ -47,12 +47,13 @@
               <el-col :span="1.5">
                 <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
               </el-col>
-<!--              <el-col :span="1.5">
-                <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
-              </el-col>
+
               <el-col :span="1.5">
-                <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
-              </el-col>-->
+                <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['system:user:add']">导入</el-button>
+              </el-col>
+<!--              <el-col :span="1.5">-->
+<!--                <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>-->
+<!--              </el-col>-->
               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
             </el-row>
 
@@ -195,9 +196,9 @@
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <template #tip>
           <div class="el-upload__tip text-center">
-            <div class="el-upload__tip">
-              <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-            </div>
+<!--            <div class="el-upload__tip">-->
+<!--              <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>
           </div>
@@ -219,6 +220,7 @@ import useAppStore from '@/store/modules/app'
 import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user"
 import { Splitpanes, Pane } from "splitpanes"
 import "splitpanes/dist/splitpanes.css"
+import {download} from "@/utils/request.js";
 
 const router = useRouter()
 const appStore = useAppStore()
@@ -427,6 +429,13 @@ function handleSelectionChange(selection) {
   multiple.value = !selection.length
 }
 
+
+// 下载模板
+const handleDownloadTemplate = () => {
+  // 直接调用 download 方法，传入 URL 和文件名（可选）
+  download('/system/user/importTemplate', {}, '用户模板.xlsx')
+}
+
 /** 导入按钮操作 */
 function handleImport() {
   upload.title = "用户导入"