优化财务单据，增加查询条件

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

@@ -165,7 +165,7 @@
               return parseInt(index)+1;
             }
           },
-          { title: '供应商名称', dataIndex: 'organName',width:120},
+          { title: '供应商', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {
               if(record.linkNumber) {

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

@@ -165,7 +165,7 @@
               return parseInt(index)+1;
             }
           },
-          { title: '客户名称', dataIndex: 'organName',width:120},
+          { title: '客户', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {
               if(record.linkNumber) {

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

@@ -165,7 +165,7 @@
               return parseInt(index)+1;
             }
           },
-          { title: '供应商名称', dataIndex: 'organName',width:120},
+          { title: '供应商', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {
               if(record.linkNumber) {

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

@@ -166,7 +166,7 @@
               return parseInt(index)+1;
             }
           },
-          { title: '供应商名称', dataIndex: 'organName',width:120},
+          { title: '供应商', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {
               if(record.linkNumber) {

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

@@ -173,7 +173,7 @@
               return parseInt(index)+1;
             }
           },
-          { title: '供应商名称', dataIndex: 'organName',width:120},
+          { title: '供应商', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {
               if(record.linkNumber) {

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

@@ -165,7 +165,7 @@
               return parseInt(index)+1;
             }
           },
-          { title: '会员卡号', dataIndex: 'organName',width:120},
+          { title: '会员', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {
               if(record.linkNumber) {

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

@@ -165,7 +165,7 @@
               return parseInt(index)+1;
             }
           },
-          { title: '会员卡号', dataIndex: 'organName',width:120},
+          { title: '会员', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {
               if(record.linkNumber) {

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

@@ -165,7 +165,7 @@
               return parseInt(index)+1;
             }
           },
-          { title: '客户名称', dataIndex: 'organName',width:120},
+          { title: '客户', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {
               if(record.linkNumber) {

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

@@ -173,7 +173,7 @@
               return parseInt(index)+1;
             }
           },
-          { title: '客户名称', dataIndex: 'organName',width:120},
+          { title: '客户', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {
               if(record.linkNumber) {

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

@@ -166,7 +166,7 @@
               return parseInt(index)+1;
             }
           },
-          { title: '客户名称', dataIndex: 'organName',width:120},
+          { title: '客户', dataIndex: 'organName',width:120},
           { title: '单据编号', dataIndex: 'number',width:160,
             customRender:function (text,record,index) {
               if(record.linkNumber) {

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

@@ -24,10 +24,43 @@
                   />
                 </a-form-item>
               </a-col>
+              <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="付款会员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择付款会员" showSearch optionFilterProp="children" v-model="queryParam.organId">
+                      <a-select-option v-for="(item,index) in retailList" :key="index" :value="item.id">
+                        {{ item.supplier }}
+                      </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="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
+                      <a-select-option v-for="(item,index) in personList" :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="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                        {{ item.userName }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+              </template>
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-col :md="6" :sm="24">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                    {{ toggleSearchStatus ? '收起' : '展开' }}
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
                 </a-col>
               </span>
             </a-row>
@@ -107,7 +140,10 @@
         queryParam: {
           billNo: "",
           searchMaterial: "",
-          type: "收预付款"
+          type: "收预付款",
+          organId: "",
+          creator: "",
+          handsPersonId: ""
         },
         // 表头
         columns: [
@@ -122,9 +158,10 @@
             }
           },
           { title: '付款会员', dataIndex: 'organName',width:140},
+          { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
-          { title: '操作员', dataIndex: 'userName',width:80},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
+          { title: '操作员', dataIndex: 'userName',width:80},
           { title: '合计金额', dataIndex: 'totalPrice',width:80},
           { title: '收款金额', dataIndex: 'changeAmount',width:80},
           { title: '备注', dataIndex: 'remark',width:200},
@@ -144,10 +181,13 @@
       }
     },
     computed: {
-
+    },
+    created () {
+      this.initRetail()
+      this.initUser()
+      this.initPerson()
     },
     methods: {
-
     }
   }
 </script>

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

@@ -24,10 +24,34 @@
                   />
                 </a-form-item>
               </a-col>
+              <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
+                      <a-select-option v-for="(item,index) in personList" :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="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                        {{ item.userName }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+              </template>
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-col :md="6" :sm="24">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                    {{ toggleSearchStatus ? '收起' : '展开' }}
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
                 </a-col>
               </span>
             </a-row>
@@ -107,7 +131,9 @@
         queryParam: {
           billNo: "",
           searchMaterial: "",
-          type: "转账"
+          type: "转账",
+          creator: "",
+          handsPersonId: ""
         },
         // 表头
         columns: [
@@ -121,9 +147,10 @@
               return parseInt(index)+1;
             }
           },
+          { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
-          { title: '操作员', dataIndex: 'userName',width:80},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
+          { title: '操作员', dataIndex: 'userName',width:80},
           { title: '实付金额', dataIndex: 'changeAmount',width:80},
           { title: '备注', dataIndex: 'remark',width:200},
           {
@@ -142,10 +169,12 @@
       }
     },
     computed: {
-
+    },
+    created () {
+      this.initUser()
+      this.initPerson()
     },
     methods: {
-
     }
   }
 </script>

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

@@ -24,10 +24,43 @@
                   />
                 </a-form-item>
               </a-col>
+              <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="客户" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择客户" showSearch optionFilterProp="children" v-model="queryParam.organId">
+                      <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
+                        {{ item.supplier }}
+                      </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="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
+                      <a-select-option v-for="(item,index) in personList" :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="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                        {{ item.userName }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+              </template>
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-col :md="6" :sm="24">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                    {{ toggleSearchStatus ? '收起' : '展开' }}
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
                 </a-col>
               </span>
             </a-row>
@@ -107,7 +140,10 @@
         queryParam: {
           billNo: "",
           searchMaterial: "",
-          type: "收入"
+          type: "收入",
+          organId: "",
+          creator: "",
+          handsPersonId: ""
         },
         // 表头
         columns: [
@@ -121,10 +157,11 @@
               return parseInt(index)+1;
             }
           },
-          { title: '往来单位', dataIndex: 'organName',width:140},
+          { title: '客户', dataIndex: 'organName',width:140},
+          { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
-          { title: '操作员', dataIndex: 'userName',width:80},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
+          { title: '操作员', dataIndex: 'userName',width:80},
           { title: '收入金额', dataIndex: 'changeAmount',width:80},
           { title: '备注', dataIndex: 'remark',width:200},
           {
@@ -143,10 +180,13 @@
       }
     },
     computed: {
-
+    },
+    created () {
+      this.initCustomer()
+      this.initUser()
+      this.initPerson()
     },
     methods: {
-
     }
   }
 </script>

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

@@ -24,10 +24,43 @@
                   />
                 </a-form-item>
               </a-col>
+              <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择供应商" showSearch optionFilterProp="children" v-model="queryParam.organId">
+                      <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
+                        {{ item.supplier }}
+                      </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="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
+                      <a-select-option v-for="(item,index) in personList" :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="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                        {{ item.userName }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+              </template>
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-col :md="6" :sm="24">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                    {{ toggleSearchStatus ? '收起' : '展开' }}
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
                 </a-col>
               </span>
             </a-row>
@@ -107,7 +140,10 @@
         queryParam: {
           billNo: "",
           searchMaterial: "",
-          type: "支出"
+          type: "支出",
+          organId: "",
+          creator: "",
+          handsPersonId: ""
         },
         // 表头
         columns: [
@@ -121,10 +157,11 @@
               return parseInt(index)+1;
             }
           },
-          { title: '往来单位', dataIndex: 'organName',width:140},
+          { title: '供应商', dataIndex: 'organName',width:140},
+          { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
-          { title: '操作员', dataIndex: 'userName',width:80},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
+          { title: '操作员', dataIndex: 'userName',width:80},
           { title: '支出金额', dataIndex: 'changeAmount',width:80},
           { title: '备注', dataIndex: 'remark',width:200},
           {
@@ -143,10 +180,13 @@
       }
     },
     computed: {
-
+    },
+    created () {
+      this.initSupplier()
+      this.initUser()
+      this.initPerson()
     },
     methods: {
-
     }
   }
 </script>

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

@@ -24,10 +24,43 @@
                   />
                 </a-form-item>
               </a-col>
+              <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="客户" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择客户" showSearch optionFilterProp="children" v-model="queryParam.organId">
+                      <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
+                        {{ item.supplier }}
+                      </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="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
+                      <a-select-option v-for="(item,index) in personList" :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="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                        {{ item.userName }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+              </template>
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-col :md="6" :sm="24">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                    {{ toggleSearchStatus ? '收起' : '展开' }}
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
                 </a-col>
               </span>
             </a-row>
@@ -108,7 +141,10 @@
         queryParam: {
           billNo: "",
           searchMaterial: "",
-          type: "收款"
+          type: "收款",
+          organId: "",
+          creator: "",
+          handsPersonId: ""
         },
         // 表头
         columns: [
@@ -123,9 +159,10 @@
             }
           },
           { title: '客户', dataIndex: 'organName',width:140},
+          { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
-          { title: '操作员', dataIndex: 'userName',width:80},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
+          { title: '操作员', dataIndex: 'userName',width:80},
           { title: '合计收款', dataIndex: 'totalPrice',width:80},
           { title: '优惠金额', dataIndex: 'discountMoney',width:80},
           { title: '实际收款', dataIndex: 'changeAmount',width:80},
@@ -146,10 +183,13 @@
       }
     },
     computed: {
-
+    },
+    created () {
+      this.initCustomer()
+      this.initUser()
+      this.initPerson()
     },
     methods: {
-
     }
   }
 </script>

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

