浏览代码

1. 修复bug

MONSTER-ygh 1 年之前
父节点
当前提交
87f01e8225

+ 6 - 6
src/views/order/viewers/index.vue

@@ -404,8 +404,8 @@ export default {
       this.loading = true;
       let params = {...this.addDateRange(this.queryParams, this.dateRange)};
       if(params.performDate&&params.performDate.length==2){
-        params.performDateStart = params.performDate[0];
-        params.performDateEnd = params.performDate[1];
+        params.performBeginDate = params.performDate[0];
+        params.performEndDate = params.performDate[1];
       }
       delete params.performDate;
       pageList(this.addDateRange(params))
@@ -542,11 +542,11 @@ export default {
           }
 
           if(this.queryParams.performDate){
-            this.queryParams.performDateStart   = this.queryParams.performDate[0];
-            this.queryParams.performDateEnd = this.queryParams.performDate[1];
+            this.queryParams.performBeginDate   = this.queryParams.performDate[0];
+            this.queryParams.performEndDate = this.queryParams.performDate[1];
           }else {
-            this.queryParams.performDateStart   = null
-            this.queryParams.performDateEnd = null
+            this.queryParams.performBeginDate   = null
+            this.queryParams.performEndDate = null
           }
 
           let params = JSON.parse(JSON.stringify(this.queryParams))

+ 4 - 0
src/views/team/applicationMr/dialog/addAndEdit.vue

@@ -321,6 +321,7 @@ export default {
     },
     /** 团队列表查询 */
     teamPageListApi(key) {
+      console.log("fadsfasdf====",key)
       this.teamIdLoading = true
       teamPageList(this.addDateRange({pageNum: 1, pageSize: 900,name:key}))
         .then(response => {
@@ -339,6 +340,9 @@ export default {
     },
     /** 团队选择 */
     teamChange(val) {
+      if(!val) {
+        this.teamPageListApi()
+      }
       this.teamList.forEach(item => {
         if(val == item.id){
           this.$set(this.form, 'teamName', item.name)

+ 1 - 1
src/views/ticket/ticketMr/index.vue

@@ -80,7 +80,7 @@
           </el-switch>
         </template>
       </el-table-column>
-
+      <el-table-column label="创建人" align="center" prop="createBy" width="160" />
       <el-table-column label="添加时间" align="center" prop="createTime" width="160" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>

+ 1 - 1
src/views/windowTicketSales/ticketingSales.vue

@@ -368,7 +368,7 @@
                     item.isSelect = this.setIsSelect(item);
                     if(item.rowNo){
                         listNum.forEach((item1,index)=>{
-                            if(item1.id == item.seatTypeId && item.status ==1) {
+                            if(item1.id == item.seatTypeId && item.status ==1 && !item.occupyStatus) {
                                 listNum[index]['num'] = listNum[index]['num'] + 1 
                             }
                         })