MONSTER-ygh hai 1 mes
pai
achega
e41c8e8982

+ 16 - 11
src/views/priceConfigurationUilt/dialog/addAndEdit.vue

@@ -79,7 +79,7 @@
         <div v-if="['group'].includes(channelType)">
           <el-form-item label="成团要求:" prop="touristLimit">
             <el-radio-group v-model="form.touristLimit" @input="selectTouristLimit">
-              <el-radio :label="0">不限</el-radio>
+              <!-- <el-radio :label="0">不限</el-radio> -->
               <el-radio :label="1">限制最低人数</el-radio>
               <el-radio :label="2">限制人数范围</el-radio>
             </el-radio-group>
@@ -101,7 +101,7 @@
         </el-form-item>
         <el-form-item :label="setSaleAmounttile()" prop="saleAmount">
           <el-input-number v-model="form.saleAmount" style="width: 350px"></el-input-number>
-          {{ !['group'].includes(channelType) ? '元':'元/人' }}
+          {{ !['group'].includes(channelType) ? '元':form.touristLimit==1?'元':'元/人' }}
         </el-form-item>
         <el-form-item v-if="channelType == 'retail'" label="佣金:" prop="retailAmount">
           <el-input-number v-model="form.retailAmount" style="width: 350px"></el-input-number>