@@ -24,10 +24,43 @@
                   />
                 </a-form-item>
               </a-col>
+              <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择供应商" showSearch optionFilterProp="children" v-model="queryParam.organId">
+                      <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
+                        {{ item.supplier }}
+                      </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="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
+                      <a-select-option v-for="(item,index) in personList" :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="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                        {{ item.userName }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+              </template>
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-col :md="6" :sm="24">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                    {{ toggleSearchStatus ? '收起' : '展开' }}
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                  </a>
                 </a-col>
               </span>
             </a-row>
@@ -108,7 +141,10 @@
         queryParam: {
           billNo: "",
           searchMaterial: "",
-          type: "付款"
+          type: "付款",
+          organId: "",
+          creator: "",
+          handsPersonId: ""
         },
         // 表头
         columns: [
@@ -123,9 +159,10 @@
             }
           },
           { title: '供应商', dataIndex: 'organName',width:140},
+          { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
-          { title: '操作员', dataIndex: 'userName',width:80},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
+          { title: '操作员', dataIndex: 'userName',width:80},
           { title: '合计付款', dataIndex: 'totalPrice',width:80},
           { title: '优惠金额', dataIndex: 'discountMoney',width:80},
           { title: '实际付款', dataIndex: 'changeAmount',width:80},
@@ -146,10 +183,13 @@
       }
     },
     computed: {
-
+    },
+    created () {
+      this.initSupplier()
+      this.initUser()
+      this.initPerson()
     },
     methods: {
-
     }
   }
 </script>

