给单据增加账户、状态和备注的筛选

jshERP-web/src/views/bill/AllocationOutList.vue

@@ -58,6 +58,19 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -144,7 +157,9 @@
           subType: "调拨",
           roleType: Vue.ls.get('roleType'),
           depotId: "",
-          creator: ""
+          creator: "",
+          status: "",
+          remark: ""
         },
         labelCol: {
           span: 5

jshERP-web/src/views/bill/AssembleList.vue

@@ -58,6 +58,19 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -144,7 +157,9 @@
           subType: "组装单",
           roleType: Vue.ls.get('roleType'),
           depotId: "",
-          creator: ""
+          creator: "",
+          status: "",
+          remark: ""
         },
         labelCol: {
           span: 5

jshERP-web/src/views/bill/DisassembleList.vue

@@ -58,6 +58,19 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -144,7 +157,9 @@
           subType: "拆卸单",
           roleType: Vue.ls.get('roleType'),
           depotId: "",
-          creator: ""
+          creator: "",
+          status: "",
+          remark: ""
         },
         labelCol: {
           span: 5

jshERP-web/src/views/bill/OtherInList.vue

@@ -72,6 +72,19 @@
                     <a-input placeholder="请输入关联单据" v-model="queryParam.linkNumber"></a-input>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -160,7 +173,9 @@
           organId: "",
           depotId: "",
           creator: "",
-          linkNumber: ""
+          linkNumber: "",
+          status: "",
+          remark: ""
         },
         labelCol: {
           span: 5

jshERP-web/src/views/bill/OtherOutList.vue

@@ -72,6 +72,19 @@
                     <a-input placeholder="请输入关联单据" v-model="queryParam.linkNumber"></a-input>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -160,7 +173,9 @@
           organId: "",
           depotId: "",
           creator: "",
-          linkNumber: ""
+          linkNumber: "",
+          status: "",
+          remark: ""
         },
         labelCol: {
           span: 5

jshERP-web/src/views/bill/PurchaseBackList.vue

@@ -72,6 +72,28 @@
                     <a-input placeholder="请输入关联单据" v-model="queryParam.linkNumber"></a-input>
                   </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.accountId">
+                      <a-select-option v-for="(item,index) in accountList" :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-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -160,7 +182,10 @@
           organId: "",
           depotId: "",
           creator: "",
-          linkNumber: ""
+          linkNumber: "",
+          accountId: "",
+          status: "",
+          remark: ""
         },
         labelCol: {
           span: 5
@@ -227,6 +252,7 @@
       this.initSupplier()
       this.getDepotData()
       this.initUser()
+      this.initAccount()
     },
     methods: {
     }

jshERP-web/src/views/bill/PurchaseInList.vue

@@ -72,6 +72,28 @@
                     <a-input placeholder="请输入关联订单" v-model="queryParam.linkNumber"></a-input>
                   </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.accountId">
+                      <a-select-option v-for="(item,index) in accountList" :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-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -162,7 +184,10 @@
           organId: "",
           depotId: "",
           creator: "",
-          linkNumber: ""
+          linkNumber: "",
+          accountId: "",
+          status: "",
+          remark: ""
         },
         labelCol: {
           span: 5
@@ -235,6 +260,7 @@
       this.initSupplier()
       this.getDepotData()
       this.initUser()
+      this.initAccount()
     },
     methods: {
     }

jshERP-web/src/views/bill/PurchaseOrderList.vue

@@ -58,6 +58,21 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</a-select-option>
+                      <a-select-option value="3">部分采购</a-select-option>
+                      <a-select-option value="2">完成采购</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -148,7 +163,9 @@
           roleType: Vue.ls.get('roleType'),
           organId: "",
           depotId: "",
-          creator: ""
+          creator: "",
+          status: "",
+          remark: ""
         },
         labelCol: {
           span: 5

jshERP-web/src/views/bill/RetailBackList.vue

@@ -72,6 +72,28 @@
                     <a-input placeholder="请输入关联单据" v-model="queryParam.linkNumber"></a-input>
                   </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.accountId">
+                      <a-select-option v-for="(item,index) in accountList" :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-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -160,7 +182,10 @@
           organId: "",
           depotId: "",
           creator: "",
-          linkNumber: ""
+          linkNumber: "",
+          accountId: "",
+          status: "",
+          remark: ""
         },
         labelCol: {
           span: 5
@@ -225,6 +250,7 @@
       this.initRetail()
       this.getDepotData()
       this.initUser()
+      this.initAccount()
     },
     methods: {
     }

jshERP-web/src/views/bill/RetailOutList.vue

@@ -67,6 +67,28 @@
                     </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.accountId">
+                      <a-select-option v-for="(item,index) in accountList" :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-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -154,7 +176,10 @@
           roleType: Vue.ls.get('roleType'),
           organId: "",
           depotId: "",
-          creator: ""
+          creator: "",
+          accountId: "",
+          status: "",
+          remark: ""
         },
         labelCol: {
           span: 5
@@ -219,6 +244,7 @@
       this.initRetail()
       this.getDepotData()
       this.initUser()
+      this.initAccount()
     },
     methods: {
     }

jshERP-web/src/views/bill/SaleBackList.vue

@@ -73,6 +73,28 @@
                     <a-input placeholder="请输入关联单据" v-model="queryParam.linkNumber"></a-input>
                   </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.accountId">
+                      <a-select-option v-for="(item,index) in accountList" :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-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -160,7 +182,10 @@
           organId: "",
           depotId: "",
           creator: "",
-          linkNumber: ""
+          linkNumber: "",
+          accountId: "",
+          status: "",
+          remark: ""
         },
         labelCol: {
           span: 5
@@ -227,6 +252,7 @@
       this.initCustomer()
       this.getDepotData()
       this.initUser()
+      this.initAccount()
     },
     methods: {
     }

jshERP-web/src/views/bill/SaleOrderList.vue

@@ -59,6 +59,21 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</a-select-option>
+                      <a-select-option value="3">部分销售</a-select-option>
+                      <a-select-option value="2">完成销售</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -148,7 +163,9 @@
           roleType: Vue.ls.get('roleType'),
           organId: "",
           depotId: "",
-          creator: ""
+          creator: "",
+          status: "",
+          remark: ""
         },
         labelCol: {
           span: 5

jshERP-web/src/views/bill/SaleOutList.vue

@@ -73,6 +73,28 @@
                     <a-input placeholder="请输入关联订单" v-model="queryParam.linkNumber"></a-input>
                   </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.accountId">
+                      <a-select-option v-for="(item,index) in accountList" :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-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -162,7 +184,10 @@
           organId: "",
           depotId: "",
           creator: "",
-          linkNumber: ""
+          linkNumber: "",
+          accountId: "",
+          status: "",
+          remark: ""
         },
         labelCol: {
           span: 5
@@ -235,6 +260,7 @@
       this.initCustomer()
       this.getDepotData()
       this.initUser()
+      this.initAccount()
     },
     methods: {
     }

jshERP-web/src/views/bill/mixins/BillListMixin.js

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import {getAction } from '@/api/manage'
-import {findBySelectSup, findBySelectCus, findBySelectRetail, getUserList } from '@/api/api'
+import {findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount} from '@/api/api'
 
 export const BillListMixin = {
   data () {
@@ -8,7 +8,8 @@ export const BillListMixin = {
       supList: [],
       cusList: [],
       retailList: [],
-      userList: []
+      userList: [],
+      accountList: []
     }
   },
   computed: {
@@ -128,6 +129,14 @@ export const BillListMixin = {
           this.userList = res;
         }
       });
+    },
+    initAccount() {
+      getAccount({}).then((res)=>{
+        if(res && res.code === 200) {
+          let list = res.data.accountList
+          this.accountList = list
+        }
+      })
     }
   }
 }

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

@@ -63,6 +63,19 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -153,6 +166,8 @@
           organId: "",
           creator: "",
           handsPersonId: "",
+          status: "",
+          remark: "",
           roleType: Vue.ls.get('roleType')
         },
         // 表头
