瀏覽代碼

客户名称

chenrui 2 年之前
父節點
當前提交
e68fa084a8

+ 6 - 6
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-item label="客户名称">
-                <a-input id="companyReceivablePayableList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入客户名称"/>
+                <a-input id="companyReceivablePayableList-settleClientName" v-model.trim="queryParam.settleClientNameCurrent" allowClear placeholder="请输入客户名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -90,13 +90,13 @@ export default {
       tableHeight: 0,
       // 查询参数
       queryParam: {
-        settleClientName: '',
+        settleClientNameCurrent: '',
         settleClientType: undefined
       },
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '客户名称', dataIndex: 'settleClientName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'settleClientNameCurrent', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '应收金额', dataIndex: 'unSettleAmountReceipt', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '应付金额', dataIndex: 'unSettleAmountPay', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -131,7 +131,7 @@ export default {
   methods: {
     //  详情
     handleDetail (row) {
-      this.$router.push({ path: `/financialManagement/companyReceivablePayable/detail/${row.settleClientSn}/${row.settleClientName}/${row.settleClientType}` })
+      this.$router.push({ path: `/financialManagement/companyReceivablePayable/detail/${row.settleClientSn}/${row.settleClientNameCurrent}/${row.settleClientType}` })
     },
     // 合计
     getTotal (param) {
@@ -145,11 +145,11 @@ export default {
     },
     //  收付款
     handleCollectionPayment (row) {
-      this.$router.push({ path: `/financialManagement/companyReceivablePayable/collectionPayment/${row.settleClientSn}/${row.settleClientName}/${row.settleClientType}` })
+      this.$router.push({ path: `/financialManagement/companyReceivablePayable/collectionPayment/${row.settleClientSn}/${row.settleClientNameCurrent}/${row.settleClientType}` })
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.settleClientName = ''
+      this.queryParam.settleClientNameCurrent = ''
       this.queryParam.settleClientType = undefined
       this.$refs.table.refresh(true)
     },

+ 1 - 1
src/views/financialManagement/financialPayment/detailModal.vue

@@ -13,7 +13,7 @@
       <a-descriptions :column="1" size="default">
         <a-descriptions-item label="付款单号">{{ detailsData&&detailsData.settleNo || '--' }}</a-descriptions-item>
         <a-descriptions-item label="发货单号">{{ detailsData&&detailsData.bizNo || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="商户名称">{{ detailsData&&detailsData.settleClientName || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="商户名称">{{ detailsData&&detailsData.settleClientName || '--' }}{{ detailsData&&detailsData.settleClientName?detailsData.settleClientName==detailsData.settleClientNameCurrent?'':'('+detailsData.settleClientName+')':'' }}</a-descriptions-item>
         <a-descriptions-item label="付款金额">{{ detailsData&&(detailsData.settledAmount || detailsData.settledAmount==0) ? toThousands(detailsData.settledAmount) : '--' }}</a-descriptions-item>
         <a-descriptions-item label="单据类型">{{ detailsData&&detailsData.bizTypeDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="付款方式">{{ detailsData&&detailsData.settleStyleName || '--' }}</a-descriptions-item>

+ 6 - 6
src/views/financialManagement/financialPayment/list.vue

@@ -19,7 +19,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="商户名称">
-                <a-input id="finacialPay-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入商户名称" />
+                <a-input id="finacialPay-settleClientName" v-model.trim="queryParam.settleClientNameCurrent" allowClear placeholder="请输入商户名称" />
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -195,7 +195,7 @@ export default {
         bizType: 'ALL',
         settleNo: '',
         bizNo: '',
-        settleClientName: '',
+        settleClientNameCurrent: '',
         billState: '',
         auditBeginDate: '',
         auditEndDate: '',
@@ -214,7 +214,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '付款单号', dataIndex: 'settleNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '关联单号', dataIndex: 'bizNo', scopedSlots: { customRender: 'bizNo' }, width: '14%', align: 'center' },
-        { title: '商户名称', dataIndex: 'settleClientName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户名称', dataIndex: 'settleClientNameCurrent', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '应付金额', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '已付金额', dataIndex: 'settledAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '待付金额', dataIndex: 'unsettleAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -336,7 +336,7 @@ export default {
       this.openSettleModal = true
       const data = {
         totalAmount: type ? this.selectTotalAmount : row && row.unsettleAmount || 0,
-        settleClientName: type ? '' : row && row.settleClientName || '',
+        settleClientNameCurrent: type ? '' : row && row.settleClientNameCurrent || '',
         title: '付款',
         type,
         row
@@ -377,7 +377,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: <div style="text-align:center"><p style="margin-top:20px;">{row.settleClientName}</p><p>付款单号:{row.settleNo},合计{ this.toThousands(row.unsettleAmount) }</p><p>确认付款吗?</p></div>,
+        content: <div style="text-align:center"><p style="margin-top:20px;">{row.settleClientNameCurrent}</p><p>付款单号:{row.settleNo},合计{ this.toThousands(row.unsettleAmount) }</p><p>确认付款吗?</p></div>,
         centered: true,
         closable: true,
         class: 'confirm-center',
@@ -432,7 +432,7 @@ export default {
         bizType: this.curBizType,
         settleNo: '',
         bizNo: '',
-        settleClientName: '',
+        settleClientNameCurrent: '',
         billState: '',
         beginDate: '',
         endDate: '',

+ 4 - 4
src/views/financialManagement/fundAccountManagement/detail.vue

@@ -38,7 +38,7 @@
               <template v-if="advanced">
                 <a-col :md="6" :sm="24">
                   <a-form-item label="往来单位">
-                    <a-input id="fundAcountDetail-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入往来单位名称"/>
+                    <a-input id="fundAcountDetail-settleClientName" v-model.trim="queryParam.settleClientNameCurrent" allowClear placeholder="请输入往来单位名称"/>
                   </a-form-item>
                 </a-col>
               </template>
@@ -115,7 +115,7 @@ export default {
         endDate: '',
         bizType: '',
         bizNo: '',
-        settleClientName: ''
+        settleClientNameCurrent: ''
       },
       // 表头
       columns: [
@@ -124,7 +124,7 @@ export default {
         { title: '关联单据号', dataIndex: 'bizNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作时间', dataIndex: 'settleTime', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作人', dataIndex: 'operateName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '往来单位', dataIndex: 'settleClientName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '往来单位', dataIndex: 'settleClientNameCurrent', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '结算金额', dataIndex: 'settleAmount', scopedSlots: { customRender: 'settleAmount' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -167,7 +167,7 @@ export default {
         endDate: '',
         bizType: '',
         bizNo: '',
-        settleClientName: ''
+        settleClientNameCurrent: ''
       }
       this.$refs.table.refresh(true)
     },

+ 1 - 1
src/views/financialManagement/ledgerRecord/list.vue

@@ -99,7 +99,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
         { title: '分账时间', dataIndex: 'separateTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'customer.customerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'customer.customerNameCurrent', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '关联工单号', dataIndex: 'separateBizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'dealerProduct.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'dealerProduct.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },