1. 新增字段

src/views/finance/Statements/quickReconciliation.vue

@@ -17,10 +17,10 @@
               value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label-width="80px" label="支付方式">
+          <el-form-item label-width="80px" label="支付账号">
             <el-select
               v-model="queryParams.unionMid"
-              placeholder="支付方式"
+              placeholder="支付账号"
               clearable
               style="width: 100%"
             >
@@ -32,6 +32,16 @@
                 />
             </el-select>
           </el-form-item>
+          <el-form-item label="支付方式" prop="payWay">
+          <el-select v-model="queryParams.payWay" placeholder="请选择支付方式" clearable>
+            <el-option
+              v-for="dict in dict.type.pay_way_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button style="margin-left: 10px;" type="primary" icon="el-icon-search" size="mini"
               @click="handleQuery">搜索</el-button>
@@ -173,6 +183,7 @@ export default {
     resetQuery() {
       this.$set(this.queryParams, 'performDate', [moment().format("yyyy-MM-DD"), moment().format("yyyy-MM-DD")])
       this.queryParams.unionMid = null
+      this.queryParams.payWay = null
       this.handleQuery();
     },
     /** 导出按钮操作 */

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

@@ -17,7 +17,7 @@
     @close="cancel"
   >
     <div class="dialog">
-      <el-form v-if="open" :model="form" ref="form" :rules="rules" label-width="120px">
+      <el-form v-if="open" :model="form" ref="form" :rules="rules" label-width="130px">
         <el-tabs v-model="activeName">
           <!--    基础信息     -->
           <el-tab-pane label="基础信息" name="01">
@@ -28,6 +28,13 @@
                 clearable
               />
             </el-form-item>
+            <el-form-item label="纸质票票务名称:" prop="printName" style="margin-top: 20px">
+              <el-input
+                v-model="form.printName"
+                placeholder="纸质票票务名称"
+                clearable
+              />
+            </el-form-item>
             <el-form-item label="票档类型:" prop="seatType">
               <el-select 
                 v-model="form.seatType"
@@ -183,6 +190,19 @@
               <el-radio v-model="form.allowReSubmit" :label="1">是</el-radio>
               <el-radio v-model="form.allowReSubmit" :label="0">否</el-radio>
             </el-form-item>
+            <el-form-item v-if="form.allowReSubmit == 1" label="禁止改签时间:" prop="reSubmitTime" label-width="120px">
+              <span style="margin-right: 5px">开演前</span>
+              <el-input
+                v-model="form.reSubmitTime"
+                @change="changePriceAmount('reSubmitTime')"
+                type="number"
+                placeholder="禁止改签时间"
+                clearable
+                style="width: 200px;"
+              >
+              </el-input>
+              <span style="margin-left: 5px">分钟内</span>
+            </el-form-item>
           </el-tab-pane>
 
           <!--    核销信息 -->
@@ -195,7 +215,7 @@
                 type="number"
                 placeholder="核销时间"
                 clearable
-                style="width: 120px;"
+                style="width: 200px;"
               >
               </el-input>
               <span style="margin-left: 5px">分钟内</span>
@@ -218,6 +238,17 @@
               </el-checkbox-group>
               <span>说明：未勾选核销凭证时，观影人员需到票务中心取票入场</span>
             </el-form-item>
+            <el-form-item label="票务闸机播报名称:" label-width="140px" prop="talkName">
+              <el-input
+                v-model="form.talkName"
+                placeholder="票务闸机播报名称"
+                clearable
+                style="width: 100%;"
+                maxlength="4"
+                show-word-limit
+              >
+              </el-input>
+            </el-form-item>
           </el-tab-pane>
         </el-tabs>
       </el-form>
@@ -349,6 +380,7 @@ export default {
       },
       rules: {
         goodsName: [{ required: true, message: "请输入票务名称", trigger: ["change","blur"] }],
+        printName: [{ required: true, message: "请输入纸质票票务名称", trigger: ["change","blur"] }],
         stopSaleTime: [
           { required: true, message: "请输入停止售卖时间", trigger: ["change","blur"] },
           // { validator: validateNumber, trigger: ["blur","change"]},
@@ -377,6 +409,8 @@ export default {
         allowReSubmit: [
           { required: true, message: "请选择是否允许改签", trigger: ["change","blur"] }
         ],
+        reSubmitTime: [{required: true, message: "请输入禁止改签时间", trigger: ["change","blur"]}],
+        talkName: [{required: true, message: "请输入票务闸机播报名称", trigger: ["change","blur"]}],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",
@@ -495,6 +529,9 @@ export default {
           }
           this.$set(this.form, 'seatTypeList', obj.seatTypeList || []);
           this.$set(this.form, 'allowReSubmit', obj.allowReSubmit);
+          this.$set(this.form, 'reSubmitTime', obj.reSubmitTime);
+          this.$set(this.form, 'talkName',obj.goodsPerform.talkName)
+          this.$set(this.form, 'printName',obj.goodsPerform.printName)
         });
       });
     },
@@ -576,7 +613,9 @@ export default {
             
             postMap.channelType = this.channelType;
             postMap.allowReSubmit = this.form.allowReSubmit;
-            
+            postMap.reSubmitTime = this.form.reSubmitTime;
+            postMap.goodsPerform.talkName = this.form.talkName
+            postMap.goodsPerform.printName = this.form.printName
             this.loading = true;
             const { code } = await saveAndEdit({ ...postMap });
             if (code === 200) {
@@ -638,6 +677,8 @@ export default {
       this.$set(this.form, 'checkList', ['A','B'])
       this.$set(this.form, 'seatTypeList', []);
       this.$set(this.form, 'allowReSubmit', 1);
+      this.$set(this.form, 'talkName', '');
+      this.$set(this.form, 'reSubmitTime', '');
     },
     /**
      * 关闭弹框