优化代码

This commit is contained in:
java110 2021-03-31 16:56:24 +08:00
parent eb8d4bf639
commit b8d2c43fa1
6 changed files with 73 additions and 14 deletions

View File

@ -3,11 +3,43 @@
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-body">
<h3 class="m-t-none m-b ">添加合同</h3>
<h3 class="m-t-none m-b ">{{addContractInfo.parentContractCode?'续签合同':'起草合同'}}</h3>
<div class="ibox-content">
<div>
<div>
<div class="row" v-if="addContractInfo.parentContractCode">
<div class="col-sm-4">
<div class="form-group row">
<label class="col-sm-3 col-form-label padding-lr-sm text-right">父合同名称</label>
<div class="col-sm-9 padding-lr-xs">
<input v-model="addContractInfo.parentContractName" disabled type="text" placeholder="必填,请填写父合同名称"
class="form-control">
</div>
</div>
</div>
<div class="col-sm-4">
<div class="form-group row">
<label class="col-sm-3 col-form-label padding-lr-sm text-right">父合同编号</label>
<div class="col-sm-9 padding-lr-xs">
<input v-model="addContractInfo.parentContractCode" disabled type="text" placeholder="必填,请填写父合同编号"
class="form-control">
</div>
</div>
</div>
<div class="col-sm-4">
<div class="form-group row">
<label class="col-sm-3 col-form-label padding-lr-sm text-right">父合同状态</label>
<div class="col-sm-9 padding-lr-xs">
<input v-model="addContractInfo.parentStateName" disabled type="text" placeholder="必填,请填写父合同状态"
class="form-control">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-4">
<div class="form-group row">
<label class="col-sm-3 col-form-label padding-lr-sm text-right">合同名称</label>
@ -158,7 +190,8 @@
<div class="form-group row">
<label class="col-sm-3 col-form-label padding-lr-sm text-right">房屋</label>
<div class="col-sm-9 padding-lr-xs">
<input v-model="addContractInfo.allNum" type="text" placeholder="选填,请填写房屋 楼栋-单元-房屋 如 1-1-1023" class="form-control" @blur="_queryRoom">
<input v-model="addContractInfo.allNum" type="text" placeholder="选填,请填写房屋 楼栋-单元-房屋 如 1-1-1023"
class="form-control" @blur="_queryRoom">
</div>
</div>
</div>

View File

@ -30,7 +30,11 @@
ownerName: '',
link: '',
objType: '1111',
objId: '-1'
objId: '-1',
contractParentId: '',
parentContractCode: '',
parentContractName: '',
parentStateName: ''
}
},
_initMethod: function () {
@ -51,6 +55,19 @@
_initEvent: function () {
vc.on('addContract', 'openAddContractModal', function (_param) {
vc.copyObject(_param, $that.addContractInfo);
if (_param.hasOwnProperty("contractId")) {
$that.addContractInfo.contractParentId = _param.contractId;
$that.addContractInfo.parentContractCode = _param.contractCode;
$that.addContractInfo.parentContractName = _param.contractName;
$that.addContractInfo.parentStateName = _param.stateName;
$that.addContractInfo.contractId = '';
$that.addContractInfo.contractCode = '';
$that.addContractInfo.contractName = '';
$that.addContractInfo.allNum = _param.objId;
$that._queryRoom();
}
$('#addContractModel').modal('show');
});
$('#addContractModel').on('show.bs.modal', function (e) {
@ -309,7 +326,11 @@
ownerName: '',
link: '',
objId: '-1',
objType: '1111'
objType: '1111',
contractParentId: '',
parentContractCode: '',
parentContractName: '',
parentStateName: ''
};
},
_loadAddContractType: function () {
@ -375,8 +396,7 @@
param.params.unitNum = _allNums[1].trim();
param.params.roomNum = _allNums[2].trim();
} else {
vc.toast('房屋填写格式错误,请填写 楼栋-单元-房屋格式')
return;
param.params.roomId = _allNum;
}
//发送get请求
@ -391,6 +411,8 @@
vc.toast('未找到房屋');
$that.addContractInfo.allNum = '';
return;
} else {
$that.addContractInfo.allNum = _rooms[0].floorNum + '-' + _rooms[0].unitNum + '-' + _rooms[0].roomNum;
}
$that.addContractInfo.roomId = _rooms[0].roomId;

View File

@ -48,7 +48,7 @@
<div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddContractModal()">
<i class="glyphicon glyphicon-plus"></i>
添加合同
起草合同
</button>
</div>
</div>
@ -59,6 +59,7 @@
<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>
@ -74,6 +75,8 @@
<tr v-for="contract in contractManageInfo.contracts">
<td class="text-center">{{contract.contractName}}</td>
<td class="text-center">{{contract.contractCode}}</td>
<td class="text-center">
{{contract.parentContractCode?contract.parentContractCode:'-'}}</td>
<td class="text-center">{{contract.contractTypeName}}</td>
<td class="text-center">{{contract.partyA}}</td>
<td class="text-center">{{contract.partyB}}</td>

View File

@ -64,6 +64,7 @@
<th class="text-center">类型名称</th>
<th class="text-center">是否审核</th>
<th class="text-center">描述</th>
<th class="text-center">创建时间</th>
<th class="text-right">操作</th>
</tr>
</thead>
@ -72,6 +73,7 @@
<td class="text-center">{{contractType.typeName}}</td>
<td class="text-center">{{contractType.auditName}}</td>
<td class="text-center">{{contractType.remark}}</td>
<td class="text-center">{{contractType.createTime}}</td>
<td class="text-right">
<div class="btn-group">
<button class="btn-white btn btn-xs"

View File

@ -82,7 +82,7 @@
<td class="text-center">
<div class="btn-group">
<button class="btn-white btn btn-xs"
v-on:click="_openEditContractModel(contract)">续签</button>
v-on:click="_openAddContractModel(contract)">续签</button>
</div>
<div class="btn-group">
<button class="btn-white btn btn-xs"
@ -106,5 +106,6 @@
</div>
</div>
</div>
<vc:create path="admin/addContract" callBackListener="" callBackFunction=""></vc:create>
</div>

View File

@ -16,7 +16,7 @@
contractName: '',
contractCode: '',
contractType: '',
expiration:'1'
expiration: '1'
}
}
},
@ -58,12 +58,10 @@
}
);
},
_openAddContractModal: function () {
vc.emit('addContract', 'openAddContractModal', {});
},
_openEditContractModel: function (_contract) {
vc.emit('editContract', 'openEditContractModal', _contract);
_openAddContractModel: function (_contract) {
vc.emit('addContract', 'openAddContractModal', _contract);
},
_openDeleteContractModel: function (_contract) {
vc.emit('deleteContract', 'openDeleteContractModal', _contract);
},