From 680f44ec4b192f1952b8c52d26a1d1aed4131c80 Mon Sep 17 00:00:00 2001
From: 吴学文 <wuxuewen@wuxuewendeMacBook-Pro.local>
Date: 星期四, 16 五月 2019 23:23:13 +0800
Subject: [PATCH] 加入添加业主信息 未测试
---
Api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java | 25 ++++++++----
WebService/src/main/resources/components/add-owner/addOwner.js | 51 +++++++++++++++++--------
WebService/src/main/resources/components/add-owner/addOwner.html | 23 +++++++++--
3 files changed, 70 insertions(+), 29 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java b/Api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java
index 0c8c662..35b0979 100644
--- a/Api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java
+++ b/Api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java
@@ -60,7 +60,6 @@
JSONObject paramObj = JSONObject.parseObject(paramIn);
HttpHeaders header = new HttpHeaders();
- dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID, "-1");
dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
JSONArray businesses = new JSONArray();
@@ -98,6 +97,12 @@
/**
* 娣诲姞灏忓尯妤间俊鎭�
*
+ * * name:'',
+ * * age:'',
+ * * link:'',
+ * * sex:'',
+ * * remark:''
+ *
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
@@ -109,11 +114,7 @@
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessOwner = new JSONObject();
- businessOwner.put("ownerId", paramInJson.getString("ownerId"));
- businessOwner.put("name", paramInJson.getString("name"));
- businessOwner.put("remark", paramInJson.getString("remark"));
- businessOwner.put("userId", paramInJson.getString("userId"));
- businessOwner.put("ownerNum", paramInJson.getString("ownerNum"));
+ businessOwner.putAll(paramInJson);
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessOwner", businessOwner);
return business;
@@ -137,7 +138,7 @@
businessCommunityMember.put("communityMemberId", "-1");
businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
businessCommunityMember.put("memberId", paramInJson.getString("ownerId"));
- businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.FLOOR);
+ businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.OWNER);
businessCommunityMember.put("auditStatusCd", StatusConstant.STATUS_CD_AUDIT_COMPLETE);
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
@@ -147,6 +148,12 @@
/**
* 鏁版嵁鏍￠獙
*
+ * name:'',
+ * age:'',
+ * link:'',
+ * sex:'',
+ * remark:''
+ *
* @param paramIn "communityId": "7020181217000001",
* "memberId": "3456789",
* "memberTypeCd": "390001200001"
@@ -154,7 +161,9 @@
private void validate(String paramIn) {
Assert.jsonObjectHaveKey(paramIn, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
Assert.jsonObjectHaveKey(paramIn, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈userId");
- Assert.jsonObjectHaveKey(paramIn, "ownerNum", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerNum");
+ Assert.jsonObjectHaveKey(paramIn, "age", "璇锋眰鎶ユ枃涓湭鍖呭惈age");
+ Assert.jsonObjectHaveKey(paramIn, "link", "璇锋眰鎶ユ枃涓湭鍖呭惈link");
+ Assert.jsonObjectHaveKey(paramIn, "sex", "璇锋眰鎶ユ枃涓湭鍖呭惈sex");
Assert.jsonObjectHaveKey(paramIn, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
}
diff --git a/WebService/src/main/resources/components/add-owner/addOwner.html b/WebService/src/main/resources/components/add-owner/addOwner.html
index 443ac29..3d2c3d3 100644
--- a/WebService/src/main/resources/components/add-owner/addOwner.html
+++ b/WebService/src/main/resources/components/add-owner/addOwner.html
@@ -2,18 +2,31 @@
<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 ">娣诲姞涓氫富</h3>
<div class="ibox-content">
<div>
- <p style="color:red;">{{addOwnerInfo.errorInfo}}</p>
<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="addOwnerInfo.name" 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="addOwnerInfo.ownerNum" type="email" placeholder="蹇呭～锛岃濉啓缂栧彿" class="form-control"></div>
+ <label class="col-sm-2 col-form-label">鎬у埆</label>
+ <div class="col-sm-10">
+ <select class="custom-select" v-model="addOwnerInfo.sex">
+ <option selected disabled value="">蹇呭～锛岃閫夋嫨鎬у埆</option>
+ <option value="0">鐢�</option>
+ <option value="1">濂�</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="addOwnerInfo.age" 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="addOwnerInfo.link" type="number" placeholder="蹇呭～锛岃濉啓鑱旂郴鏂瑰紡" class="form-control"></div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">澶囨敞</label>
diff --git a/WebService/src/main/resources/components/add-owner/addOwner.js b/WebService/src/main/resources/components/add-owner/addOwner.js
index aa8f506..7755415 100644
--- a/WebService/src/main/resources/components/add-owner/addOwner.js
+++ b/WebService/src/main/resources/components/add-owner/addOwner.js
@@ -4,9 +4,10 @@
data:{
addOwnerInfo:{
name:'',
- ownerNum:'',
- remark:'',
- errorInfo:''
+ age:'',
+ link:'',
+ sex:'',
+ remark:''
}
},
_initMethod:function(){
@@ -26,25 +27,44 @@
{
limit:"required",
param:"",
- errInfo:"妤煎悕绉颁笉鑳戒负绌�"
+ errInfo:"鍚嶇О涓嶈兘涓虹┖"
},
{
limit:"maxin",
param:"2,10",
- errInfo:"妤煎悕绉伴暱搴﹀繀椤诲湪2浣嶈嚦10浣�"
+ errInfo:"鍚嶇О闀垮害蹇呴』鍦�2浣嶈嚦10浣�"
},
],
- 'addOwnerInfo.ownerNum':[
+ 'addOwnerInfo.age':[
{
limit:"required",
param:"",
- errInfo:"妤肩紪鍙蜂笉鑳戒负绌�"
+ errInfo:"骞撮緞涓嶈兘涓虹┖"
},
{
limit:"num",
param:"",
- errInfo:"涓嶆槸鏈夋晥鐨勬暟瀛�"
+ errInfo:"骞撮緞涓嶆槸鏈夋晥鐨勬暟瀛�"
},
+ ],
+ 'addOwnerInfo.sex':[
+ {
+ limit:"required",
+ param:"",
+ errInfo:"鎬у埆涓嶈兘涓虹┖"
+ }
+ ],
+ 'addOwnerInfo.link':[
+ {
+ limit:"required",
+ param:"",
+ errInfo:"鎵嬫満鍙蜂笉鑳戒负绌�"
+ },
+ {
+ limit:"phone",
+ param:"",
+ errInfo:"涓嶆槸鏈夋晥鐨勬墜鏈哄彿"
+ }
],
'addOwnerInfo.remark':[
@@ -59,12 +79,10 @@
},
saveOwnerInfo:function(){
if(!vc.component.addOwnerValidate()){
- vc.component.addOwnerInfo.errorInfo = vc.validate.errInfo;
+ vc.message(vc.validate.errInfo);
return ;
}
-
- vc.component.addOwnerInfo.errorInfo = "";
vc.component.addOwnerInfo.communityId = vc.getCurrentCommunity().communityId;
vc.http.post(
@@ -84,22 +102,23 @@
return ;
}
- vc.component.addOwnerInfo.errorInfo = json;
+ vc.message(json);
},
function(errInfo,error){
console.log('璇锋眰澶辫触澶勭悊');
- vc.component.addOwnerInfo.errorInfo = errInfo;
+ vc.message(errInfo);
});
},
clearAddOwnerInfo:function(){
vc.component.addOwnerInfo = {
name:'',
- ownerNum:'',
- remark:'',
- errorInfo:''
+ age:'',
+ link:'',
+ sex:'',
+ remark:''
};
}
}
--
Gitblit v1.8.0