新增入账时间；优化前端标题与图标修改

ruoyi-admin/src/main/java/com/ruoyi/asset/controller/TbAssetInformationController.java

@@ -51,7 +51,6 @@ public class TbAssetInformationController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TbAssetInformation tbAssetInformation)
     {
-        startPage();
         List<TbAssetInformation> list = tbAssetInformationService.selectTbAssetInformationList(tbAssetInformation);
         return getDataTable(list);
     }

ruoyi-admin/src/main/java/com/ruoyi/asset/domain/TbAssetInformation.java

@@ -174,9 +174,10 @@ public class TbAssetInformation extends BaseEntity
     @Excel(name = "计量单位")
     private String units;
 
-    /** 预留字段d */
-   // @Excel(name = "预留字段d")
-    private String reservedColumnD;
+    /** 入账时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "入账时间", width = 40, dateFormat = "yyyy-MM-dd")
+    private Date paymentReceivingTime;
 
     /** 预留字段e */
   //  @Excel(name = "预留字段e")

ruoyi-admin/src/main/java/com/ruoyi/asset/service/impl/TbAssetInformationServiceImpl.java

@@ -13,6 +13,7 @@ import com.ruoyi.asset.mapper.TbLocationMapper;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanValidators;
@@ -81,6 +82,7 @@ public class TbAssetInformationServiceImpl implements ITbAssetInformationService
         List<String> childrens = new RecursionUtil().getNumberWithChildren(locationMapper, locationNumber);
         tbAssetInformation.setNlist(childrens);
 
+        PageUtils.startPage();
         return tbAssetInformationMapper.selectTbAssetInformationList(tbAssetInformation);
     }
 

ruoyi-admin/src/main/resources/mapper/asset/TbAssetInformationMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isWhitelist"    column="is_whitelist"    />
         <result property="quantity"    column="quantity"    />
         <result property="units"    column="units"    />
-        <result property="reservedColumnD"    column="reserved_column_d"    />
+        <result property="paymentReceivingTime"    column="payment_receiving_time"    />
         <result property="reservedColumnE"    column="reserved_column_e"    />
         <result property="reservedColumnF"    column="reserved_column_f"    />
         <result property="reservedColumnG"    column="reserved_column_g"    />
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTbAssetInformationVo">
-        select id, code, name, number, image_url, category_number, specifications_model, abc_category, manage_status, user_department, department, responsible_person, location_number, property, purchase_date, commissioning_date, original_value, durable_years, net_value, residual_value, accumulated_depreciation, last_depreciation_date, depreciation_method, contract_number, factory_number, manufacturer, supplier, purpose, maintenance_date, maintenance_tel, maintenance_user, corporation, record_status, remark, create_by, create_time, update_by, update_time, is_whitelist, quantity, units, reserved_column_d, reserved_column_e, reserved_column_f, reserved_column_g, reserved_column_h, reserved_column_i, reserved_column_j from tb_asset_information
+        select id, code, name, number, image_url, category_number, specifications_model, abc_category, manage_status, user_department, department, responsible_person, location_number, property, purchase_date, commissioning_date, original_value, durable_years, net_value, residual_value, accumulated_depreciation, last_depreciation_date, depreciation_method, contract_number, factory_number, manufacturer, supplier, purpose, maintenance_date, maintenance_tel, maintenance_user, corporation, record_status, remark, create_by, create_time, update_by, update_time, is_whitelist, quantity, units, payment_receiving_time, reserved_column_e, reserved_column_f, reserved_column_g, reserved_column_h, reserved_column_i, reserved_column_j from tb_asset_information
     </sql>
 
     <select id="selectInfoList" parameterType="TbAssetInformation" resultType="TbAssetInformation">
@@ -155,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isWhitelist != null  and isWhitelist != ''"> and is_whitelist = #{isWhitelist}</if>
             <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
             <if test="units != null  and units != ''"> and units = #{units}</if>
-            <if test="reservedColumnD != null  and reservedColumnD != ''"> and reserved_column_d = #{reservedColumnD}</if>
+            <if test="paymentReceivingTime != null"> and payment_receiving_time = #{paymentReceivingTime}</if>
             <if test="reservedColumnE != null  and reservedColumnE != ''"> and reserved_column_e = #{reservedColumnE}</if>
             <if test="reservedColumnF != null  and reservedColumnF != ''"> and reserved_column_f = #{reservedColumnF}</if>
             <if test="reservedColumnG != null  and reservedColumnG != ''"> and reserved_column_g = #{reservedColumnG}</if>
@@ -226,7 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isWhitelist != null">is_whitelist,</if>
             <if test="quantity != null">quantity,</if>
             <if test="units != null">units,</if>
