Merge remote-tracking branch 'origin/main'

ruoyi-admin/src/main/java/com/ruoyi/change/domain/TbAssetOrder.java

@@ -61,6 +61,10 @@ public class TbAssetOrder extends BaseEntity
     @Excel(name = "记录状态")
     private Long recordStatus;
 
+    /** 单据类型 */
+    @Excel(name = "单据类型")
+    private Long orderType;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -160,6 +164,15 @@ public class TbAssetOrder extends BaseEntity
     {
         return recordStatus;
     }
+    public void setOrderType(Long orderType) 
+    {
+        this.orderType = orderType;
+    }
+
+    public Long getOrderType() 
+    {
+        return orderType;
+    }
 
     @Override
     public String toString() {
@@ -175,6 +188,7 @@ public class TbAssetOrder extends BaseEntity
             .append("preparedDepartment", getPreparedDepartment())
             .append("corporation", getCorporation())
             .append("recordStatus", getRecordStatus())
+            .append("orderType", getOrderType())
             .toString();
     }
 }

ruoyi-admin/src/main/resources/application.yml

@@ -74,7 +74,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 2
+    database: 0
     # 密码
     password: foobared
     # 连接超时时间

ruoyi-admin/src/main/resources/mapper/change/TbAssetOrderMapper.xml

@@ -16,22 +16,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="preparedDepartment"    column="prepared_department"    />
         <result property="corporation"    column="corporation"    />
         <result property="recordStatus"    column="record_status"    />
+        <result property="orderType"    column="order_type"    />
     </resultMap>
 
     <sql id="selectTbAssetOrderVo">
-        select id, order_number, asset_total_original_value, asset_total_net_value, application_date, application_department, reason, prepared_by, prepared_department, corporation, record_status from tb_asset_order
+        select id, order_number, asset_total_original_value, asset_total_net_value, application_date, application_department, reason, prepared_by, prepared_department, corporation, record_status, order_type from tb_asset_order
     </sql>
 
     <select id="selectTbAssetOrderList" parameterType="TbAssetOrder" resultMap="TbAssetOrderResult">
         <include refid="selectTbAssetOrderVo"/>
         <where>  
             <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
+            <if test="assetTotalOriginalValue != null  and assetTotalOriginalValue != ''"> and asset_total_original_value = #{assetTotalOriginalValue}</if>
+            <if test="assetTotalNetValue != null  and assetTotalNetValue != ''"> and asset_total_net_value = #{assetTotalNetValue}</if>
             <if test="applicationDate != null "> and application_date = #{applicationDate}</if>
             <if test="applicationDepartment != null  and applicationDepartment != ''"> and application_department = #{applicationDepartment}</if>
+            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
             <if test="preparedBy != null  and preparedBy != ''"> and prepared_by = #{preparedBy}</if>
             <if test="preparedDepartment != null  and preparedDepartment != ''"> and prepared_department = #{preparedDepartment}</if>
             <if test="corporation != null  and corporation != ''"> and corporation = #{corporation}</if>
             <if test="recordStatus != null "> and record_status = #{recordStatus}</if>
+            <if test="orderType != null "> and order_type = #{orderType}</if>
         </where>
     </select>
     
@@ -53,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="preparedDepartment != null">prepared_department,</if>
             <if test="corporation != null">corporation,</if>
             <if test="recordStatus != null">record_status,</if>
+            <if test="orderType != null">order_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderNumber != null and orderNumber != ''">#{orderNumber},</if>
@@ -65,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="preparedDepartment != null">#{preparedDepartment},</if>
             <if test="corporation != null">#{corporation},</if>
             <if test="recordStatus != null">#{recordStatus},</if>
+            <if test="orderType != null">#{orderType},</if>
          </trim>
     </insert>
 
@@ -81,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="preparedDepartment != null">prepared_department = #{preparedDepartment},</if>
             <if test="corporation != null">corporation = #{corporation},</if>
             <if test="recordStatus != null">record_status = #{recordStatus},</if>
+            <if test="orderType != null">order_type = #{orderType},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-ui/src/views/change/order/index.vue

@@ -9,6 +9,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="资产总原值" prop="assetTotalOriginalValue">
+        <el-input
+          v-model="queryParams.assetTotalOriginalValue"
+          placeholder="请输入资产总原值"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="资产总净值" prop="assetTotalNetValue">
+        <el-input
+          v-model="queryParams.assetTotalNetValue"
+          placeholder="请输入资产总净值"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="申请日期" prop="applicationDate">
         <el-date-picker clearable
           v-model="queryParams.applicationDate"
@@ -25,6 +41,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="原因说明" prop="reason">
+        <el-input
+          v-model="queryParams.reason"
+          placeholder="请输入原因说明"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="制单人" prop="preparedBy">
         <el-input
           v-model="queryParams.preparedBy"
@@ -59,6 +83,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="单据类型" prop="orderType">
+        <el-select v-model="queryParams.orderType" placeholder="请选择单据类型" clearable>
+          <el-option
+            v-for="dict in dict.type.asset_order_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -132,6 +166,11 @@
           <dict-tag :options="dict.type.asset_record_status" :value="scope.row.recordStatus"/>
         </template>
       </el-table-column>
+      <el-table-column label="单据类型" align="center" prop="orderType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.asset_order_type" :value="scope.row.orderType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -205,6 +244,16 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="单据类型" prop="orderType">
+          <el-select v-model="form.orderType" placeholder="请选择单据类型">
+            <el-option
+              v-for="dict in dict.type.asset_order_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -219,7 +268,7 @@ import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/chan
 
 export default {
   name: "Order",
-  dicts: ['asset_record_status'],
+  dicts: ['asset_order_type', 'asset_record_status'],
   data() {
     return {
       // 遮罩层
@@ -245,12 +294,16 @@ export default {
         pageNum: 1,
         pageSize: 10,
         orderNumber: null,
+        assetTotalOriginalValue: null,
+        assetTotalNetValue: null,
         applicationDate: null,
         applicationDepartment: null,
+        reason: null,
         preparedBy: null,
         preparedDepartment: null,
         corporation: null,
-        recordStatus: null
+        recordStatus: null,
+        orderType: null
       },
       // 表单参数
       form: {},
@@ -264,6 +317,9 @@ export default {
         ],
         recordStatus: [
           { required: true, message: "记录状态不能为空", trigger: "change" }
+        ],
+        orderType: [
+          { required: true, message: "单据类型不能为空", trigger: "change" }
         ]
       }
     };
@@ -299,7 +355,8 @@ export default {
         preparedBy: null,
         preparedDepartment: null,
         corporation: null,
-        recordStatus: null
+        recordStatus: null,
+        orderType: null
       };
       this.resetForm("form");
     },