liujun vor 2 Jahren
Ursprung
Commit
3b555dc672

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

@@ -17,7 +17,7 @@
             <a-descriptions-item label="状态">{{ detailData&&detailData.statusDictValue || '--' }}</a-descriptions-item>
             <a-descriptions-item label="付款方类型">{{ detailData&&detailData.payerTypeDictValue || '--' }}</a-descriptions-item>
             <a-descriptions-item label="付款方">{{ detailData&&detailData.payerName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="备注" :span="3">{{ detailData&&detailData.remarks||'--' }}</a-descriptions-item>
+            <a-descriptions-item label="说明" :span="3">{{ detailData&&detailData.explainInfo||'--' }}</a-descriptions-item>
             <a-descriptions-item label="附件" :span="3">
               <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.attachmentList" :key="item.id">
                 {{ item.fileName }}
@@ -133,7 +133,7 @@ export default {
         { title: '户名', dataIndex: 'bankAccount', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '汇入银行', dataIndex: 'bankName', align: 'center', width: '8%', 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: '10%', customRender: function (text) { return text || '--' } }
+        { title: '说明', dataIndex: 'explainInfo', align: 'center', width: '10%', customRender: function (text) { return text || '--' } }
       ],
       useCol: [
         { title: '使用授信项目', dataIndex: 'itemName', width: '50%', align: 'center' },

+ 2 - 2
src/views/salesManagement/sendOutOrder/chooseImportModal.vue

@@ -10,7 +10,7 @@
     width="80%">
     <div class="chooseImport-con">
       <!-- 可导入数据 -->
-      <p class="">可导入数据{{ loadData.length }}条</p>
+      <p class="" v-if="paramsData&&paramsData.rightList">可导入数据{{ paramsData.rightList.length }}条</p>
       <a-table
         class="sTable"
         ref="table"
@@ -25,7 +25,7 @@
       </a-table>
       <a-divider />
       <!-- 不可导入数据 -->
-      <p class="red">不可导入数据{{ unLoadData.length }}条</p>
+      <p class="red" v-if="paramsData&&paramsData.errorList">不可导入数据{{ paramsData.errorList.length }}条</p>
       <a-table
         class="unTable"
         ref="unTable"