admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-02-23 21:36:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge http://git.homecommunity.cn/supervip/MicroCommunityWeb

Browse Source
This commit is contained in:
Your Name 2021-12-04 11:36:10 +08:00
commit 636ab3fddd
5 changed files with 66 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/components/admin/addHousekeepingType/addHousekeepingType.html
View File

@ -60,9 +60,9 @@
<div class="col-sm-10">
<input v-model="addHousekeepingTypeInfo.url" type="text" placeholder="选填，请填写URL"
class="form-control">
<label>请使用浏览器打开商城，复制#号已后的全部地址。如：/pages/market/market...直至结束</label>
<label v-if="addHousekeepingTypeInfo.skipType == '2'">请使用浏览器打开手机商城，复制#号已后的全部地址。如：/pages/market/market...直至结束</label>
<label v-if="addHousekeepingTypeInfo.skipType == '3'">输入外部完整地址，需加上http或者https。</label>
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">排序</label>

3
public/components/admin/editHousekeepingType/editHousekeepingType.html
View File

@ -61,7 +61,8 @@
<div class="col-sm-10">
<input v-model="editHousekeepingTypeInfo.url" type="text" placeholder="选填，请填写URL"
class="form-control">
<label>请使用浏览器打开商城，复制#号已后的全部地址。如：/pages/market/market...直至结束</label>
<label v-if="editHousekeepingTypeInfo.skipType == '2'">请使用浏览器打开手机商城，复制#号已后的全部地址。如：/pages/market/market...直至结束</label>
<label v-if="editHousekeepingTypeInfo.skipType == '3'">输入外部完整地址，需加上http或者https。</label>
</div>
</div>
<div class="form-group row">

7
public/components/property/newOaWorkflowForm/newOaWorkflowForm.js
View File