@@ -190,6 +205,7 @@
       this.initRetail()
       this.initUser()
       this.initPerson()
+      this.initAccount()
     },
     methods: {
     }

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

@@ -54,6 +54,28 @@
                     </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.accountId">
+                      <a-select-option v-for="(item,index) in accountList" :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-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -143,6 +165,9 @@
           type: "转账",
           creator: "",
           handsPersonId: "",
+          accountId: "",
+          status: "",
+          remark: "",
           roleType: Vue.ls.get('roleType')
         },
         // 表头
@@ -177,6 +202,7 @@
     created () {
       this.initUser()
       this.initPerson()
+      this.initAccount()
     },
     methods: {
     }

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

@@ -63,6 +63,28 @@
                     </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.accountId">
+                      <a-select-option v-for="(item,index) in accountList" :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-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -153,6 +175,9 @@
           organId: "",
           creator: "",
           handsPersonId: "",
+          accountId: "",
+          status: "",
+          remark: "",
           roleType: Vue.ls.get('roleType')
         },
         // 表头
@@ -189,6 +214,7 @@
       this.initOrgan()
       this.initUser()
       this.initPerson()
+      this.initAccount()
     },
     methods: {
     }

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

@@ -63,6 +63,28 @@
                     </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.accountId">
+                      <a-select-option v-for="(item,index) in accountList" :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-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -153,6 +175,9 @@
           organId: "",
           creator: "",
           handsPersonId: "",
+          accountId: "",
+          status: "",
+          remark: "",
           roleType: Vue.ls.get('roleType')
         },
         // 表头
@@ -189,6 +214,7 @@
       this.initOrgan()
       this.initUser()
       this.initPerson()
+      this.initAccount()
     },
     methods: {
     }

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

@@ -63,6 +63,28 @@
                     </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.accountId">
+                      <a-select-option v-for="(item,index) in accountList" :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-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -154,6 +176,9 @@
           organId: "",
           creator: "",
           handsPersonId: "",
+          accountId: "",
+          status: "",
+          remark: "",
           roleType: Vue.ls.get('roleType')
         },
         // 表头
@@ -192,6 +217,7 @@
       this.initCustomer()
       this.initUser()
       this.initPerson()
+      this.initAccount()
     },
     methods: {
     }

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

@@ -63,6 +63,28 @@
                     </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.accountId">
+                      <a-select-option v-for="(item,index) in accountList" :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-select placeholder="选择单据状态" v-model="queryParam.status">
+                      <a-select-option value="0">未审核</a-select-option>
+                      <a-select-option value="1">已审核</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>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -154,6 +176,9 @@
           organId: "",
           creator: "",
           handsPersonId: "",
+          accountId: "",
+          status: "",
+          remark: "",
           roleType: Vue.ls.get('roleType')
         },
         // 表头
@@ -192,6 +217,7 @@
       this.initSupplier()
       this.initUser()
       this.initPerson()
+      this.initAccount()
     },
     methods: {
     }

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

@@ -1,4 +1,4 @@
-import {findBySelectSup, findBySelectCus, findBySelectOrgan, findBySelectRetail, getUserList, getPersonByType } from '@/api/api'
+import {findBySelectSup, findBySelectCus, findBySelectOrgan, findBySelectRetail, getUserList, getPersonByType, getAccount} from '@/api/api'
 
 export const FinancialListMixin = {
   data () {
@@ -8,7 +8,8 @@ export const FinancialListMixin = {
       organList: [],
       retailList: [],
       userList: [],
-      personList: []
+      personList: [],
+      accountList: []
     }
   },
   computed: {
@@ -109,6 +110,14 @@ export const FinancialListMixin = {
         }
       })
     },
+    initAccount() {
+      getAccount({}).then((res)=>{
+        if(res && res.code === 200) {
+          let list = res.data.accountList
+          this.accountList = list
+        }
+      })
+    },
     onDateChange: function (value, dateString) {
       this.queryParam.beginTime=dateString[0];
       this.queryParam.endTime=dateString[1];