From 350fd63763da0d3a2ca9a7107dc30c6a007a7b70 Mon Sep 17 00:00:00 2001
From: zhangjiaqing <z1637266029@163.com>
Date: 星期四, 16 四月 2026 18:13:39 +0800
Subject: [PATCH] 合同页面修改留档
---
public/components/property/editMeterWater/editMeterWater.js | 104 ++++++
public/pages/property/oldRoomFeeImport/oldRoomFeeImport.html | 131 ++------
public/components/property/editMeterWater/editMeterWater.html | 269 +++++++++++++++++
public/components/property/addMeterWater/addMeterWater.html | 73 +++-
public/pages/property/phoneMeterManage/phoneMeterManage.html | 133 +++++++-
public/pages/property/meterWaterManage/meterWaterManage.html | 134 ++++++++
public/pages/property/phoneMeterManage/phoneMeterManage.js | 22 -
public/components/property/addMeterWater/addMeterWater.js | 31 +
8 files changed, 734 insertions(+), 163 deletions(-)
diff --git a/public/components/property/addMeterWater/addMeterWater.html b/public/components/property/addMeterWater/addMeterWater.html
index 6bfee18..770da9a 100644
--- a/public/components/property/addMeterWater/addMeterWater.html
+++ b/public/components/property/addMeterWater/addMeterWater.html
@@ -294,9 +294,34 @@
</div>
</div>
<div class="form-group row">
- <label class="col-sm-2 col-form-label">瀵煎叆浜哄憳</label>
+ <label class="col-sm-2 col-form-label">鍚堣搴旂即鎬婚噾棰�/鍏�</label>
<div class="col-sm-10">
- <input v-model="addMeterWaterInfo.writer" type="text" placeholder="閫夊～锛岃濉啓瀵煎叆浜哄憳" class="form-control">
+ <input v-model="addMeterWaterInfo.totalPayableAmount" type="number" placeholder="閫夊～锛岃濉啓鍚堣搴旂即鎬婚噾棰�/鍏�" class="form-control">
+ </div>
+ </div>
+ <!-- 鏂板缂哄け瀛楁 -->
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">绀烘暟绫诲瀷</label>
+ <div class="col-sm-10">
+ <input v-model="addMeterWaterInfo.readingType" type="text" placeholder="閫夊～锛岃濉啓绀烘暟绫诲瀷" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鐘舵�佺爜</label>
+ <div class="col-sm-10">
+ <input v-model="addMeterWaterInfo.statusCd" type="text" placeholder="閫夊～锛岃濉啓鐘舵�佺爜" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">琛ㄧ被鍨嬪悕绉�</label>
+ <div class="col-sm-10">
+ <input v-model="addMeterWaterInfo.meterTypeName" type="text" placeholder="閫夊～锛岃濉啓琛ㄧ被鍨嬪悕绉�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">璺�</label>
+ <div class="col-sm-10">
+ <input v-model="addMeterWaterInfo.roadName" type="text" placeholder="閫夊～锛岃濉啓璺�" class="form-control">
</div>
</div>
</div>
@@ -384,6 +409,12 @@
</div>
<!-- 鍦板潃鐩稿叧瀛楁锛堜娇鐢ㄥ悗绔粰鐨勫瓧娈靛悕锛� -->
<div class="form-group row">
+ <label class="col-sm-2 col-form-label">璺�</label>
+ <div class="col-sm-10">
+ <input v-model="addMeterWaterInfo.roadName" type="text" placeholder="閫夊～锛岃濉啓璺�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
<label class="col-sm-2 col-form-label">寮�</label>
<div class="col-sm-10">
<input v-model="addMeterWaterInfo.floorNum" type="text" placeholder="閫夊～锛岃濉啓寮�" class="form-control">
@@ -399,19 +430,6 @@
<label class="col-sm-2 col-form-label">瀹�</label>
<div class="col-sm-10">
<input v-model="addMeterWaterInfo.roomNum" type="text" placeholder="閫夊～锛岃濉啓瀹�" class="form-control">
- </div>
- </div>
- <!-- 鏀惰垂鍖洪棿瀛楁锛堜娇鐢ㄥ悗绔粰鐨勫瓧娈靛悕锛� -->
- <div class="form-group row">
- <label class="col-sm-2 col-form-label">鏀惰垂鍖洪棿-璧峰鏃ユ湡</label>
- <div class="col-sm-10">
- <input v-model="addMeterWaterInfo.chargeStart" type="text" placeholder="閫夊～锛岃濉啓鏀惰垂鍖洪棿-璧峰鏃ユ湡" class="form-control">
- </div>
- </div>
- <div class="form-group row">
- <label class="col-sm-2 col-form-label">鏀惰垂鍖洪棿-缁堟鏃ユ湡</label>
- <div class="col-sm-10">
- <input v-model="addMeterWaterInfo.chargeEtart" type="text" placeholder="閫夊～锛岃濉啓鏀惰垂鍖洪棿-缁堟鏃ユ湡" class="form-control">
</div>
</div>
<div class="form-group row">
@@ -510,6 +528,31 @@
<input v-model="addMeterWaterInfo.invoiceAmount" type="number" placeholder="閫夊～锛岃濉啓寮�绁ㄩ噾棰�" class="form-control">
</div>
</div>
+ <!-- 鏂板缂哄け瀛楁 -->
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">绀烘暟绫诲瀷</label>
+ <div class="col-sm-10">
+ <input v-model="addMeterWaterInfo.readingType" type="text" placeholder="閫夊～锛岃濉啓绀烘暟绫诲瀷" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鐘舵�佺爜</label>
+ <div class="col-sm-10">
+ <input v-model="addMeterWaterInfo.statusCd" type="text" placeholder="閫夊～锛岃濉啓鐘舵�佺爜" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">琛ㄧ被鍨嬪悕绉�</label>
+ <div class="col-sm-10">
+ <input v-model="addMeterWaterInfo.meterTypeName" type="text" placeholder="閫夊～锛岃濉啓琛ㄧ被鍨嬪悕绉�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">璺�</label>
+ <div class="col-sm-10">
+ <input v-model="addMeterWaterInfo.roadName" type="text" placeholder="閫夊～锛岃濉啓璺�" class="form-control">
+ </div>
+ </div>
</div>
<!-- 鍏朵粬鏀跺叆瀛楁 -->
diff --git a/public/components/property/addMeterWater/addMeterWater.js b/public/components/property/addMeterWater/addMeterWater.js
index 58f2b22..5f6a388 100644
--- a/public/components/property/addMeterWater/addMeterWater.js
+++ b/public/components/property/addMeterWater/addMeterWater.js
@@ -70,7 +70,13 @@
latePaymentSurcharge: '',
feePaymentStatus: '',
carryOverBalance: '',
- totalPayableAmount: ''
+ totalPayableAmount: '',
+ // 鍏朵粬缂哄け瀛楁
+ statusCd: '',
+ meterTypeName: '',
+ feeId: '',
+ roadName: '',
+ createTime: ''
}
},
_initMethod: function () {
@@ -523,7 +529,28 @@
remark2: '',
address: '',
writeTime: '',
- writer: ''
+ writer: '',
+ // 姘磋垂涓撶敤瀛楁
+ checkApplyCompanyName: '',
+ checkApplyDeptProject: '',
+ waterFeePayer: '',
+ accountNumber: '',
+ meterReadBookNo: '',
+ waterConsumption: '',
+ sewageTreatmentWater: '',
+ collectionStandard: '',
+ arrearsUnpaid: '',
+ latePaymentFine: '',
+ latePaymentSurcharge: '',
+ feePaymentStatus: '',
+ carryOverBalance: '',
+ totalPayableAmount: '',
+ // 鍏朵粬缂哄け瀛楁
+ statusCd: '',
+ meterTypeName: '',
+ feeId: '',
+ roadName: '',
+ createTime: ''
};
},
changeFeeConfig: function () {
diff --git a/public/components/property/editMeterWater/editMeterWater.html b/public/components/property/editMeterWater/editMeterWater.html
index f5b9774..549e0fc 100644
--- a/public/components/property/editMeterWater/editMeterWater.html
+++ b/public/components/property/editMeterWater/editMeterWater.html
@@ -59,6 +59,275 @@
class="form-control">
</div>
</div>
+ <!-- 鏂板瀛楁 -->
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鎴峰悕</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.householdName" type="text" placeholder="閫夊～锛岃濉啓鎴峰悕" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鎴峰彿</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.householdNumber" type="text" placeholder="閫夊～锛岃濉啓鎴峰彿" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鍦板潃</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.address" type="text" placeholder="閫夊～锛岃濉啓鍦板潃" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">璐﹀彿</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.accountNumber" type="text" placeholder="閫夊～锛岃濉啓璐﹀彿" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鐢佃兘琛ㄧ紪鍙�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.electricMeterId" type="text" placeholder="閫夊～锛岃濉啓鐢佃兘琛ㄧ紪鍙�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">渚涚數灞�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.powerSupplyBureau" type="text" placeholder="閫夊～锛岃濉啓渚涚數灞�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鍊嶇巼</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.multiplyingFactor" type="number" placeholder="閫夊～锛岃濉啓鍊嶇巼" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鍗曚环</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.unitPrice" type="number" placeholder="閫夊～锛岃濉啓鍗曚环" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">浠锋牸</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.price" type="number" placeholder="閫夊～锛岃濉啓浠锋牸" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">寮�绁ㄩ噾棰�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.invoiceAmount" type="number" placeholder="閫夊～锛岃濉啓寮�绁ㄩ噾棰�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">搴斾粯鎬婚</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.totalPayableAmount" type="number" placeholder="閫夊～锛岃濉啓搴斾粯鎬婚" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">宸</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.amountDifference" type="number" placeholder="閫夊～锛岃濉啓宸" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">娆犺垂鏈即</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.arrearsUnpaid" type="number" placeholder="閫夊～锛岃濉啓娆犺垂鏈即" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">缁撹浆浣欓</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.carryOverBalance" type="number" placeholder="閫夊～锛岃濉啓缁撹浆浣欓" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">婊炵撼閲�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.latePaymentFine" type="number" placeholder="閫夊～锛岃濉啓婊炵撼閲�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">婊炵撼闄勫姞璐�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.latePaymentSurcharge" type="number" placeholder="閫夊～锛岃濉啓婊炵撼闄勫姞璐�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鑷姩鎵ｆ</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.autoDeduction" type="text" placeholder="閫夊～锛岃濉啓鑷姩鎵ｆ" class="form-control">
+ </div>
+ </div>
+ <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="editMeterWaterInfo.isTransferred">
+ <option selected disabled value="">閫夊～锛岃閫夋嫨鏄惁杩囨埛</option>
+ <option value="鏄�">鏄�</option>
+ <option value="鍚�">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">杩囨埛鍚庡叕鍙稿悕绉�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.companyNameAfterTransfer" type="text" placeholder="閫夊～锛岃濉啓杩囨埛鍚庡叕鍙稿悕绉�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鐢宠鍏徃鍚嶇О</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.checkApplyCompanyName" type="text" placeholder="閫夊～锛岃濉啓鐢宠鍏徃鍚嶇О" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鐢宠閮ㄩ棬/椤圭洰</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.checkApplyDeptProject" type="text" placeholder="閫夊～锛岃濉啓鐢宠閮ㄩ棬/椤圭洰" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鏀惰垂鏍囧噯</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.collectionStandard" type="text" placeholder="閫夊～锛岃濉啓鏀惰垂鏍囧噯" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">瀵瑰簲鎴锋暟</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.correspondingHouseholdCount" type="number" placeholder="閫夊～锛岃濉啓瀵瑰簲鎴锋暟" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">缂磋垂鐘舵��</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.feePaymentStatus" type="text" placeholder="閫夊～锛岃濉啓缂磋垂鐘舵��" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">缁忓姙浜�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.handler" type="text" placeholder="閫夊～锛岃濉啓缁忓姙浜�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鏈�鍚庣即璐规棩鏈�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.lastPaymentDate" type="text" placeholder="閫夊～锛岃濉啓鏈�鍚庣即璐规棩鏈�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鎶勮〃鏈彿</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.meterReadBookNo" type="text" placeholder="閫夊～锛岃濉啓鎶勮〃鏈彿" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鎶勮〃绫诲瀷</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.readingType" type="text" placeholder="閫夊～锛岃濉啓鎶勮〃绫诲瀷" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鐢ㄦ按閲�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.waterConsumption" type="number" placeholder="閫夊～锛岃濉啓鐢ㄦ按閲�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">姹℃按澶勭悊姘撮噺</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.sewageTreatmentWater" type="number" placeholder="閫夊～锛岃濉啓姹℃按澶勭悊姘撮噺" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">姘磋垂缂寸撼鏂�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.waterFeePayer" type="text" placeholder="閫夊～锛岃濉啓姘磋垂缂寸撼鏂�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">澶囨敞2</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.remark2" type="text" placeholder="閫夊～锛岃濉啓澶囨敞2" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鐘舵�佺爜</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.statusCd" type="text" placeholder="閫夊～锛岃濉啓鐘舵�佺爜" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">褰曞叆浜�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.writer" type="text" placeholder="閫夊～锛岃濉啓褰曞叆浜�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">褰曞叆鏃堕棿</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.writeTime" type="text" placeholder="閫夊～锛岃濉啓褰曞叆鏃堕棿" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">琛ㄧ被鍨嬪悕绉�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.meterTypeName" type="text" placeholder="閫夊～锛岃濉啓琛ㄧ被鍨嬪悕绉�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">璺�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.roadName" type="text" placeholder="閫夊～锛岃濉啓璺�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">杩囨埛鏃ユ湡</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.transferDate" type="text" placeholder="閫夊～锛岃濉啓杩囨埛鏃ユ湡" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">闂ㄥ彿</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.doorNum" type="text" placeholder="閫夊～锛岃濉啓闂ㄥ彿" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">寮勫彿</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.floorNum" type="text" placeholder="閫夊～锛岃濉啓寮勫彿" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鍗曞厓鍙�</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.unitNum" type="text" placeholder="閫夊～锛岃濉啓鍗曞厓鍙�" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">瀹ゅ彿</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.roomNum" type="text" placeholder="閫夊～锛岃濉啓瀹ゅ彿" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鏀惰垂鍖洪棿-璧峰鏃ユ湡</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.chargeStart" type="text" placeholder="閫夊～锛岃濉啓鏀惰垂鍖洪棿-璧峰鏃ユ湡" class="form-control">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">鏀惰垂鍖洪棿-缁堟鏃ユ湡</label>
+ <div class="col-sm-10">
+ <input v-model="editMeterWaterInfo.chargeEnd" type="text" placeholder="閫夊～锛岃濉啓鏀惰垂鍖洪棿-缁堟鏃ユ湡" class="form-control">
+ </div>
+ </div>
<div class="ibox-content">
<button class="btn btn-primary float-right" type="button" v-on:click="editMeterWater()">
<i class="fa fa-check"></i> 淇濆瓨
diff --git a/public/components/property/editMeterWater/editMeterWater.js b/public/components/property/editMeterWater/editMeterWater.js
index 735c1f9..8bbbe53 100644
--- a/public/components/property/editMeterWater/editMeterWater.js
+++ b/public/components/property/editMeterWater/editMeterWater.js
@@ -8,7 +8,57 @@
curDegrees: '',
preReadingTime: '',
curReadingTime: '',
- remark: ''
+ remark: '',
+ // 鏂板瀛楁
+ accountNumber: '',
+ address: '',
+ amountDifference: '',
+ arrearsUnpaid: '',
+ autoDeduction: '',
+ carryOverBalance: '',
+ checkApplyCompanyName: '',
+ checkApplyDeptProject: '',
+ collectionStandard: '',
+ communityId: '',
+ companyNameAfterTransfer: '',
+ correspondingHouseholdCount: '',
+ electricMeterId: '',
+ feeId: '',
+ feePaymentStatus: '',
+ handler: '',
+ householdName: '',
+ householdNumber: '',
+ invoiceAmount: '',
+ isTransferred: '',
+ lastPaymentDate: '',
+ latePaymentFine: '',
+ latePaymentSurcharge: '',
+ meterReadBookNo: '',
+ meterTypeName: '',
+ multiplyingFactor: '',
+ objId: '',
+ objName: '',
+ objType: '',
+ powerSupplyBureau: '',
+ price: '',
+ readingType: '',
+ remark2: '',
+ sewageTreatmentWater: '',
+ statusCd: '',
+ totalPayableAmount: '',
+ unitPrice: '',
+ waterConsumption: '',
+ waterFeePayer: '',
+ writer: '',
+ writeTime: '',
+ // 鍏朵粬鐜版湁瀛楁
+ roadName: '',
+ floorNum: '',
+ unitNum: '',
+ roomNum: '',
+ chargeStart: '',
+ chargeEnd: '',
+ createTime: ''
}
},
_initMethod: function () {
@@ -201,7 +251,57 @@
curDegrees: '',
preReadingTime: '',
curReadingTime: '',
- remark: ''
+ remark: '',
+ // 鏂板瀛楁
+ accountNumber: '',
+ address: '',
+ amountDifference: '',
+ arrearsUnpaid: '',
+ autoDeduction: '',
+ carryOverBalance: '',
+ checkApplyCompanyName: '',
+ checkApplyDeptProject: '',
+ collectionStandard: '',
+ communityId: '',
+ companyNameAfterTransfer: '',
+ correspondingHouseholdCount: '',
+ electricMeterId: '',
+ feeId: '',
+ feePaymentStatus: '',
+ handler: '',
+ householdName: '',
+ householdNumber: '',
+ invoiceAmount: '',
+ isTransferred: '',
+ lastPaymentDate: '',
+ latePaymentFine: '',
+ latePaymentSurcharge: '',
+ meterReadBookNo: '',
+ meterTypeName: '',
+ multiplyingFactor: '',
+ objId: '',
+ objName: '',
+ objType: '',
+ powerSupplyBureau: '',
+ price: '',
+ readingType: '',
+ remark2: '',
+ sewageTreatmentWater: '',
+ statusCd: '',
+ totalPayableAmount: '',
+ unitPrice: '',
+ waterConsumption: '',
+ waterFeePayer: '',
+ writer: '',
+ writeTime: '',
+ // 鍏朵粬鐜版湁瀛楁
+ roadName: '',
+ floorNum: '',
+ unitNum: '',
+ roomNum: '',
+ chargeStart: '',
+ chargeEnd: '',
+ createTime: ''
}
}
}
diff --git a/public/pages/property/meterWaterManage/meterWaterManage.html b/public/pages/property/meterWaterManage/meterWaterManage.html
index e05faf6..21ff18f 100644
--- a/public/pages/property/meterWaterManage/meterWaterManage.html
+++ b/public/pages/property/meterWaterManage/meterWaterManage.html
@@ -117,13 +117,16 @@
瀹�
</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">
鐢佃兘琛ㄧ紪鍙�
@@ -138,7 +141,91 @@
鍗曚环
</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>
+ <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">
+ 璐圭敤ID
+ </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>
+ <th class="text-center">
+ 澶囨敞2
+ </th>
+ <th class="text-center">
+ 鐘舵�佺爜
+ </th>
+ <th class="text-center">
+ 褰曞叆浜�
+ </th>
+ <th class="text-center">
+ 褰曞叆鏃堕棿
</th>
<th class="text-center">
<vc:i18n name="涓婃湡搴︽暟" namespace="meterWaterManage"></vc:i18n>
@@ -171,16 +258,45 @@
<td class="text-center">{{meterWater.roadName || '-'}}</td>
<td class="text-center">{{meterWater.householdName || '-'}}</td>
<td class="text-center">{{meterWater.floorNum || '-'}}</td>
- <td class="text-center">{{meterWater.unitNum || '-'}}</td>
+ <td class="text-center">{{meterWater.doorNum || '-'}}</td>
<td class="text-center">{{meterWater.roomNum || '-'}}</td>
- <td class="text-center">{{meterWater.chargeStart || '-'}}</td>
- <td class="text-center">{{meterWater.chargeEnd || '-'}}</td>
<td class="text-center">{{meterWater.householdName || '-'}}</td>
+ <td class="text-center">{{meterWater.householdNumber || '-'}}</td>
+ <td class="text-center">{{meterWater.address || '-'}}</td>
+ <td class="text-center">{{meterWater.accountNumber || '-'}}</td>
<td class="text-center">{{meterWater.electricMeterId || '-'}}</td>
<td class="text-center">{{meterWater.powerSupplyBureau || '-'}}</td>
<td class="text-center">{{meterWater.multiplyingFactor || '-'}}</td>
<td class="text-center">{{meterWater.unitPrice || '-'}}</td>
+ <td class="text-center">{{meterWater.price || '-'}}</td>
<td class="text-center">{{meterWater.invoiceAmount || '-'}}</td>
+ <td class="text-center">{{meterWater.totalPayableAmount || '-'}}</td>
+ <td class="text-center">{{meterWater.amountDifference || '-'}}</td>
+ <td class="text-center">{{meterWater.arrearsUnpaid || '-'}}</td>
+ <td class="text-center">{{meterWater.carryOverBalance || '-'}}</td>
+ <td class="text-center">{{meterWater.latePaymentFine || '-'}}</td>
+ <td class="text-center">{{meterWater.latePaymentSurcharge || '-'}}</td>
+ <td class="text-center">{{meterWater.autoDeduction || '-'}}</td>
+ <td class="text-center">{{meterWater.isTransferred || '-'}}</td>
+ <td class="text-center">{{meterWater.companyNameAfterTransfer || '-'}}</td>
+ <td class="text-center">{{meterWater.checkApplyCompanyName || '-'}}</td>
+ <td class="text-center">{{meterWater.checkApplyDeptProject || '-'}}</td>
+ <td class="text-center">{{meterWater.collectionStandard || '-'}}</td>
+ <td class="text-center">{{meterWater.correspondingHouseholdCount || '-'}}</td>
+ <td class="text-center">{{meterWater.feeId || '-'}}</td>
+ <td class="text-center">{{meterWater.feePaymentStatus || '-'}}</td>
+ <td class="text-center">{{meterWater.handler || '-'}}</td>
+ <td class="text-center">{{meterWater.lastPaymentDate || '-'}}</td>
+ <td class="text-center">{{meterWater.meterReadBookNo || '-'}}</td>
+ <td class="text-center">{{meterWater.readingType || '-'}}</td>
+ <td class="text-center">{{meterWater.waterConsumption || '-'}}</td>
+ <td class="text-center">{{meterWater.sewageTreatmentWater || '-'}}</td>
+ <td class="text-center">{{meterWater.waterFeePayer || '-'}}</td>
+ <td class="text-center">{{meterWater.remark || '-'}}</td>
+ <td class="text-center">{{meterWater.remark2 || '-'}}</td>
+ <td class="text-center">{{meterWater.statusCd || '-'}}</td>
+ <td class="text-center">{{meterWater.writer || '-'}}</td>
+ <td class="text-center">{{meterWater.writeTime || '-'}}</td>
<td class="text-center">{{meterWater.preDegrees || '-'}}</td>
<td class="text-center">{{meterWater.curDegrees || '-'}}</td>
<td class="text-center">{{meterWater.preReadingTime || '-'}}</td>
diff --git a/public/pages/property/oldRoomFeeImport/oldRoomFeeImport.html b/public/pages/property/oldRoomFeeImport/oldRoomFeeImport.html
index 4ef2311..12093ae 100644
--- a/public/pages/property/oldRoomFeeImport/oldRoomFeeImport.html
+++ b/public/pages/property/oldRoomFeeImport/oldRoomFeeImport.html
@@ -66,13 +66,13 @@
<thead>
<tr style="white-space: nowrap;">
<th class="text-center">
+ 搴忓彿
+ </th>
+ <th class="text-center">
<vc:i18n name="鏀惰垂鏃ユ湡" namespace="oldRoomFeeImport"></vc:i18n>
</th>
<th class="text-center">
<vc:i18n name="鍙戠エ銆佹敹鎹彿鐮�" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <th class="text-center">
- <vc:i18n name="鎴垮彿" namespace="oldRoomFeeImport"></vc:i18n>
</th>
<th class="text-center">
<vc:i18n name="涓氫富鍦板潃" namespace="oldRoomFeeImport"></vc:i18n>
@@ -86,9 +86,17 @@
<th class="text-center">
<vc:i18n name="瀹ゅ彿" namespace="oldRoomFeeImport"></vc:i18n>
</th>
-
<th class="text-center">
- <vc:i18n name="闂ㄥ耿瀹ゅ彿" namespace="oldRoomFeeImport"></vc:i18n>
+ 闂ㄥ鍙�
+ </th>
+ <th class="text-center">
+ 鏀舵鎵�灞炲勾搴�
+ </th>
+ <th class="text-center">
+ <vc:i18n name="鏀惰垂鍖洪棿-璧峰鏃ユ湡" namespace="oldRoomFeeImport"></vc:i18n>
+ </th>
+ <th class="text-center">
+ <vc:i18n name="鏀惰垂鍖洪棿-缁堟鏃ユ湡" namespace="oldRoomFeeImport"></vc:i18n>
</th>
<th class="text-center">
<vc:i18n name="鏀惰垂鍐呭" namespace="oldRoomFeeImport"></vc:i18n>
@@ -97,107 +105,46 @@
<vc:i18n name="鏀惰垂閲戦" namespace="oldRoomFeeImport"></vc:i18n>
</th>
<th class="text-center">
- <vc:i18n name="鏀惰垂浜�" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <th class="text-center">
- <vc:i18n name="閾惰瑙ｆ鏃ユ湡" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <th class="text-center">
- <vc:i18n name="閾惰瑙ｆ浜�" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <th class="text-center">
- <vc:i18n name="鎷嗗垎鍚庨摱琛岃В娆鹃噾棰�" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <th class="text-center">
- <vc:i18n name="閾惰瑙ｆ閲戦" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <th class="text-center">
- <vc:i18n name="鏍稿閲戦" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <th class="text-center">
- <vc:i18n name="鐧藉崟瀛樻。缂栧彿" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <th class="text-center">
- <vc:i18n name="寮犳暟" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <th class="text-center">
- <vc:i18n name="璐㈠姟鏀惰处浜猴紙鏀舵浜猴級" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <th class="text-center">
- <vc:i18n name="杈撳叆鏃堕棿" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <th class="text-center">
- <vc:i18n name="杈撳叆浜哄憳" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <th class="text-center">
- <vc:i18n name="鍗曞彿" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <th class="text-center">
<vc:i18n name="杞︾墝鍙�" namespace="oldRoomFeeImport"></vc:i18n>
</th>
<th class="text-center">
- <vc:i18n name="22椤瑰垎绫�" namespace="oldRoomFeeImport"></vc:i18n>
+ 寰呰В鍐抽棶棰�
</th>
<th class="text-center">
- <vc:i18n name="鏀惰垂璧�" namespace="oldRoomFeeImport"></vc:i18n>
+ 25椤规敹璐瑰垎绫�
</th>
<th class="text-center">
- <vc:i18n name="鏀惰垂姝�" namespace="oldRoomFeeImport"></vc:i18n>
- </th>
- <!-- 鏂板瀛楁 -->
- <th class="text-center">
- 鏀舵鎵�灞炲勾
+ 鏀惰垂鍒嗙被瀛愬垎绫�
</th>
<th class="text-center">
- 闂ㄥ鍙�
+ 璐㈠姟鏍稿
</th>
- <!-- 鍦板潃鐩稿叧瀛楁 -->
-
-<!-- 鏀惰垂鍖洪棿瀛楁 -->
-<th class="text-center">
- <vc:i18n name="鏀惰垂鍖洪棿-璧峰鏃ユ湡" namespace="oldRoomFeeImport"></vc:i18n>
-</th>
-<th class="text-center">
- <vc:i18n name="鏀惰垂鍖洪棿-缁堟鏃ユ湡" namespace="oldRoomFeeImport"></vc:i18n>
-</th>
+ <th class="text-center">
+ 鏍稿鏃ユ湡
+ </th>
</tr>
</thead>
<tbody>
- <tr v-for="fee in oldRoomFeeImport.improtFees" style="white-space: nowrap;">
- <td class="text-center">{{ fee.chargeTime || '-' }}</td>
- <td class="text-center">{{ fee.invoiceReceiptNo || '-' }}</td>
- <td class="text-center">{{ fee.roomId || '-' }}</td>
- <td class="text-center">{{ fee.propertyAddress || '-' }}</td>
- <td class="text-center">{{ fee.laneNumber || '-' }}</td> <!-- 寮勫彿 -->
- <td class="text-center">{{ fee.doorNumber || '-' }}</td> <!-- 闂ㄥ彿 -->
- <td class="text-center">{{ fee.roomNumber || '-' }}</td> <!-- 瀹ゅ彿 -->
- <td class="text-center">{{ fee.doorRoomNum || '-' }}</td>
- <td class="text-center">{{ fee.secondaryFeeTypeCd || '-' }}</td>
- <td class="text-center">{{ fee.chargeAmount || '-' }}</td>
- <td class="text-center">{{ fee.charger || '-' }}</td> <!-- 鏀惰垂浜� -->
- <td class="text-center">{{ fee.bankDepositDate || '-' }}</td> <!-- 閾惰瑙ｆ鏃ユ湡 -->
- <td class="text-center">{{ fee.bankDepositor || '-' }}</td> <!-- 閾惰瑙ｆ浜� -->
- <td class="text-center">{{ fee.splitBankDepositAmount || '-' }}</td> <!-- 鎷嗗垎鍚庨摱琛岃В娆鹃噾棰� -->
- <td class="text-center">{{ fee.bankDepositAmount || '-' }}</td> <!-- 閾惰瑙ｆ閲戦 -->
- <td class="text-center">{{ fee.checkAmount || '-' }}</td> <!-- 鏍稿閲戦 -->
- <td class="text-center">{{ fee.whiteListArchiveNo || '-' }}</td> <!-- 鐧藉崟瀛樻。缂栧彿 -->
- <td class="text-center">{{ fee.sheetCount || '-' }}</td> <!-- 寮犳暟 -->
- <td class="text-center">{{ fee.financialReceiver || '-' }}</td> <!-- 璐㈠姟鏀惰处浜� -->
- <td class="text-center">{{ fee.inputTime || '-' }}</td> <!-- 杈撳叆鏃堕棿 -->
- <td class="text-center">{{ fee.inputPerson || '-' }}</td> <!-- 杈撳叆浜哄憳 -->
- <td class="text-center">{{ fee.orderNo || '-' }}</td> <!-- 鍗曞彿 -->
+ <tr v-for="(fee, index) in oldRoomFeeImport.improtFees" style="white-space: nowrap;">
+ <td class="text-center">{{ index + 1 || '-' }}</td> <!-- 搴忓彿 -->
+ <td class="text-center">{{ fee.chargeTime || '-' }}</td> <!-- 鏀惰垂鏃ユ湡 -->
+ <td class="text-center">{{ fee.invoiceReceiptNo || '-' }}</td> <!-- 鍙戠エ銆佹敹鎹彿鐮� -->
+ <td class="text-center">{{ fee.propertyAddress || '-' }}</td> <!-- 涓氫富鍦板潃 -->
+ <td class="text-center">{{ fee.nong || '-' }}</td> <!-- 寮勫彿 -->
+ <td class="text-center">{{ fee.men || '-' }}</td> <!-- 闂ㄥ彿 -->
+ <td class="text-center">{{ fee.shi || '-' }}</td> <!-- 瀹ゅ彿 -->
+ <td class="text-center">{{ fee.doorRoomNum || '-' }}</td> <!-- 闂ㄥ鍙� -->
+ <td class="text-center">{{ fee.receiptYear || '-' }}</td> <!-- 鏀舵鎵�灞炲勾搴� -->
+ <td class="text-center">{{ fee.chargeStart || '-' }}</td> <!-- 鏀惰垂鍖洪棿-璧峰鏃ユ湡 -->
+ <td class="text-center">{{ fee.chargeEnd || '-' }}</td> <!-- 鏀惰垂鍖洪棿-缁堟鏃ユ湡 -->
+ <td class="text-center">{{ fee.secondaryFeeTypeCd || '-' }}</td> <!-- 鏀惰垂鍐呭 -->
+ <td class="text-center">{{ fee.chargeAmount || '-' }}</td> <!-- 鏀惰垂閲戦 -->
<td class="text-center">{{ fee.licensePlate || '-' }}</td> <!-- 杞︾墝鍙� -->
- <td class="text-center">{{ fee.category22 || '-' }}</td> <!-- 22 椤瑰垎绫� -->
- <td class="text-center">{{ fee.chargeStart || '-' }}</td> <!-- 鏀惰垂璧� -->
- <td class="text-center">{{ fee.chargeEnd || '-' }}</td> <!-- 鏀惰垂姝� -->
- <!-- 鏂板瀛楁鏁版嵁 -->
- <td class="text-center">{{ fee.receiptYear || '-' }}</td> <!-- 鏀舵鎵�灞炲勾 -->
- <td class="text-center">{{ fee.roomNumber || '-' }}</td> <!-- 闂ㄥ鍙� -->
-
- <!-- 鏀惰垂鍖洪棿鏁版嵁 -->
-<td class="text-center">{{ fee.chargeStart || '-' }}</td> <!-- 鏀惰垂鍖洪棿-璧峰鏃ユ湡 -->
-<td class="text-center">{{ fee.chargeEnd || '-' }}</td> <!-- 鏀惰垂鍖洪棿-缁堟鏃ユ湡 -->
-
+ <td class="text-center">{{ fee.pendingProblem || '-' }}</td> <!-- 寰呰В鍐抽棶棰� -->
+ <td class="text-center">{{ fee.category22 || '-' }}</td> <!-- 25椤规敹璐瑰垎绫伙紙瀹為檯鏄�22椤癸級 -->
+ <td class="text-center">{{ fee.subCategory || '-' }}</td> <!-- 鏀惰垂鍒嗙被瀛愬垎绫� -->
+ <td class="text-center">{{ fee.financialCheck || '-' }}</td> <!-- 璐㈠姟鏍稿 -->
+ <td class="text-center">{{ fee.checkDate || '-' }}</td> <!-- 鏍稿鏃ユ湡 -->
</tr>
</tbody>
</table>
diff --git a/public/pages/property/phoneMeterManage/phoneMeterManage.html b/public/pages/property/phoneMeterManage/phoneMeterManage.html
index 7e6a23e..ea21049 100644
--- a/public/pages/property/phoneMeterManage/phoneMeterManage.html
+++ b/public/pages/property/phoneMeterManage/phoneMeterManage.html
@@ -3,7 +3,7 @@
<div style="padding-right:0px;width: 250px; height: 95%; overflow-x: hidden; overflow-y: scroll;" class="room-floor-unit-tree">
<vc:create path="property/roomTreeDiv" callBackListener="phoneMeterManage"></vc:create>
</div>
- <div class="margin-top-xs margin-left-sm" style="flex-grow: 1;">
+ <div class="margin-top-xs margin-left-sm" style="flex-grow: 1;width: 50%;">
<div class="ibox ">
<div class="ibox-title">
<h5>
@@ -80,7 +80,7 @@
缁忓姙浜�
</th>
<th class="text-center">
- 鏄惁杩囨埛锛堟槸/鍚︼級
+ 鏄惁杩囨埛
</th>
<th class="text-center">
杩囨埛鍚庡叕鍙稿悕绉�
@@ -89,19 +89,70 @@
杩囨埛鏃ユ湡
</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>
+ <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">
+ 澶囨敞1
+ </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">
+ 澶囨敞2
+ </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">
<vc:i18n name="鎿嶄綔" namespace="phoneMeterManage"></vc:i18n>
@@ -121,21 +172,55 @@
<!-- 缁忓姙浜� -->
<td class="text-center">{{phoneBillFlow.handler || '-'}}</td>
<!-- 鏄惁杩囨埛 -->
- <td class="text-center">{{phoneBillFlow.isTransferred || '-'}}</td>
+ <td class="text-center">{{phoneBillFlow.isTransfer || '-'}}</td>
<!-- 杩囨埛鍚庡叕鍙稿悕绉� -->
- <td class="text-center">{{phoneBillFlow.companyNameAfterTransfer || '-'}}</td>
+ <td class="text-center">{{phoneBillFlow.transferredCompany || '-'}}</td>
<!-- 杩囨埛鏃ユ湡 -->
<td class="text-center">{{phoneBillFlow.transferDate || '-'}}</td>
- <!-- 璺� -->
- <td class="text-center">{{phoneBillFlow.roadName || '-'}}</td>
- <!-- 寮� -->
- <td class="text-center">{{phoneBillFlow.floorNum || '-'}}</td>
- <!-- 闂� -->
- <td class="text-center">{{phoneBillFlow.unitNum || '-'}}</td>
- <!-- 瀹� -->
- <td class="text-center">{{phoneBillFlow.roomNum || '-'}}</td>
<!-- 鍦板潃 -->
<td class="text-center">{{phoneBillFlow.address || '-'}}</td>
+ <!-- 骞� -->
+ <td class="text-center">{{phoneBillFlow.year || '-'}}</td>
+ <!-- 鏈� -->
+ <td class="text-center">{{phoneBillFlow.month || '-'}}</td>
+ <!-- 璐﹀崟鎵�灞炲懆鏈� -->
+ <td class="text-center">{{phoneBillFlow.billCycle || '-'}}</td>
+ <!-- 鏈�鍚庣即娆炬棩鏈� -->
+ <td class="text-center">{{phoneBillFlow.lastPaymentDate || '-'}}</td>
+ <!-- 濂楅鍙婂浐瀹氳垂 -->
+ <td class="text-center">{{phoneBillFlow.packageFixedFee || '-'}}</td>
+ <!-- 濂楅澶栬闊抽�氫俊璐� -->
+ <td class="text-center">{{phoneBillFlow.extraVoiceFee || '-'}}</td>
+ <!-- 缁煎悎淇℃伅鏈嶅姟璐� -->
+ <td class="text-center">{{phoneBillFlow.comprehensiveInfoFee || '-'}}</td>
+ <!-- 鍏朵粬璐圭敤 -->
+ <td class="text-center">{{phoneBillFlow.otherFee || '-'}}</td>
+ <!-- 搴斾粯璐﹀崟閲戦 -->
+ <td class="text-center">{{phoneBillFlow.payableAmount || '-'}}</td>
+ <!-- 澶囨敞1 -->
+ <td class="text-center">{{phoneBillFlow.remark1 || '-'}}</td>
+ <!-- 宸插紑绁ㄩ噾棰� -->
+ <td class="text-center">{{phoneBillFlow.invoicedAmount || '-'}}</td>
+ <!-- 鏈紑绁ㄩ噾棰� -->
+ <td class="text-center">{{phoneBillFlow.uninvoicedAmount || '-'}}</td>
+ <!-- 婊炵撼閲� -->
+ <td class="text-center">{{phoneBillFlow.lateFee || '-'}}</td>
+ <!-- 灏忚 -->
+ <td class="text-center">{{phoneBillFlow.subtotal || '-'}}</td>
+ <!-- 鎵�灞炲崟浣� -->
+ <td class="text-center">{{phoneBillFlow.affiliatedUnit || '-'}}</td>
+ <!-- 鏀粯鏃ユ湡 -->
+ <td class="text-center">{{phoneBillFlow.paymentDate || '-'}}</td>
+ <!-- 澶囨敞2 -->
+ <td class="text-center">{{phoneBillFlow.remark2 || '-'}}</td>
+ <!-- 鏁版嵁褰曞叆浜� -->
+ <td class="text-center">{{phoneBillFlow.dataEntryPerson || '-'}}</td>
+ <!-- 鏁版嵁褰曞叆鏃ユ湡 -->
+ <td class="text-center">{{phoneBillFlow.dataEntryDate || '-'}}</td>
+ <!-- 璐㈠姟瀹℃牳浜� -->
+ <td class="text-center">{{phoneBillFlow.financialAuditor || '-'}}</td>
+ <!-- 璐㈠姟瀹℃牳鏃ユ湡 -->
+ <td class="text-center">{{phoneBillFlow.financialAuditDate || '-'}}</td>
<td class="text-center">
<div class="btn-group">
<button class="btn-white btn btn-xs"
diff --git a/public/pages/property/phoneMeterManage/phoneMeterManage.js b/public/pages/property/phoneMeterManage/phoneMeterManage.js
index bb995a0..61b832c 100644
--- a/public/pages/property/phoneMeterManage/phoneMeterManage.js
+++ b/public/pages/property/phoneMeterManage/phoneMeterManage.js
@@ -89,7 +89,7 @@
_listPhoneBillFlows: function (_page, _rows) {
// 璁剧疆鍒嗛〉鍙傛暟
$that.phoneMeterManageInfo.conditions.page = _page;
- $that.phoneMeterManageInfo.conditions.row = _rows;
+ $that.phoneMeterManageInfo.conditions.row = 10;
// 璁剧疆灏忓尯ID
$that.phoneMeterManageInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
@@ -112,24 +112,8 @@
$that.phoneMeterManageInfo.total = _json.total;
$that.phoneMeterManageInfo.records = _json.records;
- // 杞崲鏁版嵁缁撴瀯锛屽皢鍗曞厓鏁版嵁杞崲涓虹數璇濊垂鎶勮〃鏁版嵁鏍煎紡
- let convertedData = [];
- if (_json.data && Array.isArray(_json.data)) {
- _json.data.forEach(item => {
- convertedData.push({
- deviceNum: item.unitNum || '-',
- objName: item.floorNum + '-' + item.unitNum || '-',
- preDegrees: '-',
- curDegrees: '-',
- preReadingTime: '-',
- curReadingTime: '-',
- createTime: '-',
- id: item.unitId || ''
- });
- });
- }
-
- $that.phoneMeterManageInfo.phoneBillFlows = convertedData;
+ // 鐩存帴浣跨敤API杩斿洖鐨勭數璇濊垂娴佹按鏁版嵁
+ $that.phoneMeterManageInfo.phoneBillFlows = _json.data || [];
// 璁＄畻鎬婚〉鏁�
var totalPages = Math.ceil(_json.total / _rows) || 1;
--
Gitblit v1.8.0