Explorar el Código

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/zyyc_channe_html into deploy

lilei hace 4 años
padre
commit
fdd5e7db14
Se han modificado 1 ficheros con 11 adiciones y 20 borrados
  1. 11 20
      src/views/SetmealSales/VerificationRecords.vue

+ 11 - 20
src/views/SetmealSales/VerificationRecords.vue

@@ -24,7 +24,7 @@
           </a-col>
           <a-col :span="6">
             <a-form-item label="客户信息" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input v-model.trim="searchForm.queryWorld" placeholder="请输入手机号" allowClear id="VerificationRecords-queryWorld"/>
+              <a-input v-model.trim="searchForm.queryWord" placeholder="请输入手机号" allowClear id="VerificationRecords-queryWord"/>
             </a-form-item>
           </a-col>
           <a-col :span="6">
@@ -51,11 +51,6 @@
     <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
-      >{{ paymentAmountTotal || 0 }} 元</span>
-    </div> -->
     <!-- 列表 -->
     <s-table
       ref="table"
@@ -79,11 +74,8 @@
         <span v-if="!record.custMobile && !record.vehicleNum">--</span>
       </template>
     </s-table>
-    <!-- 查看详情弹窗 -->
-    <!-- <order-detail-modal :openModal="openDetailModal" :nowId="detailId" @close="openDetailModal=false" /> -->
   </a-card>
 </template>
-
 <script>
 import {
   STable,
@@ -109,7 +101,7 @@ export default {
         endDate: null, // 创建的结束时间
         usedStoreId: undefined, // 核销门店
         orderNo: '', // 单号
-        queryWorld: '', // 客户信息
+        queryWord: '', // 客户信息
         bundName: '' // 套餐名称
       },
       loading: false, // 导出loading
@@ -129,12 +121,12 @@ export default {
         width: 60,
         align: 'center'
       },
-	  {
-	    title: '核销时间',
-	    dataIndex: 'usedTime',
-	    width: 100,
-	    align: 'center'
-	  },
+      {
+        title: '核销时间',
+        dataIndex: 'usedTime',
+        width: 100,
+        align: 'center'
+      },
       {
         title: '核销单号/关联订单号',
         scopedSlots: { customRender: 'num' },
@@ -219,7 +211,7 @@ export default {
         endDate: this.searchForm.endDate,
         usedStoreId: this.searchForm.usedStoreId,
         orderNo: this.searchForm.orderNo,
-        queryWorld: this.searchForm.queryWorld,
+        queryWord: this.searchForm.queryWord,
         bundName: this.searchForm.bundName
       }
       params.beginDate == null ? params.beginDate = getDate.getToday().starttime : null
@@ -252,13 +244,12 @@ export default {
     },
     // 导出
     handleExport () {
-      this.loading = true
       const params = {
         beginDate: this.searchForm.beginDate == null ? getDate.getToday().starttime : this.searchForm.beginDate,
         endDate: this.searchForm.endDate == null ? getDate.getToday().endtime : this.searchForm.endDate,
         usedStoreId: this.searchForm.usedStoreId,
         orderNo: this.searchForm.orderNo,
-        queryWorld: this.searchForm.queryWorld,
+        queryWord: this.searchForm.queryWord,
         bundName: this.searchForm.bundName
       }
 	  if (!params.beginDate && !params.endDate) {
@@ -269,8 +260,8 @@ export default {
         this.$message.error('单次最多只能导出3个月的数据,请缩小查询区间后再进行导出!')
         return
       }
+	  this.loading = true
       settlementRecordsExport(params).then(res => {
-        console.log(res)
         this.loading = false
         this.download(res)
       })