oa二期内容更新添加账户检索出入账数据，存在问题物料品牌规格的多字段查询需要重新确立独立接口

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaReceiveAccountController.java

@@ -47,6 +47,16 @@ public class SysOaReceiveAccountController extends BaseController {
         return R.ok(iSysOaReceiveAccountService.queryPageList(bo));
     }
 
+    /**
+     * 获取全部账户数据
+     */
+    @GetMapping("/allList")
+    public R<List<SysOaReceiveAccountVo>> allList(SysOaReceiveAccountBo bo) {
+
+        return R.ok(iSysOaReceiveAccountService.queryList(bo));
+    }
+
+
     /**
      * 导出付款账户管理列表
      */

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java

@@ -1,14 +1,17 @@
 package com.ruoyi.oa.domain.vo;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.oa.domain.SysOaDetail;
+import com.ruoyi.oa.domain.SysOaFinance;
 import com.ruoyi.oa.domain.SysOaProject;
 import lombok.Data;
+
 import java.util.Date;
 import java.util.List;
 
@@ -21,7 +24,7 @@ import java.util.List;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class SysOaFinanceVo {
+public class SysOaFinanceVo extends SysOaFinance {
 
     private static final long serialVersionUID = 1L;
 
@@ -70,7 +73,6 @@ public class SysOaFinanceVo {
     private Date financeTime;
 
 
-
     /**
      * 开票比例
      */

ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.oa.mapper.SysOaFinanceMapper">
 
-    <resultMap type="com.ruoyi.oa.domain.SysOaFinance" id="SysOaFinanceResult">
+    <resultMap type="com.ruoyi.oa.domain.vo.SysOaFinanceVo" id="SysOaFinanceResult">
         <result property="financeId" column="finance_id"/>
         <result property="projectId" column="project_id"/>
         <result property="financeTitle" column="finance_title"/>
@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="receiveAccountId" column="receive_account_id"/>
+        <result property="receiveAccountName" column="receive_account_name"/>
         <association property="project" column="project_id" javaType="SysOaProject" resultMap="SysOaProjectResult"/>
         <association property="detailList" javaType="java.util.List" resultMap="detailResult"/>
     </resultMap>
@@ -74,23 +76,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectFinanceList" resultMap="SysOaFinanceResult">
-        select a.finance_id, a.project_id, a.finance_title, a.finance_parties, a.pay_type, a.finance_type, a.finance_time, a.make_ratio, a.make_price, a.make_time, a.make_explain, a.accessory, a.remark as finance_remark, a.create_by, a.create_time, a.update_by, a.update_time,
+        select sof.finance_id,
-               b.detail_id, b.detail_title, b.price, b.big_price, b.remark as detail_remark,
+               sof.project_id,
-               p.project_id,p.project_name
+               sof.finance_title,
-        from sys_oa_finance a
+               sof.finance_parties,
-                 left join sys_oa_detail b on a.finance_id = b.finance_id
+               sof.pay_type,
-                 left join sys_oa_project p on a.project_id = p.project_id
+               sof.finance_type,
+               sof.finance_time,
+               sof.make_ratio,
+               sof.make_price,
+               sof.make_time,
+               sof.make_explain,
+               sof.accessory,
+               sof.remark as finance_remark,
+               sof.create_by,
+               sof.create_time,
+               sof.update_by,
+               sof.update_time,
+               b.detail_id,
+               b.detail_title,
+               b.price,
+               b.big_price,
+               b.remark as detail_remark,
+               p.project_id,
+               p.project_name,
+               sora.receive_account_name,
+               sora.receive_account_id
+        from sys_oa_finance sof
+                 left join sys_oa_detail b on sof.finance_id = b.finance_id
+                 left join sys_oa_project p on sof.project_id = p.project_id
+                left join sys_oa_receive_account sora on sof.receive_account_id = sora.receive_account_id
             ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectFinanceById" parameterType="Long" resultMap="SysOaFinanceResult">
-        select a.finance_id, a.project_id, a.finance_title, a.finance_parties, a.pay_type, a.finance_type, a.finance_time, a.make_ratio, a.make_price, a.make_time, a.make_explain,  a.accessory, a.remark as finance_remark, a.create_by, a.create_time, a.update_by, a.update_time,
+        select sof.finance_id,
-               b.detail_id, b.detail_title, b.price, b.big_price, b.remark as detail_remark,
+               sof.project_id,
-               p.project_id,p.project_name
+               sof.finance_title,
-        from sys_oa_finance a
+               sof.finance_parties,
-                 left join sys_oa_detail b on a.finance_id = b.finance_id
+               sof.pay_type,
-                 left join sys_oa_project p on a.project_id = p.project_id
+               sof.finance_type,
-        where a.finance_id = #{financeId}
+               sof.finance_time,
+               sof.make_ratio,
+               sof.make_price,
+               sof.make_time,
+               sof.make_explain,
+               sof.accessory,
+               sof.remark as finance_remark,
+               sof.create_by,
+               sof.create_time,
+               sof.update_by,
+               sof.update_time,
+               b.detail_id,
+               b.detail_title,
+               b.price,
+               b.big_price,
+               b.remark as detail_remark,
+               p.project_id,
+               p.project_name,
+               sora.receive_account_name,
+               sora.receive_account_id
+        from sys_oa_finance sof
+                 left join sys_oa_detail b on sof.finance_id = b.finance_id
+                 left join sys_oa_project p on sof.project_id = p.project_id
+                 left join sys_oa_receive_account sora on sof.receive_account_id = sora.receive_account_id
+        where sof.finance_id = #{financeId}
     </select>
     <!--进出账查询-->
     <select id="selectFinanceByProjectId" resultMap="SysOaFinanceResult">

ruoyi-ui/src/api/oa/oaReceiveAccount.js

@@ -8,6 +8,14 @@ export function listOaReceiveAccount(query) {
     params: query
   })
 }
+// 查询全部付款账户管理列表
+export function AllListOaReceiveAccount(query) {
+  return request({
+    url: '/system/oaReceiveAccount/allList',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询付款账户管理详细
 export function getOaReceiveAccount(receiveAccountId) {

ruoyi-ui/src/views/oa/finance/index.vue

@@ -620,11 +620,25 @@
     <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <el-col :span="16">
+          <el-col :span="8">
             <el-form-item :label="type == 1 ? '入账名称' : '出账名称'" prop="financeTitle">
               <el-input v-model="form.financeTitle" placeholder="请输入账务名称"/>
             </el-form-item>
           </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="账户" prop="receiveAccountId">
+              <el-select v-model="form.receiveAccountId" placeholder="请选择账户">
+              <el-option
+                v-for="item in receiveAccounts"
+                :key="item.receiveAccountId"
+                :label="item.receiveAccountName"
+                :value="item.receiveAccountId">
+                <span v-if="item.receiveAccountId===-1">无分类</span>
+              </el-option>
+            </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="交易时间" prop="financeTime">
               <el-date-picker clearable
@@ -747,7 +761,7 @@ import {
 } from "@/api/oa/finance";
 import Vue from "vue";
 import {
-  addOaReceiveAccount,
+  addOaReceiveAccount, AllListOaReceiveAccount,
   delOaReceiveAccount,
   listOaReceiveAccount,
   updateOaReceiveAccount
@@ -823,6 +837,7 @@ export default {
       titleLink: "增长人数",
       checkByTime: {},
       monthCheck: {},
+      receiveAccounts:[],
       // monthOutByTime: 0,
       // monthComeByTime: 0,
       yearCheck: {},
@@ -845,6 +860,7 @@ export default {
         name: '王小虎',
         address: '上海市普陀区金沙江路 1516 弄'
       }],
+
       // 表单校验
       rules: {
         financeTitle: [
@@ -862,6 +878,9 @@ export default {
         financeTime: [
           {required: true, message: "交易时间不能为空", trigger: "blur"}
         ],
+        receiveAccountId: [
+          {required: true, message: "账户不能为空", trigger: "blur"}
+        ],
       }
     };
   },
@@ -925,7 +944,9 @@ export default {
     getReceiveAccountList() {
       listOaReceiveAccount().then(response => {
         this.receiveAccountList = response.data;
-
+      })
+      AllListOaReceiveAccount().then(response => {
+        this.receiveAccounts = response.data;
       })
     },
 
@@ -1096,6 +1117,7 @@ export default {
       const financeId = row.financeId || this.ids
       getFinance(financeId).then(response => {
         this.loading = false;
+
         this.form = response.data;
         this.detailList = response.data.detailList;
         this.detailPriceSum(response.data.detailList);