11

src/views/system/area/index.vue

@@ -243,18 +243,14 @@
           <el-col :span="12">
   <el-form-item label="自定义">
     <el-time-picker
-                v-model="value1"
+      v-model="form.areaTimeStart"
-                :picker-options="{
+      value-format="HH:mm:ss"
-                  selectableRange: '18:30:00 - 20:30:00'
-                }"
       placeholder="开始时间">
     </el-time-picker>
     <el-time-picker
       arrow-control
-                v-model="value2"
+      v-model="form.areaTimeEnd"
-                :picker-options="{
+      value-format="HH:mm:ss"
-                  selectableRange: '18:30:00 - 20:30:00'
-                }"
       placeholder="结束时间">
     </el-time-picker>
   </el-form-item>

src/views/system/fee/index.vue

@@ -260,13 +260,13 @@
   <el-radio-group v-model="form.chargingCycle">
     <el-radio label="1">
       订单生成后
-      <el-input v-model="form.chargingCycleValue"
+      <el-input v-model="time1"
         style="width: 80px; display: inline-block; margin-left: 10px;" />
       小时
     </el-radio>
     <el-radio label="2">
       自定义时刻
-      <el-time-picker v-model="form.chargingCycleValue" placeholder="选择时间" style="margin-left: 10px;" />
+      <el-time-picker v-model="time2" value-format="HH:mm:ss" placeholder="选择时间" style="margin-left: 10px;" />
     </el-radio>
   </el-radio-group>
 </el-form-item>
@@ -300,6 +300,7 @@
 
 <script>
 import { listFee, getFee, delFee, addFee, updateFee } from "@/api/system/fee";
+import { time } from 'echarts';
 
 export default {
   name: "Fee",
@@ -321,6 +322,8 @@ export default {
         name: null,
         status: null,
       },
+      time1:'',
+      time2:'',
       form: {
         name: '',
         instructions: '',
@@ -501,6 +504,12 @@ export default {
           // 获取数组的最后一个元素
           this.more = json.rule[json.rule.length - 1];
         }
+        if(this.form.chargingCycle==1){
+            this.time1=this.form.chargingCycleValue
+          }else if(this.form.chargingCycle==2){
+            // this.data.chargingCycleValue=time2
+            this.time2=this.form.chargingCycleValue
+          }
         console.log(this.form,'this.formthis.form');
         this.open = true;
         this.title = "修改收费方式";
@@ -515,6 +524,7 @@ export default {
 
 
           this.rule.push(this.more)
+
           data.ridingRuleJson = {}
           if (this.form.ridingRule == 2) {
             data.ridingRuleJson.rule = this.rule
@@ -528,7 +538,11 @@ export default {
 
           }
           data.ridingRuleJson = JSON.stringify(data.ridingRuleJson);
-
+          if(this.form.chargingCycle==1){
+            data.chargingCycleValue=this.time1
+          }else if(this.form.chargingCycle==2){
+            data.chargingCycleValue=this.time2
+          }
           // console.log(data, 'mmmmmmmmmmmmm');
           if (this.form.ruleId != null) {
             updateFee(data).then(() => {

src/views/user/user/index.vue

@@ -549,7 +549,7 @@ export default {
     handleBandSysUser(row){
       this.reset();
       const userId = row.userId || this.ids;
-      getSysUserList({"userType":"00"}).then(response => {
+      getSysUserList(userId).then(response => {
         this.sysUserOptions = response.rows;
         this.form.userId = userId;
         this.open2 = true;