chenrui 4 lat temu
rodzic
commit
41d1cccb1b

+ 0 - 4
src/components/Select/index.js

@@ -46,7 +46,6 @@ export default {
     })
   },
   methods: {
-
     /**
      * 获取当前所有的option 数据
      * @returns options data
@@ -81,9 +80,6 @@ export default {
       change: obj => {
         this.$emit('change', obj, _.find(this.dataList, ['code', obj]))
         this.$emit('input', obj)
-      },
-      dropdownVisibleChange: obj => {
-        this.$emit('dropdownVisibleChange', obj, _.find(this.dataList, ['code', obj]))
       }
     }
     if (this.showType === 'tabs') {

+ 9 - 18
src/views/CarWashManagement/AddCarWashModal.vue

@@ -60,7 +60,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-model-item label="网点标签" prop="sign">
-            <v-select ref="sign" mode="multiple" placeholder="请选择网点标签" v-model="form.sign" code="CHECK_ENABLE_STATE"></v-select>
+            <v-select ref="sign" v-model="form.sign" mode="multiple" placeholder="请选择网点标签" showArrow code="CHECK_ENABLE_STATE"></v-select>
           </a-form-model-item>
         </a-col>
         <a-col :span="12">
@@ -84,7 +84,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-model-item label="服务类型" prop="serviceType">
-            <v-select ref="serviceType" mode="multiple" placeholder="请选择服务类型" v-model="form.serviceType" :disabled="isResetPeriodPriceStatus" @dropdownVisibleChange="isResetPeriodPrice" code="CHECK_ENABLE_STATE"></v-select>
+            <v-select ref="serviceType" v-model="form.serviceType" @change="isResetPeriodPrice" showArrow mode="multiple" placeholder="请选择服务类型" code="CHECK_ENABLE_STATE"></v-select>
           </a-form-model-item>
         </a-col>
         <a-col :span="12">
@@ -92,13 +92,13 @@
             <a-row :gutter="20">
               <a-col :span="11">
                 <a-form-model-item prop="startTime">
-                  <a-time-picker v-model="form.startTime" @openChange="isResetPeriodPrice" :disabled="isResetPeriodPriceStatus" format="HH:mm" placeholder="请选择开始时间" class="time-picker" />
+                  <a-time-picker ref="startTime" v-model="form.startTime" @change="isResetPeriodPrice" format="HH:mm" placeholder="请选择开始时间" class="time-picker" />
                 </a-form-model-item>
               </a-col>
               <a-col :span="2">至</a-col>
               <a-col :span="11">
                 <a-form-model-item prop="endTime">
-                  <a-time-picker v-model="form.endTime" @openChange="isResetPeriodPrice" :disabled="isResetPeriodPriceStatus" format="HH:mm" placeholder="请选择结束时间" class="time-picker" />
+                  <a-time-picker ref="endTime" v-model="form.endTime" @change="isResetPeriodPrice" format="HH:mm" placeholder="请选择结束时间" class="time-picker" />
                 </a-form-model-item>
               </a-col>
             </a-row>
@@ -246,7 +246,6 @@
         },
         openEquipmentModal: false  ,//  选择设备  弹框展示状态
         equipmentName: '',  //  选中的设备  名称
-        isResetPeriodPriceStatus: false,  //  是否重置时段价格
       }
     },
     methods: {
@@ -281,21 +280,13 @@
         this.isShow = false
       },
       // 是否重置时段价格
-      isResetPeriodPrice(open){
-        const _this = this
-        if(_this.form.periodPrice.length != 0 && open){
-          _this.isResetPeriodPriceStatus = true
-          _this.$confirm({
+      isResetPeriodPrice(){
+        if(this.form.periodPrice.length != 0){
+          this.$warning({
             title: '提示',
-            content: '更改后已设置的时段价格将会全部清空,确定更改吗?',
-            onOk () {
-              _this.form.periodPrice = []
-            },
-            onCancel() {
-              _this.$confirm.$destroy
-              _this.isResetPeriodPriceStatus = false
-            }
+            content: '更改后已设置的时段价格将会全部清空,请重新填写',
           })
+          this.form.periodPrice = []
         }
       },
       //  选择设备

+ 8 - 10
src/views/CarWashManagement/CarWashManagement.vue

@@ -39,7 +39,6 @@
     <!-- 新建 -->
     <div class="table-operator">
       <a-button type="primary" icon="plus" @click="modalHandle('add')">新建</a-button>
-      <a-button type="primary" icon="plus">详情</a-button>
     </div>
     <!-- 表格列表 -->
     <s-table ref="table" size="default" rowKey="id" :columns="columns" :data="loadData" bordered >
@@ -115,15 +114,14 @@
           //   }
           //   return res.data
           // })
-          let data = [
-            { createDate: '2020-07-31 15:09', equipment: 'ID585787887', name: '网点A', addrProvince: '陕西省', addrCity: '西安市', addrDetail: '华帝金座', businessHours: '8:30 - 22:00', equipmentStatus: '在线', businessStatus: '正常营业', wechatCode: '' },
-            { createDate: '2020-07-31 15:09', equipment: 'ID585787887', name: '网点A', addrProvince: '陕西省', addrCity: '西安市', addrDetail: '华帝金座', businessHours: '8:30 - 22:00', equipmentStatus: '在线', businessStatus: '正常营业', wechatCode: '' },
-            { createDate: '2020-07-31 15:09', equipment: 'ID585787887', name: '网点A', addrProvince: '陕西省', addrCity: '西安市', addrDetail: '华帝金座', businessHours: '8:30 - 22:00', equipmentStatus: '在线', businessStatus: '正常营业', wechatCode: '' },
-          ]
-          return new Promise((resolve, reject) => {
-            console.log((resolve, reject))
-            resolve(data)
-          }).catch(() => console.log('Oops errors!'))
+          // let data = [
+          //   { createDate: '2020-07-31 15:09', equipment: 'ID585787887', name: '网点A', addrProvince: '陕西省', addrCity: '西安市', addrDetail: '华帝金座', businessHours: '8:30 - 22:00', equipmentStatus: '在线', businessStatus: '正常营业', wechatCode: '' },
+          //   { createDate: '2020-07-31 15:09', equipment: 'ID585787887', name: '网点A', addrProvince: '陕西省', addrCity: '西安市', addrDetail: '华帝金座', businessHours: '8:30 - 22:00', equipmentStatus: '在线', businessStatus: '正常营业', wechatCode: '' },
+          //   { createDate: '2020-07-31 15:09', equipment: 'ID585787887', name: '网点A', addrProvince: '陕西省', addrCity: '西安市', addrDetail: '华帝金座', businessHours: '8:30 - 22:00', equipmentStatus: '在线', businessStatus: '正常营业', wechatCode: '' },
+          // ]
+          // return new Promise((resolve, reject) => {
+          //   resolve(data)
+          // }).catch(() => console.log('Oops errors!'))
         },
         openModal: false,  //  新增/编辑 洗车机  弹框展示状态
         mtitle: '',  //  新增/编辑 洗车机  弹框标题