jshERP-web/src/views/financial/dialog/FinancialDetail.vue

@@ -32,7 +32,7 @@
                 </a-form-item>
               </a-col>
               <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
                   {{model.handsPersonName}}
                 </a-form-item>
               </a-col>
@@ -85,7 +85,7 @@
           <section ref="print" id="giroPrint">
             <a-row class="form-row" :gutter="24">
               <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
                   <a-input v-decorator="['id']" hidden/>
                   {{model.handsPersonName}}
                 </a-form-item>
@@ -139,13 +139,13 @@
           <section ref="print" id="itemInPrint">
             <a-row class="form-row" :gutter="24">
               <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
                   <a-input v-decorator="['id']" hidden/>
                   {{model.organName}}
                 </a-form-item>
               </a-col>
               <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
                   {{model.handsPersonName}}
                 </a-form-item>
               </a-col>
@@ -197,13 +197,13 @@
           <section ref="print" id="itemOutPrint">
             <a-row class="form-row" :gutter="24">
               <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
                   <a-input v-decorator="['id']" hidden/>
                   {{model.organName}}
                 </a-form-item>
               </a-col>
               <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
                   {{model.handsPersonName}}
                 </a-form-item>
               </a-col>
@@ -261,7 +261,7 @@
                 </a-form-item>
               </a-col>
               <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
                   {{model.handsPersonName}}
                 </a-form-item>
               </a-col>
@@ -330,7 +330,7 @@
                 </a-form-item>
               </a-col>
               <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
                   {{model.handsPersonName}}
                 </a-form-item>
               </a-col>

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

