md

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

@@ -425,18 +425,18 @@ export default {
   created() {
     this.queryOrderType="1"
 
-    let start = new Date()
+    // let start = new Date()
-    start.setDate(1)
+    // start.setDate(1)
-    start.setHours(0,0,0,0)
+    // start.setHours(0,0,0,0)
 
-    let end = new Date()
+    // let end = new Date()
-    end.setHours(23,59,59,0)
+    // end.setHours(23,59,59,0)
-    var currentMonth = end.getMonth()
+    // var currentMonth = end.getMonth()
-    var nextMonth = ++currentMonth
+    // var nextMonth = ++currentMonth
-    var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1)
+    // var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1)
-    var oneDay = 1000 * 60 * 60 * 24
+    // var oneDay = 1000 * 60 * 60 * 24
-    end=Date(nextMonthFirstDay - oneDay)
+    // end=Date(nextMonthFirstDay - oneDay)
-    this.dateTimeRange=[timeFormat(start), timeFormat(end)]
+    // 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;

src/views/emis/emisSettlePayRecord/panel/PayQrCode.vue

@@ -12,9 +12,10 @@
                 <div style="width:150px;margin: 0 auto;">
                   <img :src="wxPayQrImageUrl" width="100%" draggable="false"/>
                  </div>
-                <div class="pay-title"><span style="color: black;font-size: 20px;">￥{{ settleBillItem.recMoney-settleBillItem.recedMoney }} </span></div>
+                 <!-- -settleBillItem.recedMoney -->
+                <div class="pay-title"><span style="color: red;font-size: 20px;">￥{{ settleBillItem.thisPayMoney }} </span></div>
                 <div style="text-align: center;" >
-                  <div>请使用微信[<span style="color:black;font-weight: bold;">24小时</span>]内完成支付</div>
+                  <div>请使用微信[<span style="color:blue;font-weight: bold;">24小时</span>]内完成支付</div>
                 </div>
               </div>
           </el-col>
@@ -43,7 +44,7 @@
                   </el-col>
 
                   <el-col :span="12">
-                      <span class="item-label">应付金额:</span><span class="item-value">￥{{ settleBillItem.recMoney }}</span>
+                      <span class="item-label">总费用:</span><span class="item-value">￥{{ settleBillItem.recMoney }}</span>
                   </el-col>
                    <el-col :span="12">
                       <span class="item-label">开票状态:</span>
@@ -59,11 +60,17 @@
                    <!-- <el-col :span="12">
                   </el-col> -->
                    <el-col :span="12">
-                      <span class="item-label">已付金额:</span><span class="item-value">￥{{ settleBillItem.recedMoney }}</span>
+                      <span class="item-label">已付费用:</span><span class="item-value">￥{{ settleBillItem.recedMoney }}</span>
+                  </el-col>
+                  <el-col :span="12">
+                      <span class="item-label" style="color:red">待支付:</span><span class="item-value" style="color:red">￥{{ settleBillItem.thisPayMoney }}</span>
                   </el-col>
               </el-row>
            </el-col>
-            <el-col :span="24" v-for="item in emisSettleSubBillList"  :key="item.id">
+           <el-col style="border-bottom: 2px solid #f0f0f0 ;padding-top: 10px;color: black;font-weight: bold;" :span="24">
+              运单明细列表：
+           </el-col>
+            <el-col style="border-top: 2px solid #f0f0f0 ;padding-bottom: 10px;" :span="24" v-for="item in emisSettleSubBillList"  :key="item.id">
               <el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top:10px">
                 <el-col :span="12">
                     <span class="item-label">运单号:</span><span class="item-value" style="font-size:14px;font-weight: bold;">{{ item.billCode }}</span>
@@ -91,6 +98,12 @@
                 <el-col :span="12">
                     <span class="item-label">实际重量:</span><span class="item-value">{{ item.waybillDetail.billWeight }}KG</span>
                 </el-col>
+                <el-col :span="12">
+                    <span class="item-label">体积:</span><span class="item-value">{{ item.waybillDetail.totalVolume }}m³</span>
+                </el-col>
+                <el-col :span="12">
+                    <span class="item-label">结算重量:</span><span class="item-value">{{ item.waybillDetail.settlementWeight }}KG</span>
+                </el-col>
                 <el-col :span="12">
                     <span class="item-label">产品类型:</span><span class="item-value">{{ item.waybillDetail.productTypeName }}</span>
                 </el-col>
@@ -98,14 +111,16 @@
                     <span class="item-label">寄件公司:</span><span class="item-value">{{ item.waybillDetail.sendCompany }}</span>
                 </el-col>
                 <el-col :span="24">
-                    <span class="item-label">备注:</span><span class="item-value">{{ item.waybillDetail.remark }} {{ item.waybillDetail.feeRemark }}</span>
+                    <span class="item-label">费用备注:</span><span class="item-value">{{ item.waybillDetail.feeRemark }}</span>
                 </el-col>
+
+                <!-- {{ item.waybillDetail.remark }}  -->
               </el-row>
            </el-col>
         </el-row>
     </el-form>
     <div style="margin-bottom: 20px;">
-      <!-- <el-button type="primary" v-print="'#payPage'" >打印</el-button> -->
+      <el-button type="primary" v-print="'#payPage'" >打印</el-button>
     </div>
   </div>
 </template>

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()
+    // let end = new Date()
-    start.setDate(1)
+    // end.setHours(23,59,59,0)
-    start.setHours(0,0,0,0)
+    // var currentMonth = end.getMonth()
-
+    // var nextMonth = ++currentMonth
-    let end = new Date()
+    // var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1)
-    end.setHours(23,59,59,0)
+    // var oneDay = 1000 * 60 * 60 * 24
-    var currentMonth = end.getMonth()
+    // end=Date(nextMonthFirstDay - oneDay)
-    var nextMonth = ++currentMonth
+    // this.dateTimeRange=[timeFormat(start), timeFormat(end)]
-    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();

src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue

@@ -786,18 +786,18 @@ export default {
  },
  created() {
 
-    let start = new Date()
+    // let start = new Date()
-    start.setDate(1)
+    // start.setDate(1)
-    start.setHours(0,0,0,0)
+    // start.setHours(0,0,0,0)
 
-    let end = new Date()
+    // let end = new Date()
-    end.setHours(23,59,59,0)
+    // end.setHours(23,59,59,0)
-    var currentMonth = end.getMonth()
+    // var currentMonth = end.getMonth()
-    var nextMonth = ++currentMonth
+    // var nextMonth = ++currentMonth
-    var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1)
+    // var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1)
-    var oneDay = 1000 * 60 * 60 * 24
+    // var oneDay = 1000 * 60 * 60 * 24
-    end=Date(nextMonthFirstDay - oneDay)
+    // end=Date(nextMonthFirstDay - oneDay)
-    this.dateTimeRange=[timeFormat(start), timeFormat(end)]
+    // this.dateTimeRange=[timeFormat(start), timeFormat(end)]
 
   //  this.queryParams.blConfirmCenter='0';
    this.actionType=this.$route.query.actionType;