-            <if test="reservedColumnD != null">reserved_column_d,</if>
+            <if test="paymentReceivingTime != null">payment_receiving_time,</if>
             <if test="reservedColumnE != null">reserved_column_e,</if>
             <if test="reservedColumnF != null">reserved_column_f,</if>
             <if test="reservedColumnG != null">reserved_column_g,</if>
@@ -275,7 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isWhitelist != null">#{isWhitelist},</if>
             <if test="quantity != null">#{quantity},</if>
             <if test="units != null">#{units},</if>
-            <if test="reservedColumnD != null">#{reservedColumnD},</if>
+            <if test="paymentReceivingTime != null">#{paymentReceivingTime},</if>
             <if test="reservedColumnE != null">#{reservedColumnE},</if>
             <if test="reservedColumnF != null">#{reservedColumnF},</if>
             <if test="reservedColumnG != null">#{reservedColumnG},</if>
@@ -328,7 +328,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isWhitelist != null">is_whitelist = #{isWhitelist},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="units != null">units = #{units},</if>
-            <if test="reservedColumnD != null">reserved_column_d = #{reservedColumnD},</if>
+            <if test="paymentReceivingTime != null">payment_receiving_time = #{paymentReceivingTime},</if>
             <if test="reservedColumnE != null">reserved_column_e = #{reservedColumnE},</if>
             <if test="reservedColumnF != null">reserved_column_f = #{reservedColumnF},</if>
             <if test="reservedColumnG != null">reserved_column_g = #{reservedColumnG},</if>

ruoyi-ui/.env.development

@@ -1,5 +1,7 @@
 # 页面标题
-VUE_APP_TITLE = RFID酒店管理系统
+VUE_APP_TITLE = 昆展资产管理系统
+# 标题图标
+VUE_APP_ICON = 'logo.gif'
 
 # 开发环境配置
 ENV = 'development'

ruoyi-ui/.env.production

@@ -1,5 +1,7 @@
 # 页面标题
-VUE_APP_TITLE = RFID酒店管理系统
+VUE_APP_TITLE = 昆展资产管理系统
+# 标题图标
+VUE_APP_ICON = 'logo.gif'
 
 # 生产环境配置
 ENV = 'production'

ruoyi-ui/.env.staging

@@ -1,5 +1,7 @@
 # 页面标题
-VUE_APP_TITLE = RFID酒店管理系统
+VUE_APP_TITLE = 昆展资产管理系统
+# 标题图标
+VUE_APP_ICON = 'logo.gif'
 
 NODE_ENV = production
 

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -1,20 +1,19 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
+  <div class="sidebar-logo-container" :class="{ collapse: collapse }" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1>
       </router-link>
     </transition>
   </div>
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
 import variables from '@/assets/styles/variables.scss'
 
 export default {
@@ -22,23 +21,36 @@ export default {
   props: {
     collapse: {
       type: Boolean,
-      required: true
-    }
+      required: true,
+    },
   },
   computed: {
     variables() {
-      return variables;
+      return variables
     },
     sideTheme() {
       return this.$store.state.settings.sideTheme
-    }
+    },
   },
   data() {
     return {
       title: 'RFID酒店管理系统',
-      logo: logoImg
+      logo: '',
     }
-  }
+  },
+  methods: {
+    getApplicationName() {
+      return process.env.VUE_APP_TITLE
+    },
+    getApplicationIcon() {
+      const icon = process.env.VUE_APP_ICON
+      return require(`@/assets/logo/${icon}`)
+    },
+  },
+  created() {
+    this.title = this.getApplicationName()
+    this.logo = this.getApplicationIcon()
+  },
 }
 </script>
 

ruoyi-ui/src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">RFID酒店管理系统</h3>
+      <h3 class="title">{{getApplicationName()}}</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -108,6 +108,9 @@ export default {
     this.getCookie();
   },
   methods: {
+    getApplicationName() {
+      return process.env.VUE_APP_TITLE
+    },
     getCode() {
       getCodeImg().then(res => {
         this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;

ruoyi-ui/src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">RFID酒店管理系统</h3>
+      <h3 class="title">{{getApplicationName()}}</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -111,6 +111,9 @@ export default {
     this.getCode();
   },
   methods: {
+    getApplicationName() {
+      return process.env.VUE_APP_TITLE
+    },
     getCode() {
       getCodeImg().then(res => {
         this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;

sql/rfid-hotel-manager.sql

@@ -1204,7 +1204,7 @@ CREATE TABLE `tb_asset_information`  (
   `is_whitelist` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '是否白名单',
   `quantity` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '数量',
   `units` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '计量单位',
-  `reserved_column_d` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '预留字段d',
+  `payment_receiving_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '入账时间',
   `reserved_column_e` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '预留字段e',
   `reserved_column_f` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '预留字段f',
   `reserved_column_g` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '预留字段g',