收入、支出单改为支持供应商和客户同时选择

jshERP-web/src/api/api.js

@@ -95,6 +95,7 @@ const checkSupplier = (params)=>getAction("/supplier/checkIsNameExist",params);
 const findBySelectSup = (params)=>postAction("/supplier/findBySelect_sup",params);
 const findBySelectCus = (params)=>postAction("/supplier/findBySelect_cus",params);
 const findBySelectRetail = (params)=>postAction("/supplier/findBySelect_retail",params);
+const findBySelectOrgan = (params)=>postAction("/supplier/findBySelect_organ",params);
 //单据相关
 const findBillDetailByNumber = (params)=>getAction("/depotHead/getDetailByNumber",params);
 const findStockByDepotAndBarCode = (params)=>getAction("/depotItem/findStockByDepotAndBarCode",params);
@@ -177,6 +178,7 @@ export {
   findBySelectSup,
   findBySelectCus,
   findBySelectRetail,
+  findBySelectOrgan,
   findBillDetailByNumber,
   findStockByDepotAndBarCode,
   getBatchNumberList,

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

@@ -155,7 +155,7 @@
         },
         // 表头
         columns: [
-          { title: '客户', dataIndex: 'organName',width:140, ellipsis:true},
+          { title: '往来单位', dataIndex: 'organName',width:140, ellipsis:true},
           { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},

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

@@ -155,7 +155,7 @@
         },
         // 表头
         columns: [
-          { title: '供应商', dataIndex: 'organName',width:140, ellipsis:true},
+          { title: '往来单位', dataIndex: 'organName',width:140, ellipsis:true},
           { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},

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

 import { VALIDATE_NO_PASSED, validateFormAndTables } from '@/utils/JEditableTableUtil'
-import {findBySelectSup,findBySelectCus,findBySelectRetail,findStockByDepotAndBarCode,getAccount,getPersonByType,findInOutItemByParam} from '@/api/api'
+import {findBySelectSup,findBySelectCus,findBySelectRetail,findBySelectOrgan,findStockByDepotAndBarCode,getAccount,getPersonByType,findInOutItemByParam} from '@/api/api'
 import { getAction,putAction } from '@/api/manage'
 import { getMpListShort, getNowFormatDateTime } from "@/utils/util"
 import Vue from 'vue'
@@ -11,6 +11,7 @@ export const FinancialModalMixin = {
       supList: [],
       cusList: [],
       retailList: [],
+      organList: [],
       personList: [],
       accountList: [],
       spans: {
@@ -73,6 +74,14 @@ export const FinancialModalMixin = {
         }
       });
     },
+    initOrgan() {
+      let that = this;
+      findBySelectOrgan({}).then((res)=>{
+        if(res) {
+          that.organList = res;
+        }
+      });
+    },
     initRetail() {
       let that = this;
       findBySelectRetail({}).then((res)=>{

jshERP-web/src/views/financial/modules/ItemInModal.vue

@@ -16,10 +16,10 @@
       <a-form :form="form">
         <a-row class="form-row" :gutter="24">
           <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
-              <a-select placeholder="选择客户" v-decorator="[ 'organId', validatorRules.organId ]"
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
+              <a-select placeholder="选择往来单位" v-decorator="[ 'organId', validatorRules.organId ]"
                 :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
-                <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
+                <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
                   {{ item.supplier }}
                 </a-select-option>
               </a-select>
@@ -199,7 +199,7 @@
           let url = this.readOnly ? this.url.detailList : this.url.detailList;
           this.requestSubTableData(url, params, this.accountTable);
         }
-        this.initCustomer()
+        this.initOrgan()
         this.initPerson()
         this.initInOutItem('in')
         this.initAccount()

jshERP-web/src/views/financial/modules/ItemOutModal.vue

@@ -16,10 +16,10 @@
       <a-form :form="form">
         <a-row class="form-row" :gutter="24">
           <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
-              <a-select placeholder="选择供应商" v-decorator="[ 'organId', validatorRules.organId ]"
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
+              <a-select placeholder="选择往来单位" v-decorator="[ 'organId', validatorRules.organId ]"
                 :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
-                <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
+                <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
                   {{ item.supplier }}
                 </a-select-option>
               </a-select>
@@ -199,7 +199,7 @@
           let url = this.readOnly ? this.url.detailList : this.url.detailList;
           this.requestSubTableData(url, params, this.accountTable);
         }
-        this.initSupplier()
+        this.initOrgan()
         this.initPerson()
         this.initInOutItem('out')
         this.initAccount()