From 80291a5dbd48bfb3bfb7d2ae291dbec7001a230c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 26 Apr 2021 01:16:13 +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
---
.../contractChangeAssets.html | 71 ++++++++++-----
.../contractChangeAssets.js | 86 +++++++------------
.../contractChangeDetail.js | 7 ++
3 files changed, 85 insertions(+), 79 deletions(-)
diff --git a/public/components/admin/contractChangeAssets/contractChangeAssets.html b/public/components/admin/contractChangeAssets/contractChangeAssets.html
index 7f5b23874..0287f0b30 100644
--- a/public/components/admin/contractChangeAssets/contractChangeAssets.html
+++ b/public/components/admin/contractChangeAssets/contractChangeAssets.html
@@ -2,34 +2,59 @@
-
资产调整
+
关联房屋
-
+
+
+
\ No newline at end of file
diff --git a/public/components/admin/contractChangeAssets/contractChangeAssets.js b/public/components/admin/contractChangeAssets/contractChangeAssets.js
index 70ab50e26..c5face15f 100644
--- a/public/components/admin/contractChangeAssets/contractChangeAssets.js
+++ b/public/components/admin/contractChangeAssets/contractChangeAssets.js
@@ -7,13 +7,8 @@
},
data: {
contractChangeAssetsInfo: {
- allNum: '',
- ownerName: '',
- link:'',
- roomId:'',
- objType:'',
- objId:'',
- planType: '3003'
+ rooms: [],
+ contractId: '',
}
},
watch: {
@@ -25,72 +20,51 @@
}
},
_initMethod: function () {
- vc.initDateTime('changeStartTime', function (_value) {
- $that.contractChangeAssetsInfo.startTime = _value;
- });
- vc.initDateTime('changeEndTime', function (_value) {
- $that.contractChangeAssetsInfo.endTime = _value;
- });
+
},
_initEvent: function () {
-
+ vc.on('contractChangeAssets', 'contractInfo', function (param) {
+ $that.contractChangeAssetsInfo.contractId = param.contractId;
+ $that._loadContractRooms();
+ })
+ vc.on('contractChangeAssets', 'chooseRoom', function (param) {
+ $that.contractChangeAssetsInfo.rooms.push(param);
+ })
},
methods: {
clearcontractChangeAssetsInfo: function () {
vc.component.contractChangeAssetsInfo = {
- allNum: '',
- ownerName: '',
- link:'',
- roomId:'',
- objType:'',
- objId:'',
- planType: '3003'
+ rooms: [],
};
},
- _queryRoom: function () {
- let _allNum = $that.contractChangeAssetsInfo.allNum;
- if (_allNum == '') {
- return;
- }
+ _selectRoom: function () {
+ vc.emit('searchRoom', 'openSearchRoomModel', {})
+ },
+ _openDelRoomModel: function (_room) {
+
+ let _tmpRooms = [];
+ $that.contractChangeAssetsInfo.rooms.forEach(item => {
+ if (item.roomId != _room.roomId) {
+ _tmpRooms.push(item);
+ }
+ });
+ $that.contractChangeAssetsInfo.rooms = _tmpRooms;
+ },
+ _loadContractRooms: function () {
let param = {
params: {
+ contractId: vc.component.contractChangeAssetsInfo.contractId,
page: 1,
- row: 1,
- communityId: vc.getCurrentCommunity().communityId
+ row: 100
}
- };
-
- if (_allNum.split('-').length == 3) {
- let _allNums = _allNum.split('-')
- param.params.floorNum = _allNums[0].trim();
- param.params.unitNum = _allNums[1].trim();
- param.params.roomNum = _allNums[2].trim();
- } else {
- vc.toast('房屋填写格式错误,请填写 楼栋-单元-房屋格式')
- return;
}
-
//发送get请求
- vc.http.get('roomCreateFee',
- 'listRoom',
+ vc.http.apiGet('/contract/queryContractRoom',
param,
function (json, res) {
- let listRoomData = JSON.parse(json);
- let _rooms = listRoomData.rooms;
-
- if (_rooms.length < 1) {
- vc.toast('未找到房屋');
- $that.contractChangeAssetsInfo.allNum = '';
- return;
- }
-
- $that.contractChangeAssetsInfo.roomId = _rooms[0].roomId;
- $that.contractChangeAssetsInfo.ownerName = _rooms[0].ownerName;
- $that.contractChangeAssetsInfo.link = _rooms[0].link;
- $that.contractChangeAssetsInfo.objType = '3333';
- $that.contractChangeAssetsInfo.objId = _rooms[0].roomId;
-
+ var _contractTFile = JSON.parse(json);
+ vc.component.contractChangeAssetsInfo.rooms = _contractTFile.data;
}, function (errInfo, error) {
console.log('请求失败处理');
}
diff --git a/public/pages/admin/contractChangeDetail/contractChangeDetail.js b/public/pages/admin/contractChangeDetail/contractChangeDetail.js
index 719fae80e..dbd0387a4 100644
--- a/public/pages/admin/contractChangeDetail/contractChangeDetail.js
+++ b/public/pages/admin/contractChangeDetail/contractChangeDetail.js
@@ -25,6 +25,7 @@
signingTime: '',
param: '',
planType: '',
+ rooms:[]
},
newContract: {
@@ -39,11 +40,17 @@
_initEvent: function () {
vc.on('contractChangeDetailInfo', 'chooseContract', function (_app) {
vc.copyObject(_app, vc.component.contractChangeDetailInfo);
+ if($that.contractChangeDetailInfo.param == 'contractChangeAssets'){
+ vc.emit('contractChangeAssets','contractInfo',vc.component.contractChangeDetailInfo);
+ }
});
vc.on('contractChangeDetailInfo', 'notice', function (item) {
let _changeRemark = $that.newContract.changeRemark;
$that.newContract = vc.deepClone($that.contractChangeDetailInfo);
$that.newContract.changeRemark = _changeRemark;
+ if(item.hasOwnProperty('rooms')){
+ $that.newContract.rooms = item.rooms;
+ }
vc.copyObject(item, $that.newContract);
});