费用编码后台管理调整

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/BizFinancialFeeItemsServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.logistics.service.impl;
 
 import java.util.List;
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.logistics.mapper.BizFinancialFeeItemsMapper;
@@ -55,6 +56,9 @@ public class BizFinancialFeeItemsServiceImpl implements IBizFinancialFeeItemsSer
     public int insertBizFinancialFeeItems(BizFinancialFeeItems bizFinancialFeeItems)
     {
         bizFinancialFeeItems.setCreateTime(DateUtils.getNowDate());
+        bizFinancialFeeItems.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
+        bizFinancialFeeItems.setUserId(SecurityUtils.getUserId());
+        bizFinancialFeeItems.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         int result = bizFinancialFeeItemsMapper.insertBizFinancialFeeItems(bizFinancialFeeItems);
         return result;
     }
@@ -69,6 +73,7 @@ public class BizFinancialFeeItemsServiceImpl implements IBizFinancialFeeItemsSer
     public int updateBizFinancialFeeItems(BizFinancialFeeItems bizFinancialFeeItems)
     {
         bizFinancialFeeItems.setUpdateTime(DateUtils.getNowDate());
+        bizFinancialFeeItems.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
         int result = bizFinancialFeeItemsMapper.updateBizFinancialFeeItems(bizFinancialFeeItems);
         return result;
     }

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/logistics/BizFinancialFeeItemsMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
         </where>
+        or order by create_time desc
     </select>
     
     <select id="selectBizFinancialFeeItemsByFeeItemId" parameterType="Long" resultMap="BizFinancialFeeItemsResult">

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="98px">
       <el-form-item label="费用项目编码" prop="feeItemCode">
         <el-input
           v-model="queryParams.feeItemCode"
@@ -17,10 +17,10 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="外部渠道" prop="feeItemCategory">
+      <el-form-item label="渠道" prop="feeItemCategory">
         <el-select
           v-model="queryParams.feeItemCategory"
-          placeholder="请选择外部渠道"
+          placeholder="请选择渠道"
           clearable
         >
           <el-option
@@ -31,7 +31,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="外部费用编码" prop="extFeeCode">
+<!--      <el-form-item label="外部费用编码" prop="extFeeCode">
         <el-input
           v-model="queryParams.extFeeCode"
           placeholder="请输入外部费用编码"
@@ -46,7 +46,7 @@
           clearable
           @keyup.enter="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -83,7 +83,7 @@
           v-hasPermi="['system:inancialFee:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -91,7 +91,7 @@
           @click="handleExport"
           v-hasPermi="['system:inancialFee:export']"
         >导出</el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -99,14 +99,19 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="费用项目编码" align="center" prop="feeItemCode" />
       <el-table-column label="费用项目名称" align="center" prop="feeItemName" />
-      <el-table-column label="外部渠道" align="center" prop="feeItemCategory">
+      <el-table-column label="渠道" align="center" prop="feeItemCategory">
         <template #default="scope">
           <dict-tag :options="logistics_type" :value="scope.row.feeItemCategory" />
         </template>
       </el-table-column>
       <el-table-column label="外部费用编码" align="center" prop="extFeeCode" />
       <el-table-column label="外部费用名称" align="center" prop="extFeeName" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <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" prop="remark" />-->
       <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:inancialFee:edit']">修改</el-button>
@@ -125,7 +130,7 @@
 
     <!-- 添加或修改费用类型管理对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="inancialFeeRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="inancialFeeRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="费用项目编码" prop="feeItemCode">
           <el-input v-model="form.feeItemCode" placeholder="请输入费用项目编码" />
         </el-form-item>
@@ -148,9 +153,9 @@
         <el-form-item label="外部费用名称" prop="extFeeName">
           <el-input v-model="form.extFeeName" placeholder="请输入外部费用名称" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
+<!--        <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <template #footer>
         <div class="dialog-footer">