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

md

Browse Source
This commit is contained in:
linfso 2025-06-12 15:11:02 +08:00
parent 8152d205b5
commit 98874d947a
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
View File

@ -153,7 +153,7 @@
:disabled="multiple" :disabled="multiple"
@click="handleBatchGenBill" @click="handleBatchGenBill"
v-hasPermi="['emis:emisSettleBill:add']" v-hasPermi="['emis:emisSettleBill:add']"
>批量生成</el-button> >批量生成现金账单</el-button>
</el-col> </el-col>
<el-col :span="1.5" > <el-col :span="1.5" >
@ -910,17 +910,19 @@ export default {
// 批量生成 // 批量生成
handleBatchGenBill(){ handleBatchGenBill(){
if(!this.billMonth){ // if(!this.billMonth){
this.$modal.msgError("账单月不能为空!"); // this.$modal.msgError("账单月不能为空!");
return; // return;
} // }
if(!this.selectBillList){ if(!this.selectBillList){
this.$modal.msgError("请先选择单号 !"); this.$modal.msgError("请先选择单号 !");
return return
} }
this.$confirm("确定批量生成吗?", "提示", { // 检查单号是否包含月结账单
this.$confirm("注意:现金账单账期是根据寄件日期月生成，确定批量生成吗?", "提示", {
cancelButtonText: "否", cancelButtonText: "否",
confirmButtonText: "确定", confirmButtonText: "确定",
type: "warning", type: "warning",
@ -928,7 +930,6 @@ export default {
closeOnClickModal: false closeOnClickModal: false
}).then(async () => { }).then(async () => {
let startDate = new Date(this.billMonth+"-01 00:00:00"); let startDate = new Date(this.billMonth+"-01 00:00:00");
let endDate= this.getMonthLast(startDate); let endDate= this.getMonthLast(startDate);
endDate.setHours(23,59,59,0) endDate.setHours(23,59,59,0)

10
src/views/emis/emisTmsSiteBatchMiss/index.vue
View File

@ -84,7 +84,7 @@
ref="refTable" ref="refTable"
row-key="id" row-key="id"
storageName="emisTmsSiteBatchMissList_main_240702" storageName="emisTmsSiteBatchMissList_main_240703"
size="small" size="small"
:data="emisTmsSiteBatchMissList" :data="emisTmsSiteBatchMissList"
@ -114,8 +114,12 @@
<el-table-column :label="$t('运单号')" align="left" prop="billCode" min-width="170" /> <el-table-column :label="$t('运单号')" align="left" prop="billCode" min-width="170" />
<el-table-column :label="$t('漏组批次原因')" align="left" prop="missReason" min-width="200" :show-overflow-tooltip="true"/> <el-table-column :label="$t('漏组批次原因')" align="left" prop="missReason" min-width="200" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('起始节点')" align="left" prop="sendSiteName" min-width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('起始节点')" align="left" prop="startSiteName" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('下一节点')" align="left" prop="destinationName" min-width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('下一节点')" align="left" prop="nextSiteName" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件网点')" align="left" prop="sendSiteName" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的网点')" align="left" prop="destinationName" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('线路')" align="left" prop="transLineTypeName" min-width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('线路')" align="left" prop="transLineTypeName" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('产品类型')" align="left" prop="productTypeName" min-width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('产品类型')" align="left" prop="productTypeName" min-width="100" :show-overflow-tooltip="true"/>