From a6999b0c6ebff9b616b487c105d2299f3182f6eb Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 19 Sep 2023 02:09:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/fee/fee.js                                |  18 ++
 .../vc-upload-async/vc-upload-async.vue       |   9 +-
 constant/url.js                               |   3 +
 pages.json                                    |   9 +
 pages/fee/createFee.vue                       | 217 ++++++++++++++++++
 pages/fee/roomPayFee.vue                      |   9 +-
 6 files changed, 257 insertions(+), 8 deletions(-)
 create mode 100644 pages/fee/createFee.vue

diff --git a/api/fee/fee.js b/api/fee/fee.js
index fcf2b2d..910036c 100644
--- a/api/fee/fee.js
+++ b/api/fee/fee.js
@@ -125,3 +125,21 @@ export function listFeeDetail(_that,_data){
 	});
 }
 
+export function saveRoomCreateFee(_that,_data){
+	return new Promise(function(reslove,reject){
+		_that.context.post({
+			url: url.saveRoomCreateFee,
+			data:_data,
+			success: function(res) {
+				reslove(res.data);
+			},
+			fail: function(e) {
+				wx.showToast({
+					title: "服务器异常了",
+					icon: 'none',
+					duration: 2000
+				})
+			}
+		})
+	});
+}
diff --git a/components/vc-upload-async/vc-upload-async.vue b/components/vc-upload-async/vc-upload-async.vue
index 8dbdd57..ceebf29 100644
--- a/components/vc-upload-async/vc-upload-async.vue
+++ b/components/vc-upload-async/vc-upload-async.vue
@@ -88,12 +88,7 @@
 		methods: {
 			_initImageList: function(_imageLists) {
 				this.sendImgList = _imageLists;
-				if (this.sendImgList.length > 0) {
-					uni.showLoading({
-						title: "图片加载中...",
-						mask: true
-					})
-				}
+				
 				this.sendImgList.forEach((item, index) => {
 					if (item.indexOf('base64,') > -1) {
 						this.imgList.push(_photo);
@@ -117,7 +112,7 @@
 						});
 					}
 				})
-				uni.hideLoading();
+				
 				console.log(this.imgList);
 			},
 			// 向父组件传递base64数据
