Merge pull request 'develop' (#202) from develop into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/202

src/views/emis/emisSettleBill/InvoiceReversalList.vue

@@ -166,7 +166,20 @@
             <el-table-column :label="$t('红冲发票登记网点')" align="center" prop="redCreateSiteName" min-width="150" />
             <el-table-column :label="$t('发票作废时间')" align="center" prop="redCreateTime" min-width="150" />
             <el-table-column :label="$t('销售联系人')" align="center" prop="salesmens" min-width="150" />
-            <el-table-column :label="$t('对应面单号')" align="center" prop="billCodes" min-width="150" />
+            <!-- <el-table-column :label="$t('对应面单号')" align="center" prop="billCodes" min-width="150" /> -->
+            <el-table-column :label="$t('对应面单号')" align="center" prop="billCodes" min-width="150" >
+                <template #default="scope">
+                    <el-tooltip 
+                    :content="scope.row.billCodes" 
+                    placement="top" 
+                    effect="dark"
+                    :disabled="!scope.row.billCodes || scope.row.billCodes.length <= 20" 
+                    >
+                    <div class="table-text-ellipsis">{{ scope.row.billCodes }}</div>
+                    </el-tooltip>
+                </template>
+            </el-table-column>
+
         </XdTable>
         <!-- 作废申请 弹窗 -->
         <el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag
@@ -493,4 +506,11 @@ export default {
     }
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.table-text-ellipsis {
+  white-space: nowrap; /* 强制不换行 */
+  overflow: hidden;    /* 超出隐藏 */
+  text-overflow: ellipsis; /* 超出显示省略号 */
+  width: 100%;         /* 继承单元格宽度 */
+}
+</style>

src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue

@@ -72,13 +72,13 @@
       <el-table-column :label="$t('账单金额')" align="center" prop="emisWaybill.freight" min-width="100" >
           <template slot-scope="scope">
                 <!-- 求和 -->
-                {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight || 0), 0) }}
+                {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight || 0), 0).toFixed(2) }} 
           </template>
       </el-table-column>   
       <el-table-column :label="$t('已收金额')" align="center" prop="emisSettleSubBill.recedMoney" min-width="100" >
           <template slot-scope="scope">
                 <!-- 求和 -->
-                {{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.recedMoney || 0), 0) }}
+                {{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.recedMoney || 0), 0).toFixed(2) }} 
           </template>
       </el-table-column>   
       <el-table-column :label="$t('本次销账金额')" align="center" prop="writeoffAmount" min-width="150" />

src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue

@@ -79,14 +79,14 @@
                 :show-overflow-tooltip="true" />
             <el-table-column :label="$t('账单金额')" align="center" prop="emisWaybill.freight" min-width="100" >
                 <template slot-scope="scope">
-                     <!-- 求和 -->
-                      {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight || 0), 0) }}
+                     <!-- 求和-->
+                      {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight || 0), 0).toFixed(2) }}
                 </template>
             </el-table-column>   
             <el-table-column :label="$t('已收金额')" align="center" prop="emisSettleSubBill.recedMoney" min-width="100" >
                 <template slot-scope="scope">
                      <!-- 求和 -->
-                      {{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.recedMoney || 0), 0) }}
+                      {{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.recedMoney || 0), 0).toFixed(2) }}
                 </template>
             </el-table-column>   
             <el-table-column :label="$t('本次销账金额')" align="center" prop="writeoffAmount" min-width="140" />

src/views/emis/emisWaybillAjustApply/InvoiceCancellationForm.vue

@@ -29,7 +29,19 @@
                 <el-table-column :label="$t('开票抬头 ')" align="center" prop="emisSettleInvoiceRecord.companyName" min-width="150" />
                 <el-table-column :label="$t('发票号')" align="center" prop="emisSettleInvoiceRecord.invoiceNo" min-width="150" />
                 <el-table-column :label="$t('开票时间')" align="center" prop="emisSettleInvoiceRecord.applyDate" min-width="150" />
-                <el-table-column :label="$t('对应运单号')" align="center" prop="billCodes" min-width="150" />
+                <!-- <el-table-column :label="$t('对应运单号')" align="center" prop="billCodes" min-width="150" /> -->
+                <el-table-column :label="$t('对应面单号')" align="center" prop="billCodes" min-width="150" >
+                    <template #default="scope">
+                        <el-tooltip 
+                        :content="scope.row.billCodes" 
+                        placement="top" 
+                        effect="dark"
+                        :disabled="!scope.row.billCodes || scope.row.billCodes.length <= 20" 
+                        >
+                        <div class="table-text-ellipsis">{{ scope.row.billCodes }}</div>
+                        </el-tooltip>
+                    </template>
+                </el-table-column> 
                 <el-table-column :label="$t('销售联系人')" align="center" prop="salesmens" min-width="150" />
             </el-table>
             <!-- 输入框 -->
@@ -227,5 +239,10 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-
+.table-text-ellipsis {
+  white-space: nowrap; /* 强制不换行 */
+  overflow: hidden;    /* 超出隐藏 */
+  text-overflow: ellipsis; /* 超出显示省略号 */
+  width: 100%;         /* 继承单元格宽度 */
+}
 </style>

src/views/emis/emisWaybillAjustApply/InvoiceCancellationList.vue

@@ -116,7 +116,19 @@
             <el-table-column :label="$t('开票金额')" align="center" prop="emisSettleInvoiceRecord.applyMoney" min-width="150" />
             <el-table-column :label="$t('发票号')" align="center" prop="emisSettleInvoiceRecord.invoiceNo" min-width="150" />
             <el-table-column :label="$t('开票时间')" align="center" prop="emisSettleInvoiceRecord.applyDate" min-width="150" />
-            <el-table-column :label="$t('对应面单号')" align="center" prop="billCodes" min-width="150" />
+            <!-- <el-table-column :label="$t('对应面单号')" align="center" prop="billCodes" min-width="150" /> -->
+            <el-table-column :label="$t('对应面单号')" align="center" prop="billCodes" min-width="150" >
+                <template #default="scope">
+                    <el-tooltip 
+                    :content="scope.row.billCodes" 
+                    placement="top" 
+                    effect="dark"
+                    :disabled="!scope.row.billCodes || scope.row.billCodes.length <= 20" 
+                    >
+                    <div class="table-text-ellipsis">{{ scope.row.billCodes }}</div>
+                    </el-tooltip>
+                </template>
+            </el-table-column>
             <el-table-column :label="$t('销售联系人')" align="center" prop="salesmens" min-width="150" />
 
             <el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="150" />
@@ -418,4 +430,11 @@ export default {
     }
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.table-text-ellipsis {
+  white-space: nowrap; /* 强制不换行 */
+  overflow: hidden;    /* 超出隐藏 */
+  text-overflow: ellipsis; /* 超出显示省略号 */
+  width: 100%;         /* 继承单元格宽度 */
+}
+</style>