MONSTER-ygh пре 4 месеци
родитељ
комит
03df4f8721
1 измењених фајлова са 43 додато и 26 уклоњено
  1. 43 26
      src/views/tourism/productManagement/formBox/cateringManagementForm.vue

+ 43 - 26
src/views/tourism/productManagement/formBox/cateringManagementForm.vue

@@ -138,17 +138,30 @@
                   </el-form-item>
                 </div>
               </el-form-item>
-              <el-form-item label="打烊时间:" prop="closeTime">
-                <el-time-picker
-                  is-range
-                  v-model="form.closeTime"
-                  value-format="HH:mm:ss"
-                  range-separator="至"
-                  start-placeholder="开始时间"
-                  end-placeholder="结束时间"
-                  placeholder="选择时间范围">
-                </el-time-picker>
-                <!-- <div 
+              <el-form-item label="打烊时间:" required>
+                <div style="display: flex;">
+                  <el-form-item label="" label-width="0px" prop="closeTimeStart">
+                    <el-time-picker
+                      style="width: 140px;"
+                      v-model="form.closeTimeStart"
+                      value-format="HH:mm:ss"
+                      placeholder="任意时间点">
+                    </el-time-picker>
+                  </el-form-item>
+                  <span style="padding: 0 10px;">至</span>
+                  <el-form-item label="" label-width="0px" prop="closeTimeEnd">
+                    <el-time-picker
+                      style="width: 140px;"
+                      v-model="form.closeTimeEnd"
+                      value-format="HH:mm:ss"
+                      placeholder="任意时间点">
+                    </el-time-picker>
+                  </el-form-item>
+                </div>
+              </el-form-item>
+              
+              <!-- <el-form-item label="" prop="closeTimeS">
+                <div 
                 style="display: flex;margin-bottom: 10px;"
                 v-for="(timeItem, timeIndex) in form.closeTimeList" 
                 :key="`${timeIndex}-time`">
@@ -176,8 +189,8 @@
                   <el-button style="margin-left: 10px;" type="primary" v-if="form.closeTimeList.length-1 == timeIndex" @click="addCloseTimeList">添加</el-button>
                   <el-button :style="{marginLeft: timeIndex< form.closeTimeList.length-1? '20px':'10px'}" type="danger" @click="clearCloseTimeList(timeItem)">移除</el-button>
                 </div>
-                <el-button type="primary" v-if="form.closeTimeList.length == 0" @click="addCloseTimeList">添加</el-button> -->
-              </el-form-item>
+                <el-button type="primary" v-if="form.closeTimeList.length == 0" @click="addCloseTimeList">添加</el-button>
+              </el-form-item> -->
               <el-form-item label="关店节假日时间:" prop="holiday">
                 <el-date-picker
                   type="dates"
@@ -343,7 +356,7 @@ export default {
         shopAdvImgs: [],
         shopLabel: [],
         cancelOrderFlag: '-1',
-        closeTime: [],
+        closeTimeS: [],
         closeTimeList: []
       },
       rules: {
@@ -361,7 +374,9 @@ export default {
        
         cancelOrderFlag: [{ required: true, message: "请选择是否支持取消订单", trigger: ["change","blur"] }],
         cancelOrderTime: [{ required: false, message: "请输入分钟", trigger: ["change","blur"] }],
-        closeTime: [{ required: true, message: "请输入打烊时间", trigger: ["change","blur"] }],
+       
+        closeTimeStart: [{ required: true, message: "请输入开始时间", trigger: ["change","blur"] }],
+        closeTimeEnd: [{ required: true, message: "请输入结束时间", trigger: ["change","blur"] }],
       },
       scenicAreaProducts: [],// 景点产品关联
 
@@ -390,7 +405,7 @@ export default {
           shopAdvImgs: [],
           shopLabel: [],
           cancelOrderFlag: '-1',
-          closeTime: [],
+          //closeTimeS: [undefined,undefined],
           holiday: [],
           closeTimeList: []
         })
@@ -439,11 +454,11 @@ export default {
             obj.cancelOrderFlag = '-2'
             obj['cancelOrderTime'] = undefined
           }
-          if(res.data.closeTimeStart && res.data.closeTimeEnd) {
-            obj['closeTime'] = [res.data.closeTimeStart,res.data.closeTimeEnd]
-          }else {
-            obj['closeTime'] = []
-          }
+          // if(res.data.closeTimeStart && res.data.closeTimeEnd) {
+          //   obj['closeTimeS'] = [res.data.closeTimeStart,res.data.closeTimeEnd]
+          // }else {
+          //   obj['closeTimeS'] = [undefined,undefined]
+          // }
           if(res.data.holiday) {
             obj['holiday'] = res.data.holiday.split(',')
           }else {
@@ -495,13 +510,15 @@ export default {
             params['cancelOrderFlag'] = 1
             params['cancelOrderTime'] = 0
           }
-          if(params.closeTime&&params.closeTime.length>0) {
-            params['closeTimeStart'] = params.closeTime[0]
-            params['closeTimeEnd'] = params.closeTime[1]
-            delete params.closeTime
-          }
+          // if(params.closeTimeS&&params.closeTimeS.length>0) {
+          //   params['closeTimeStart'] = params.closeTimeS[0]
+          //   params['closeTimeEnd'] = params.closeTimeS[1]
+          //   delete params.closeTimeS
+          // }
           if(params.holiday && params.holiday.length>0) {
             params.holiday = params.holiday.join(',')
+          }else {
+            params.holiday = null
           }
           params.shopLabel = params.shopLabel.join(',')
           params.shopAdvImgs = params.shopAdvImgs.join(',')