diff --git a/constant/url.js b/constant/url.js
index c076f51..c7f25bf 100644
--- a/constant/url.js
+++ b/constant/url.js
@@ -215,6 +215,9 @@ export default {
 	//todo 费用
 	listOweFeeCallable: baseUrl+"app/oweFeeCallable.listOweFeeCallable",
 	writeOweFeeCallable: baseUrl+"app/oweFeeCallable.writeOweFeeCallable",
+	saveRoomCreateFee: baseUrl+"app/fee.saveRoomCreateFee",
+	
+	
 	
 	
 	
diff --git a/pages.json b/pages.json
index 978b6c2..04c6423 100644
--- a/pages.json
+++ b/pages.json
@@ -795,6 +795,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/fee/createFee",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "创建费用",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
diff --git a/pages/fee/createFee.vue b/pages/fee/createFee.vue
new file mode 100644
index 0000000..3e88a77
--- /dev/null
+++ b/pages/fee/createFee.vue
@@ -0,0 +1,217 @@
+<template>
+	<view>
+		<view class="block__title">基本信息</view>
+		<view class="cu-form-group">
+			<view class="title">收费范围</view>
+			<input v-model="payerObjName" disabled="disabled" placeholder="必填,请输入收费范围"></input>
+		</view>
+		<view class="cu-form-group">
+			<view class="title">收费类型</view>
+			<picker :value="feeTypeCdIndex" :range="feeTypeCds" range-key="name" @change="_changeFeeTypeCd">
+				<view class="picker">
+					{{feeTypeCdIndex == -1 ?'请选择':feeTypeCds[feeTypeCdIndex].name}}
+				</view>
+			</picker>
+		</view>
+		<view class="cu-form-group">
+			<view class="title">收费项目</view>
+			<picker :value="configIndex" :range="feeConfigs" range-key="feeName" @change="_changeConfig">
+				<view class="picker">
+					{{configIndex == -1 ?'请选择':feeConfigs[configIndex].feeName}}
+				</view>
+			</picker>
+		</view>
+		<view class="cu-form-group" v-if="computingFormula == '4004'">
+			<view class="title">收费金额</view>
+			<input v-model="amount" placeholder="必填,请输入收费金额"></input>
+		</view>
+		<view class="cu-form-group">
+			<view class="title">计费起始时间</view>
+			<picker mode="date" :value="startTime" class="" start="2020-09-01" end="2050-09-01"
+				@change="startTimeChange">
+				<view class="picker">
+					{{startTime||'请选择'}}
+				</view>
+			</picker>
+		</view>
+		<view class="cu-form-group" v-show="feeFlag != '1003006'">
+			<view class="title">计费结束时间</view>
+			<picker mode="date" :value="endTime" class="" start="2020-09-01" end="2050-09-01" @change="endTimeChange">
+				<view class="picker">
+					{{endTime||'请选择'}}
+				</view>
+			</picker>
+		</view>
+		<view class="cu-form-group" v-if="computingFormula == '1102'">
+			<view class="title">递增周期</view>
+			<input v-model="rateCycle" placeholder="必填,请输入递增周期"></input>
+		</view>
+		<view class="cu-form-group" v-if="computingFormula == '1102'">
+			<view class="title">计费递增率</view>
+			<input v-model="rate" placeholder="必填,请输入计费递增率"></input>
+		</view>
+		<view class="cu-form-group" v-show="computingFormula == '1102'">
+			<view class="title">递增开始时间</view>
+			<picker mode="date" :value="rateStartTime" class="" start="2020-09-01" end="2050-09-01"
+				@change="rateStartTimeChange">
+				<view class="picker">
+					{{rateStartTime||'请选择'}}
+				</view>
+			</picker>
+		</view>
+
+		<view class="flex flex-direction margin-top margin-bottom">
+			<button class="cu-btn bg-green margin-tb-sm lg" @click="_submitCreateFee()">提交</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		queryDictInfo
+	} from '../../api/apply/apply.js';
+	import {
+		queryFeeTypesItems
+	} from '../../api/meter/meter.js';
+	import {
+		saveRoomCreateFee
+	} from '../../api/fee/fee.js';
+	export default {
+		data() {
+			return {
+				payerObjName: '',
+				payerObjId: '',
+				feeTypeCds: [],
+				feeTypeCd: '',
+				feeTypeCdIndex: -1,
+				feeConfigs: [],
+				configId: '',
+				configIndex: -1,
+				startTime: '',
+				feeFlag: '',
+				endTime: '',
+				computingFormula: '',
+				amount: '',
+				rateCycle: '',
+				rate: '',
+				rateStartTime: ''
+			}
+		},
+		onLoad(options) {
+			this.payerObjId = options.payerObjId;
+			this.payerObjName = options.payerObjName;
+			this._loadFeeTypeCds();
+		},
+		methods: {
+			_loadFeeTypeCds: function() {
+				let _that = this;
+				let _objData = {
+					'name': "pay_fee_config",
+					'type': "fee_type_cd",
+				};
+				queryDictInfo(this, _objData)
+					.then(function(_data) {
+						let _datanew = [];
+						_data.forEach((item, index) => {
+							if (item.statusCd != "888800010015" && item.statusCd != "888800010016") {
+								_datanew.push(item);
+							}
+						});
+						_that.feeTypeCds = _datanew;
+					})
+			},
+			_changeFeeTypeCd: function(e) {
+				this.feeTypeCdIndex = e.detail.value;
+				this.feeTypeCd = this.feeTypeCds[this.feeTypeCdIndex].statusCd;
+				this._loadConfigs();
+			},
+			_loadConfigs: function() {
+				if (!this.feeTypeCd) {
+					return;
+				}
+				let _that = this;
+				queryFeeTypesItems(this, {
+					page: 1,
+					row: 500,
+					communityId: this.getCommunityId(),
+					feeTypeCd: this.feeTypeCd,
+					isDefault: 'F',
+					valid: 1
+				}).then(_data => {
+					_that.feeConfigs = _data;
+				})
+			},
+			_changeConfig: function(e) {
+				let _that = this;
+				this.configIndex = e.detail.value;
+				this.configId = this.feeConfigs[this.configIndex].configId;
+
+				if (this.feeTypeCd != '888800010006' && this.feeTypeCd != '888800010014' && this.feeFlag ==
+					'1003006') {
+					this.endTime = '';
+				}
+				this.feeConfigs.forEach(item => {
+					if (_that.configId == item.configId) {
+						_that.feeFlag = item.feeFlag;
+						_that.computingFormula = item.computingFormula;
+						return;
+					}
+				});
+			},
+			startTimeChange: function(e) {
+				this.startTime = e.detail.value;
+			},
+			endTimeChange: function(e) {
+				this.endTime = e.detail.value;
+			},
+			rateStartTimeChange: function(e) {
+				this.rateStartTime = e.detail.rateStartTime;
+			},
+			_submitCreateFee: function() {
+				saveRoomCreateFee(this, {
+					"locationTypeCd": "3000",
+					"locationObjId": this.payerObjId,
+					"feeTypeCd": this.feeTypeCd,
+					"configId": this.configId,
+					"startTime": this.startTime,
+					"feeFlag": this.feeFlag,
+					"endTime": this.endTime,
+					"computingFormula": this.computingFormula,
+					"amount": this.amount,
+					"rateCycle": this.rateCycle,
+					"rate": this.rate,
+					"rateStartTime": this.rateStartTime,
+					"communityId": this.getCommunityId()
+				}).then(_data => {
+					if (_data.hasOwnProperty('code') && _data.code != 0) {
+						uni.showToast({
+							icon:'none',
+							title:_data.msg
+						})
+						return;
+					}
+					uni.showToast({
+						icon:'none',
+						title:"创建收费成功，总共[" + _data.totalRoom + "]房屋，成功[" + _data.successRoom + "],失败[" + _data.errorRoom + "]"
+					});
+					uni.navigateBack()
+				})
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.block__title {
+		margin: 0;
+		font-weight: 400;
+		font-size: 14px;
+		color: rgba(69, 90, 100, .6);
+		padding: 40rpx 30rpx 20rpx;
+	}
+
+	.button_up_blank {
+		height: 40rpx;
+	}
+</style>
diff --git a/pages/fee/roomPayFee.vue b/pages/fee/roomPayFee.vue
index 65386d0..1212e8e 100644
--- a/pages/fee/roomPayFee.vue
+++ b/pages/fee/roomPayFee.vue
@@ -6,7 +6,9 @@
 				<input type="text" placeholder="输入房屋编号 楼栋-单元-房屋" v-model="roomName" confirm-type="search"></input>
 			</view>
 			<view class="action">
-				<button class="cu-btn bg-gradual-green shadow-blur round" @tap="_queryRoom()">搜索</button>
+				<button class="cu-btn line-blue round" @tap="_queryRoom()">搜索</button>
+				<button v-if="roomInfo.roomId" class="cu-btn line-blue round margin-left" @tap="_createFee()">创建费用</button>
+				
 			</view>
 		</view>
 		<view>
@@ -160,6 +162,11 @@
 					});
 					return;
 				}
+			},
+			_createFee:function(){
+				uni.navigateTo({
+					url:'/pages/fee/createFee?payerObjId='+this.roomInfo.roomId+"&payerObjName="+this.roomInfo.roomName
+				})
 			}
 		}
 	}