11

src/views/system/fee/index.vue

@@ -43,8 +43,8 @@
       <el-table-column label="id" align="center" prop="ruleId" />
       <el-table-column label="套餐名称" align="center" prop="name" />
       <el-table-column label="说明" align="center" prop="instructions" />
-      <el-table-column label="时间(小时)" align="center" prop="time" />
+      <!-- <el-table-column label="时间(小时)" align="center" prop="time" />
-      <el-table-column label="费用(元)" align="center" prop="fee" />
+      <el-table-column label="费用(元)" align="center" prop="fee" /> -->
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
@@ -133,13 +133,13 @@
           <el-form-item label="起步价">
             <el-row :gutter="10">
               <el-col :span="6">
-                <el-input v-model="startPrice" placeholder="请输入起步价" />
+                <el-input v-model="startingPrice" placeholder="请输入起步价" />
               </el-col>
               <el-col :span="2" style="line-height: 32px;">
                 元（含
               </el-col>
               <el-col :span="6">
-                <el-input v-model="startTime" placeholder="请输入起步时间" />
+                <el-input v-model="startingTime" placeholder="请输入起步时间" />
               </el-col>
               <el-col :span="2" style="line-height: 32px;">
                 {{ timeUnit }})
@@ -149,13 +149,13 @@
           <el-form-item label="超出价">
             <el-row :gutter="10">
               <el-col :span="6">
-                <el-input v-model="exceedPrice" placeholder="请输入超出价格" />
+                <el-input v-model="timeoutPrice" placeholder="请输入超出价格" />
               </el-col>
               <el-col :span="2" style="line-height: 32px;">
                 元/
               </el-col>
               <el-col :span="6">
-                <el-input v-model="exceedTime" placeholder="请输入超出时间" />
+                <el-input v-model="timeoutTime" placeholder="请输入超出时间" />
               </el-col>
               <el-col :span="4" style="line-height: 32px;">
                 {{ timeUnit }}（超出起步价后）
@@ -339,10 +339,10 @@ export default {
         // chargingCycle: 1, // 默认选择第一个选项
         // chargingCycleValue: '', // 对应的值
       },
-      exceedTime: '',
+      timeoutTime: '',
-      startPrice: '',
+      startingPrice: '',
-      startTime: '',
+      startingTime: '',
-      exceedPrice: '',
+      timeoutPrice: '',
       enablelnterval: false,
       rule: [{ start: '', end: '', eachUnit: '', fee: '' }],
       more: { start: '', end: '9999', eachUnit: '', fee: '' },
@@ -452,10 +452,10 @@ export default {
       this.enablelnterval = false,
         this.more = { start: '', end: '9999', eachUnit: '', fee: '' }
       this.rule = [{ start: '', end: '', eachUnit: '', fee: '' }],
-        this.exceedTime = '',
+        this.timeoutTime = '',
-        this.startPrice = '',
+        this.startingPrice = '',
-        this.startTime = '',
+        this.startingTime = '',
-        this.exceedPrice = '',
+        this.timeoutPrice = '',
         this.resetForm("form")
     },
     handleQuery() {
@@ -481,13 +481,20 @@ export default {
       const ruleId = row.ruleId || this.ids;
       getFee(ruleId).then(response => {
         this.form = response.data;
+        if(this.form.rentalUnit=='minutes'){
+          this.timeUnit='分钟'
+        }else if(this.form.rentalUnit=='hours'){
+          this.timeUnit='小时'
+        }else if(this.form.rentalUnit=='day'){
+          this.timeUnit='天'
+        }
         // delete this.form.ridingRuleJson;
         let json = JSON.parse(response.data.ridingRuleJson)
         if (this.form.ridingRule == 1) {
-          this.exceedTime = json.exceedTime
+          this.timeoutTime = json.timeoutTime
-          this.startPrice = json.startPrice
+          this.startingPrice = json.startingPrice
-          this.startTime = json.startTime
+          this.startingTime = json.startingTime
-          this.exceedPrice = json.exceedPrice
+          this.timeoutPrice = json.timeoutPrice
         } else {
           this.rule = json.rule.slice(0, -1);
 
@@ -514,10 +521,10 @@ export default {
             data.ridingRuleJson.enablelnterval = this.enablelnterval
 
           } else {
-            data.ridingRuleJson.exceedTime = this.exceedTime
+            data.ridingRuleJson.timeoutTime = this.timeoutTime
-            data.ridingRuleJson.startPrice = this.startPrice
+            data.ridingRuleJson.startingPrice = this.startingPrice
-            data.ridingRuleJson.startTime = this.startTime
+            data.ridingRuleJson.startingTime = this.startingTime
-            data.ridingRuleJson.exceedPrice = this.exceedPrice
+            data.ridingRuleJson.timeoutPrice = this.timeoutPrice
 
           }
           data.ridingRuleJson = JSON.stringify(data.ridingRuleJson);
@@ -566,10 +573,10 @@ export default {
         this.enablelnterval = false
 
         this.rule = [{ start: '', end: '', eachUnit: '', fee: '' }]
-        this.exceedTime = ''
+        this.timeoutTime = ''
-        this.startPrice = ''
+        this.startingPrice = ''
-        this.startTime = ''
+        this.startingTime = ''
-        this.exceedPrice = ''
+        this.timeoutPrice = ''
       }
     },
   }

src/views/user/user/index.vue

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