@ -10,8 +10,8 @@
formJson: {},
conditions: {},
flowId: '',
file: '',
realFile: ''
fileName: '',
realFileName: ''
}
},
_initMethod: function() {},
@ -21,7 +21,7 @@
vc.component._listOaWorkflowForm(DEFAULT_PAGE, DEFAULT_ROWS);
});
vc.on('newOaWorkflowForm', 'newOaWorkflowForm', 'fileName', function(_param) {
vc.on('newOaWorkflowForm', 'fileName', function(_param) {
$that.newOaWorkflowFormInfo.fileName = _param.fileName;
$that.newOaWorkflowFormInfo.realFileName = _param.realFileName;
})
@ -68,7 +68,6 @@
let node = document.querySelector('.form .uploadFile');
const submitBtn = document.querySelector('.form .fjs-form-field-button');
submitBtn.parentNode.insertBefore(node, submitBtn);
let node = document.querySelector('.form .uploadFile');
});
},
_submitFormData(_data, _err) {

128
public/pages/property/listRoomFee/listRoomFee.html
View File

@ -5,95 +5,83 @@
<div class="ibox-title">
<h5>{{listRoomCreateFeeInfo.roomName}}费用</h5>
<div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
v-on:click="_openProxyFeeModal()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openProxyFeeModal()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
代收费用
</button>
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
v-on:click="_openAddMeterWaterModal()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openAddMeterWaterModal()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
水电抄表
</button>
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
v-on:click="_openRoomCreateFeeAddModal()"
v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_openRoomCreateFeeAddModal()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
创建费用
</button>
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
v-on:click="_toOwnerPayFee()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_toOwnerPayFee()" v-if="listRoomCreateFeeInfo.hireOwnerFee == '0'">
欠费缴费
</button>
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
v-on:click="_goBack()">
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_goBack()">
返回
</button>
</div>
</div>
<div class="ibox-content">
<table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px"
data-page-size="10">
<table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
<thead>
<tr>
<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>
<th class="text-center">状态</th>
<th class="text-center">操作</th>
</tr>
<tr>
<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>
<th class="text-center">状态</th>
<th class="text-center">操作</th>
</tr>
</thead>
<tbody>
<tr v-for="fee in listRoomCreateFeeInfo.fees">
<td class="text-center">{{fee.feeName}}</td>
<td class="text-center">{{fee.feeFlagName}}</td>
<td class="text-center">{{fee.feeTypeCdName}}</td>
<td class="text-center">{{fee.amountOwed}}</td>
<td class="text-center">{{fee.startTime}}</td>
<td class="text-center">{{_getEndTime(fee)}}</td>
<td class="text-center">{{_getDeadlineTime(fee)}}</td>
<td class="text-center" v-if="fee.computingFormula == '5005' || fee.computingFormula == '9009'">
<div>上期度数：{{fee.preDegrees}}</div>
<div>本期度数：{{fee.curDegrees}}</div>
<div>单价：{{getOnePrice1(fee)}}</div>
<div>附加费：{{fee.additionalAmount}}</div>
</td>
<td class="text-center" v-else-if="fee.computingFormula == '6006'">
<div>用量：{{_getAttrValue(fee.feeAttrs,'390006')}}</div>
<div>单价：{{fee.squarePrice}}</div>
<div>附加费：{{fee.additionalAmount}}</div>
</td>
<td class="text-center" width="150" v-else-if="fee.feeTypeCd == '888800010017'">
<div>算法：{{_getAttrValue(fee.feeAttrs,'390005')}}</div>
<div>用量：{{_getAttrValue(fee.feeAttrs,'390003')}}</div>
</td>
<td class="text-center" width="150" v-else-if="fee.computingFormula == '4004'">
<div>费用根据实际情况而定</div>
</td>
<td class="text-center" v-else>
<div>面积：{{listRoomCreateFeeInfo.builtUpArea}}</div>
<div>单价：{{fee.squarePrice}}</div>
<div v-if="fee.feeFlag == '1003006'">附加费：{{fee.additionalAmount}}</div>
<div v-else>固定费：{{fee.additionalAmount}}</div>
</td>
<td class="text-center">{{fee.stateName}}</td>
<td class="text-center">
<button class="btn btn-link btn-xs"
v-if="fee.state != '2009001' && vc.hasPrivilege('502020082314267912')"
v-on:click="_payFee(fee)">缴费
<tr v-for="fee in listRoomCreateFeeInfo.fees">
<td class="text-center">{{fee.feeName}}</td>
<td class="text-center">{{fee.feeFlagName}}</td>
<td class="text-center">{{fee.feeTypeCdName}}</td>
<td class="text-center">{{fee.amountOwed}}</td>
<td class="text-center">{{fee.startTime}}</td>
<td class="text-center">{{_getEndTime(fee)}}</td>
<td class="text-center">{{_getDeadlineTime(fee)}}</td>
<td class="text-center" v-if="fee.computingFormula == '5005' || fee.computingFormula == '9009'">
<div>上期度数：{{fee.preDegrees}}</div>
<div>本期度数：{{fee.curDegrees}}</div>
<div>单价：{{getOnePrice1(fee)}}</div>
<div>附加费：{{fee.additionalAmount}}</div>
</td>
<td class="text-center" v-else-if="fee.computingFormula == '6006'">
<div>用量：{{_getAttrValue(fee.feeAttrs,'390006')}}</div>
<div>单价：{{fee.squarePrice}}</div>
<div>附加费：{{fee.additionalAmount}}</div>
</td>
<td class="text-center" width="150" v-else-if="fee.feeTypeCd == '888800010017'">
<div>算法：{{_getAttrValue(fee.feeAttrs,'390005')}}</div>
<div>用量：{{_getAttrValue(fee.feeAttrs,'390003')}}</div>
</td>
<td class="text-center" width="150" v-else-if="fee.computingFormula == '4004'">
<div>费用根据实际情况而定</div>
</td>
<td class="text-center" v-else>
<div>面积：{{listRoomCreateFeeInfo.builtUpArea}}</div>
<div>单价：{{fee.squarePrice}}</div>
<div v-if="fee.feeFlag == '1003006'">附加费：{{fee.additionalAmount}}</div>
<div v-else>固定费：{{fee.additionalAmount}}</div>
</td>
<td class="text-center">{{fee.stateName}}</td>
<td class="text-center">
<button class="btn btn-link btn-xs" v-if="fee.state != '2009001' && vc.hasPrivilege('502020082314267912')" v-on:click="_payFee(fee)">缴费
</button>
<button class="btn btn-link btn-xs" v-on:click="_payFeeHis(fee)">缴费历史</button>
<button class="btn btn-link btn-xs" v-if="vc.hasPrivilege('502020090604200029')"
v-on:click="_deleteFee(fee)">取消费用
<button class="btn btn-link btn-xs" v-on:click="_payFeeHis(fee)">缴费历史</button>
<button class="btn btn-link btn-xs" v-if="vc.hasPrivilege('502020090604200029')" v-on:click="_deleteFee(fee)">取消费用
</button>
<button class="btn btn-link btn-xs"
v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')"
v-on:click="_editFee(fee)">费用变更
<button class="btn btn-link btn-xs" v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')" v-on:click="_editFee(fee)">费用变更
</button>
</td>
</tr>
</td>
</tr>
</tbody>
</table>
<!-- 分页 -->

2
public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.html
View File

@ -42,7 +42,7 @@
<div class="row">
<div class="col-sm-4" v-for="(item,index) in newOaWorkflowDetailInfo.files">
<div class="form-group">
<a class="col-form-label" :href="item.fileName">{{item.realFileName}}：</a>
<a class="col-form-label" :href="item.realFileName">{{item.fileName}}</a>
</div>
</div>
</div>