@@ -198,20 +198,25 @@ export default {
       if (obj){
         this.title = "编辑价格配置";
         this.selectGoodsId(obj.goodsId)
-        this.form = {
-          ...obj,
-          performDate: [obj.dateStart,obj.dateEnd],
-          goodsId: obj.goodsId ? obj.goodsId.split(','):[],
-          weekName: obj.weekName ? obj.weekName.split(','):[],
-          planSessionList: obj.planSessionList ? obj.planSessionList:[],
-          id: null
+        if(this.channelType == 'group') {
+          this.form = {
+            ...obj,
+          }
+        }else {
+          this.form = {
+            ...obj,
+            performDate: [obj.dateStart,obj.dateEnd],
+            goodsId: obj.goodsId ? obj.goodsId.split(','):[],
+            weekName: obj.weekName ? obj.weekName.split(','):[],
+            planSessionList: obj.planSessionList ? obj.planSessionList:[],
+            id: null
+          }
         }
-        
       }else{
         this.title = "新增价格配置";
         if(this.channelType == 'group') {
           this.form = {
-            touristLimit: 0,
+            touristLimit: 1,
           };
         }else {
           this.form = {

+ 15 - 0
src/views/priceConfigurationUilt/index.vue

@@ -77,12 +77,22 @@
         </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <span v-hasPermi="configPermi.edit" style="display: inline-block;">
+            <el-button
+              size="mini"
+              type="text"
+              style="margin-left: 10px;"
+              @click="handleEdit(scope.row)"
+              v-if="['group'].includes(channelType)"
+            >编辑</el-button>
+          </span>
           <span v-hasPermi="configPermi.deatils" style="display: inline-block;">
             <el-button
               size="mini"
               type="text"
               style="margin-left: 10px;"
               @click="handleUpdate(scope.row)"
+              v-if="!['group'].includes(channelType)"
             >价格日历</el-button>
           </span>
 
@@ -185,6 +195,7 @@ export default {
         del: [`${this.channelType}:priceConfigurationUitl:deatils`],
         deatils: [`${this.channelType}:priceConfigurationUitl:deatils`],
         tuandui: [`${this.channelType}:priceConfigurationUitl:tuandui`],
+        edit: [`${this.channelType}:priceConfigurationUitl:edit`],
     }
     this.getList();
   },
@@ -223,6 +234,10 @@ export default {
       this.$refs["addAndEdit"].openDialog("新增数据", null);
     },
     /** 修改按钮操作 */
+    handleEdit(row) {
+      this.$refs["addAndEdit"].openDialog("新增数据", row);
+    },
+    /** 日历 */
     handleUpdate(row) {
       this.$refs["calendarBox"].openDialog("修改数据", row);
     },

+ 11 - 11
src/views/statisticalReport/seatInventory.vue

@@ -41,52 +41,52 @@
       <el-table-column label="座位类型" align="center" prop="seatTypeName"></el-table-column>
       <el-table-column label="座位总数" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.total }}</span>
+          <span>{{ scope.row.total }}</span>
         </template>
       </el-table-column>
       <el-table-column label="自营" align="center">
         <el-table-column
           prop="microAppTotal"
-          label="小程序()">
+          label="小程序()">
         </el-table-column>
         <el-table-column
           prop="groupBuyTotal"
-          label="团购()">
+          label="团购()">
         </el-table-column>
         <el-table-column
           prop="winTotal"
-          label="窗口()">
+          label="窗口()">
         </el-table-column>
       </el-table-column>
       <el-table-column label="OTA" align="center">
         <el-table-column
           prop="meituanTotal"
-          label="美团()">
+          label="美团()">
         </el-table-column>
         <el-table-column
           prop="xiechenTotal"
-          label="携程()">
+          label="携程()">
         </el-table-column>
         <el-table-column
           prop="maoyanTotal"
-          label="猫眼()">
+          label="猫眼()">
         </el-table-column>
         <el-table-column
           prop="duoyinTotal"
-          label="抖音()">
+          label="抖音()">
         </el-table-column>
         <el-table-column
           prop="otherTotal"
-          label="其他()">
+          label="其他()">
         </el-table-column>
       </el-table-column>
       <el-table-column 
       prop="saleTotal"
-      label="已售小计()">
+      label="已售小计()">
       </el-table-column>
       <el-table-column 
       prop="noSaleTotal"
-      label="剩余()">
+      label="剩余()">
       </el-table-column>
     </el-table>
 

+ 13 - 13
src/views/statisticalReport/sessionInventory.vue

@@ -49,58 +49,58 @@
           <span>{{ scope.row.performTimeStart }} -- {{ scope.row.performTimeEnd }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="座位可售总数()" align="center" prop="total" />
+      <el-table-column label="座位可售总数()" align="center" prop="total" />
       <el-table-column label="自营渠道" align="center">
         <el-table-column
           prop="microAppTotal"
-          label="小程序()">
+          label="小程序()">
         </el-table-column>
         <el-table-column
           prop="groupBuyTotal"
-          label="团购()">
+          label="团购()">
         </el-table-column>
         <el-table-column
           prop="winTotal"
-          label="窗口()">
+          label="窗口()">
         </el-table-column>
       </el-table-column>
       <el-table-column label="其他渠道" align="center">
         <el-table-column
           prop="meituanTotal"
-          label="美团()">
+          label="美团()">
         </el-table-column>
         <el-table-column
           prop="xiechenTotal"
-          label="携程()">
+          label="携程()">
         </el-table-column>
         <el-table-column
           prop="maoyanTotal"
-          label="猫眼()">
+          label="猫眼()">
         </el-table-column>
         <el-table-column
           prop="duoyinTotal"
-          label="抖音()">
+          label="抖音()">
         </el-table-column>
         <el-table-column
           prop="piaoliangTotal"
-          label="票亮()">
+          label="票亮()">
         </el-table-column>
         <el-table-column
           prop="yimayouTotal"
-          label="一码游()">
+          label="一码游()">
         </el-table-column>
         <el-table-column
           prop="otherTotal"
-          label="其他()">
+          label="其他()">
         </el-table-column>
       </el-table-column>
       <el-table-column 
       prop="saleTotal"
-      label="已售小计()">
+      label="已售小计()">
       </el-table-column>
       <el-table-column 
       prop="noSaleTotal"
-      label="剩余()">
+      label="剩余()">
       </el-table-column>
     </el-table>