liujun 2 роки тому
батько
коміт
71eed52660

+ 1 - 1
src/views/financialManagement/financialCollection/edit.vue

@@ -183,7 +183,7 @@ export default {
         { title: '户名', dataIndex: 'bankAccount', align: 'center', width: '7%', customRender: function (text) { return text || '--' } },
         { title: '汇入银行', dataIndex: 'bankName', align: 'center', width: '7%', customRender: function (text) { return text || '--' } },
         { title: '足额打款', dataIndex: 'fullPaymentFlagDictValue', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '备注', dataIndex: 'remarks', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
+        { title: '说明', dataIndex: 'remarks', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ],
       useCol: [

+ 2 - 2
src/views/financialManagement/financialCollection/fcDetailModal.vue

@@ -170,8 +170,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item style="margin-bottom:5px;" label="备注" :labelCol="{span:3}" :wrapper-col="{ span: 20 }">
-              <a-textarea :rows="2" :maxLength="500" placeholder="请输入备注(最多500个字符)" v-model="form.remarks"></a-textarea>
+            <a-form-model-item style="margin-bottom:5px;" label="说明" :labelCol="{span:3}" :wrapper-col="{ span: 20 }">
+              <a-textarea :rows="2" :maxLength="500" placeholder="请输入说明(最多500个字符)" v-model="form.remarks"></a-textarea>
             </a-form-model-item>
           </a-col>
           <!-- 使用授信列表 -->

+ 16 - 4
src/views/financialManagement/financialCollection/list.vue

@@ -21,17 +21,27 @@
               </a-form-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="申请人">
                   <employee style="width: 100%;" id="financialCollectionList-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="收款事由">
                   <a-input id="financialCollectionList-bookReason" v-model.trim="queryParam.bookReason" allowClear placeholder="请输入收款事由"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="付款方类型">
+                  <v-select
+                    v-model="queryParam.payerType"
+                    ref="payType"
+                    code="PAYER_TYPE"
+                    placeholder="请选择付款方式类型"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
                 <a-form-item label="付款方">
                   <a-input id="financialCollectionList-payerNames" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
                 </a-form-item>
@@ -41,7 +51,7 @@
                   <rangeDate ref="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="状态">
                   <v-select
                     v-model="queryParam.status"
@@ -170,6 +180,7 @@ export default {
       baseModal: false,
       tableHeight: 0,
       queryParam: { //  查询条件
+        payerType:'',
         beginDate: '',
         endDate: '',
         bookNo: '',
@@ -268,6 +279,7 @@ export default {
       this.queryParam.applyPersonSn = undefined
       this.queryParam.bookReason = ''
       this.queryParam.status = undefined
+      this.queryParam.payerType = undefined
       this.$refs.table.refresh(true)
     },
     // 新增