@@ -1,4 +1,15 @@
+import {findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getPersonByType } from '@/api/api'
+
 export const FinancialListMixin = {
+  data () {
+    return {
+      supList: [],
+      cusList: [],
+      retailList: [],
+      userList: [],
+      personList: []
+    }
+  },
   computed: {
     importExcelUrl: function(){
       return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
@@ -37,6 +48,45 @@ export const FinancialListMixin = {
       }
       this.loadData(1);
     },
+    initSupplier() {
+      let that = this;
+      findBySelectSup({}).then((res)=>{
+        if(res) {
+          that.supList = res;
+        }
+      });
+    },
+    initCustomer() {
+      let that = this;
+      findBySelectCus({}).then((res)=>{
+        if(res) {
+          that.cusList = res;
+        }
+      });
+    },
+    initRetail() {
+      let that = this;
+      findBySelectRetail({}).then((res)=>{
+        if(res) {
+          that.retailList = res;
+        }
+      });
+    },
+    initUser() {
+      getUserList({}).then((res)=>{
+        if(res) {
+          this.userList = res;
+        }
+      });
+    },
+    initPerson() {
+      let that = this;
+      getPersonByType({type:'财务员'}).then((res)=>{
+        if(res && res.code === 200) {
+          that.personList = res.data.personList;
+        }
+      })
+    },
     onDateChange: function (value, dateString) {
       this.queryParam.beginTime=dateString[0];
       this.queryParam.endTime=dateString[1];

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

@@ -26,8 +26,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
                 :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                 <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                   {{ item.name }}
@@ -146,7 +146,7 @@
           },
           handsPersonId:{
             rules: [
-              { required: true, message: '请选择经手人!' }
+              { required: true, message: '请选择财务人员!' }
             ]
           },
           billTime:{

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

@@ -16,8 +16,8 @@
       <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
                 :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                 <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                   {{ item.name }}
@@ -138,7 +138,7 @@
         validatorRules:{
           handsPersonId:{
             rules: [
-              { required: true, message: '请选择经手人!' }
+              { required: true, message: '请选择财务人员!' }
             ]
           },
           billTime:{

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

@@ -16,8 +16,8 @@
       <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
-              <a-select placeholder="选择往来单位" v-decorator="[ 'organId', validatorRules.organId ]"
+              <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">
                   {{ item.supplier }}
@@ -26,8 +26,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
                 :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                 <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                   {{ item.name }}
@@ -146,12 +146,12 @@
         validatorRules:{
           organId:{
             rules: [
-              { required: true, message: '请选择往来单位!' }
+              { required: true, message: '请选择客户!' }
             ]
           },
           handsPersonId:{
             rules: [
-              { required: true, message: '请选择经手人!' }
+              { required: true, message: '请选择财务人员!' }
             ]
           },
           billTime:{

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

@@ -16,8 +16,8 @@
       <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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
-              <a-select placeholder="选择往来单位" v-decorator="[ 'organId', validatorRules.organId ]"
+              <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">
                   {{ item.supplier }}
@@ -26,8 +26,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
                 :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                 <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                   {{ item.name }}
@@ -146,12 +146,12 @@
         validatorRules:{
           organId:{
             rules: [
-              { required: true, message: '请选择往来单位!' }
+              { required: true, message: '请选择供应商!' }
             ]
           },
           handsPersonId:{
             rules: [
-              { required: true, message: '请选择经手人!' }
+              { required: true, message: '请选择财务人员!' }
             ]
           },
           billTime:{

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

@@ -27,8 +27,8 @@
               </a-form-item>
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-                <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+                <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
                   :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                   <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                     {{ item.name }}
@@ -173,7 +173,7 @@
             rules: [{ required: true, message: '请选择客户!' }]
           },
           handsPersonId:{
-            rules: [{ required: true, message: '请选择经手人!' }]
+            rules: [{ required: true, message: '请选择财务人员!' }]
           },
           billTime:{
             rules: [{ required: true, message: '请选择单据日期!' }]

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

@@ -27,8 +27,8 @@
               </a-form-item>
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-                <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+                <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
                   :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                   <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                     {{ item.name }}
@@ -173,7 +173,7 @@
             rules: [{ required: true, message: '请选择供应商!' }]
           },
           handsPersonId:{
-            rules: [{ required: true, message: '请选择经手人!' }]
+            rules: [{ required: true, message: '请选择财务人员!' }]
           },
           billTime:{
             rules: [{ required: true, message: '请选择单据日期!' }]