From b1ff1b87ca65b2989f209d1d12778ddd8ce6a084 Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期三, 04 一月 2023 21:40:23 +0800
Subject: [PATCH] 合并大屏项目

---
 src/components/page/costRule/index.vue |   67 ++++++++++++++++++++++++++-------
 1 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/src/components/page/costRule/index.vue b/src/components/page/costRule/index.vue
index c1993f4..4dce309 100644
--- a/src/components/page/costRule/index.vue
+++ b/src/components/page/costRule/index.vue
@@ -50,9 +50,11 @@
         <el-pagination background @size-change="onPageSizeChange" @current-change="onCurrentPageChange" :current-page="pageData.currentPage" :page-size="pageData.pageSize" :total="pageData.total" style="float: right"></el-pagination>
 
         <el-dialog title="缂栬緫" :visible.sync="flag" width="40%">
-            <el-form :model="formData" ref="formData" label-width="100px">
+            <el-form :model="formData" ref="formData" label-width="150px">
                 <el-form-item label="鍋滆溅鍦�" prop="parkId" :rules="[{ required: true, message: '璇烽�夋嫨鍋滆溅鍦�', trigger: 'change'}]">
-                  <el-option v-for="item in table1" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                  <el-select v-model="formData.parkId">
+                    <el-option v-for="item in table1" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                  </el-select>
                 </el-form-item>
                 <el-form-item label="鍐涜溅鏄惁鍏嶈垂" prop="armyCar" :rules="[{ required: true, message: '璇烽�夋嫨', trigger: 'change'}]">
                     <el-select v-model="formData.armyCar" >
@@ -60,43 +62,78 @@
                         <el-option label="鏀惰垂" :value=1></el-option>
                     </el-select>
                 </el-form-item>
+              <el-form-item label="鍋滆溅鍏嶈垂鏃堕暱(鍒嗛挓)" prop="freeTime">
+                <el-input-number v-model="formData.freeTime" :min="0"></el-input-number>
+              </el-form-item>
                 <el-form-item label="璁¤垂寮�濮嬫椂闂�" prop="chargeStartTime1">
-                    <el-date-picker type="date" placeholder="閫夋嫨鏃堕棿" v-model="formData.chargeStartTime1"></el-date-picker>
+                  <el-time-picker
+                      v-model="formData.chargeStartTime1"
+                      :picker-options="{ selectableRange: '00:00:00 - 23:59:59' }"
+                      format="HH:mm:ss"
+                      value-format="HH:mm:ss"
+                     >
+                  </el-time-picker>
                 </el-form-item>
               <el-form-item label="璁¤垂缁撴潫鏃堕棿" prop="chargeEndTime1">
-                <el-date-picker type="date" placeholder="閫夋嫨鏃堕棿" v-model="formData.chargeEndTime1"></el-date-picker>
+                <el-time-picker
+                    v-model="formData.chargeEndTime1"
+                    :picker-options="{ selectableRange: '00:00:00 - 23:59:59' }"
+                    format="HH:mm:ss"
+                    value-format="HH:mm:ss"
+                >
+                </el-time-picker>
               </el-form-item>
               <el-form-item label="姣忓皬鏃舵敹璐�(鍏�)" prop="cost1">
-                <el-input-number v-model="formData.cost1"></el-input-number>
+                <el-input-number v-model="formData.cost1" :min="0"></el-input-number>
               </el-form-item>
               <el-form-item label="灏侀《浠锋牸(鍏�)" prop="maxCost1">
-                <el-input-number v-model="formData.maxCost1"></el-input-number>
+                <el-input-number v-model="formData.maxCost1" :min="0"></el-input-number>
               </el-form-item>
 
               <el-form-item label="璁¤垂寮�濮嬫椂闂�2" prop="chargeStartTime2">
-                <el-date-picker type="date" placeholder="閫夋嫨鏃堕棿" v-model="formData.chargeStartTime2"></el-date-picker>
+                <el-time-picker
+                    v-model="formData.chargeStartTime2"
+                    :picker-options="{ selectableRange: '00:00:00 - 23:59:59' }"
+                    format="HH:mm:ss"
+                    value-format="HH:mm:ss"
+                />
               </el-form-item>
               <el-form-item label="璁¤垂缁撴潫鏃堕棿2" prop="chargeEndTime2">
-                <el-date-picker type="date" placeholder="閫夋嫨鏃堕棿" v-model="formData.chargeEndTime2"></el-date-picker>
+                <el-time-picker
+                    v-model="formData.chargeEndTime2"
+                    :picker-options="{ selectableRange: '00:00:00 - 23:59:59' }"
+                    format="HH:mm:ss"
+                    value-format="HH:mm:ss"
+                />
               </el-form-item>
               <el-form-item label="姣忓皬鏃舵敹璐�(鍏�)2" prop="cost2">
-                <el-input-number v-model="formData.cost2"></el-input-number>
+                <el-input-number v-model="formData.cost2" :min="0"></el-input-number>
               </el-form-item>
               <el-form-item label="灏侀《浠锋牸(鍏�)2" prop="maxCost2">
-                <el-input-number v-model="formData.maxCost2"></el-input-number>
+                <el-input-number v-model="formData.maxCost2" :min="0"></el-input-number>
               </el-form-item>
 
               <el-form-item label="璁¤垂寮�濮嬫椂闂�3" prop="chargeStartTime3">
-                <el-date-picker type="date" placeholder="閫夋嫨鏃堕棿" v-model="formData.chargeStartTime3"></el-date-picker>
+                <el-time-picker
+                    v-model="formData.chargeStartTime3"
+                    :picker-options="{ selectableRange: '00:00:00 - 23:59:59' }"
+                    format="HH:mm:ss"
+                    value-format="HH:mm:ss"
+                />
               </el-form-item>
               <el-form-item label="璁¤垂缁撴潫鏃堕棿3" prop="chargeEndTime3">
-                <el-date-picker type="date" placeholder="閫夋嫨鏃堕棿" v-model="formData.chargeEndTime3"></el-date-picker>
+                <el-time-picker
+                    v-model="formData.chargeEndTime3"
+                    :picker-options="{ selectableRange: '00:00:00 - 23:59:59' }"
+                    format="HH:mm:ss"
+                    value-format="HH:mm:ss"
+                />
               </el-form-item>
               <el-form-item label="姣忓皬鏃舵敹璐�(鍏�)3" prop="cost3">
-                <el-input-number v-model="formData.cost3"></el-input-number>
+                <el-input-number v-model="formData.cost3" :min="0"></el-input-number>
               </el-form-item>
               <el-form-item label="灏侀《浠锋牸(鍏�)3" prop="maxCost3">
-                <el-input-number v-model="formData.maxCost3"></el-input-number>
+                <el-input-number v-model="formData.maxCost3" :min="0"></el-input-number>
               </el-form-item>
 
             </el-form>
@@ -133,6 +170,7 @@
                     chargeEndTime3: '',
                     cost3:'',
                     maxCost3:'',
+                    freeTime:0,
                     parkId:null
                 },
                 urlPath:this.$systemconfig.basePath + '/rule/',
@@ -184,6 +222,7 @@
                   chargeEndTime3: '',
                   cost3:'',
                   maxCost3:'',
+                  freeTime:0,
                   parkId:null
                 }
             },

--
Gitblit v1.9.1