From b1b52d61acedccd6fdd58b32dcd04ebf14a96f38 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 19 二月 2020 13:43:03 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/resources/components/feePackage/feeConfig-manage/feeConfigManage.html | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/WebService/src/main/resources/components/feePackage/feeConfig-manage/feeConfigManage.html b/WebService/src/main/resources/components/feePackage/feeConfig-manage/feeConfigManage.html
index 9a9e595..7ea76c5 100644
--- a/WebService/src/main/resources/components/feePackage/feeConfig-manage/feeConfigManage.html
+++ b/WebService/src/main/resources/components/feePackage/feeConfig-manage/feeConfigManage.html
@@ -25,12 +25,9 @@
<div class="col-sm-3">
<select class="custom-select" v-model="feeConfigManageInfo.conditions.feeTypeCd">
<option selected value="">璇烽�夋嫨璐圭敤绫诲瀷</option>
- <option value="888800010001">鐗╀笟璐�</option>
- <option value="888800010002">鍦颁笂鍑哄敭杞︿綅璐�</option>
- <option value="888800010003">鍦颁笅鍑哄敭杞︿綅璐�</option>
- <option value="888800010004">鍦颁笂鍑虹杞︿綅璐�</option>
- <option value="888800010005">鍦颁笅鍑虹杞︿綅璐�</option>
- <option value="888800010007">涓存椂杞﹁垂鐢�</option>
+ <option v-for="(item,index) in feeConfigManageInfo.feeTypeCds" :key="index"
+ v-bind:value="item.statusCd">{{item.name}}
+ </option>
</select></div>
<div class="col-sm-1">
<button type="button" class="btn btn-primary btn-sm" v-on:click="_queryFeeConfigMethod()">
@@ -52,7 +49,7 @@
<div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddFeeConfigModal()">
<i class="glyphicon glyphicon-plus"></i>
- 娣诲姞璐圭敤椤�
+ 娣诲姞
</button>
</div>
</div>
@@ -70,7 +67,7 @@
<th class="text-center">璁¤垂璧峰鏃堕棿</th>
<th class="text-center">璁¤垂缁堟鏃堕棿</th>
<th class="text-center">璁¤垂鍗曚环</th>
- <th class="text-center">闄勫姞璐圭敤</th>
+ <th class="text-center">闄勫姞/鍥哄畾璐圭敤</th>
<th class="text-center">鎿嶄綔</th>
@@ -79,20 +76,22 @@
<tbody>
<tr v-for="feeConfig in feeConfigManageInfo.feeConfigs">
<td class="text-center">{{feeConfig.configId}}</td>
- <td class="text-center">{{feeConfig.feeTypeCd}}</td>
+ <td class="text-center">{{feeConfig.feeTypeCdName}}</td>
<td class="text-center">{{feeConfig.feeName}}</td>
- <td class="text-center">{{feeConfig.feeFlag}}</td>
+ <td class="text-center">{{feeConfig.feeFlagName}}</td>
<td class="text-center">{{feeConfig.startTime}}</td>
<td class="text-center">{{feeConfig.endTime}}</td>
- <td class="text-center">{{feeConfig.squarePrice}}</td>
- <td class="text-center">{{feeConfig.additionalAmount}}</td>
+ <td class="text-center">{{feeConfig.computingFormula == '2002' ?
+ '-':feeConfig.squarePrice+'鍏�'}}
+ </td>
+ <td class="text-center">{{feeConfig.additionalAmount}}鍏�</td>
<td class="text-center">
<div class="btn-group">
<button class="btn-white btn btn-xs"
v-on:click="_openEditFeeConfigModel(feeConfig)">淇敼
</button>
</div>
- <div class="btn-group" v-if="feeConfig.isDefault='F'">
+ <div class="btn-group" v-if="feeConfig.isDefault=='F'">
<button class="btn-white btn btn-xs"
v-on:click="_openDeleteFeeConfigModel(feeConfig)">鍒犻櫎
</button>
--
Gitblit v1.8.0