Browse Source

修复合作商运营端 核销记录页面核销服务名称与套餐名称取反的bug单

zhangdan 4 years ago
parent
commit
cc99d27d56

+ 3 - 3
src/views/FinancialManagement/PaySettlementRecords.vue

@@ -5,7 +5,7 @@
       <a-form layout="inline" @keyup.enter.native="refresh">
         <a-row :gutter="48">
           <a-col :lg="6" :sm="12">
-            <a-form-item label="结算时间:">
+            <a-form-item label="结算时间:" :label-col="{ span: 3 }" :wrapper-col="{ span: 12 }">
               <a-range-picker
                 style="width:100%"
                 id="PaySettlementRecords-queryOrderDate"
@@ -16,7 +16,7 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6" :sm="12">
-            <a-form-item label="结算单号">
+            <a-form-item label="结算单号" :label-col="{ span: 3 }" :wrapper-col="{ span: 12 }">
               <a-input class="full-width" v-model="queryParam.settleNo" placeholder="请输入" allowClear id="PaySettlementRecords-queryOrderDate"/>
             </a-form-item>
           </a-col>
@@ -158,7 +158,7 @@ export default {
     },
     // 查看详情
     handleDetail (record) {
-		 this.itemId = record.settleNo
+      this.itemId = record.settleNo
       if (record.settleType === 'BUNDLE_SALE') {
         this.openModalDetails = true
         console.log(this.openModalDetails)

+ 7 - 7
src/views/SetmealSales/VerificationRecords.vue

@@ -48,9 +48,9 @@
       </a-form>
     </div>
     <!-- 合计 -->
-	<a-alert type="info" showIcon style="margin-bottom:15px">
-	  <div class="ftext" slot="message">总计:<span>{{ orderTotal || 0 }}</span>单,结算金额:<span>¥{{ paymentAmountTotal || 0  }}</span>元</div>
-	</a-alert>
+    <a-alert type="info" showIcon style="margin-bottom:15px">
+      <div class="ftext" slot="message">总计:<span>{{ orderTotal || 0 }}</span>单,结算金额:<span>¥{{ paymentAmountTotal || 0 }}</span>元</div>
+    </a-alert>
     <!-- <div class="total">
       <a-icon type="info-circle" class="iconImg" />
       <strong>总计:</strong><span>{{ orderTotal || 0 }} 单</span><strong style="margin-left: 15px;">结算金额:</strong><span
@@ -132,7 +132,7 @@ export default {
 	  {
 	    title: '核销时间',
 	    dataIndex: 'usedTime',
-	    width:100,
+	    width: 100,
 	    align: 'center'
 	  },
       {
@@ -143,8 +143,8 @@ export default {
       },
       {
         title: '核销服务名称',
-        dataIndex: 'bundName',
-       width: 150,
+        dataIndex: 'bundItemName',
+        width: 150,
         align: 'center'
       },
       {
@@ -155,7 +155,7 @@ export default {
       },
       {
         title: '套餐名称',
-        dataIndex: 'bundItemName',
+        dataIndex: 'bundName',
         width: 150,
         align: 'center'
       },