admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-02-24 05:46:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/xinghong-dev'

Browse Source
This commit is contained in:
java110 2021-04-02 18:19:13 +08:00
commit c0f6fd69f6
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/components/property/addRepairSetting/addRepairSetting.html
View File

@ -34,7 +34,7 @@
</select>
</div>
</div>
<div class="form-group row">
<!-- <div class="form-group row">
<label class="col-sm-2 col-form-label">收费情况</label>
<div class="col-sm-10">
<select class="custom-select" v-model="addRepairSettingInfo.payFeeFlag">
@ -43,7 +43,7 @@
<option value="T">收费</option>
</select>
</div>
</div>
</div> -->
<div class="form-group row" v-if="addRepairSettingInfo.payFeeFlag == 'T'">
<label class="col-sm-2 col-form-label">收费金额</label>
<div class="col-sm-10">

4
public/components/property/addRepairSetting/addRepairSetting.js
View File

@ -12,7 +12,7 @@
repairWay: '',
remark: '',
publicArea: '',
payFeeFlag: '',
payFeeFlag: 'F',
priceScope: '',
returnVisitFlag: ''
@ -141,7 +141,7 @@
repairWay: '',
remark: '',
publicArea: '',
payFeeFlag: '',
payFeeFlag: 'F',
priceScope: '',
returnVisitFlag: ''
};

4
public/components/property/editRepairSetting/editRepairSetting.html
View File

@ -34,7 +34,7 @@
</select>
</div>
</div>
<div class="form-group row">
<!-- <div class="form-group row">
<label class="col-sm-2 col-form-label">收费情况</label>
<div class="col-sm-10">
<select class="custom-select" v-model="editRepairSettingInfo.payFeeFlag">
@ -43,7 +43,7 @@
<option value="T">收费</option>
</select>
</div>
</div>
</div> -->
<div class="form-group row" v-if="editRepairSettingInfo.payFeeFlag == 'T'">
<label class="col-sm-2 col-form-label">收费金额</label>
<div class="col-sm-10">

5
public/pages/property/repairSettingManage/repairSettingManage.html
View File

@ -65,7 +65,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>
<th class="text-center">创建时间</th>
<th class="text-center">操作</th>
@ -77,8 +77,7 @@
<td class="text-center">{{repairSetting.repairWayName}}</td>
<td class="text-center">{{repairSetting.repairType}}</td>
<td class="text-center">{{repairSetting.publicArea == 'T'?'是':'否'}}</td>
<td class="text-center">{{repairSetting.payFeeFlag == 'T'?repairSetting.priceScope:'不收费'}}
</td>
<!-- <td class="text-center">{{repairSetting.payFeeFlag == 'T'?repairSetting.priceScope:'不收费'}}</td> -->
<td class="text-center">{{repairSetting.returnVisitFlagName}}</td>
<td class="text-center">{{repairSetting.createTime}}</td>
<td class="text-center">