电单车费率

jsowell-ui/src/views/billing/template/components/addBilling.vue

@@ -6,11 +6,7 @@
         <el-radio v-model="form.type" label="2">电动自行车</el-radio>
       </el-form-item>
       <el-form-item label="名称" prop="name" label-width="150px">
-        <el-input
+        <el-input v-model="form.name" style="width: 50%" placeholder="请输入模板名称" />
-          v-model="form.name"
-          style="width: 50%"
-          placeholder="请输入模板名称"
-        />
       </el-form-item>
       <el-form-item label="备注" prop="templateRemark" label-width="150px">
         <el-input
@@ -30,9 +26,7 @@
         <!-- 电汽车 -->
         <el-row :gutter="20">
           <el-col :span="6">
-            <div class="grid-content bg-purple" style="margin-left: 20px">
+            <div class="grid-content bg-purple" style="margin-left: 20px">时段</div>
-              时段
-            </div>
           </el-col>
 
           <el-col :span="8">
@@ -168,10 +162,7 @@
             effect="dark"
           >
             {{ item.label }}
-            <i
+            <i class="el-icon-edit el-icon&#45;&#45;right" @click="editBtn(item.label)" />
-              class="el-icon-edit el-icon&#45;&#45;right"
-              @click="editBtn(item.label)"
-            />
             <i class="el-icon-close" @click="deleteBtn(item.label)" />
           </el-tag>
         </div>
@@ -228,69 +219,24 @@
       </div>
       <div v-else>
         <!-- 电单车页面 -->
-        <div class="txt">
+        <el-row :gutter="0">
-          <p>
+          <el-col :span="2" style="text-align: right; margin-right: 20px">
-            <b>
+            <el-button type="success">电费</el-button>
-              以下配置应用于电动汽车占桩费计算。例如
+          </el-col>
-              免费占桩时间30分钟，封顶金额25元 占桩费单价2元/分钟
+          <el-col :span="6">
-            </b>
+            <el-form-item prop="electricityPriceC">
-          </p>
+              <el-input
-          <p>
+                v-model="form.electricityPriceC"
-            表示：充电结束30分钟内不收取费用，超过30分钟的时间按每分钟2元收费，封顶25元。
+                type="number"
-          </p>
+                class="clearInputScore"
-        </div>
+                placeholder="0"
-        <el-form-item
+                clearable
-          label="最小单位费用(元):"
+              >
-          prop="minMoney"
+                <template slot="append"> (元/度)</template>
-          label-width="150px"
+              </el-input>
-        >
+            </el-form-item>
-          <el-input v-model="form.minMoney" type="text" placeholder="0" />
+          </el-col>
-        </el-form-item>
+        </el-row>
-        <div class="txt">
-          <p>
-            <b>
-              本设置只应用于电动自行车（按功率时长）的计费策略，当费用不足最小单位费用的整数倍时，将会安装最小单位费用的整数倍收取（前几分钟不参与计费）。
-            </b>
-          </p>
-          <p>
-            如，最小单位费用的是0.5元，当费用为1.1元时，将会收取1.5元；当费用为1.5元时，将会收取1.5元
-          </p>
-          <p>
-            如，<i>免费充电时长的是5分钟</i>，当充电时长是4分钟时，将不会收取费用；当充电时长是6分钟，将会根据计费模板收取6分钟的费用
-          </p>
-        </div>
-        <el-form-item
-          label="免费充电时长(分钟):"
-          prop="minute"
-          label-width="150px"
-        >
-          <el-input v-model="form.minute" type="text" placeholder="5" />
-        </el-form-item>
-
-        <!-- 按钮 -->
-        <div class="btn">
-          <div class="p1">
-            功率-0W至300W
-            <el-link :underline="false">
-              <i
-                class="el-icon-edit el-icon--right"
-                @click="dialogFormVisible = true"
-              />
-            </el-link>
-            <el-link :underline="false"><i class="el-icon-close" /></el-link>
-          </div>
-          <div class="energy">
-            电费:1元<span>{{ num }}小时</span>
-          </div>
-        </div>
-
-        <el-button
-          style="width: 170px"
-          type="text"
-          @click="dialogFormVisible = true"
-          >增加测试功率分段</el-button
-        >
-        测试
         <el-divider />
       </div>
     </el-form>
@@ -321,40 +267,22 @@
       </el-radio-group>
       <span slot="footer" class="dialog-footer">
         <el-button @click="reviseVisible = false">取 消</el-button>
-        <el-button type="primary" @click="clickSelectStartTimeConfirm"
+        <el-button type="primary" @click="clickSelectStartTimeConfirm">确 定</el-button>
-          >确 定</el-button
-        >
       </span>
     </el-dialog>
-    <el-dialog
+    <el-dialog title="设置功率分段" :visible.sync="dialogFormVisible" append-to-body>
-      title="设置功率分段"
-      :visible.sync="dialogFormVisible"
-      append-to-body
-    >
       <el-form :model="form">
         <el-form-item label="充电功率(W):" :label-width="formLabelWidth">
-          <el-input
+          <el-input v-model.number="form.name" min="0" type="number" autocomplete="off" />
-            v-model.number="form.name"
-            min="0"
-            type="number"
-            autocomplete="off"
-          />
         </el-form-item>
         <el-form-item label="费用(1元X小时):" :label-width="formLabelWidth">
-          <el-input
+          <el-input v-model.number="form.region" type="number" placeholder="2" min="0" />
-            v-model.number="form.region"
-            type="number"
-            placeholder="2"
-            min="0"
-          />
         </el-form-item>
       </el-form>
       <!--设置功率分段dialog的按钮-->
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogFormVisible = false"
+        <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
-          >确 定</el-button
-        >
       </div>
     </el-dialog>
     <!-- 电动汽车 电动自行车 公用一组按钮 -->
@@ -507,7 +435,7 @@ export default {
         ],
         type: "1",
         name: "",
-          templateRemark: "",
+        templateRemark: "",
         minMoney: "",
         minute: "",
       },
@@ -548,9 +476,7 @@ export default {
       // 新时间插入数组最后
       this.selectStartTime.push(e);
       // selectStartTime根据startTime排序
-      this.selectStartTime.sort((a, b) =>
+      this.selectStartTime.sort((a, b) => a.startTime.localeCompare(b.startTime));
-        a.startTime.localeCompare(b.startTime)
-      );
       // 关闭对话框
       this.reviseVisible = false;
       // 调生成方法