Browse Source

客户名称

chenrui 2 years ago
parent
commit
0b30c6af14

+ 11 - 10
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -9,20 +9,21 @@
         </template>
         </template>
       </a-page-header>
       </a-page-header>
       <!-- 基础信息 -->
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont">
+      <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont" v-if="basicInfoData">
         <a-collapse :activeKey="['1']">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions :column="3">
             <a-descriptions :column="3">
-              <a-descriptions-item label="单位名称">{{ (basicInfoData&&basicInfoData.settleClientName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="单位类型">{{ (basicInfoData&&basicInfoData.settleClientTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="结算类型">{{ (basicInfoData&&basicInfoData.settleTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="应结算金额">{{ (basicInfoData&&(basicInfoData.settleAmount || basicInfoData.settleAmount==0)) ? toThousands(basicInfoData.settleAmount) : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="客户名称" v-if="basicInfoData.settleClientType&&basicInfoData.settleClientType=='CUSTOMER'">{{ basicInfoData.settleClientNameCurrent || '--' }}{{ basicInfoData.settleClientName?basicInfoData.settleClientName==basicInfoData.settleClientNameCurrent?'':'('+basicInfoData.settleClientName+')':'' }}</a-descriptions-item>
+              <a-descriptions-item label="客户名称" v-else>{{ basicInfoData.settleClientName ||'--' }}</a-descriptions-item>
+              <a-descriptions-item label="单位类型">{{ basicInfoData.settleClientTypeDictValue || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="结算类型">{{ basicInfoData.settleTypeDictValue || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="应结算金额">{{ (basicInfoData.settleAmount || basicInfoData.settleAmount==0) ? toThousands(basicInfoData.settleAmount) : '--' }}</a-descriptions-item>
               <a-descriptions-item label="折让金额">{{ (discountAmount || discountAmount==0) ? toThousands(discountAmount) : '--' }}</a-descriptions-item>
               <a-descriptions-item label="折让金额">{{ (discountAmount || discountAmount==0) ? toThousands(discountAmount) : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="实结算金额">{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? toThousands(basicInfoData.realSettleAmount) : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="结算时间">{{ (basicInfoData&&basicInfoData.createDate) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="操作人">{{ (basicInfoData&&basicInfoData.operateName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="结算方式">{{ (basicInfoData&&basicInfoData.settleStyleSnDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="备注">{{ (basicInfoData&&basicInfoData.remark) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="实结算金额">{{ (basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0) ? toThousands(basicInfoData.realSettleAmount) : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="结算时间">{{ basicInfoData.createDate || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="操作人">{{ basicInfoData.operateName || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="结算方式">{{ basicInfoData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="备注">{{ basicInfoData.remark || '--' }}</a-descriptions-item>
             </a-descriptions>
             </a-descriptions>
           </a-collapse-panel>
           </a-collapse-panel>
         </a-collapse>
         </a-collapse>

+ 6 - 1
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -90,6 +90,11 @@
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         :defaultLoadData="false"
         bordered>
         bordered>
+        <!-- 客户名称 -->
+        <template slot="customerName" slot-scope="text, record">
+          <span v-if="record.settleClientType&&record.settleClientType=='CUSTOMER'">{{ record.settleClientNameCurrent||'--' }}</span>
+          <span v-else>{{ record.settleClientName||'--' }}</span>
+        </template>
         <!-- 结算单号 -->
         <!-- 结算单号 -->
         <template slot="unitSettleNo" slot-scope="text, record">
         <template slot="unitSettleNo" slot-scope="text, record">
           <span :class="$hasPermissions('M_companyCollectionPayment_detail')?'table-td-link':'common'" @click="handleDetail(record)">{{ record.unitSettleNo }}</span>
           <span :class="$hasPermissions('M_companyCollectionPayment_detail')?'table-td-link':'common'" @click="handleDetail(record)">{{ record.unitSettleNo }}</span>
@@ -128,7 +133,7 @@ export default {
       // 表头
       // 表头
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '客户名称', dataIndex: 'settleClientNameCurrent', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', width: '17%', align: 'center', scopedSlots: { customRender: 'customerName' }, ellipsis: true },
         { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '结算类型', dataIndex: 'settleTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '结算类型', dataIndex: 'settleTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '结算单号', scopedSlots: { customRender: 'unitSettleNo' }, width: '17%', align: 'center' },
         { title: '结算单号', scopedSlots: { customRender: 'unitSettleNo' }, width: '17%', align: 'center' },

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
         <template slot="subTitle">
           <a id="collectionPayment-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a id="collectionPayment-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name || '--' }}</p>
+          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
         </template>
         </template>
         <template slot="extra" v-if="$hasPermissions('B_cPayment_printAndExport')">
         <template slot="extra" v-if="$hasPermissions('B_cPayment_printAndExport')">
           <Print :disabled="chooseLoadData.length==0||totalBalance==0" @handlePrint="handlePrint"></Print>
           <Print :disabled="chooseLoadData.length==0||totalBalance==0" @handlePrint="handlePrint"></Print>

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
         <template slot="subTitle">
           <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name || '--' }}</p>
+          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
         </template>
         </template>
       </a-page-header>
       </a-page-header>
       <a-card>
       <a-card>

+ 16 - 3
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -51,6 +51,11 @@
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         :defaultLoadData="false"
         bordered>
         bordered>
+        <!-- 客户名称 -->
+        <template slot="customerName" slot-scope="text, record">
+          <span v-if="record.settleClientType&&record.settleClientType=='CUSTOMER'">{{ record.settleClientNameCurrent||'--' }}</span>
+          <span v-else>{{ record.settleClientName||'--' }}</span>
+        </template>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
           <a-button
           <a-button
@@ -96,7 +101,7 @@ export default {
       // 表头
       // 表头
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '客户名称', dataIndex: 'settleClientNameCurrent', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', width: '20%', align: 'center', scopedSlots: { customRender: 'customerName' } },
         { title: '单位类型', dataIndex: 'settleClientTypeDictValue', 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: '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) : '--') } },
         { title: '应付金额', dataIndex: 'unSettleAmountPay', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -131,7 +136,11 @@ export default {
   methods: {
   methods: {
     //  详情
     //  详情
     handleDetail (row) {
     handleDetail (row) {
-      this.$router.push({ path: `/financialManagement/companyReceivablePayable/detail/${row.settleClientSn}/${row.settleClientNameCurrent}/${row.settleClientType}` })
+      if (row.settleClientType == 'CUSTOMER') {
+        this.$router.push({ path: `/financialManagement/companyReceivablePayable/detail/${row.settleClientSn}/${row.settleClientNameCurrent}/${row.settleClientType}` })
+      } else {
+        this.$router.push({ path: `/financialManagement/companyReceivablePayable/detail/${row.settleClientSn}/${row.settleClientName}/${row.settleClientType}` })
+      }
     },
     },
     // 合计
     // 合计
     getTotal (param) {
     getTotal (param) {
@@ -145,7 +154,11 @@ export default {
     },
     },
     //  收付款
     //  收付款
     handleCollectionPayment (row) {
     handleCollectionPayment (row) {
-      this.$router.push({ path: `/financialManagement/companyReceivablePayable/collectionPayment/${row.settleClientSn}/${row.settleClientNameCurrent}/${row.settleClientType}` })
+      if (row.settleClientType == 'CUSTOMER') {
+        this.$router.push({ path: `/financialManagement/companyReceivablePayable/collectionPayment/${row.settleClientSn}/${row.settleClientNameCurrent}/${row.settleClientType}` })
+      } else {
+        this.$router.push({ path: `/financialManagement/companyReceivablePayable/collectionPayment/${row.settleClientSn}/${row.settleClientName}/${row.settleClientType}` })
+      }
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {

+ 10 - 9
src/views/financialManagement/financialCollection/detailModal.vue

@@ -9,16 +9,17 @@
     @cancel="isShow=false"
     @cancel="isShow=false"
     :width="600">
     :width="600">
     <!-- 详情 -->
     <!-- 详情 -->
-    <div>
+    <div v-if="detailsData">
       <a-descriptions :column="1" size="default">
       <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.settleClientNameCurrent || '--' }}{{ 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.settleStyleSnDictValue || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="收款时间">{{ detailsData&&detailsData.settleTime || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="审核时间">{{ detailsData&&detailsData.auditTime || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="收款单号">{{ detailsData.settleNo || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="关联单号">{{ detailsData.bizNo || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="商户名称" v-if="detailsData.settleClientType&&detailsData.settleClientType=='CUSTOMER'">{{ detailsData.settleClientNameCurrent || '--' }}{{ detailsData.settleClientName?detailsData.settleClientName==detailsData.settleClientNameCurrent?'':'('+detailsData.settleClientName+')':'' }}</a-descriptions-item>
+        <a-descriptions-item label="商户名称" v-else>{{ detailsData.settleClientName ||'--' }}</a-descriptions-item>
+        <a-descriptions-item label="收款金额">{{ detailsData.settledAmount || detailsData.settledAmount==0 ? toThousands(detailsData.settledAmount) : '--' }}</a-descriptions-item>
+        <a-descriptions-item label="收款类型">{{ detailsData.bizTypeDictValue || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="收款方式">{{ detailsData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="收款时间">{{ detailsData.settleTime || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="审核时间">{{ detailsData.auditTime || '--' }}</a-descriptions-item>
       </a-descriptions>
       </a-descriptions>
       <div class="btn-cont"><a-button id="financialPaymentDetail-modal-back" @click="isShow = false">关闭</a-button></div>
       <div class="btn-cont"><a-button id="financialPaymentDetail-modal-back" @click="isShow = false">关闭</a-button></div>
     </div>
     </div>

+ 6 - 1
src/views/financialManagement/financialCollection/list.vue

@@ -103,6 +103,11 @@
         <template slot="bizNo" slot-scope="text, record">
         <template slot="bizNo" slot-scope="text, record">
           <span class="table-td-link" @click="handleDetail(record)">{{ record.bizNo }}</span>
           <span class="table-td-link" @click="handleDetail(record)">{{ record.bizNo }}</span>
         </template>
         </template>
+        <!-- 客户名称 -->
+        <template slot="customerName" slot-scope="text, record">
+          <span v-if="record.settleClientType&&record.settleClientType=='CUSTOMER'">{{ record.settleClientNameCurrent||'--' }}</span>
+          <span v-else>{{ record.settleClientName||'--' }}</span>
+        </template>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
           <a-button
           <a-button
@@ -218,7 +223,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '收款单号', dataIndex: 'settleNo', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款单号', dataIndex: 'settleNo', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '关联单号', dataIndex: 'bizNo', scopedSlots: { customRender: 'bizNo' }, width: '16%', align: 'center' },
         { title: '关联单号', dataIndex: 'bizNo', scopedSlots: { customRender: 'bizNo' }, width: '16%', align: 'center' },
-        { title: '商户名称', dataIndex: 'settleClientNameCurrent', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户名称', width: '15%', align: 'center', scopedSlots: { customRender: 'customerName' } },
         { title: '应收金额', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(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: '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) : '--') } },
         { title: '待收金额', dataIndex: 'unsettleAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

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

@@ -13,7 +13,8 @@
       <a-descriptions :column="1" size="default">
       <a-descriptions :column="1" size="default">
         <a-descriptions-item label="付款单号">{{ detailsData&&detailsData.settleNo || '--' }}</a-descriptions-item>
         <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.bizNo || '--' }}</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="商户名称" v-if="detailsData&&detailsData.settleClientType&&detailsData.settleClientType=='CUSTOMER'">{{ detailsData.settleClientNameCurrent || '--' }}{{ detailsData.settleClientName==detailsData.settleClientNameCurrent?'':'('+detailsData.settleClientName+')' }}</a-descriptions-item>
+        <a-descriptions-item label="商户名称" v-else>{{ 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.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.bizTypeDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="付款方式">{{ detailsData&&detailsData.settleStyleName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="付款方式">{{ detailsData&&detailsData.settleStyleName || '--' }}</a-descriptions-item>

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

@@ -103,6 +103,11 @@
           <span v-if="$hasPermissions('B_purchaseDetail')||$hasPermissions('B_salesReturnDetail')||$hasPermissions('B_bulkWarehousingOrder_detail')||$hasPermissions('B_allocLinkagePutDetail')||$hasPermissions('B_expenseDetail')" class="table-td-link" @click="handleDetail(record)">{{ record.bizNo }}</span>
           <span v-if="$hasPermissions('B_purchaseDetail')||$hasPermissions('B_salesReturnDetail')||$hasPermissions('B_bulkWarehousingOrder_detail')||$hasPermissions('B_allocLinkagePutDetail')||$hasPermissions('B_expenseDetail')" class="table-td-link" @click="handleDetail(record)">{{ record.bizNo }}</span>
           <span v-else>{{ record.bizNo }}</span>
           <span v-else>{{ record.bizNo }}</span>
         </template>
         </template>
+        <!-- 客户名称 -->
+        <template slot="customerName" slot-scope="text, record">
+          <span v-if="record.settleClientType&&record.settleClientType=='CUSTOMER'">{{ record.settleClientNameCurrent||'--' }}</span>
+          <span v-else>{{ record.settleClientName || '--' }}</span>
+        </template>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
           <a-button
           <a-button
@@ -214,7 +219,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '付款单号', dataIndex: 'settleNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '付款单号', dataIndex: 'settleNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '关联单号', dataIndex: 'bizNo', scopedSlots: { customRender: 'bizNo' }, width: '14%', align: 'center' },
         { title: '关联单号', dataIndex: 'bizNo', scopedSlots: { customRender: 'bizNo' }, width: '14%', align: 'center' },
-        { title: '商户名称', dataIndex: 'settleClientNameCurrent', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户名称', width: '10%', align: 'center', scopedSlots: { customRender: 'customerName' } },
         { title: '应付金额', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(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: '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) : '--') } },
         { title: '待付金额', dataIndex: 'unsettleAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

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

@@ -11,7 +11,7 @@
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-item label="客户名称">
             <a-form-item label="客户名称">
-              <custSatelliteList ref="custSatelliteList" @change="custSatelliteChange"></custSatelliteList>
+              <custList ref="custSatelliteList" @change="custSatelliteChange"></custList>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :md="4" :sm="24">
           <a-col :md="4" :sm="24">
@@ -67,11 +67,11 @@ import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
-import custSatelliteList from '@/views/common/custSatelliteList.vue'
+import custList from '@/views/common/custList.vue'
 import { satelliteWHSeparateList, satelliteWHSeparateTotal } from '@/api/satelliteWH'
 import { satelliteWHSeparateList, satelliteWHSeparateTotal } from '@/api/satelliteWH'
 export default {
 export default {
   name: 'LedgerRecordList',
   name: 'LedgerRecordList',
-  components: { STable, VSelect, rangeDate, custSatelliteList },
+  components: { STable, VSelect, rangeDate, custList },
   mixins: [commonMixin],
   mixins: [commonMixin],
   data () {
   data () {
     const _this = this
     const _this = this

+ 6 - 1
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -68,6 +68,11 @@
         :scroll="{ y: tableHeight }"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         :defaultLoadData="false"
         bordered>
         bordered>
+        <!-- 客户名称 -->
+        <template slot="customerName" slot-scope="text, record">
+          <span v-if="record.demanderType&&record.demanderType=='CUSTOMER'">{{ record.demanderNameCurrent||'--' }}</span>
+          <span v-else>{{ record.demanderName||'--' }}</span>
+        </template>
         <!-- 状态 -->
         <!-- 状态 -->
         <template slot="state" slot-scope="text, record">
         <template slot="state" slot-scope="text, record">
           <stateIcon :title="record.stateDictValue" :state="record.state == 'FINISH'?'1':'2'"></stateIcon>
           <stateIcon :title="record.stateDictValue" :state="record.state == 'FINISH'?'1':'2'"></stateIcon>
@@ -159,7 +164,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '关联单号', dataIndex: 'outBizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '关联单号', dataIndex: 'outBizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'demanderNameCurrent', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', width: '20%', align: 'center', scopedSlots: { customRender: 'customerName' } },
         { title: '总款数', dataIndex: 'productTotalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总款数', dataIndex: 'productTotalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'productTotalPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '总售价', dataIndex: 'productTotalPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },