diff --git a/public/components/property/simplifyContract/simplifyContract.js b/public/components/property/simplifyContract/simplifyContract.js
index 95a20f71d..48f4f0308 100644
--- a/public/components/property/simplifyContract/simplifyContract.js
+++ b/public/components/property/simplifyContract/simplifyContract.js
@@ -28,12 +28,12 @@
_initEvent: function () {
//切换 至费用页面
vc.on('simplifyContract', 'switch', function (_param) {
- if (_param.roomId == '') {
+ if (_param.ownerId == '') {
return;
}
$that.clearContractInfoInfo();
vc.copyObject(_param, $that.simplifyRoomFeeInfo);
- $that.contractInfo.conditions.objId = _param.roomId;
+ $that.contractInfo.conditions.objId = _param.ownerId;
$that._listContractInfo(DEFAULT_PAGE, DEFAULT_ROWS);
});
@@ -79,7 +79,7 @@
window.open("/print.html#/pages/admin/printContract?contractTypeId=" + _contract.contractType + "&contractId=" + _contract.contractId);
},
_viewContract: function (_contract) {
- //vc.jumpToPage("/admin.html#/pages/admin/contractDetailView?contractId=" + _contract.contractId);
+ vc.jumpToPage("/admin.html#/pages/common/contractApplyDetail?contractId="+_contract.contractId);
},
clearContractInfoInfo: function () {
$that.contractInfo = {
diff --git a/public/pages/admin/addContract/addContract.html b/public/pages/admin/addContract/addContract.html
index 74763270a..c98027503 100644
--- a/public/pages/admin/addContract/addContract.html
+++ b/public/pages/admin/addContract/addContract.html
@@ -223,7 +223,33 @@
+
@@ -295,6 +321,7 @@
class="fa fa-check"> 提交
-
+
+
\ No newline at end of file
diff --git a/public/pages/admin/addContract/addContract.js b/public/pages/admin/addContract/addContract.js
index 3ec6bd441..4b0d7cb81 100755
--- a/public/pages/admin/addContract/addContract.js
+++ b/public/pages/admin/addContract/addContract.js
@@ -422,27 +422,29 @@
$that.addContractInfo.contractFilePo.push(_file);
},
-
+
deleteStep: function (_step) {
for (var i = 0; i < $that.addContractInfo.contractFilePo.length; i++) {
if ($that.addContractInfo.contractFilePo[i].seq == _step.seq) {
-
+
$that.addContractInfo.contractFilePo.splice(i, 1);
}
}
},
- getFile: function (e, index) {
+ getFile: function (e,index) {
vc.component.addContractInfo.tempfile = e.target.files[0];
$that.addContractInfo.contractFilePo[index].fileRealName = vc.component.addContractInfo.tempfile.name;
this._importData(index);
},
_importData: function (index) {
// 导入数据
- if (!vc.component.checkFileType(vc.component.addContractInfo.tempfile.name.split('.')[1])) {
+ let _fileName = vc.component.addContractInfo.tempfile.name;
+ let _suffix = _fileName.substring(_fileName.lastIndexOf('.') + 1);
+ if (!vc.component.checkFileType(_suffix.toLowerCase())) {
vc.toast('操作失败,请上传图片、PDF格式的文件');
return;
}
-
+
var param = new FormData();
param.append("uploadFile", vc.component.addContractInfo.tempfile);
vc.http.upload(
@@ -471,7 +473,7 @@
});
},
checkFileType: function (fileType) {
- const acceptTypes = ['png', 'pdf', 'jpg'];
+ const acceptTypes = ['png','pdf','jpg'];
for (var i = 0; i < acceptTypes.length; i++) {
if (fileType === acceptTypes[i]) {
return true;
diff --git a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
index 3ccc437cb..1684e734a 100755
--- a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
+++ b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
@@ -148,6 +148,11 @@
停车费用
+
+ 业主合同
+
房屋绑定记录
-
- 业主合同
-
+