Browse Source

Merge branch 'master' of http://dzgogs.hw.hongweisoft.com/great_transition/great_webui

gcz 11 months ago
parent
commit
c64f5918d1

+ 27 - 0
src/api/windowTicketSales/ticketingSales.js

@@ -55,6 +55,24 @@ export const gotoMicroPay = (query) => {
     })
   }
 
+   // 授信额度支付
+   export const gotoQuotaPay = (query) => {
+    return request({
+      url: '/order/orderInfo/gotoQuotaPay',
+      method: 'post',
+      data: query
+    })
+  }
+
+   // 余额支付
+   export const gotoBalancePay = (query) => {
+    return request({
+      url: '/order/orderInfo/gotoBalancePay',
+      method: 'post',
+      data: query
+    })
+  }
+
   // 支付查询
 
   export const payQuery = (query) => {
@@ -131,4 +149,13 @@ export const getGoodsPerformApi = (query) => {
     method: 'get',
     params: query
   })
+}
+
+// 根据OTA来源查询剩余金额
+export const selectMarketTeamBySourceApi = (query) => {
+  return request({
+    url: '/member/marketTeam/selectMarketTeamBySource',
+    method: 'get',
+    params: query
+  })
 }

+ 13 - 0
src/utils/request.js

@@ -94,6 +94,19 @@ service.interceptors.response.use(res => {
       });
     }
       return Promise.reject('无效的会话,或者会话已过期,请重新登录。')
+    } if (code === 601) {
+      if (!isRelogin.show) {
+        isRelogin.show = true;
+        MessageBox.confirm('你的账号在其他设备登录,请重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
+          isRelogin.show = false;
+          store.dispatch('LogOut').then(() => {
+            location.href = '/index';
+          })
+      }).catch(() => {
+        isRelogin.show = false;
+      });
+    }
+      return Promise.reject('你的账号在其他设备登录,请重新登录。')
     } else if (code === 500) {
       Message({ message: msg, type: 'error' })
       return Promise.reject(new Error(msg))

+ 34 - 29
src/views/officesale/ticketingSales.vue

@@ -145,14 +145,14 @@
             </div>
             <div style="margin-top: 5px; margin-left: 30px;display: flex;">
                 <div style="flex-shrink: 0;">
-                    <span>已勾选(需购买):{{ seatSelectList.length }}个座位</span>
-                    ——
-                    <span>已勾选(需解锁):{{ seatSelectListNo.length }}个座位</span>
+                    <span>已勾选可售座位:{{ seatSelectList.length }}</span>
+                    
+                    <span>已勾选锁定座位:{{ seatSelectListNo.length }}</span>
                     <el-button size="mini" type="warning"  @click="clearSeatSelectListAll">清空已选座位</el-button>
                 </div>
                 <div style="width: 100%;display: flex;justify-content: center;height: 30px;">
                     <el-button size="mini" type="warning" :loading="lockOrUnLockLoading" @click="lockOrUnLockFun(0)">{{ seatSelectListNo.length>0?'解锁':'锁定' }}</el-button>
-                    <el-button size="mini" type="primary" @click="increaseViewersFun">购票</el-button>
+                    <el-button size="mini" type="primary" @click="increaseViewersFun">预约</el-button>
                 </div>
             </div>
             
@@ -349,7 +349,7 @@
                     })
                 })
                 let res = await lockOrUnLock({
-                    type: type,
+                    type: this.seatSelectListNo.length>0 ? 1 : 0,
                     seatList: list
                 })
                 this.lockOrUnLockLoading = false
