1. 优化

src/api/windowTicketSales/ticketingCollection.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 分页查询
 export const pageList = (query) => {
   return request({
-    url: '/order/orderInfo/getValidList',
+    url: '/order/orderInfo/getValidPageList',
     method: 'get',
     params: query
   })

src/views/team/applicationMr/dialog/applicationDetails.vue

@@ -81,7 +81,7 @@
 
     <span slot="footer" class="dialog-footer" v-if="detailsType">
       <el-button type="primary" @click="passOpenEven" style="margin-right: 20px">通过</el-button>
-       <el-button type="danger" @click="rejectOpen = true" >驳回</el-button>
+       <el-button type="danger" @click="setRejectOpen" >驳回</el-button>
     </span>
 
 
@@ -359,6 +359,13 @@ export default {
     cancel() {
       this.open = false;
     },
+    setRejectOpen() {
+      this.rejectOpen = true
+      this.$set(this.rejectForm,'errReason','')
+      this.$nextTick(()=>{
+        this.$refs.refRejectForm.clearValidate('errReason')
+      })
+    }
   },
 };
 </script>

src/views/ticket/ticketMr/dialog/addAndEdit.vue

@@ -466,6 +466,7 @@ export default {
       this.$set(this.form, 'buyAstrict', '');
       this.$set(this.form, 'channelWx', '');
       this.$set(this.form, 'channelWindow', '');
+      this.$set(this.form, 'beforeTime', '');
 
       this.$set(this.form, 'backStatus', '');
       this.$set(this.form, 'backTime', '1');

src/views/ticket/ticketMr/dialog/details.vue

@@ -26,9 +26,9 @@
         <el-col :span="12">
           <div class="grid-content bg-purple item-class">实名信息: <span>全部观影人员均实名</span></div>
         </el-col>
-        <!-- <el-col :span="12">
-          <div class="grid-content bg-purple item-class">停止售卖时间: <span>开演前{{ form.stopSaleTime || '' }}分钟内</span></div>
-        </el-col> -->
+        <el-col :span="12">
+          <div class="grid-content bg-purple item-class">停止售卖时间: <span>开演前{{ form.goodsPerform && form.goodsPerform.stopSaleTime || '' }}分钟内</span></div>
+        </el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple item-class">核销时间: <span>开演前{{ form.goodsPerform && form.goodsPerform.beforeTime || '' }}分钟内</span></div>
         </el-col>

src/views/windowTicketSales/ticketingCollection.vue

@@ -1,6 +1,15 @@
 <template>
-    <div class="app-container">
+    <div class="app-container app-container-me">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+        <el-form-item label="订单号" label-width="100px">
+          <el-input
+            v-model="queryParams.orderId"
+            placeholder="请输入订单号"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item label="取票码" label-width="100px">
           <el-input
             v-model="queryParams.qrcodeNo"
@@ -26,7 +35,9 @@
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
-          />
+          >
+            <el-button slot="append" :loading="idcardLoading" size="mini" type="primary" @click="readCert">{{ idcardLoading ? '识别中':'识别' }}</el-button>
+          </el-input>
         </el-form-item>
         <el-form-item label="订单状态">
           <el-select
@@ -109,7 +120,13 @@
             </div>
         </template>
       </el-table>
-
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
       <el-dialog
         title="选择打印机"
         :visible.sync="dialogVisible"
@@ -154,10 +171,10 @@
         dataList: null,
         // 查询参数
         queryParams: {
-          // pageNum: 1,
-          // pageSize: 10,
+          pageNum: 1,
+          pageSize: 10,
           // type: undefined
-          orderStatus: "3"
+          //orderStatus: "3"
         },
         visibleStatus: false,
         visibleStatusLoading: false,
@@ -179,6 +196,8 @@
           ],
         },
         dialogVisibleLoading: false,
+
+        idcardLoading: false,
       };
     },
     created() {
@@ -191,11 +210,15 @@
         this.loading = true;
         pageList(this.queryParams,)
         .then(response => {
-            this.dataList = response.data.list;
-            //this.total = response.data.total;
+            this.dataList = response.data.rows;
+            this.total = response.data.total;
             this.loading = false;
           }
-        );
+        ).catch(()=>{
+          this.dataList = []
+          this.total = 0
+          this.loading = false
+        })
       },
       
       // 取消按钮
@@ -209,6 +232,7 @@
       /** 重置按钮操作 */
       resetQuery() {
         this.dateRange = [];
+        this.$set(this.queryParams, 'orderId', '');
         this.$set(this.queryParams, 'qrcodeNo', '');
         this.$set(this.queryParams, 'idcard', '');
         this.$set(this.queryParams, 'mobile', '');
@@ -372,8 +396,43 @@
           //   this.dialogVisible = false
           //   this.dialogVisibleLoading = false
           // })
+        },
+        /**  读取身份证 */
+        readCert(){
+          this.idcardLoading = true
+          var result = "";
+          try {
+              let xmlHttp = new XMLHttpRequest();
+              let Protocol = window.location.protocol.split(':')[0];
+              //获取当前协议，并且分割字符串，得到http或者https
+              if (Protocol === 'https'){
+                //创建请求 第一个参数是代表以post方式发送；第二个是请求端口和地址；第三个表示是否异步
+                xmlHttp.open("POST", "http://127.0.0.1:18889/api/readCert?ReadSN=" + 0, false);	  //readCert读卡，生成正反面仿复印件	
+              }else {
+                //创建请求 第一个参数是代表以post方式发送；第二个是请求端口和地址；第三个表示是否异步
+                xmlHttp.open("POST", "http://127.0.0.1:18889/api/readCert?ReadSN=" + 0, false);	  //readCert读卡，生成正反面仿复印件	
+              }
+              //发送请求
+              xmlHttp.send();
+              if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
+                  result = xmlHttp.responseText;
+                  xmlHttp.readyState = 1;
+              }
+          } catch (e) {
+            console.error("e====",e)
+          }
+          let obj = JSON.parse(result)
+          if(obj.resultContent && obj.resultContent.certNumber){
+            this.$set(this.queryParams,"idcard",obj.resultContent.certNumber)
+          }else {
+            this.$message.error('读取失败!!!');
+          }
+          
+          this.idcardLoading = false
+          //return result;
+            console.log(result,obj)
+          }
         }
-    }
+        
   };
-  </script>
-  
+  </script>