增加父订单号显示，ota美团增加查询

src/views/login.vue

@@ -141,7 +141,7 @@ export default {
             Cookies.remove('rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then(async () => {
-            console.log(this.redirect, 'this.redirect');
+            // console.log(this.redirect, 'this.redirect');
             this.$router.push({ path: this.redirect || "/index" }).catch(() => { });
           }).catch(() => {
             this.loading = false;

src/views/order/orderMr/index.vue

@@ -259,7 +259,8 @@
         <el-table ref="tables" height="100%" v-loading="loading" :data="dataList" border>
           <el-table-column label="序号" align="center" :fixed="fixed" type="index" width="60"></el-table-column>
           <el-table-column label="订单号" align="center" :fixed="fixed" prop="id" width="170" />
-          <el-table-column label="购票人手机号" align="center" :fixed="fixed" prop="memberMobile" />
+          <el-table-column label="父订单号" align="center" :fixed="fixed" prop="parentId" width="170" />
+          <el-table-column label="购票人电话" align="center" :fixed="fixed" prop="memberMobile" width="100" />
           <el-table-column label="剧目名称" align="center" :fixed="fixed" prop="performName" />
           <el-table-column label="票务名称" align="center" :fixed="fixed" prop="goodsName" />
           <el-table-column label="座位类型" align="center" :fixed="fixed" prop="seatTypeName" />

src/views/order/viewers/index.vue

@@ -119,8 +119,9 @@
           :fixed="fixed"
           width="55"></el-table-column>
           <el-table-column label="订单号" :fixed="fixed" align="center" prop="orderId" width="170" />
-          <el-table-column label="观影人名称" :fixed="fixed" align="center" prop="name" />
-          <el-table-column label="身份证号" :fixed="fixed" align="center" prop="idcard" width="130" />
+          <el-table-column label="父订单号" :fixed="fixed" align="center" prop="parentId" width="170" />
+          <el-table-column label="观影人姓名" :fixed="fixed" align="center" prop="name" width="100" />
+          <el-table-column label="身份证号" :fixed="fixed" align="center" prop="idcard" width="140" />
           <el-table-column label="票务名称" :fixed="fixed" align="center" prop="goodsName" width="130" />
           <el-table-column label="座位类型" :fixed="fixed" align="center" prop="seatTypeName" />
           <el-table-column label="购买渠道" :fixed="fixed" align="center" prop="source">
@@ -831,7 +832,7 @@ export default {
         this.tkRuleForm['refundAmountAll'] = refundAmountAll;
         this.tkRuleForm['refundPeople'] = refundPeople;
         this.tkSelectList = JSON.parse(JSON.stringify(list));
-        console.log("Updated list:", this.tkSelectList);
+        // console.log("Updated list:", this.tkSelectList);
         this.tkDialogVisible = true;
       };
 
@@ -922,7 +923,7 @@ export default {
               })
               this.refundSubmitError = []
               this.refundSubmitErrorList = list
-              console.log("this.refundSubmitErrorList===",list)
+              // console.log("this.refundSubmitErrorList===",list)
               this.moreRefundSubmitFun(0)
             }else {
               this.refundSubmitFun(0)
@@ -1057,7 +1058,7 @@ export default {
       return row.status == 3 || row.status == 6 || row.status == 7 || row.status == 8
     },
     handleCloseTk(formName){
-      console.log('dsfsdfsdf')
+      // console.log('dsfsdfsdf')
       this.tkDialogVisible = false
       if(this.$refs.tkRuleForm) {
         this.$refs.tkRuleForm.resetFields()

src/views/otaMr/meituan/index.vue

@@ -1,5 +1,29 @@
 <template>
   <div class="app-container">
+     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="商品名称" prop="goodsName">
+        <el-input
+          v-model="queryParams.goodsName"
+          placeholder="请输入商品名称"
+          clearable
+          style="width: 200px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="美团ID" prop="id">
+        <el-input
+          v-model="queryParams.id"
+          placeholder="请输入美团ID"
+          clearable
+          style="width: 200px;"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
     <el-row :gutter="10" class="mb8">
       <right-toolbar :showSearch.sync="showSearch" :search="false" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -126,8 +150,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      pageList(this.addDateRange(this.queryParams, this.dateRange))
-      .then(response => {
+      // pageList(this.addDateRange(this.queryParams, this.dateRange))
+      pageList(this.queryParams).then(response => {
           this.dataList = response.data.rows;
           this.total = response.data.total?Number(response.data.total):0;
           this.loading = false;
@@ -151,8 +175,11 @@ export default {
     resetQuery() {
       this.dateRange = [];
       this.dataList = [];
-      this.queryParams.pageNum = 1;
-      this.handleQuery();
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      }
+      this.getList();
     },
     /** 修改按钮操作 */
     handleUpdate(row,type) {