@@ -671,15 +671,20 @@
         },
         increaseViewersFun(){
             if(this.seatSelectList.length>0){
-                if(this.ifRealUser != 0 || this.ifRealTeam != 0 ) {
-                    if(this.personnelNum != 0) {
-                        if( this.seatSelectList.length != this.personnelNum ) {
-                            this.$message.error(`票务类型设置了实名要求,选择人数为${ this.personnelNum }人`);
-                            return
-                        }
+                // if(this.ifRealUser != 0 || this.ifRealTeam != 0 ) {
+                //     if(this.personnelNum != 0) {
+                //         if( this.seatSelectList.length != this.personnelNum ) {
+                //             this.$message.error(`票务类型设置了实名要求,选择人数为${ this.personnelNum }人`);
+                //             return
+                //         }
+                //     }
+                // }
+                if(this.personnelNum != 0) {
+                    if( this.seatSelectList.length != this.personnelNum ) {
+                        this.$message.error(`票务类型设置了实名要求,选择人数为${ this.personnelNum }人`);
+                        return
                     }
                 }
-
                 this.changePerformId(this.queryParams.timeId)
                 this.$refs.increaseViewers.initData(this.seatSelectList,{
                     ...this.queryParams,
@@ -943,28 +948,28 @@
         border: 5px solid #ff182f !important;
       }
       .occupy-status-no {
-        //background-color: #f56c6c !important;
+        background-color: #f56c6c !important;
         user-select: none;
         // pointer-events: none;
         cursor: not-allowed !important;
         position: relative;
       }
-      .occupy-status-no:after{
-            content:"";
-            display:block;
-            position:absolute;
-            top:0;
-            left:0;
-            width:100%;
-            height:100%;
-            background-color:rgba(0,0,0,0.3);
-            z-index:-1;
-            background-image: url('../../assets/jinzhi.png');
-            background-size: 50% 50%;
-            background-position: 50% 50%;
-            background-repeat: no-repeat;
-            z-index: 99;
-        }
+    //   .occupy-status-no:after{
+    //         content:"";
+    //         display:block;
+    //         position:absolute;
+    //         top:0;
+    //         left:0;
+    //         width:100%;
+    //         height:100%;
+    //         background-color:rgba(0,0,0,0.3);
+    //         z-index:-1;
+    //         background-image: url('../../assets/jinzhi.png');
+    //         background-size: 50% 50%;
+    //         background-position: 50% 50%;
+    //         background-repeat: no-repeat;
+    //         z-index: 99;
+    //     }
       .seat-item-class-box {
         width: 100%;
         display: flex;

+ 1 - 1
src/views/order/groupBuyingMr/dialog/details.vue

@@ -167,7 +167,7 @@
                     <div class="seat-item-class"
                       :class="setSeatClass(item)"
                       v-for="(item, index) in seatMapList[item1.key]"
-                      :style="{ backgroundColor: item.color ? item.color : 'none' }" @click.stop="seatClick(item)"
+                      :style="{ backgroundColor: item.color ? item.color : 'none' }"
                       :key="index">
                       <p class="text-class">{{ item.status != 1 ? '不可售' : (item.name ? item.name : '暂未命名') }}</p>
                     </div>

+ 136 - 25
src/views/order/groupBuyingMr/index.vue

@@ -2,6 +2,7 @@
   <div class="app-container" :style="{'--q-height':qHeight}">
     <div class="app-container-query" ref="queryFormBox">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        
         <el-form-item label="订单号">
           <el-input
             v-model="queryParams.id"
@@ -80,6 +81,15 @@
             end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="支付单号">
+          <el-input
+            v-model="queryParams.paymentId"
+            placeholder="请输入支付单号"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <!-- <el-form-item label="场次时间">
           <el-date-picker
             style="width: 230px;"
@@ -198,6 +208,7 @@
               <span>{{ parseTime(scope.row.payTime) }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="支付单号" align="center" prop="paymentId" />
           <el-table-column label="订单状态" align="center" prop="type">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.order_status_type" :value="scope.row.status"/>
@@ -243,7 +254,7 @@
                 v-hasPermi="['groupBuyingMr:groupBuyingMr:details']"
               >详情</el-button>
               <el-button
-              v-if="scope.row.payWay == 'corporate'"
+              v-if="scope.row.payWay == 'corporate'||scope.row.status === 0"
                 size="mini"
                 type="text"
                 @click="handleCorporatePay(scope.row)"
@@ -307,7 +318,7 @@
         @close="handleCorporatePayClose"
         :before-close="handleCorporatePayClose">
         <el-form v-loading="corporatePayLoading" :model="ruleForm" :rules="corporatePayRules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-          <el-form-item label="凭证上传" prop="photoList" required>
+          <!-- <el-form-item label="凭证上传" prop="photoList" required>
             <el-upload
                 ref="upload"
                 :class="form.photoList && form.photoList.length>=15 ? 'upload-box':''"
@@ -323,6 +334,46 @@
               >
                 <i class="el-icon-plus"></i>
               </el-upload>
+          </el-form-item> -->
+          <el-form-item label="凭证上传" prop="photoList">
+            <div style="display: flex;flex-wrap: wrap;">
+              <div 
+              v-for="(item,index) in form.photoList" 
+              :key="index"
+              style="width: 100px; height: 100px;margin-top: 5px; position: relative;border: 1px solid #999;border-radius: 5px;margin-right: 20px;">
+                <el-image 
+                  style="width: 100%; height: 100%"
+                  :src="item" 
+                  :preview-src-list="form.photoList">
+                </el-image>
+                <span @click="handleRemove(index)" style="position: absolute;top: -15px;right: -15px;color: red;font-size: 24px;z-index: 999;cursor: pointer;">
+                  <i class="el-icon-error"></i>
+                </span>
+              </div>
+              <div 
+              style="width: 100px; height: 100px;margin-top: 5px;" 
+              v-if="!form.photoList||form.photoList.length<15"
+              v-loading="actionUrlLoading"
+              element-loading-text="上传中..."
+              element-loading-spinner="el-icon-loading"
+              element-loading-background="rgba(0, 0, 0, 0.8)"
+              >
+                <el-upload
+                  class="avatar-uploader"
+                  :action="uploadObj.url"
+                  :headers="uploadObj.headers"
+                  :show-file-list="false"
+                  :before-upload="beforeAvatarUpload"
+                  :on-success="handleAvatarSuccess"
+                  :on-progress="handleAvatarProgress"
+                  :disabled="actionUrlLoading"
+                  :on-error="handleAvatarError"
+                  >
+                  <i class="el-icon-plus avatar-uploader-icon"></i>
+                </el-upload>
+              </div>
+              
+            </div>
           </el-form-item>
           <el-form-item label="备注">
             <el-input placeholder="请备注" type="textarea" maxlength="300" show-word-limit v-model="form.corporate.remark"></el-input>
@@ -472,6 +523,7 @@ export default {
       pagePerformTimeList: [], // 场次列表
       multiPerformDate:false,
       fixed: 'left',
+      actionUrlLoading: false,
     };
   },
   created() {
@@ -539,6 +591,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
+      this.$set(this.queryParams, 'paymentId', '');
       this.$set(this.queryParams, 'id', '');
       this.$set(this.queryParams, 'status', '');
       this.$set(this.queryParams, 'teamTypeId', '');
@@ -659,21 +712,23 @@ export default {
           })
         },
         async handleCorporatePay(row){
+          this.actionUrlLoading = false
           console.log('corporatePay',row);
           this.showCorporatePay = true;
           this.corporatePayLoading = true;
           let res = await getSelectById(row.id)
           this.form.orderId = row.id;
+          this.$set(this.form,'photoList',[])
           if(res.data.corporate){
             let urlList = res.data.corporate.voucherUrl.split(',')||[]
-            let urlListObj = []
-            urlList.forEach((item,index)=>{
-              urlListObj.push({
-                name: 'url_'+index,
-                url: item
-              })
-            })
-            this.$set(this.form,'photoList',urlListObj)
+            // let urlListObj = []
+            // urlList.forEach((item,index)=>{
+            //   urlListObj.push({
+            //     name: 'url_'+index,
+            //     url: item
+            //   })
+            // })
+            this.$set(this.form,'photoList',urlList)
             this.$set(this.form.corporate,'remark',res.data.corporate.remark)
           }else {
             this.$set(this.form,'photoList',[])
@@ -683,6 +738,7 @@ export default {
 
         },
         handleCorporatePayClose(){
+          this.$set(this.form,'photoList',[])
           console.log('1111');
           this.corporatePayLoading = false;
           this.showCorporatePay = false;
@@ -694,7 +750,7 @@ export default {
             return
           }
           this.corporatePayLoading = true;
-          const voucherUrl = this.form.photoList.map(item => item.url).join(",");
+          const voucherUrl = this.form.photoList.map(item => item).join(",");
           this.form.corporate.voucherUrl = voucherUrl;
           gotoCorporatePay(this.form).then((res)=>{
             this.$message.success(res.msg);
@@ -726,26 +782,26 @@ export default {
         this.$set(this.form.photoList, this.form.photoList.length, photo);
       }
     },
-    handleRemove(file, fileList) {
-      this.form.photoList.forEach((item, index) => {
-        if(item.uid == file.uid){
-          this.form.photoList.splice(index, 1)
-        }
-      })
-    },
+    // handleRemove(file, fileList) {
+    //   this.form.photoList.forEach((item, index) => {
+    //     if(item.uid == file.uid){
+    //       this.form.photoList.splice(index, 1)
+    //     }
+    //   })
+    // },
     /**
      * 上传文件之前之前
      * @date 2023-11-22
      * @param {any} file
      * @returns {any}
      */
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === "image/jpeg" || "image/png";
-      if (!isJPG) {
-        this.$message.error("上传头像图片只能是jpg或png格式!");
-      }
-      return isJPG;
-    },
+    // beforeAvatarUpload(file) {
+    //   const isJPG = file.type === "image/jpeg" || "image/png";
+    //   if (!isJPG) {
+    //     this.$message.error("上传头像图片只能是jpg或png格式!");
+    //   }
+    //   return isJPG;
+    // },
     /**
      * 导出报表
      * @date 2022-10-24
@@ -843,6 +899,37 @@ export default {
         });
       }).catch(() => {});
     },
+
+    /**  上传图片 单张  */
+  handleAvatarSuccess(response, file, fileList) {
+      console.log("res, file",response, file, fileList)
+      this.actionUrlLoading = false
+      if(response.code == 200) {
+        this.form.photoList.push(response.data.url)
+      }
+    },
+    beforeAvatarUpload(file) {
+      const isLt2M = file.size / 1024 / 1024 <= 100;
+      let testmsg = file.name.substring(file.name.lastIndexOf('.')+1)
+      let typeList = ['png','jepg','jpg','gif']
+      const isJPG = typeList.includes(testmsg);
+      if (!isJPG) {
+        this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片图片大小不能超过 100MB!');
+      }
+      return isJPG && isLt2M;
+    },
+    handleAvatarProgress(){
+      this.actionUrlLoading = true
+    },
+    handleAvatarError() {
+      this.actionUrlLoading = false
+    },
+    handleRemove(index) {
+      this.form.photoList.splice(index,1)
+    },
   },
   beforeDestroy() {
     this.resizeObserver.unobserve(this.$refs.queryFormBox);
@@ -888,4 +975,28 @@ export default {
     display: none;
   }
 } 
+
+::v-deep .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  ::v-deep .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  ::v-deep .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
 </style>

+ 40 - 29
src/views/order/orderMr/index.vue

@@ -111,6 +111,15 @@
             end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="支付单号">
+          <el-input
+            v-model="queryParams.paymentId"
+            placeholder="请输入支付单号"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item label="下单时间">
           <el-date-picker
             style="width: 230px;"
@@ -234,6 +243,7 @@
               <span>{{ parseTime(scope.row.payTime) }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="支付单号" align="center" prop="paymentId" />
           <el-table-column label="订单状态" align="center" prop="status">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.order_status_type" :value="scope.row.status"/>
@@ -405,7 +415,7 @@ export default {
   },
   created() {
     this.$set(this.queryParams,'performDate',[moment().format("yyyy-MM-DD"),moment().format("yyyy-MM-DD")])
-    this.pagePerformTimeListFun(this.queryParams.performDate)
+    //this.pagePerformTimeListFun(this.queryParams.performDate)
     this.getList();
   },
   mounted() {
@@ -427,6 +437,34 @@ export default {
     getList() {
       this.loading = true;
       let params = {...this.addDateRange(this.queryParams, this.dateRange)};
+      if(params.time){
+        params.payBeginTime = params.time[0];
+        params.payEndTime = params.time[1];
+      }else {
+        params.payBeginTime = null
+        params.payEndTime = null
+      }
+      if(params.createTime&&params.createTime.length>0){
+        params.createBeginTime = params.createTime[0];
+        params.createEndTime = params.createTime[1];
+      }else {
+        params.createBeginTime = null
+        params.createEndTime = null
+      }
+      if(params.performDate){
+        params.performDateStart   = params.performDate[0];
+        params.performDateEnd = params.performDate[1];
+      }else {
+        params.performDateStart   = null
+        params.performDateEnd = null
+      }
+      if(params.invoiceTime&&params.invoiceTime.length==2){
+       params.invoiceBeginTime =params.invoiceTime[0];
+       params.invoiceEndTime =params.invoiceTime[1];
+      }else {
+       params.invoiceBeginTime = null
+       params.invoiceEndTime = null
+      }
       delete params.performDate;
       delete params.invoiceTime
       pageList(params)
@@ -443,39 +481,12 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      if(this.queryParams.time){
-        this.queryParams.payBeginTime = this.queryParams.time[0];
-        this.queryParams.payEndTime = this.queryParams.time[1];
-      }else {
-        this.queryParams.payBeginTime = null
-        this.queryParams.payEndTime = null
-      }
-      if(this.queryParams.createTime&&this.queryParams.createTime.length>0){
-        this.queryParams.createBeginTime = this.queryParams.createTime[0];
-        this.queryParams.createEndTime = this.queryParams.createTime[1];
-      }else {
-        this.queryParams.createBeginTime = null
-        this.queryParams.createEndTime = null
-      }
-      if(this.queryParams.performDate){
-        this.queryParams.performDateStart   = this.queryParams.performDate[0];
-        this.queryParams.performDateEnd = this.queryParams.performDate[1];
-      }else {
-        this.queryParams.performDateStart   = null
-        this.queryParams.performDateEnd = null
-      }
-      if(this.queryParams.invoiceTime&&this.queryParams.invoiceTime.length==2){
-       this.queryParams.invoiceBeginTime =this.queryParams.invoiceTime[0];
-       this.queryParams.invoiceEndTime =this.queryParams.invoiceTime[1];
-      }else {
-       this.queryParams.invoiceBeginTime = null
-       this.queryParams.invoiceEndTime = null
-      }
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
+      this.$set(this.queryParams, 'paymentId', '');
       this.$set(this.queryParams, 'orderId', '');
       this.$set(this.queryParams, 'status', '');
       this.$set(this.queryParams, 'memberMobile', '');

+ 78 - 0
src/views/team/teamMr/dialog/addAndEdit.vue

@@ -35,6 +35,7 @@
             placeholder="团队类型"
             clearable
             style="width: 100%;"
+            @change="changeType"
           >
             <el-option
               v-for="dict in dict.type.team_type"
@@ -44,6 +45,21 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="OTA来源:" prop="source" v-if="form.type == 6">
+          <el-select
+            v-model="form.source"
+            placeholder="OTA来源"
+            clearable
+            style="width: 100%;"
+          >
+            <el-option
+              v-for="dict in listType"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="销售员:" prop="salerPerson">
           <el-input
             v-model="form.salerPerson"
@@ -139,6 +155,7 @@
 import { saveAndEdit, getSelectById } from "@/api/team/teamMr";
 import Editor from "@/components/Editor";
 import { getToken } from "@/utils/auth";
+import { index } from "mathjs";
 export default {
   name: "addAndEdit",
   props: {
@@ -161,9 +178,36 @@ export default {
         id: undefined,
         type: "",
       },
+      listType: [
+          {
+              "label": "窗口美团",
+              "value": 10,
+          },
+          {
+              "label": "窗口携程",
+              "value": 11,
+          },
+          {
+              "label": "窗口抖音",
+              "value": 13,
+          },
+          {
+              "label": "窗口猫眼",
+              "value": 14
+          },
+          {
+              "label": "窗口大麦",
+              "value": 18,
+          },
+          {
+              "label": "窗口飞猪",
+              "value": 19,
+          }
+      ],
       rules: {
         name: [{ required: true, message: "请输入团队名称", trigger: ["change","blur"] }],
         type: [{ required: true, message: "请选择团队类型", trigger: ["change","blur"] }],
+        source: [{ required: true, message: "请选择OTA来源", trigger: ["change","blur"] }], 
         contact: [{ required: true, message: "请输入客户负责人", trigger: ["change","blur"] }],
         mobile: [{ required: true, message: "请输入客户账号/联系电话", trigger: ["change","blur"] }],
         salerPerson: [{ required: true, message: "请输入销售员", trigger: ["change","blur"] }],
@@ -209,6 +253,7 @@ export default {
             this.$set(this.form, 'id', obj.id);
             this.$set(this.form, 'name', obj.name);
             this.$set(this.form, 'type', obj.type + '');
+            this.$set(this.form, 'source', obj.source)
             this.$set(this.form, 'contact', obj.contact);
             this.$set(this.form, 'password', "");
             this.$set(this.form, 'mobile', obj.mobile);
@@ -217,6 +262,7 @@ export default {
             this.$set(this.form, 'checkRemark', obj.checkRemark);
             this.$set(this.form, 'haveContract', obj.haveContract);
             this.$set(this.form, 'contractReason', obj.contractReason);
+            this.changeType(this.form.type)
             if(obj.contractImg){
               if(obj.contractImg.indexOf(',') > -1){
                 let img_list = obj.contractImg.split(',');
@@ -280,6 +326,7 @@ export default {
       this.$set(this.form, 'id', "");
       this.$set(this.form, 'name', "");
       this.$set(this.form, 'type', "");
+      this.$set(this.form, 'source', "")
       this.$set(this.form, 'contact', "");
       this.$set(this.form, 'password', "");
       this.$set(this.form, 'mobile', "");
@@ -351,6 +398,37 @@ export default {
         }
       })
     },
+    /**  选择团队类型  */
+    changeType(value) {
+      if(value == 6) {
+        this.rules = {
+          ...this.rules,
+          contact: [{ required: false, message: "请输入客户负责人", trigger: ["change","blur"] }],
+          mobile: [{ required: false, message: "请输入客户账号/联系电话", trigger: ["change","blur"] }],
+          salerPerson: [{ required: false, message: "请输入销售员", trigger: ["change","blur"] }],
+          salerMobile: [{ required: false, message: "请输入销售员联系电话", trigger: ["change","blur"] }],
+
+          haveContract: [{ required: false, message: "请选择是否有合同", trigger: ["change","blur"] }],
+          photoList: [{ required: false, message: "请上传合约信息图片", trigger: ["change","blur"] }],
+          contractReason: [{ required: false, message: "请输入无合约原因", trigger: ["change","blur"] }],
+        
+        }
+      }else {
+        this.rules = {
+          ...this.rules,
+          contact: [{ required: true, message: "请输入客户负责人", trigger: ["change","blur"] }],
+          mobile: [{ required: true, message: "请输入客户账号/联系电话", trigger: ["change","blur"] }],
+          salerPerson: [{ required: true, message: "请输入销售员", trigger: ["change","blur"] }],
+          salerMobile: [{ required: true, message: "请输入销售员联系电话", trigger: ["change","blur"] }],
+
+          haveContract: [{ required: true, message: "请选择是否有合同", trigger: ["change","blur"] }],
+          photoList: [{ required: true, message: "请上传合约信息图片", trigger: ["change","blur"] }],
+          contractReason: [{ required: true, message: "请输入无合约原因", trigger: ["change","blur"] }],
+          
+        }
+        this.$refs["form"].clearValidate();
+      }
+    }
   },
 };
 </script>

+ 15 - 9
src/views/team/teamMr/dialog/auditBox.vue

@@ -26,6 +26,11 @@
             <dict-tag :options="dict.type.team_type" :value="form.type"/>
           </el-form-item>
         </div>
+        <div style="display: flex;" v-if="form.type == 6">
+          <el-form-item label="OTA来源:" prop="source">
+            <dict-tag :options="dict.type.order_form_type" :value="form.source"/>
+        </el-form-item>
+        </div>
         <div style="display: flex;">
           <el-form-item label="销售员:" prop="salerPerson">
             <span style="display: flex ; min-width: 300px;">{{ form.salerPerson }}</span>
@@ -42,13 +47,13 @@
             <span style="display: flex ; min-width: 300px;">{{ form.mobile }}</span>
           </el-form-item>
         </div>
-        <el-form-item label="是否有合同">
+        <el-form-item label="是否有合同:">
           <span>{{ form.haveContract==0?'无':'有' }}</span>
         </el-form-item>
         <!-- <el-form-item label="密码">
           <span>{{ form.password }}</span>
         </el-form-item> -->
-        <el-form-item label="无合约原因" >
+        <el-form-item label="无合约原因:" >
           <span>{{ form.contractReason }}</span>
         </el-form-item>
         <el-form-item v-if="form.haveContract==1" label="合约信息:">
@@ -74,7 +79,7 @@
             v-if="model == 'Audit'"
             v-model="form.checkRemark"
             type="textarea"
-            placeholder="审核备注"
+            placeholder="审核备注:"
             clearable
             style="width: 100%;"
             @input="checkRemarkFun"
@@ -138,13 +143,14 @@ export default {
         id: undefined,
         type: "",
       },
+      
       rules: {
-        name: [{ required: true, message: "请输入团队名称", trigger: ["change","blur"] }],
-        type: [{ required: true, message: "请选择团队类型", trigger: ["change","blur"] }],
-        contact: [{ required: true, message: "请输入客户负责人", trigger: ["change","blur"] }],
-        mobile: [{ required: true, message: "请输入客户账号/联系电话", trigger: ["change","blur"] }],
-        salerPerson: [{ required: true, message: "请输入销售员", trigger: ["change","blur"] }],
-        salerMobile: [{ required: true, message: "请输入销售员联系电话", trigger: ["change","blur"] }],
+        name: [{ required: false, message: "请输入团队名称", trigger: ["change","blur"] }],
+        type: [{ required: false, message: "请选择团队类型", trigger: ["change","blur"] }],
+        contact: [{ required: false, message: "请输入客户负责人", trigger: ["change","blur"] }],
+        mobile: [{ required: false, message: "请输入客户账号/联系电话", trigger: ["change","blur"] }],
+        salerPerson: [{ required: false, message: "请输入销售员", trigger: ["change","blur"] }],
+        salerMobile: [{ required: false, message: "请输入销售员联系电话", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

+ 757 - 0
src/views/team/teamMr/dialog/details.vue

@@ -0,0 +1,757 @@
+<!--
+ * @Description: 详情弹框
+ * @Author: Sugar.
+ * @Date: 2023-11-24 13:55:00
+ * @LastEditors: gcz
+ * @LastEditTime: 2024-03-15 15:13:27
+ * @FilePath: \great_webui\src\views\order\groupBuyingMr\dialog\details.vue
+ * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    title="订单详情"
+    :visible.sync="open"
+    width="96%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div v-loading="loading" class="dialog dialog-bbb" v-if="form">
+      <div v-loading="loading_form"
+      element-loading-text="加载详情中...">
+        <!--   基础信息   -->
+        <div class="title-class" style="margin-top: 0">基础信息</div>
+        <el-row>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">团队名称: <span>{{ form.teamName || ''}}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">团队类型: <span><dict-tag style="display: inline-block" :options="dict.type.team_type" :value="form.teamType"/></span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">预约场馆: <span>{{ form.theatreName || '' }}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">预约演出厅: <span>{{ form.auditoriumName || '' }}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">预约剧目: <span>{{ form.performName || '' }}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">票务名称: <span>{{ form.goodsName || '' }}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">座位类型: <span>{{ form.seatTypeName || '' }}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">团购单价: <span v-if="form.price">¥{{ form.price || '' }}/人</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">预约时间: <span v-if="form.performDate">{{ form.performDate + "  " || '' }}{{ form.performTimeStart +'  --'  || '' }}{{ form.performTimeEnd || '' }}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">报名时间: <span>{{ form.applyTime || '' }}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">客户负责人: <span>{{ form.teamContact || '' }}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">销售员: <span>{{ form.salerPerson || '' }}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">联系电话: <span>{{ form.teamMobile || '' }}</span></div>
+          </el-col>
+          <!-- <el-col :span="12">
+            <div class="grid-content bg-purple item-class">支付总额: <span>¥{{ form.orderPrice || '' }}</span></div>
+          </el-col> -->
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">应收金额: <span>¥{{ form.orderPrice || form.orderPrice == 0 ? form.orderPrice : '' }}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">实收金额: <span>¥{{ form.realPrice || form.realPrice == 0 ? form.realPrice : '' }}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">团购人数: <span>{{ form.quantity || '' }}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">支付时间: <span>{{ form.payTime || '' }}</span></div>
+          </el-col>
+          <!-- <el-col :span="12">
+            <div class="grid-content bg-purple item-class">支付方式: <span>{{ payWayList[form.payWay] || '' }}</span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class">订单状态: <span>{{ statusList[form.status] || '' }}</span></div>
+          </el-col> -->
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class" style="display: flex;">支付方式: <span
+                style="display: block;margin-left: 5px;"><dict-tag :options="dict.type.pay_way_type"
+                  :value="form.payWay" /></span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class" style="display: flex;">订单状态: <span
+                style="display: block;margin-left: 5px;"><dict-tag :options="dict.type.order_status_type"
+                  :value="form.status" /></span></div>
+          </el-col>
+          <el-col :span="12">
+            <div class="grid-content bg-purple item-class" style="display: flex;">是否成功开票: <span style="display: block;margin-left: 5px;">{{ form.ifSuccessInvoice=='1'?'是':'否'  }}</span></div>
+          </el-col>
+        </el-row>
+
+        <!-- 对公支付信息 -->
+        <div v-if="form.payWay=='corporate'&&form.status>0&&form.corporate">
+          <div class="title-class">对公支付信息</div>
+            <el-row>
+              <el-col :span="24">
+                <div class="voucher-list">
+                  <el-image 
+                    v-for="(item,index) in voucherUrl" :key="index"
+                    style="width: 100px; height: 100px"
+                    :src="item" 
+                    :preview-src-list="voucherUrl">
+                  </el-image>
+                </div>
+              </el-col>
+              <el-col class="pay-type-remark" :span="24">
+                对公支付备注:{{corporateRremark}}
+              </el-col>
+            </el-row>
+        </div>
+
+        <!--   观影人员信息   -->
+        <div class="title-class">观影人员信息</div>
+        <el-row>
+          <el-col :span="24">
+            <el-table ref="tables" :data="form.viewersOrderList" border>
+              <el-table-column label="序号" align="center" type="index" width="60"></el-table-column>
+              <el-table-column label="姓名" align="center" prop="name" />
+              <el-table-column label="身份证号码" align="center" prop="idCard" />
+              <el-table-column label="核销状态" align="center">
+                <template slot-scope="scope">
+                  <dict-tag :options="dict.type.order_status_type" :value="scope.row.status"/>
+                  <!-- <el-tag v-if="scope.row.qrcodeStatus == 0">未使用</el-tag>
+                  <el-tag v-if="scope.row.qrcodeStatus == 1" type="success">已使用</el-tag>
+                  <el-tag v-if="scope.row.qrcodeStatus == 2" type="info">过期</el-tag> -->
+                </template>
+              </el-table-column>
+              <el-table-column label="核销时间" align="center" prop="useTime" />
+              <el-table-column label="座位信息" align="center" prop="seatName" />
+              <el-table-column label="座位类型" align="center" prop="seatTypeName" />
+            </el-table>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="dialog-bbb_2" v-loading="loading_seta" element-loading-text="加载座位图中...">
+        <div class="seat-tool-box">
+          <span class="demonstration">座位大小</span>
+          <div class="seat-tool-box-slider">
+            <el-slider v-model="scaleNum" :min="30" :max="100"></el-slider>
+          </div>
+          <div style="display: flex;margin-left: 20px;" v-if="seatMapList && JSON.stringify(seatMapList) != '{}'">
+            <div>座位余量:</div>
+            <div :key="index" v-for="(item, index) in seatTypeList" style="margin-left: 10px;align-items: center;">
+              <span :style="{ color: item.color ? item.color : 'none' }">{{ item.name ? (item.name + '(剩余:' + (item.num || 0) + ')')
+                :
+                '暂未命名'}}</span>
+            </div>
+          </div>
+        </div>
+        <div class="seat-box" :style="{ '--scaleNum': scaleNum / 100 }">
+          <!-- 选择座位  -->
+          <div class="seat-list-box">
+            <!--  座位排版  -->
+            <div id="seatbox-me" ref="seatbox" class="dialogss">
+              <div class="dialogss-box"
+                :style="{ width: width * (scaleNum / 100) + 'px', margin: justifyContent ? 'auto' : 'unset' }">
+                <div style="width: 100%;position: absolute;" class="seat-box-class clearfix" v-if="seatMapList">
+                  <div class="seat-item-class-box" v-for="(item1, index1) in seatMapListKey" :key="item1.key">
+                    <div class="seat-item-class"
+                      :class="setSeatClass(item)"
+                      v-for="(item, index) in seatMapList[item1.key]"
+                      :style="{ backgroundColor: item.color ? item.color : 'none' }"
+                      :key="index">
+                      <p class="text-class">{{ item.status != 1 ? '不可售' : (item.name ? item.name : '暂未命名') }}</p>
+                    </div>
+                  </div>
+                </div>
+              </div>
+
+            </div>
+            <div style="margin-top: 5px; margin-left: 30px;display: flex;">
+              <div style="flex-shrink: 0;">
+                已勾选:{{ seatSelectList.length }}个座位
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+
+    <!-- <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="cancel">关闭</el-button>
+    </span> -->
+
+  </el-dialog>
+</template>
+
+<script>
+import { getSelectById } from '@/api/order/groupBuyingMr'
+import { querySeatList } from '@/api/team/applicationMr'
+import { pageList as getSeatType } from '@/api/seatTypeMr/seatTypeMr'
+export default {
+  name: "detailsDia",
+  dicts: ['order_form_type', 'order_status_type', 'pay_way_type', 'personnel_type'],
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      open: false,
+      loading: false,
+      form: {
+        id: undefined
+      },
+      corporateRremark:'',
+      performerVisible: false,
+      performerList: [],
+      refund: false,
+      statusList: {
+        0: '待支付',
+        2: '超时取消',
+        3: '支付完成,待使用',
+        4: '退款中',
+        5: '己退款',
+        6: '退款失败',
+        7: '己使用',
+        8: '己超期',
+        9: '关闭',
+      },
+      payWayList: {
+        'cahsh': '现金',
+        'wecaht.applet': '微信小程序支付',
+        'alipay': '支付宝OTA',
+        'wecaht.h5': '微信公众号支付',
+        'meituan': '美团支付',
+        'corporate': '对公支付',
+      },
+      sourceList: {
+        1: '小程序',
+        2: '公众号',
+        3: '美团',
+        4: '携程',
+        5: '团购',
+      },
+      dataList: [],
+      voucherUrl:[],
+
+
+      merchantTheatreAuditoriumListS: [], // 演出厅
+      merchantPerformTimeListS: [], // 场次
+      querySeatListS: [], // 座位
+      goodsPageListS: [], // 票务
+      goodsPageListSAll: [], // 票务全部
+      setList: [],
+      seatMapList: {},
+      seatMapListKey: [], // key
+      seatSelectList: [],
+
+      lockOrUnLockLoading: false,
+
+      performId: '',// 剧目ID
+      scaleNum: 30,
+
+      width: 0,
+      justifyContent: false,
+      activeName: 'first',
+      seatTypeList: [],
+      loading_form: false,//  加载表单
+      loading_seta: false, //  加载座位
+    };
+  },
+  created() {
+    this.getSeatTypeList()
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj, type) {
+      this.open = true;
+      this.querySeatListS = [];
+      this.setList = [];
+      this.seatSelectList = [];
+      this.getSelectByIdApi(obj);
+    },
+    /** 获取详情 */
+    async getSelectByIdApi(row) {
+      try {
+        //this.loading = true
+        this.loading_form =  true//  加载表单
+        this.loading_seta =  true //  加载座位
+        const id = row.id
+        let res = await getSelectById(id)
+        this.seatSelectList = res.data.viewersOrderList
+        this.form = res.data;
+        if(res.data.corporate){
+          this.voucherUrl = res.data.corporate.voucherUrl.split(',')||[];
+          this.corporateRremark =  res.data.corporate.remark;
+        }
+        this.loading_form =  false//  加载表单
+        let res1 = await querySeatList({
+          auditoriumId: res.data.auditoriumId,
+          //seatTypeId: res.data.seatTypeId,
+          timeId: res.data.performTimeId,
+        })
+        this.querySeatListS = res1.data;
+        this.setList = res1.data;
+        if (this.setList && this.setList.length > 0) {
+          this.setSeatMapListCopy(this.setList);
+        }
+        this.loading_seta =  false//  加载表单
+        this.loading = false
+      } catch (error) {
+        this.loading = false
+        this.loading_form = false//  加载表单
+        this.loading_seta = false //  加载座位
+      }
+      
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.open = false;
+    },
+    // 设置座位集合
+    setSeatMapListCopy(list) {
+      if (list && list.length > 0) {
+        let listCopy = {}
+        let lisyCopy1 = {}
+        let listNum = JSON.parse(JSON.stringify(this.seatTypeList))
+        listNum.forEach((item, index) => {
+          listNum[index]['num'] = 0
+        })
+        list.forEach(item => {
+          item.isDisabled = (item.occupyStatus != null && (item.occupyStatus == 0 || item.occupyStatus == 1) ? true : false); // 座位是否已被选择
+          item.isSelect = this.setIsSelect(item);
+          if (item.rowNo) {
+            listNum.forEach((item1, index) => {
+              if (item1.id == item.seatTypeId && item.status == 1 && !item.occupyStatus) {
+                listNum[index]['num'] = listNum[index]['num'] + 1
+              }
+            })
+            if (listCopy['my' + item.rowNo]) {
+              listCopy['my' + item.rowNo].push(item)
+            } else {
+              listCopy['my' + item.rowNo] = [item]
+            }
+          }
+        })
+        this.seatTypeList = JSON.parse(JSON.stringify(listNum))
+        let width = 0
+        let flog = 0
+        let seatMapListKey = []
+        Object.keys(listCopy).forEach((item) => {
+          if (listCopy[item].length > flog) {
+            flog = listCopy[item].length
+          }
+          seatMapListKey.push({
+            key: item,
+            sort: Number(item.replace('my', ''))
+          })
+        })
+        seatMapListKey.sort((a, b) => {
+          return a.sort - b.sort
+        })
+        this.seatMapListKey = seatMapListKey
+        console.log("seatMapListKey=====", seatMapListKey)
+        this.width = 70 * flog
+        this.$nextTick(() => {
+          if (this.$refs.seatbox) {
+            var ele = document.getElementById('seatbox-me');
+            console.log(ele.getBoundingClientRect().width); // 100
+            if (this.width < ele.getBoundingClientRect().width) {
+              this.justifyContent = true
+            } else {
+              //this.justifyContent = false
+              this.justifyContent = true
+            }
+            //this.$refs.seatbox.scrollTo(this.width/4,0)
+          }
+        })
+
+        console.log("list====", listCopy)
+        this.seatMapList = JSON.parse(JSON.stringify(listCopy))
+      }
+    },
+    setIsSelect(item) {
+      if (!this.seatSelectList || this.seatSelectList.length == 0) {
+        return false
+      }
+      let flog = false
+      this.seatSelectList.forEach((item1, index1) => {
+        if (item.id == item1.seatId) {
+          flog = true
+        }
+      })
+      return flog
+    },
+    /** 获取座位类型 说明 */
+    getSeatTypeList() {
+      getSeatType({
+        pageNum: 1,
+        pageSize: 999,
+      })
+        .then(response => {
+          this.seatTypeList = response.data.rows;
+        });
+    },
+    /** 座位状态 展示  */
+    setSeatClass(item){
+      let srt =
+      this.setIsSelect(item)?'purchased-status':
+      item.occupyStatus == 0 ? 'occupy-status' : 
+      item.occupyStatus == 1 ? 'occupy-status-no' : 
+      item.isDisabled || item.status != 1 ? 'disabled-class' : 
+      item.isSelect ? 'select-class' : ''
+      console.log("srt=====",srt)
+      return srt
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  width: 100%;
+  height: 70vh;
+}
+.dialog {
+  padding: 0 30px;
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+  .title-class{
+    font-size: 16px;
+    font-weight: bold;
+    color: black;
+    margin-bottom: 20px;
+    margin-top: 20px;
+  }
+  .item-class{
+    margin-bottom: 20px;
+  }
+}
+
+.voucher-list{
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  gap: 24rpx;
+}
+.pay-type-remark{
+  margin:14px 0;
+}
+
+.dialog-bbb {
+  width: 100%;
+  display: flex;
+  --widdd: 700px;
+
+  >div:first-child {
+    width: var(--widdd);
+    flex-shrink: 0;
+    overflow-y: auto;
+    padding: 0 0 10px 0;
+    margin-right: 10px;
+  }
+
+  .dialog-bbb_2 {
+    width: calc(100% - var(--widdd));
+    height: 100%;
+  }
+}
+
+.dialog-bbb_2 {
+  .seat-tool-box {
+    height: 20px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    white-space: nowrap;
+
+    span {
+      flex-shrink: 0;
+      font-size: 12px;
+      white-space: nowrap;
+    }
+
+    .seat-tool-box-slider {
+      width: 100px;
+      margin-left: 10px;
+    }
+  }
+
+  .seat-box {
+    width: 100%;
+    height: calc(100% - 50px);
+    box-sizing: border-box;
+    display: flex;
+    position: relative;
+
+    .seat-list-box {
+      width: 100%;
+      height: 100%;
+      box-sizing: border-box;
+      position: relative;
+    }
+
+    .seat-select-box {
+      width: 200px;
+      height: 100%;
+      flex-shrink: 0;
+      box-sizing: border-box;
+      padding: 0 5px;
+      margin-left: 10px;
+      border: 1px solid #ccc;
+      border-radius: 10px;
+
+      .seat-select-info {
+        width: 100%;
+        height: calc(100% - 60px);
+        overflow: hidden;
+        overflow-y: auto;
+
+        .seat-select-item {
+          border: 1px solid #ccc;
+          margin-bottom: 5px;
+          padding: 5px;
+          border-radius: 5px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          font-size: 12px;
+
+          >div:first-child {
+            display: flex;
+            flex-direction: column;
+
+            span:first-child {
+              font-weight: 600;
+            }
+          }
+
+          >div:last-child {
+            span:first-child {
+              color: #f56c6c;
+              cursor: pointer;
+            }
+          }
+        }
+
+        .seat-select-color-item {
+          display: flex;
+          align-items: center;
+          margin-bottom: 5px;
+
+          >span:first-child {
+            width: 20px;
+            height: 20px;
+            flex-shrink: 0;
+          }
+
+          >span:last-child {
+            font-size: 16px;
+            font-weight: 600;
+            margin-left: 10px;
+          }
+        }
+      }
+    }
+  }
+
+  .seat-list-box::before {
+    content: "舞台";
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 300px;
+    height: 30px;
+    background-color: rgb(204, 204, 204, 0.5);
+    font-size: 18px;
+    font-weight: 600;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 0 0 20px 20px;
+    z-index: 99;
+  }
+
+  .dialogss {
+    padding: 30px 10px 10px;
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    overflow: auto;
+    border-radius: 10px;
+    border: 1px solid #323333;
+
+    .dialogss-box {
+      position: relative;
+    }
+
+    .upload-btn {
+      width: 100px;
+      height: 100px;
+      background-color: #fbfdff;
+      border: dashed 1px #c0ccda;
+      border-radius: 5px;
+
+      i {
+        font-size: 30px;
+        margin-top: 20px;
+      }
+
+      &-text {
+        margin-top: -10px;
+      }
+    }
+
+    .avatar {
+      cursor: pointer;
+    }
+
+    .title-class {
+      font-size: 16px;
+      font-weight: bold;
+      color: black;
+      margin-bottom: 20px;
+      margin-top: 20px;
+    }
+
+    .item-class {
+      margin-bottom: 20px;
+    }
+
+    .seat-box-class {
+      padding: 5px;
+      transform-origin: 50% 0;
+      transform: scale(var(--scaleNum));
+      box-sizing: border-box;
+
+      .disabled-class {
+        background-color: #aaabad;
+        user-select: none;
+        // pointer-events: none;
+        cursor: not-allowed !important;
+      }
+
+      .select-class {
+        //background-color: #e85353 !important;
+        border: 5px solid #1890ff !important;
+        // color: #eceaea !important;
+        position: relative;
+      }
+
+      .purchased-status:after {
+        content: "";
+        display: block;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background-color: rgba(0, 0, 0, 0.5);
+        z-index: -1;
+        background-image: url('../../../../assets/renyuan.png');
+        background-size: 50% 50%;
+        background-position: 50% 50%;
+        background-repeat: no-repeat;
+        z-index: 99;
+      }
+
+      .occupy-status:after {
+        content: "";
+        display: block;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background-color: rgba(0, 0, 0, 0.3);
+        z-index: -1;
+        background-image: url('../../../../assets/jinzhi.png');
+        background-size: 50% 50%;
+        background-position: 50% 50%;
+        background-repeat: no-repeat;
+        z-index: 99;
+      }
+
+      .occupy-status {
+        //pointer-events: none;
+      }
+
+      .occupy-status-no {
+        background-color: #f56c6c !important;
+        user-select: none;
+        // pointer-events: none;
+        cursor: not-allowed !important;
+      }
+
+      .seat-item-class-box {
+        width: 100%;
+        display: flex;
+        flex-wrap: nowrap;
+        justify-content: center;
+        margin: auto 0;
+        text-align: center;
+      }
+
+      .seat-item-class {
+        flex-shrink: 0;
+        display: block;
+        float: left;
+        width: 60px;
+        height: 60px;
+        margin: 5px;
+        border: 1px solid #4c4d4d;
+        border-radius: 3px;
+        cursor: pointer;
+        position: relative;
+        user-select: none;
+
+        // transform-origin: 50% 50%;
+        // transform: scale(var(--scaleNum));
+        &:hover {
+          opacity: 0.6;
+        }
+
+        .text-class {
+          font-size: 12px;
+          padding: 5px;
+          line-height: 16px;
+          margin: 0;
+          color: #000;
+        }
+      }
+    }
+  }
+}
+</style>

+ 258 - 0
src/views/team/teamMr/dialog/orderAllBox.vue

@@ -0,0 +1,258 @@
+<!--
+ * @Description: 新增/编辑弹框
+ * @Author: Sugar.
+ * @Date: 2023-11-24 13:55:00
+ * @LastEditors: Sugar.
+ * @LastEditTime: 22023-11-24 13:55:00
+ * @FilePath: \cattle_webui\src\views\team\teamMr\AddOrEditDialog.vue
+ * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
+-->
+<template>
+    <el-dialog
+      :visible.sync="open"
+      width="95%"
+      append-to-body
+      :close-on-click-modal="false"
+      @close="cancel"
+    >
+      <div class="dialog">
+        <div class="app-container-table-box">
+            <div style="width: 100%;display: flex;justify-content: center;font-size: 20px;"><span>{{ teamName + '团队订单' }}</span></div>
+            <div class="app-container-table-info">
+                <el-table ref="tables" height="calc( 80vh - 90px )" 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" />
+                  <el-table-column label="票务名称" align="center" :fixed="fixed" prop="goodsName" />
+                  <el-table-column label="座位类型" align="center" :fixed="fixed" prop="seatTypeName" />
+                  <el-table-column label="场次时间" align="center" prop="performDate" />
+                  <el-table-column label="场次" width="120" align="center" prop="timeSnapshot">
+                    <template slot-scope="scope">
+                      <span>{{ scope.row.timeSnapshot }} <br /> ({{ scope.row.performTimeStart + '-' + scope.row.performTimeEnd }})</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="团购数量" align="center" prop="quantity" />
+                  <!-- <el-table-column label="支付总额" align="center" prop="orderPrice">
+                    <template slot-scope="scope">
+                      <span>¥{{ scope.row.orderPrice }}</span>
+                    </template>
+                  </el-table-column> -->
+                  <el-table-column label="应收金额" align="center" prop="orderPrice">
+                    <template slot-scope="scope">
+                      <span>¥{{ scope.row.orderPrice }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="实收金额" align="center" prop="realPrice">
+                    <template slot-scope="scope">
+                      <span>¥{{ scope.row.realPrice }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="支付方式" align="center" prop="type">
+                    <template slot-scope="scope">
+                      <dict-tag :options="dict.type.pay_way_type" :value="scope.row.payWay"/>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="支付时间" align="center" prop="payTime" width="160" >
+                    <template slot-scope="scope">
+                      <span>{{ parseTime(scope.row.payTime) }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="订单状态" align="center" prop="type">
+                    <template slot-scope="scope">
+                      <dict-tag :options="dict.type.order_status_type" :value="scope.row.status"/>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="已核销票数" align="center" prop="usedTotal">
+                    <template slot-scope="scope">
+                      <span>{{ scope.row.usedTotal }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="已核销金额" align="center" prop="usedPriceTotal">
+                    <template slot-scope="scope">
+                      <span>{{ scope.row.usedPriceTotal }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="退票数量" align="center" prop="refundTotal">
+                    <template slot-scope="scope">
+                      <span>{{ scope.row.refundTotal }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="退票金额" align="center" prop="refundPriceTotal">
+                    <template slot-scope="scope">
+                      <span>{{ scope.row.refundPriceTotal }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="是否成功开票" align="center">
+                    <template slot-scope="scope">
+                      <el-tag type="danger" v-if="scope.row.ifSuccessInvoice  == '0'">否</el-tag>
+                      <el-tag type="success" v-else-if="scope.row.ifSuccessInvoice  == '1'">是</el-tag>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="开票时间" align="center" prop="invoiceTime">
+                    <template slot-scope="scope">
+                      <span>{{ scope.row.invoiceTime }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
+                    <template slot-scope="scope">
+                      <el-button
+                        size="mini"
+                        type="text"
+                        @click="openDetails(scope.row)"
+                      >详情</el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+            </div>
+            <pagination
+                v-show="total>0"
+                :total="total"
+                :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                @pagination="getSelectByIdApi"
+            />
+        </div>
+      </div>
+      <!-- 详情 -->
+    <details-dia ref="detailsDia"></details-dia>
+
+    </el-dialog>
+  </template>
+  
+  <script>
+  import { pageList } from '@/api/order/groupBuyingMr';
+  import detailsDia from "./details";
+  export default {
+    name: "addAndEdit",
+    components: {
+      detailsDia
+    },
+    dicts: ['order_form_type','order_status_type','pay_way_type'],
+    data() {
+      return {
+        title: "编辑",
+        model: "EDIT",
+        activeName: '01',
+        open: false,
+
+        loading: false,
+        // 用户表格数据
+        dataList: [],
+        total: 0,
+        // 查询参数
+        queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+        },
+        fixed: 'left',
+        teamName: null,
+      };
+    },
+    methods: {
+      /**
+       * 打开弹框
+       * @date 2023-11-22
+       * @param {any} obj
+       * @returns {any}
+       */
+      openDialog(title, obj) {
+        this.open = true;
+        this.title = title;
+        this.reset();
+        if (obj){
+          this.queryParams = {
+            pageNum: 1,
+            pageSize: 10,
+            teamId: obj.id,
+          }
+          this.teamName = obj.name
+          this.getSelectByIdApi(obj);
+        }else{
+          this.$nextTick(() => {
+            this.$refs["form"].clearValidate();
+          });
+        }
+      },
+      /** 获取详情 */
+      getSelectByIdApi() {
+        this.loading = true;
+        let params = {...this.addDateRange(this.queryParams)};
+        pageList(params)
+        .then(response => {
+            this.dataList = response.data.rows;
+            this.total = response.data.total;
+            this.loading = false;
+        });
+      },
+      reset() {
+        this.form = {}
+        if(this.$refs["form"]) {
+          this.$refs["form"].clearValidate();
+        }
+      },
+      /**
+       * 关闭弹框
+       * @date 2023-11-22
+       * @returns {any}
+       */
+      cancel() {
+        this.reset();
+        this.open = false;
+      },
+       /** 详情按钮操作 */
+        openDetails(row, type) {
+            this.$refs["detailsDia"].openDialog("详情", row, type);
+        },
+    },
+  };
+  </script>
+  
+  <style lang="scss" scoped>
+  .dialog {
+    height: 80vh;
+    overflow-y: auto;
+  }
+  .dialog {
+    padding: 0 30px;
+    .upload-btn {
+      width: 100px;
+      height: 100px;
+      background-color: #fbfdff;
+      border: dashed 1px #c0ccda;
+      border-radius: 5px;
+      i {
+        font-size: 30px;
+        margin-top: 20px;
+      }
+      &-text {
+        margin-top: -10px;
+      }
+    }
+    .avatar {
+      cursor: pointer;
+    }
+  }
+  ::v-deep .avatar-uploader .el-upload {
+      border: 1px dashed #d9d9d9;
+      border-radius: 6px;
+      cursor: pointer;
+      position: relative;
+      overflow: hidden;
+    }
+    ::v-deep .avatar-uploader .el-upload:hover {
+      border-color: #409EFF;
+    }
+    ::v-deep .avatar-uploader-icon {
+      font-size: 28px;
+      color: #8c939d;
+      width: 100px;
+      height: 100px;
+      line-height: 100px;
+      text-align: center;
+    }
+    ::v-deep .avatar {
+      width: 100px;
+      height: 100px;
+      display: block;
+    }
+  </style>
+  

+ 24 - 7
src/views/team/teamMr/index.vue

@@ -152,23 +152,27 @@
             v-hasPermi="['teamMr:teamMr:delete']"
             v-if="(scope.row.checkStatus == 1 && name!=scope.row.createBy)||scope.row.checkStatus != 1"
           >删除</el-button>
-          <el-dropdown v-if="scope.row.checkStatus == 1" size="mini" @command="(command) => handleCommand(command, scope.row,scope.index)">
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row,scope.index)">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
+                v-if="scope.row.checkStatus == 1"
                 v-hasPermi="['teamMr:teamMr:resetting']">重置密码</el-dropdown-item>
               <el-dropdown-item command="rechargeBox" icon="el-icon-key"
-              v-if="scope.row.checkStatus == 1 && name!=scope.row.createBy" 
+              v-if="scope.row.checkStatus == 1 && name!=scope.row.createBy && scope.row.checkStatus == 1" 
               v-hasPermi="['teamMr:teamMr:rechargeBox']"
                 >账户充值</el-dropdown-item>
               <el-dropdown-item command="creditGranting" icon="el-icon-circle-check"
-              v-if="scope.row.checkStatus == 1 && name!=scope.row.createBy" 
+              v-if="scope.row.checkStatus == 1 && name!=scope.row.createBy && scope.row.checkStatus == 1" 
               v-hasPermi="['teamMr:teamMr:creditGranting']"
               >账户授信余额</el-dropdown-item>
               <el-dropdown-item command="creditGrantingBox" icon="el-icon-circle-check"
-              v-if="scope.row.checkStatus == 1 && name!=scope.row.createBy"
+              v-if="scope.row.checkStatus == 1 && name!=scope.row.createBy && scope.row.checkStatus == 1"
               v-hasPermi="['teamMr:teamMr:creditGrantingBox']" 
               >账户授信欠款</el-dropdown-item>
+              <el-dropdown-item command="orderAll" icon="el-icon-circle-check"
+              v-hasPermi="['teamMr:teamMr:orderAll']" 
+              >查看团购订单</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -208,6 +212,12 @@
       @getList="getList"
     />
 
+    <!-- 账户授信余额 -->
+    <orderAllBox
+      ref="orderAllBox"
+      @getList="getList"
+    />
+
     <!-- 详情 / 审核 -->
     <auditBox ref="auditBox" :dict="dict" @getList="getList" />
     <el-dialog
@@ -244,11 +254,12 @@ import creditGranting from './dialog/creditGranting.vue';
 import rechargeBox from './dialog/rechargeBox.vue';
 import auditBox from './dialog/auditBox.vue';
 import creditGrantingBox from './dialog/creditGrantingBox.vue';
+import orderAllBox from './dialog/orderAllBox.vue';
 import { mapGetters } from 'vuex'
 export default {
   name: "agreement",
-  dicts: ['team_type'],
-  components: { addAndEdit, creditGranting, rechargeBox, auditBox, creditGrantingBox },
+  dicts: ['team_type','order_form_type'],
+  components: { addAndEdit, creditGranting, rechargeBox, auditBox, creditGrantingBox, orderAllBox },
   data() {
     return {
       // 遮罩层
@@ -416,6 +427,9 @@ export default {
         case "creditGrantingBox":
             this.creditGrantingBoxFun(row);
             break;
+        case "orderAll":
+            this.orderAllBoxFun(row);
+            break;
         default:
             break;
         }
@@ -428,7 +442,10 @@ export default {
     },
     creditGrantingBoxFun(row) {
       this.$refs["creditGrantingBox"].openDialog("账户授信欠款", row);
-    }
+    },
+    orderAllBoxFun(row) {
+      this.$refs["orderAllBox"].openDialog("查看团购订单", row);
+    },
   }
 };
 </script>

+ 101 - 5
src/views/windowTicketSales/model/increaseViewers.vue

@@ -152,7 +152,7 @@
                 
                 <div style="display: flex;">
                     <el-form-item label="用户来源 :" prop="source">
-                        <el-radio-group v-model="ruleForm.source">
+                        <el-radio-group @input="selectMarketTeamBySourceFun" v-model="ruleForm.source">
                             <el-radio label="7">窗口</el-radio>
                             <el-radio label="10">美团</el-radio>
                             <el-radio label="11">携程</el-radio>
@@ -175,7 +175,9 @@
                     <el-radio-group v-model="ruleForm.paymentType">
                         <el-radio label="1">扫码</el-radio>
                         <el-radio label="2">现金</el-radio>
-                        <el-radio v-if="['10','11','13','14','18','19'].includes(ruleForm.source)" label="3">对公支付</el-radio>
+                        <!-- <el-radio v-if="['10','11','13','14','18','19'].includes(ruleForm.source)" label="3">对公支付</el-radio> -->
+                        <el-radio v-if="['10','11','13','14','18','19'].includes(ruleForm.source)" label="4">账户余额({{ balance }})</el-radio>
+                        <el-radio v-if="['10','11','13','14','18','19'].includes(ruleForm.source)" label="5">授信余额({{ grantQuota }})</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="应收金额 :">
@@ -255,10 +257,13 @@ import {
   gotoMicroPay,
   gotoCashPay,
   gotoCorporatePay,
+  gotoBalancePay,
+  gotoQuotaPay,
   payQuery,
   selectRegion,
   orderInfoCancel,
-  factorAuth
+  factorAuth,
+  selectMarketTeamBySourceApi
  } from '@/api/windowTicketSales/ticketingSales'
  import { pageList as getPrintListApi } from "@/api/device/pda";
  import { printApi } from '@/api/windowTicketSales/ticketingCollection'
@@ -339,7 +344,11 @@ import {
         ifRealTeam: 0,   // 团购是否实名:0否 1-是
         oneMany: 1,   // 证件要求: 1一证一票,2一证多票
         personnelNum: 0,   // 人员要求:0-表示不限制 其他数字表示限制人数
-      };
+      
+    
+        balance: null, // 授信额度
+        grantQuota: null, // 授信使用额度
+    };
       
     },
     methods: {
@@ -642,6 +651,14 @@ import {
         submitForm(formName) {
             this.$refs[formName].validate((valid) => {
             if (valid) {
+                if(this.ruleForm.paymentType == 4 && (!this.balance||this.balance<=0||this.balance < this.moneyAll)) {
+                    this.$message.error('团队账户余额不足!!!');
+                    return
+                }
+                if(this.ruleForm.paymentType == 5 && (!this.grantQuota||this.grantQuota<=0||this.grantQuota < this.moneyAll)) {
+                    this.$message.error('团队授信余额不足!!!');
+                    return
+                }
                 if(!this.checkViewerList()){
                     this.orderInfoSubmitFun()
                 }
@@ -670,6 +687,10 @@ import {
                         this.gotoCashPayFun(this.orderId)
                     }else if(this.ruleForm.paymentType == 3) { // 对公支付
                         this.gotoCorporatePayFun(this.orderId)
+                    }else if(this.ruleForm.paymentType == 4){ // 账户余额
+                        this.gotoBalancePayFun(this.orderId)
+                    }else if(this.ruleForm.paymentType == 5){ // 授信余额
+                        this.gotoQuotaPayFun(this.orderId)
                     }else {
                         // 扫码支付
                         this.loading = false
@@ -745,6 +766,60 @@ import {
                 this.loading = false
                 this.payStatus = 3
             }
+        },
+        /**  授信额度支付  */
+        async gotoQuotaPayFun(orderId) {
+            this.loading = true
+            try {
+                this.loadingText = "订单入库中..."
+                let res = await gotoQuotaPay({
+                    "orderId": orderId, // 订单编号-提交订单返回
+                })
+                if(res.code == 200){
+                    if(this.payTime){
+                        clearInterval(this.payTime)
+                    }
+                    this.payTimeNum = 0
+                    this.payTime = setInterval(()=>{
+                        this.payQueryFun(this.orderId)
+                    },1000)
+                }else{
+                    this.$message.error('订单入库中失败!!!');
+                    this.loading = false
+                    this.payStatus = 3
+                }
+            } catch (error) {
+                this.$message.error('订单入库中失败!!!');
+                this.loading = false
+                this.payStatus = 3
+            }
+        },
+        /**  余额支付  */
+        async gotoBalancePayFun(orderId) {
+            this.loading = true
+            try {
+                this.loadingText = "订单入库中..."
+                let res = await gotoBalancePay({
+                    "orderId": orderId, // 订单编号-提交订单返回
+                })
+                if(res.code == 200){
+                    if(this.payTime){
+                        clearInterval(this.payTime)
+                    }
+                    this.payTimeNum = 0
+                    this.payTime = setInterval(()=>{
+                        this.payQueryFun(this.orderId)
+                    },1000)
+                }else{
+                    this.$message.error('订单入库中失败!!!');
+                    this.loading = false
+                    this.payStatus = 3
+                }
+            } catch (error) {
+                this.$message.error('订单入库中失败!!!');
+                this.loading = false
+                this.payStatus = 3
+            }
         },
          /**  订单现金支付  */
          async gotoCashPayFun(orderId){
@@ -1064,7 +1139,28 @@ import {
           //   this.loading = false
           // })
         },
-        
+        /** 获取授信余额和账户余额  */
+        async selectMarketTeamBySourceFun(value) {
+            console.log("value===",value)
+            try {
+                if(!['10','11','13','14','18','19'].includes(value)) return
+                let res = await selectMarketTeamBySourceApi({
+                    source: value
+                })
+                this.balance = res.data.balance
+                if(res.data.grantQuota && res.data.grantUsed) {
+                    this.grantQuota = res.data.grantQuota - res.data.grantUsed
+                }else if(res.data.grantQuota) {
+                    this.grantQuota = res.data.grantQuota
+                }else {
+                    this.grantQuota = 0
+                }
+                
+            } catch (error) {
+                this.balance = null
+                this.grantQuota = null
+            }
+        }
     }
 }
 </script>

+ 21 - 16
src/views/windowTicketSales/ticketingSales.vue

@@ -145,9 +145,9 @@
             </div>
             <div style="margin-top: 5px; margin-left: 30px;display: flex;">
                 <div style="flex-shrink: 0;">
-                    <span>已勾选(需购买):{{ seatSelectList.length }}个座位</span>
-                    ——
-                    <span>已勾选(需解锁):{{ seatSelectListNo.length }}个座位</span>
+                    <span>已勾选可售座位:{{ seatSelectList.length }}</span>
+                    
+                    <span>已勾选锁定座位:{{ seatSelectListNo.length }}</span>
                     <el-button size="mini" type="warning"  @click="clearSeatSelectListAll">清空已选座位</el-button>
                 </div>
                 <div style="width: 100%;display: flex;justify-content: center;height: 30px;">
@@ -349,7 +349,7 @@
                     })
                 })
                 let res = await lockOrUnLock({
-                    type: type,
+                    type: this.seatSelectListNo.length>0 ? 1 : 0,
                     seatList: list
                 })
                 this.lockOrUnLockLoading = false
@@ -671,15 +671,20 @@
         },
         increaseViewersFun(){
             if(this.seatSelectList.length>0){
-                if(this.ifRealUser != 0 || this.ifRealTeam != 0 ) {
-                    if(this.personnelNum != 0) {
-                        if( this.seatSelectList.length != this.personnelNum ) {
-                            this.$message.error(`票务类型设置了实名要求,选择人数为${ this.personnelNum }人`);
-                            return
-                        }
+                // if(this.ifRealUser != 0 || this.ifRealTeam != 0 ) {
+                //     if(this.personnelNum != 0) {
+                //         if( this.seatSelectList.length != this.personnelNum ) {
+                //             this.$message.error(`票务类型设置了实名要求,选择人数为${ this.personnelNum }人`);
+                //             return
+                //         }
+                //     }
+                // }
+                if(this.personnelNum != 0) {
+                    if( this.seatSelectList.length != this.personnelNum ) {
+                        this.$message.error(`票务类型设置了实名要求,选择人数为${ this.personnelNum }人`);
+                        return
                     }
                 }
-
                 this.changePerformId(this.queryParams.timeId)
                 this.$refs.increaseViewers.initData(this.seatSelectList,{
                     ...this.queryParams,
@@ -930,7 +935,7 @@
         height:100%;
         background-color:rgba(0,0,0,0.3);
         z-index:-1;
-        background-image: url('../../assets/jinzhi_1.png');
+        background-image: url('../../assets/jinzhi.png');
         background-size: 50% 50%;
         background-position: 50% 50%;
         background-repeat: no-repeat;
@@ -943,13 +948,13 @@
         border: 5px solid #ff182f !important;
       }
       .occupy-status-no {
-        //background-color: #f56c6c !important;
+        background-color: #f56c6c !important;
         user-select: none;
         // pointer-events: none;
         cursor: not-allowed !important;
         position: relative;
       }
-      .occupy-status-no:after{
+        /* .occupy-status-no:after{
             content:"";
             display:block;
             position:absolute;
@@ -959,12 +964,12 @@
             height:100%;
             background-color:rgba(0,0,0,0.3);
             z-index:-1;
-            background-image: url('../../assets/jinzhi.png');
+            background-image: url('../../assets/jinzhi_1.png');
             background-size: 50% 50%;
             background-position: 50% 50%;
             background-repeat: no-repeat;
             z-index: 99;
-        }
+        } */
       .seat-item-class-box {
         width: 100%;
         display: flex;