|
@@ -133,7 +133,7 @@ |
|
|
:on-remote-response="'data'" |
|
|
:on-remote-response="'data'" |
|
|
/> |
|
|
/> |
|
|
<van-field required v-model="item.sfzh" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]" @input="updateMemberInfo(index)"/> |
|
|
<van-field required v-model="item.sfzh" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]" @input="updateMemberInfo(index)"/> |
|
|
<van-field required v-model="item.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/> |
|
|
|
|
|
|
|
|
<van-field required v-model="applicationDetail.sqhhzhkszd" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</van-tab> |
|
|
</van-tab> |
|
@@ -299,7 +299,7 @@ |
|
|
:readonly="!formEnabled.baseApplyForm.baseFormEnabled" |
|
|
:readonly="!formEnabled.baseApplyForm.baseFormEnabled" |
|
|
clickable |
|
|
clickable |
|
|
required |
|
|
required |
|
|
:rules="[{ required: applicationDetail.sjtz == '2' , message:'请选择资金支出类别' }]" |
|
|
|
|
|
|
|
|
:rules="[{ required: applicationDetail.sjtz == '2' , message:'请选择选通用图' }]" |
|
|
label="选通用图" |
|
|
label="选通用图" |
|
|
placeholder="选通用图" |
|
|
placeholder="选通用图" |
|
|
v-model="tytzName" |
|
|
v-model="tytzName" |
|
@@ -1320,10 +1320,8 @@ |
|
|
<van-col span="5">竣工<br/>平面<br/>简图<br/> |
|
|
<van-col span="5">竣工<br/>平面<br/>简图<br/> |
|
|
(标注<br/>长宽<br/>及四至)</van-col> |
|
|
(标注<br/>长宽<br/>及四至)</van-col> |
|
|
<van-col span="19"> |
|
|
<van-col span="19"> |
|
|
<house-location-plan-comp ref="pictureUploadAccepting" :uploadDisabled="!formEnabled.acceptingForm.townFormEnabled" :jsonData="uploadImgAccepting.fileList" :proposer-id="uploadImgAccepting.proposerId" tableName="t_homeapply_ydjfys" |
|
|
|
|
|
@uploadFileChanged="(x) => {this.uploadImgAccepting.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgAccepting.removeFileList = x;}" |
|
|
|
|
|
/> |
|
|
|
|
|
<van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" v-model="applicationDetail.ydjfys.jgpmjtjbr" placeholder="经办人" label="经办人" input-align="left" :rules="[{ required: true }]"/> |
|
|
|
|
|
|
|
|
<MultiImageUploadComp :value="applicationDetail.ydjfys.jgpmjt" :uploadDisabled="!formEnabled.acceptingForm.baseFormEnabled" @fileUpdate="fileUpdatePmt"/> |
|
|
|
|
|
<van-field required :readonly="!this.formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.jgpmjtjbr" placeholder="经办人" label="经办人" input-align="left" :rules="[{ required: true }]"/> |
|
|
</van-col> |
|
|
</van-col> |
|
|
</van-row> |
|
|
</van-row> |
|
|
</div> |
|
|
</div> |
|
@@ -1400,7 +1398,7 @@ |
|
|
<van-row type="flex" justify="space-between" align="center"> |
|
|
<van-row type="flex" justify="space-between" align="center"> |
|
|
<van-col span="5">承揽人<br/>(姓名/<br/>单位/<br/>职务)</van-col> |
|
|
<van-col span="5">承揽人<br/>(姓名/<br/>单位/<br/>职务)</van-col> |
|
|
<van-col span="19"> |
|
|
<van-col span="19"> |
|
|
<van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.clr" label="签字" placeholder="外立面颜色" input-align="right" label-width="auto" :rules="[{ required: true }]"/> |
|
|
|
|
|
|
|
|
<van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.clr" label="签字" placeholder="承揽人签字" input-align="right" label-width="auto" :rules="[{ required: true }]"/> |
|
|
<!-- </van-cell>--> |
|
|
<!-- </van-cell>--> |
|
|
<field-date-picker |
|
|
<field-date-picker |
|
|
v-model="applicationDetail.ydjfys.qtysnr.clrsj" |
|
|
v-model="applicationDetail.ydjfys.qtysnr.clrsj" |
|
@@ -1418,7 +1416,7 @@ |
|
|
<van-row type="flex" justify="space-between" align="center"> |
|
|
<van-row type="flex" justify="space-between" align="center"> |
|
|
<van-col span="5">第三服务方</van-col> |
|
|
<van-col span="5">第三服务方</van-col> |
|
|
<van-col span="19"> |
|
|
<van-col span="19"> |
|
|
<van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.dsfwf" label="签字" placeholder="外立面颜色" input-align="right" label-width="auto" :rules="[{ required: true }]"/> |
|
|
|
|
|
|
|
|
<van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.dsfwf" label="签字" placeholder="第三服务方签字" input-align="right" label-width="auto" :rules="[{ required: true }]"/> |
|
|
<!-- </van-cell>--> |
|
|
<!-- </van-cell>--> |
|
|
<field-date-picker |
|
|
<field-date-picker |
|
|
v-model="applicationDetail.ydjfys.qtysnr.dsfwfsj" |
|
|
v-model="applicationDetail.ydjfys.qtysnr.dsfwfsj" |
|
@@ -1436,7 +1434,7 @@ |
|
|
<van-row type="flex" justify="space-between" align="center"> |
|
|
<van-row type="flex" justify="space-between" align="center"> |
|
|
<van-col span="5">专业技<br/>术人员)</van-col> |
|
|
<van-col span="5">专业技<br/>术人员)</van-col> |
|
|
<van-col span="19"> |
|
|
<van-col span="19"> |
|
|
<van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.zyjsry" label="签字" placeholder="外立面颜色" input-align="right" label-width="auto" :rules="[{ required: true }]"/> |
|
|
|
|
|
|
|
|
<van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.zyjsry" label="签字" placeholder="专业技术人员签字" input-align="right" label-width="auto" :rules="[{ required: true }]"/> |
|
|
<!-- </van-cell>--> |
|
|
<!-- </van-cell>--> |
|
|
<field-date-picker |
|
|
<field-date-picker |
|
|
v-model="applicationDetail.ydjfys.qtysnr.zyjsrysj" |
|
|
v-model="applicationDetail.ydjfys.qtysnr.zyjsrysj" |
|
@@ -2058,7 +2056,6 @@ export default { |
|
|
this.type = this.$route.query.type; |
|
|
this.type = this.$route.query.type; |
|
|
this.taskId = this.$route.query.taskId; |
|
|
this.taskId = this.$route.query.taskId; |
|
|
this.instanceId = this.$route.query.instanceId; |
|
|
this.instanceId = this.$route.query.instanceId; |
|
|
console.log(this.$cookies) |
|
|
|
|
|
this.getDicts("family_status").then(response => { |
|
|
this.getDicts("family_status").then(response => { |
|
|
let arr = []; |
|
|
let arr = []; |
|
|
response.data.forEach(function (item) { |
|
|
response.data.forEach(function (item) { |
|
@@ -2111,6 +2108,9 @@ export default { |
|
|
this.reset(); |
|
|
this.reset(); |
|
|
if(this.id) |
|
|
if(this.id) |
|
|
{ |
|
|
{ |
|
|
|
|
|
if(this.type === "edit"){ |
|
|
|
|
|
this.proposerStatus = PROPOSER_EDIT; |
|
|
|
|
|
} |
|
|
allInformationWLHT(this.id).then(response => { |
|
|
allInformationWLHT(this.id).then(response => { |
|
|
listHomeapplytype({deptId: response.data.deptId}).then(res => { |
|
|
listHomeapplytype({deptId: response.data.deptId}).then(res => { |
|
|
this.tytzList = res.rows; |
|
|
this.tytzList = res.rows; |
|
@@ -2219,9 +2219,6 @@ export default { |
|
|
let hasGroupLevel = false; //value.tHouseApplyProposer.hasOwnProperty('hasGroupLevel') ? value.tHouseApplyProposer.hasGroupLevel : this.isGroupLevel; |
|
|
let hasGroupLevel = false; //value.tHouseApplyProposer.hasOwnProperty('hasGroupLevel') ? value.tHouseApplyProposer.hasGroupLevel : this.isGroupLevel; |
|
|
|
|
|
|
|
|
console.log("当前申请状态: " + homeApplyStatus); |
|
|
console.log("当前申请状态: " + homeApplyStatus); |
|
|
// 默认状态 |
|
|
|
|
|
this.formVisible.baseApplyForm.homesteadFormVisible = value ? value.sfyyzjd ==='Y' : false; |
|
|
|
|
|
|
|
|
|
|
|
this.formVisible.editVisible = false; |
|
|
this.formVisible.editVisible = false; |
|
|
|
|
|
|
|
|
this.formVisible.baseApplyForm.groupFormVisible = false; |
|
|
this.formVisible.baseApplyForm.groupFormVisible = false; |
|
@@ -2322,10 +2319,10 @@ export default { |
|
|
// 初始化申请平面图 |
|
|
// 初始化申请平面图 |
|
|
this.uploadImg.fileList = value.ydjfsp ? value.ydjfsp.zjdzlpmwzt : ''; |
|
|
this.uploadImg.fileList = value.ydjfsp ? value.ydjfsp.zjdzlpmwzt : ''; |
|
|
this.uploadImg.proposerId = this.applicationDetail.id; |
|
|
this.uploadImg.proposerId = this.applicationDetail.id; |
|
|
// // 初始化验收平面图 |
|
|
|
|
|
// this.uploadImgAccepting.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.locationPlan : ''; |
|
|
|
|
|
// this.uploadImgAccepting.proposerId = value.tHouseApplyProposer.id; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 初始化验收平面图 |
|
|
|
|
|
this.uploadImgAccepting.fileList = value.ydjfys ? value.ydjfys.jgpmjt : ''; |
|
|
|
|
|
this.uploadImgAccepting.proposerId = this.applicationDetail.id; |
|
|
|
|
|
console.info(this.uploadImgAccepting); |
|
|
//地图查看 |
|
|
//地图查看 |
|
|
this.applicationDetail = value; |
|
|
this.applicationDetail = value; |
|
|
this.pointDarw(null); |
|
|
this.pointDarw(null); |
|
@@ -2377,6 +2374,7 @@ export default { |
|
|
let handlerName = this.$store.getters.nickName; |
|
|
let handlerName = this.$store.getters.nickName; |
|
|
let handlerTime = this.getDate(); |
|
|
let handlerTime = this.getDate(); |
|
|
this.applicationDetail = value; |
|
|
this.applicationDetail = value; |
|
|
|
|
|
console.info(1111) |
|
|
if(this.type === "todo"){ |
|
|
if(this.type === "todo"){ |
|
|
if(this.isProposeStatus(homeApplyStatus, ["14"])){ |
|
|
if(this.isProposeStatus(homeApplyStatus, ["14"])){ |
|
|
if(this.$route.query.electronicSignature != null){ |
|
|
if(this.$route.query.electronicSignature != null){ |
|
@@ -2872,9 +2870,10 @@ export default { |
|
|
this.uploadImg.fileList = value.ydjfsp ? value.ydjfsp.zjdzlpmwzt : ''; |
|
|
this.uploadImg.fileList = value.ydjfsp ? value.ydjfsp.zjdzlpmwzt : ''; |
|
|
this.uploadImg.proposerId = this.applicationDetail.id; |
|
|
this.uploadImg.proposerId = this.applicationDetail.id; |
|
|
|
|
|
|
|
|
this.uploadImgAccepting.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.locationPlan : ''; |
|
|
|
|
|
|
|
|
this.uploadImgAccepting.fileList = value.ydjfys ? value.ydjfys.jgpmjt : ''; |
|
|
this.uploadImgAccepting.proposerId = this.applicationDetail.id; |
|
|
this.uploadImgAccepting.proposerId = this.applicationDetail.id; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//地图编辑 |
|
|
//地图编辑 |
|
|
this.pointDarw(null); |
|
|
this.pointDarw(null); |
|
|
// this.pointDarwNature(null); |
|
|
// this.pointDarwNature(null); |
|
@@ -2896,12 +2895,14 @@ export default { |
|
|
|
|
|
|
|
|
this.pointDarw(); |
|
|
this.pointDarw(); |
|
|
getWorkflow().then((resp) => { |
|
|
getWorkflow().then((resp) => { |
|
|
|
|
|
|
|
|
this.$set(this.applicationDetail, 'proposerActiveIndex', -1); |
|
|
this.$set(this.applicationDetail, 'proposerActiveIndex', -1); |
|
|
this.$set(this.applicationDetail, 'startActiveIndex', -1); |
|
|
this.$set(this.applicationDetail, 'startActiveIndex', -1); |
|
|
this.$set(this.applicationDetail, 'endActiveIndex', -1); |
|
|
this.$set(this.applicationDetail, 'endActiveIndex', -1); |
|
|
this.$set(this.applicationDetail, 'applyStepList', resp.data.applyStepList.name); |
|
|
this.$set(this.applicationDetail, 'applyStepList', resp.data.applyStepList.name); |
|
|
this.$set(this.applicationDetail, 'startStepList', resp.data.startStepList.name); |
|
|
this.$set(this.applicationDetail, 'startStepList', resp.data.startStepList.name); |
|
|
this.$set(this.applicationDetail, 'endStepList', resp.data.endStepList.name); |
|
|
this.$set(this.applicationDetail, 'endStepList', resp.data.endStepList.name); |
|
|
|
|
|
console.info(this.applicationDetail); |
|
|
}); |
|
|
}); |
|
|
//this.initData(); |
|
|
//this.initData(); |
|
|
break; |
|
|
break; |
|
@@ -3181,8 +3182,6 @@ export default { |
|
|
if(res.data) |
|
|
if(res.data) |
|
|
{ |
|
|
{ |
|
|
this.applicationDetail = res.data; |
|
|
this.applicationDetail = res.data; |
|
|
this.$set(this.applicationDetail, 'sqhhzhkszd', val.sqhhzhkszd); |
|
|
|
|
|
this.$set(this.applicationDetail, 'sqhjtzz', val.sqhjtzz); |
|
|
|
|
|
this.$set(this.applicationDetail, 'jflx', "4"); |
|
|
this.$set(this.applicationDetail, 'jflx', "4"); |
|
|
this.$set(this.applicationDetail, 'projectName', "分户新建"); |
|
|
this.$set(this.applicationDetail, 'projectName', "分户新建"); |
|
|
this.$set(this.applicationDetail, 'nsqzjddldm', "10"); |
|
|
this.$set(this.applicationDetail, 'nsqzjddldm', "10"); |
|
@@ -3240,6 +3239,7 @@ export default { |
|
|
|
|
|
|
|
|
console.log("进行保存", this.applicationDetail); |
|
|
console.log("进行保存", this.applicationDetail); |
|
|
this.$set(this.applicationDetail, 'applyUserId', this.sysFarmer.id); |
|
|
this.$set(this.applicationDetail, 'applyUserId', this.sysFarmer.id); |
|
|
|
|
|
this.$set(this.applicationDetail, 'auditStatus', "0"); |
|
|
saveHomeBaseInfo(this.applicationDetail).then((response) => { |
|
|
saveHomeBaseInfo(this.applicationDetail).then((response) => { |
|
|
if(submit) |
|
|
if(submit) |
|
|
{ |
|
|
{ |
|
@@ -3248,7 +3248,6 @@ export default { |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
this.$set(this.applicationDetail, 'auditStatus', "0"); |
|
|
|
|
|
this.notify("保存成功", 'success'); |
|
|
this.notify("保存成功", 'success'); |
|
|
this.goBack(); |
|
|
this.goBack(); |
|
|
} |
|
|
} |
|
@@ -3309,9 +3308,12 @@ export default { |
|
|
this.$set(this.zjdzdxxDetailed, 'zdszn', resp.data.zjdzdxxList[0].zdszn); |
|
|
this.$set(this.zjdzdxxDetailed, 'zdszn', resp.data.zjdzdxxList[0].zdszn); |
|
|
this.$set(this.zjdzdxxDetailed, 'zdszx', resp.data.zjdzdxxList[0].zdszx); |
|
|
this.$set(this.zjdzdxxDetailed, 'zdszx', resp.data.zjdzdxxList[0].zdszx); |
|
|
this.$set(this.zjdzdxxDetailed, 'zdszb', resp.data.zjdzdxxList[0].zdszb); |
|
|
this.$set(this.zjdzdxxDetailed, 'zdszb', resp.data.zjdzdxxList[0].zdszb); |
|
|
|
|
|
this.$set(this.applicationDetail, 'sfyyzjd', "Y"); |
|
|
resp.data.zjdzdxxList.forEach(function(item){ |
|
|
resp.data.zjdzdxxList.forEach(function(item){ |
|
|
_this.zjddmColumns.push({text:item.zjddm,value:item.zjddm}); |
|
|
_this.zjddmColumns.push({text:item.zjddm,value:item.zjddm}); |
|
|
}) |
|
|
}) |
|
|
|
|
|
}else{ |
|
|
|
|
|
this.$set(this.applicationDetail, 'sfyyzjd', "N"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// this.applicationDetail.tHouseApplyCurrentSituation.landPerArea= (resp.data.zdmj/(this.applicationDetail.tHouseApplyProposer.members +1)); //人均宅基地面积 |
|
|
// this.applicationDetail.tHouseApplyCurrentSituation.landPerArea= (resp.data.zdmj/(this.applicationDetail.tHouseApplyProposer.members +1)); //人均宅基地面积 |
|
@@ -3952,6 +3954,18 @@ export default { |
|
|
this.$set(this.applicationDetail.ydjfsp, 'zjdzlpmwzt',resp.fileUrl); |
|
|
this.$set(this.applicationDetail.ydjfsp, 'zjdzlpmwzt',resp.fileUrl); |
|
|
}); |
|
|
}); |
|
|
}, |
|
|
}, |
|
|
|
|
|
fileUpdatePmt(val){ |
|
|
|
|
|
console.info(val) |
|
|
|
|
|
const params = new FormData(); |
|
|
|
|
|
params.append("tableId", this.applicationDetail.ydjfys.id); |
|
|
|
|
|
params.append("tableName", "t_homeapply_ydjfsq"); |
|
|
|
|
|
params.append("bizPath", "upload"); |
|
|
|
|
|
params.append("fileType", "0"); |
|
|
|
|
|
params.append('file', val.file); |
|
|
|
|
|
attach(params).then((resp) => { |
|
|
|
|
|
this.$set(this.applicationDetail.ydjfys, 'jgpmjt',resp.fileUrl); |
|
|
|
|
|
}); |
|
|
|
|
|
}, |
|
|
// 带平面图附件上传的镇级验收审批 |
|
|
// 带平面图附件上传的镇级验收审批 |
|
|
submitHouseApplyEndLocationplanOptions(pass, commentText) { |
|
|
submitHouseApplyEndLocationplanOptions(pass, commentText) { |
|
|
return this.$refs.pictureUploadAccepting.updatePlanFiles() |
|
|
return this.$refs.pictureUploadAccepting.updatePlanFiles() |
|
@@ -4087,6 +4101,7 @@ export default { |
|
|
// this.applicationDetail.tHouseApplyEnd.theGeom = this.convertGeom(this.applicationDetail.tHouseApproveNatureOptions.theGeom); |
|
|
// this.applicationDetail.tHouseApplyEnd.theGeom = this.convertGeom(this.applicationDetail.tHouseApproveNatureOptions.theGeom); |
|
|
// } |
|
|
// } |
|
|
// } |
|
|
// } |
|
|
|
|
|
console.info(this.applicationDetail); |
|
|
saveHomeBaseInfo(this.applicationDetail).then(resp => { |
|
|
saveHomeBaseInfo(this.applicationDetail).then(resp => { |
|
|
if(submit) |
|
|
if(submit) |
|
|
{ |
|
|
{ |
|
|