aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/212
This commit is contained in:
wuteng 2026-03-10 16:47:34 +08:00
commit dd3c05353d
4 changed files with 58 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue
View File

@ -117,7 +117,19 @@
</template>
</el-table-column> -->
<el-table-column :label="$t('收款公司')" align="center" prop="recedCompanyName" min-width="100" />
<el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="100" />
<el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="100">
<template #default="scope">
<el-tooltip
:content="scope.row.invoiceNo"
placement="top"
effect="dark"
:disabled="!scope.row.invoiceNo || scope.row.invoiceNo.length <= 20"
>
<div class="table-text-ellipsis">{{ scope.row.invoiceNo }}</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column :label="$t('申请说明')" align="center" prop="applyMemo" min-width="100">
</el-table-column>
<el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="80">
@ -361,4 +373,10 @@ export default {
text-overflow: ellipsis;
vertical-align: top; white-space: nowrap;
}
.table-text-ellipsis {
white-space: nowrap; /* 强制不换行 */
overflow: hidden; /* 超出隐藏 */
text-overflow: ellipsis; /* 超出显示省略号 */
width: 100%; /* 继承单元格宽度 */
}
</style>

19
src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue
View File

@ -40,7 +40,18 @@
<el-table-column :label="$t('产品类型')" align="center" prop="emisWaybill.productTypeName" min-width="100"></el-table-column>
<el-table-column :label="$t('件数')" align="center" prop="emisWaybill.parcelQty" min-width="100"> </el-table-column>
<el-table-column :label="$t('结算重量 ')" align="center" prop="emisWaybill.settlementWeight" min-width="100" />
<el-table-column :label="$t('发票号 ')" align="center" prop="invoiceNo" min-width="100" />
<el-table-column :label="$t('发票号 ')" align="center" prop="invoiceNo" min-width="100" >
<template #default="scope">
<el-tooltip
:content="scope.row.invoiceNo"
placement="top"
effect="dark"
:disabled="!scope.row.invoiceNo || scope.row.invoiceNo.length <= 20"
>
<div class="table-text-ellipsis">{{ scope.row.invoiceNo }}</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column :label="$t('收款状态 ')" align="center" prop="emisSettleSubBill.paymentStatus" min-width="100">
<template slot-scope="scope">
<!-- 收款状态 展示不同颜色的标签 -->
@ -206,4 +217,10 @@ export default {
color: #0955ee;
cursor: pointer;
}
.table-text-ellipsis {
white-space: nowrap; /* 强制不换行 */
overflow: hidden; /* 超出隐藏 */
text-overflow: ellipsis; /* 超出显示省略号 */
width: 100%; /* 继承单元格宽度 */
}
</style>

16
src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue
View File

@ -112,6 +112,16 @@
<el-table-column :label="$t('销账日期')" align="center" prop="tradeDate" min-width="100">
</el-table-column>
<el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="100">
<template #default="scope">
<el-tooltip
:content="scope.row.invoiceNo"
placement="top"
effect="dark"
:disabled="!scope.row.invoiceNo || scope.row.invoiceNo.length <= 20"
>
<div class="table-text-ellipsis">{{ scope.row.invoiceNo }}</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column :label="$t('图片')" align="center" prop="fileUrl" min-width="200">
<template slot-scope="scope">
@ -560,4 +570,10 @@ export default {
vertical-align: top;
white-space: nowrap;
}
.table-text-ellipsis {
white-space: nowrap; /* 强制不换行 */
overflow: hidden; /* 超出隐藏 */
text-overflow: ellipsis; /* 超出显示省略号 */
width: 100%; /* 继承单元格宽度 */
}
</style>

9
src/views/emis/emisTransPlanRule/index.vue
View File

@ -15,7 +15,8 @@
<EmisSiteSimplePicker1 v-model="queryParams.nextSiteCode" ></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item label="供应商" prop="supplierCode">
<EmisSupplierPicker :placeholder="$t('请选择')" v-model="queryParams.supplierCode" ></EmisSupplierPicker>
<!-- <EmisSupplierPicker :placeholder="$t('请选择')" v-model="queryParams.supplierCode" ></EmisSupplierPicker> -->
<EmisSupplierMultiplePicker :placeholder="$t('请选择')" v-model="queryParams.supplierCode" ></EmisSupplierMultiplePicker>
</el-form-item>
<el-form-item label="节点负责人" prop="manager" label-width="100px">
<EmpNamePicker :placeholder="$t('节点负责人')" v-model="queryParams.manager" ></EmpNamePicker>
@ -184,10 +185,9 @@ import { autoScanSiteBatchV2 } from "@/api/emis/emisCommon"
import emisTransPlanRuleForm from '@/views/emis/emisTransPlanRule/emisTransPlanRuleForm';
import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
import EmisSupplierMultiplePicker from '@/views/emis/EmisBaseTools/EmisSupplierMultiplePicker.vue';
import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue';
import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue';
@ -208,7 +208,8 @@ export default {
TransLineAllPicker,
TransProductAllPicker,
EmpNamePicker,
BatchTransPlanRuleUpdateForm
BatchTransPlanRuleUpdateForm,
EmisSupplierMultiplePicker,
},
dicts: [