1. 新增销售有效期限

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

@@ -96,6 +96,16 @@
                 <template slot="append">元</template>
               </el-input>
             </el-form-item>
+            <el-form-item label="销售有效期:" label-width="100px" prop="saleTimeAll">
+              <el-date-picker
+              v-model="form.saleTimeAll"
+              type="datetimerange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+            </el-form-item>
             <el-form-item label="是否限购:" prop="buyAstrictType" label-width="100px" style="margin-bottom: 10px">
               <el-radio v-model="form.buyAstrictType" label="1">是</el-radio>
               <el-radio v-model="form.buyAstrictType" label="2">否</el-radio>
@@ -116,7 +126,7 @@
               <el-checkbox v-model="form.channelWindow">窗口</el-checkbox>
               <el-checkbox v-model="form.channelAutoSale">自助售/取票机</el-checkbox>
             </el-form-item>
-            <!-- <el-form-item label="税率:" prop="taxRate" label-width="100px">
+            <el-form-item label="税率:" prop="taxRate" label-width="100px">
               <el-select
                 v-model="form.taxRate"
                 placeholder="请选择税率"
@@ -130,7 +140,7 @@
                   :value="dict.value"
                 />
               </el-select>
-            </el-form-item> -->
+            </el-form-item>
             <el-form-item label="可售区域:" label-width="100px">
               <span @click="deliverableAreaDialogCancel(form.saleArea)" style="cursor: pointer;color: #1890ff;">请选择(点击这里进行选择)</span>
               <span style="margin-left: 10px;color: red;cursor: pointer;" @click="form.saleArea=''">全部清除</span>
@@ -314,6 +324,7 @@ export default {
 
         backStatus: [{ required: true, message: "请选择是否支持退票", trigger: ["change","blur"] }],
         days: [{ required: true, message: "请输入日期", trigger: ["change","blur"] }],
+        saleTimeAll: [{required: true, message: "请选择销售有效期", trigger: ["change","blur"]}]
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",
@@ -372,6 +383,7 @@ export default {
       getSelectById(id).then(response => {
         const obj = response.data;
         this.$nextTick(() => {
+          this.form = {}
           this.$set(this.form, 'id', obj.id);
           this.$set(this.form, 'goodsName', obj.goodsName);
           this.$set(this.form, 'isAuth', '1');
@@ -405,6 +417,10 @@ export default {
             this.$set(this.form, 'days', obj.performRefundRule.days);
             this.$set(this.form, 'hour', obj.performRefundRule.hour);
           }
+
+          if(obj.goodsPerform.saleBeginTime && obj.goodsPerform.saleEndTime){
+            this.$set(this.form, 'saleTimeAll', [obj.goodsPerform.saleBeginTime,obj.goodsPerform.saleEndTime]);
+          }
         });
       });
     },
@@ -459,6 +475,11 @@ export default {
             postMap.classifyName = "门票类";
             postMap.saleArea = this.form.saleArea&&this.form.saleArea.length>0?this.form.saleArea:[]
             postMap.goodsPerform.stopSaleTime = this.form.stopSaleTime
+            if(this.form.saleTimeAll && this.form.saleTimeAll.length > 0) {
+              postMap.goodsPerform.saleBeginTime = this.form.saleTimeAll[0];
+              postMap.goodsPerform.saleEndTime = this.form.saleTimeAll[1];
+            }
+
             this.loading = true;
             const { code } = await saveAndEdit({ ...postMap });
             if (code === 200) {
@@ -500,7 +521,7 @@ export default {
       this.$set(this.form, 'hour', '');
       this.$set(this.form, 'saleArea', '');
       this.$set(this.form, 'stopSaleTime', '');
-
+      this.$set(this.form, 'saleTimeAll', '');
     },
     /**
      * 关闭弹框

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

@@ -46,6 +46,13 @@
         <el-col :span="12">
           <div class="grid-content bg-purple item-class">销售价: <span>{{ form.salePrice + '元' || '' }}</span></div>
         </el-col>
+        <el-col :span="24">
+          <div class="grid-content bg-purple item-class">销售有效期: <span>{{ 
+            form.goodsPerform && form.goodsPerform.saleBeginTime && form.goodsPerform.saleEndTime ? 
+            form.goodsPerform.saleBeginTime +'--'+ form.goodsPerform.saleEndTime :
+            '-'
+          }}</span></div>
+        </el-col>
         <el-col :span="12" v-if="form.goodsPerform">
           <div class="grid-content bg-purple item-class">
             是否限购:
@@ -61,9 +68,9 @@
            + ' ' + 
            (form.goodsPerform.channelAutoSale == 0 ? '自助售/取票机' : '')}}</span></div>
         </el-col>
-        <!-- <el-col :span="12">
+        <el-col :span="12">
           <div class="grid-content bg-purple item-class">税率: <span>{{ form.taxRate }}</span></div>
-        </el-col> -->
+        </el-col>
         <el-col :span="24" v-if="form.goodsPerform">
           <div style="width: 100%;height: 100px;overflow: hidden;overflow-y: auto;background-color: rgba(204, 204, 204,0.3);padding: 5px;box-sizing: border-box;border-radius: 10px;">
             <div style="padding: 0 10px;" class="grid-content bg-purple item-class">可售渠道: </div>

src/views/ticket/ticketMr/index.vue

@@ -33,12 +33,12 @@
     <el-table ref="tables" v-loading="loading" :data="dataList" border>
       <el-table-column label="序号" align="center" type="index" width="60"></el-table-column>
       <el-table-column label="票务名称" align="center" prop="goodsName" />
-      <el-table-column label="销售价" align="center" prop="type">
+      <el-table-column label="销售价" align="center">
         <template slot-scope="scope">
           <span>￥{{ scope.row.salePrice }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否限购" align="center" prop="type">
+      <el-table-column label="是否限购" align="center">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.goodsPerform.buyAstrict > -1">是</el-tag>
           <el-tag type="danger" v-if="scope.row.goodsPerform.buyAstrict == -1">否</el-tag>
@@ -54,13 +54,22 @@
           (scope.row.goodsPerform.channelAutoSale == 0 ? '自助售/取票机' : '')}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否可退" align="center" prop="type">
+      <el-table-column label="是否可退" align="center">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.goodsPerform.backStatus == 0">可退</el-tag>
           <el-tag type="danger" v-if="scope.row.goodsPerform.backStatus == 1">不可退</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="type">
+      <el-table-column label="销售有效期" align="center">
+        <template slot-scope="scope">
+          <span>{{ 
+            scope.row.goodsPerform && scope.row.goodsPerform.saleBeginTime && scope.row.goodsPerform.saleEndTime ? 
+            scope.row.goodsPerform.saleBeginTime +'--'+ scope.row.goodsPerform.saleEndTime :
+            '-'
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <el-switch
             @change="ionlineApi(scope.row)"