diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue index 8fd77d4c..6fba6cc8 100644 --- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue +++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue @@ -425,18 +425,18 @@ export default { created() { this.queryOrderType="1" - let start = new Date() - start.setDate(1) - start.setHours(0,0,0,0) + // let start = new Date() + // start.setDate(1) + // start.setHours(0,0,0,0) - let end = new Date() - end.setHours(23,59,59,0) - var currentMonth = end.getMonth() - var nextMonth = ++currentMonth - var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) - var oneDay = 1000 * 60 * 60 * 24 - end=Date(nextMonthFirstDay - oneDay) - this.dateTimeRange=[timeFormat(start), timeFormat(end)] + // let end = new Date() + // end.setHours(23,59,59,0) + // var currentMonth = end.getMonth() + // var nextMonth = ++currentMonth + // var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + // var oneDay = 1000 * 60 * 60 * 24 + // end=Date(nextMonthFirstDay - oneDay) + // this.dateTimeRange=[timeFormat(start), timeFormat(end)] this.getList(); }, @@ -496,6 +496,12 @@ export default { handleGenPayCode(row) { // this.$modal.msgSuccess("暂不支持"); // const ids = row.id || this.ids; + let selItem=this.selectList[0]; + if(selItem.paymentStatus == 1){ + this.$modal.msgError("已支付，无需再支付"); + return + } + this.resetRefreshId="pay-"+Math.random().toString(36).substring(3,10); this.titleForm="微信二维码收款"; this.openForm=true; diff --git a/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue b/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue index 7db56485..9e5332d0 100644 --- a/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue +++ b/src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue @@ -12,9 +12,10 @@
-
￥{{ settleBillItem.recMoney-settleBillItem.recedMoney }}
+ +
￥{{ settleBillItem.thisPayMoney }}
-
请使用微信[24小时]内完成支付
+
请使用微信[24小时]内完成支付
@@ -43,7 +44,7 @@ - 应付金额:￥{{ settleBillItem.recMoney }} + 总费用:￥{{ settleBillItem.recMoney }} 开票状态: @@ -59,11 +60,17 @@ - 已付金额:￥{{ settleBillItem.recedMoney }} + 已付费用:￥{{ settleBillItem.recedMoney }} + + + 待支付:￥{{ settleBillItem.thisPayMoney }} - + + 运单明细列表： + + 运单号:{{ item.billCode }} @@ -91,6 +98,12 @@ 实际重量:{{ item.waybillDetail.billWeight }}KG + + 体积:{{ item.waybillDetail.totalVolume }}m³ + + + 结算重量:{{ item.waybillDetail.settlementWeight }}KG + 产品类型:{{ item.waybillDetail.productTypeName }} @@ -98,14 +111,16 @@ 寄件公司:{{ item.waybillDetail.sendCompany }} - 备注:{{ item.waybillDetail.remark }} {{ item.waybillDetail.feeRemark }} + 费用备注:{{ item.waybillDetail.feeRemark }} + +
- + 打印
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue index 7c64d220..d02837f6 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue @@ -763,19 +763,18 @@ export default { this.queryParams.blConfirmCenter='0'; this.actionType=this.$route.query.actionType; + // let start = new Date() + // start.setDate(1) + // start.setHours(0,0,0,0) - let start = new Date() - start.setDate(1) - start.setHours(0,0,0,0) - - let end = new Date() - end.setHours(23,59,59,0) - var currentMonth = end.getMonth() - var nextMonth = ++currentMonth - var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) - var oneDay = 1000 * 60 * 60 * 24 - end=Date(nextMonthFirstDay - oneDay) - this.dateTimeRange=[timeFormat(start), timeFormat(end)] + // let end = new Date() + // end.setHours(23,59,59,0) + // var currentMonth = end.getMonth() + // var nextMonth = ++currentMonth + // var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + // var oneDay = 1000 * 60 * 60 * 24 + // end=Date(nextMonthFirstDay - oneDay) + // this.dateTimeRange=[timeFormat(start), timeFormat(end)] this.initData(); this.getList(); diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue index 4c819304..19791000 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue @@ -786,18 +786,18 @@ export default { }, created() { - let start = new Date() - start.setDate(1) - start.setHours(0,0,0,0) + // let start = new Date() + // start.setDate(1) + // start.setHours(0,0,0,0) - let end = new Date() - end.setHours(23,59,59,0) - var currentMonth = end.getMonth() - var nextMonth = ++currentMonth - var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) - var oneDay = 1000 * 60 * 60 * 24 - end=Date(nextMonthFirstDay - oneDay) - this.dateTimeRange=[timeFormat(start), timeFormat(end)] + // let end = new Date() + // end.setHours(23,59,59,0) + // var currentMonth = end.getMonth() + // var nextMonth = ++currentMonth + // var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + // var oneDay = 1000 * 60 * 60 * 24 + // end=Date(nextMonthFirstDay - oneDay) + // this.dateTimeRange=[timeFormat(start), timeFormat(end)] // this.queryParams.blConfirmCenter='0'; this.actionType=this.$route.query.actionType;