部门页面、用户页面管理调整

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/BizBannerController.java

@@ -38,7 +38,7 @@ public class BizBannerController extends BaseController
     /**
      * 查询轮播图列表
      */
-    @RequiresPermissions("system:banner:list")
+    @RequiresPermissions("logistics:banner:list")
     @GetMapping("/list")
     public TableDataInfo list(BizBanner bizBanner)
     {
@@ -50,7 +50,7 @@ public class BizBannerController extends BaseController
     /**
      * 导出轮播图列表
      */
-    @RequiresPermissions("system:banner:export")
+    @RequiresPermissions("logistics:banner:export")
     @Log(title = "轮播图", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizBanner bizBanner)
@@ -63,7 +63,7 @@ public class BizBannerController extends BaseController
     /**
      * 获取轮播图详细信息
      */
-    @RequiresPermissions("system:banner:query")
+    @RequiresPermissions("logistics:banner:query")
     @GetMapping(value = "/{bannerId}")
     public AjaxResult getInfo(@PathVariable("bannerId") Long bannerId)
     {
@@ -73,7 +73,7 @@ public class BizBannerController extends BaseController
     /**
      * 新增轮播图
      */
-    @RequiresPermissions("system:banner:add")
+    @RequiresPermissions("logistics:banner:add")
     @Log(title = "轮播图", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BizBanner bizBanner)
@@ -84,7 +84,7 @@ public class BizBannerController extends BaseController
     /**
      * 修改轮播图
      */
-    @RequiresPermissions("system:banner:edit")
+    @RequiresPermissions("logistics:banner:edit")
     @Log(title = "轮播图", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BizBanner bizBanner)
@@ -95,7 +95,7 @@ public class BizBannerController extends BaseController
     /**
      * 删除轮播图
      */
-    @RequiresPermissions("system:banner:remove")
+    @RequiresPermissions("logistics:banner:remove")
     @Log(title = "轮播图", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{bannerIds}")
     public AjaxResult remove(@PathVariable Long[] bannerIds)

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

@@ -55,20 +55,20 @@
          :default-expand-all="isExpandAll"
          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
-         <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-         <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
-         <el-table-column prop="status" label="状态" width="100">
-            <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+         <el-table-column prop="deptName" label="供应商名称" width="180"></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="150"></el-table-column>
-         <el-table-column prop="invoiceNum" label="税号" width="200"></el-table-column>
-         <el-table-column prop="rateValue" label="费率" width="100"></el-table-column>
-         <el-table-column prop="openBank" label="开户银行" width="200"></el-table-column>
-         <el-table-column prop="bankAccount" label="银行账号" width="200"></el-table-column>
-         <el-table-column prop="companyAddress" label="公司地址" width="250"></el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+        <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>
@@ -82,32 +82,32 @@
          </el-table-column>
       </el-table>
 
-      <!-- 添加或修改部门对话框 -->
-      <el-dialog :title="title" v-model="open" width="600px" append-to-body>
-         <el-form ref="deptRef" :model="form" :rules="rules" label-width="80px">
+      <!-- 添加或修改供应商对话框 -->
+      <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-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="选择上级部门"
+                        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 label="供应商名称" prop="deptName">
+                     <el-input v-model="form.deptName" placeholder="请输入供应商名称" />
                   </el-form-item>
                </el-col>
-               <el-col :span="12">
+<!--               <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>-->
                <el-col :span="12">
                   <el-form-item label="负责人" prop="leader">
                      <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
@@ -124,7 +124,7 @@
                   </el-form-item>
                </el-col>
                <el-col :span="12">
-                  <el-form-item label="部门状态">
+                  <el-form-item label="供应商状态">
                      <el-radio-group v-model="form.status">
                         <el-radio
                            v-for="dict in sys_normal_disable"
@@ -135,7 +135,7 @@
                   </el-form-item>
                </el-col>
                <el-col :span="24">
-                  <el-form-item label="开票名称" prop="invoiceName">
+                  <el-form-item label="开票名称(抬头)" prop="invoiceName">
                      <el-input v-model="form.invoiceName" placeholder="请输入开票名称" />
                   </el-form-item>
                </el-col>
@@ -198,8 +198,8 @@ const data = reactive({
     status: undefined
   },
   rules: {
-    parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
-    deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
+    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" }],
@@ -266,7 +266,7 @@ function handleAdd(row) {
     form.value.parentId = row.deptId
   }
   open.value = true
-  title.value = "添加部门"
+  title.value = "添加供应商"
 }
 
 /** 展开/折叠操作 */
@@ -287,7 +287,7 @@ function handleUpdate(row) {
   getDept(row.deptId).then(response => {
     form.value = response.data
     open.value = true
-    title.value = "修改部门"
+    title.value = "修改供应商"
   })
 }
 

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

@@ -6,7 +6,7 @@
         <pane size="16">
           <el-col>
             <div class="head-container">
-              <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search" style="margin-bottom: 20px" />
+              <el-input v-model="deptName" placeholder="请输入组织名称" clearable prefix-icon="Search" style="margin-bottom: 20px" />
             </div>
             <div class="head-container">
               <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all @node-click="handleNodeClick" />
@@ -47,12 +47,12 @@
               <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-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-col>-->
               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
             </el-row>
 
@@ -61,8 +61,8 @@
               <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns.userId.visible" />
               <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true" />
               <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
+              <el-table-column label="组织" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
+<!--              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />-->
               <el-table-column label="状态" align="center" key="status" v-if="columns.status.visible">
                 <template #default="scope">
                   <el-switch
@@ -111,12 +111,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <el-tree-select v-model="form.deptId" :data="enabledDeptOptions" :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择归属部门" clearable check-strictly />
+            <el-form-item label="归属组织" prop="deptId">
+              <el-tree-select v-model="form.deptId" :data="enabledDeptOptions" :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择归属组织" clearable check-strictly />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+<!--        <el-row>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phonenumber">
               <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
@@ -127,11 +127,11 @@
               <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row>-->
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+            <el-form-item v-if="form.userId == undefined" label="用户账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户账号" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -259,9 +259,9 @@ const upload = reactive({
 // 列显隐信息
 const columns = ref({
   userId: { label: '用户编号', visible: true },
-  userName: { label: '用户名称', visible: true },
+  userName: { label: '用户账号', visible: true },
   nickName: { label: '用户昵称', visible: true },
-  deptName: { label: '部门', visible: true },
+  deptName: { label: '组织', visible: true },
   phonenumber: { label: '手机号码', visible: true },
   status: { label: '状态', visible: true },
   createTime: { label: '创建时间', visible: true }