给收入单和支出单增加收支项目的查询条件

jshERP-web/src/views/financial/ItemInList.vue

@@ -81,6 +81,15 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="收入项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="请选择收入项目" showSearch optionFilterProp="children" v-model="queryParam.inOutItemId">
+                      <a-select-option v-for="(item,index) in inOutItemList" :key="index" :value="item.id">
+                        {{ item.name }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-input placeholder="请输入单据备注" v-model="queryParam.remark"></a-input>
@@ -176,6 +185,7 @@
           creator: undefined,
           handsPersonId: undefined,
           accountId: undefined,
+          inOutItemId: undefined,
           status: undefined,
           remark: ""
         },
@@ -217,6 +227,7 @@
       this.initUser()
       this.initPerson()
       this.initAccount()
+      this.initInOutItem('in')
     },
     methods: {
     }

jshERP-web/src/views/financial/ItemOutList.vue

@@ -81,6 +81,15 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="支出项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="请选择支出项目" showSearch optionFilterProp="children" v-model="queryParam.inOutItemId">
+                      <a-select-option v-for="(item,index) in inOutItemList" :key="index" :value="item.id">
+                        {{ item.name }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-input placeholder="请输入单据备注" v-model="queryParam.remark"></a-input>
@@ -176,6 +185,7 @@
           creator: undefined,
           handsPersonId: undefined,
           accountId: undefined,
+          inOutItemId: undefined,
           status: undefined,
           remark: ""
         },
@@ -217,6 +227,7 @@
       this.initUser()
       this.initPerson()
       this.initAccount()
+      this.initInOutItem('out')
     },
     methods: {
     }

jshERP-web/src/views/financial/MoneyInList.vue

@@ -82,13 +82,13 @@
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="单据备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="销售单号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input placeholder="请输入单据备注" v-model="queryParam.remark"></a-input>
+                    <a-input placeholder="请输入销售单号" v-model="queryParam.number"></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="销售单号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="单据备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input placeholder="请输入销售单号" v-model="queryParam.number"></a-input>
+                    <a-input placeholder="请输入单据备注" v-model="queryParam.remark"></a-input>
                   </a-form-item>
                 </a-col>
               </template>

jshERP-web/src/views/financial/MoneyOutList.vue

@@ -82,13 +82,13 @@
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="单据备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="采购单号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input placeholder="请输入单据备注" v-model="queryParam.remark"></a-input>
+                    <a-input placeholder="请输入采购单号" v-model="queryParam.number"></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="采购单号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="单据备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input placeholder="请输入采购单号" v-model="queryParam.number"></a-input>
+                    <a-input placeholder="请输入单据备注" v-model="queryParam.remark"></a-input>
                   </a-form-item>
                 </a-col>
               </template>

jshERP-web/src/views/financial/mixins/FinancialListMixin.js

@@ -1,5 +1,7 @@
-import {findFinancialDetailByNumber, findBySelectSup, findBySelectCus, findBySelectOrgan, findBySelectRetail,
+import {
-  getUserList, getPersonByType, getAccount, getCurrentSystemConfig, getPlatformConfigByKey} from '@/api/api'
+  findFinancialDetailByNumber, findBySelectSup, findBySelectCus, findBySelectOrgan, findBySelectRetail,
+  getUserList, getPersonByType, getAccount, getCurrentSystemConfig, getPlatformConfigByKey, findInOutItemByParam
+} from '@/api/api'
 import { getCheckFlag, getFormatDate, getPrevMonthFormatDate } from '@/utils/util'
 import Vue from 'vue'
 import moment from 'moment'
@@ -20,6 +22,7 @@ export const FinancialListMixin = {
       userList: [],
       personList: [],
       accountList: [],
+      inOutItemList: [],
       queryParam: {
         beginTime: getPrevMonthFormatDate(3),
         endTime: getFormatDate(),
@@ -162,8 +165,14 @@ export const FinancialListMixin = {
     initAccount() {
       getAccount({}).then((res)=>{
         if(res && res.code === 200) {
-          let list = res.data.accountList
+          this.accountList = res.data.accountList
-          this.accountList = list
+        }
+      })
+    },
+    initInOutItem(type) {
+      findInOutItemByParam({type:type}).then((res)=>{
+        if(res) {
+          this.inOutItemList = res
         }
       })
     },