Merge branch 'master' of http://dzgogs.hw.hongweisoft.com/tourism_project/tourism_merchant_ui

src/views/system/user/index.vue

@@ -120,6 +120,7 @@
               icon="el-icon-upload2"
               size="mini"
               @click="handleImport"
+              v-if="false"
               v-hasPermi="['system:user:import']"
             >导入</el-button>
           </el-col>

src/views/tourism/financialManagement/detailsBox/ticketRefundOrderDetails.vue

@@ -94,7 +94,7 @@
           <div v-if="model=='DEATILSADD'">
             <div class="form-title"><span>审核操作</span></div>
               <div>
-                <el-form-item label="审核备注：" label-width="100px"></el-form-item>
+                <el-form-item label="审核备注：" :error="errorText" label-width="100px"><span style="color: #ccc;">(注：驳回时要填写驳回原因)</span></el-form-item>
                 <div>
                   <el-input
                     type="textarea"
@@ -151,6 +151,7 @@ export default {
       },
       rules: {},
       scenicAreaProducts: [],// 景点产品关联
+      errorText: '', // 驳回原因
     };
   },
   methods: {
@@ -162,6 +163,7 @@ export default {
       this.actionUrlLoading = false
       this.model = model
       this.formStatus = 0
+      this.errorText = ''
       if(model=='DEATILSADD') { // 新增
         this.$set(this,'form',{...row})
         this.formStatus = 1
@@ -229,12 +231,15 @@ export default {
     },
     /**  审核操作  */
     refundAudit(type){
+      if(type==2 && !this.form.errReason) {
+        this.errorText = '驳回时请输入驳回原因'
+        return
+      }
       addTableApi(
         this.configUrl.refundAudit,{
           refundId: this.form.id,// 退款ID-列表ID
           status: type,
           errReason: this.form.errReason,
-          errReason: ''
         }).then(response => {
           this.$modal.msgSuccess(`提交成功`);
           this.loading = false

src/views/tourism/orderManagement/ticketOrdersAll/ticketOrders.vue

@@ -61,6 +61,45 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
+            <el-form-item label="门票规格" prop="goodsName" label-width="100px">
+              <el-input
+                v-model="queryParams.goodsName"
+                placeholder="请输入门票规格"
+                clearable
+                style="width: 240px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="订单状态" prop="status">
+              <el-select v-model="queryParams.status" clearable placeholder="请选择订单状态">
+                  <el-option
+                      v-for="dict in dict.type.tourism_ticketOrders_status"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value">
+                  </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="支付方式" prop="payWay">
+              <el-select v-model="queryParams.payWay" clearable placeholder="请选择支付方式">
+                  <el-option
+                      v-for="dict in dict.type.tourism_ticketOrders_payWay"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value">
+                  </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="支付状态" prop="payStatus">
+              <el-select v-model="queryParams.payStatus" clearable placeholder="请选择支付状态">
+                  <el-option
+                      v-for="dict in dict.type.tourism_ticketOrders_payStatus"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value">
+                  </el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item label="购票渠道" prop="source">
               <el-select v-model="queryParams.source" clearable placeholder="请选择购票渠道">
                   <el-option

src/views/tourism/productManagement/formBox/scenicAreaTicketsSpecsForm.vue

@@ -164,6 +164,9 @@
                   <el-radio :label="2">一证多票</el-radio>
                 </el-radio-group>
               </el-form-item>
+              <el-form-item label="票速通产品编码" prop="thirdGoodsSn">
+                <el-input style="width: 100%;" v-model="form.thirdGoodsSn" placeholder="请输入票速通产品编码" />
+              </el-form-item>
               <div class="form-title"><span>退票规则</span></div>
               <el-form-item label="退票政策" prop="backStatus">
                 <el-radio-group v-model="form.backStatus">
@@ -360,6 +363,9 @@ export default {
         
         areaRadio: [{ required: true, message: "请选择指定地点", trigger: ["change","blur"] }],
         area: [{ required: false, message: "请输入身份证", trigger: ["change","blur"] }],
+        
+        thirdGoodsSn: [{ required: true, message: "请输入票速通产品编码", trigger: ["change","blur"] }],
+      
       },
       tableList: [],// 景点产品关联
     };

src/views/tourism/routeManagementAll/routeManagement.vue

@@ -285,7 +285,7 @@
           });
         }).then(() => {
           this.getList();
-          this.$modal.msgSuccess(`${row.status == 1 ? '打开' : '关闭'}成功`);
+          this.$modal.msgSuccess(`${row.status == 0 ? '打开' : '关闭'}成功`);
         }).catch((e) => {
           console.error("失败====",e)
         });