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

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);