Browse Source

宅基地调查、家庭成员优化

rongxin_prod
Xyq123* 2 years ago
parent
commit
60c51aadba
8 changed files with 63 additions and 67 deletions
  1. +16
    -5
      src/views/homesteadSurvey/add4.vue
  2. +13
    -49
      src/views/homesteadSurvey/hncyList2.vue
  3. +3
    -3
      src/views/homesteadSurvey/index.vue
  4. +0
    -4
      src/views/homesteadSurvey/list.vue
  5. +19
    -1
      src/views/homesteadSurvey/nhcyList.vue
  6. +1
    -1
      src/views/homesteadSurvey/nmfwAdd.vue
  7. +3
    -2
      src/views/sunVillage_info/familyMember/familyMemberList.vue
  8. +8
    -2
      src/views/sunVillage_info/login_code.vue

+ 16
- 5
src/views/homesteadSurvey/add4.vue View File

@@ -63,7 +63,7 @@
<div style="padding:15px;">
<p style="display: flex;align-items: center;">
<img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 5px;">
<span style="line-height: 1;font-size: 16px;">{{item.fssslx}}</span>
<span style="line-height: 1;font-size: 16px;">{{ formatDict(fssslxList, item.fssslx) }}</span>
</p>
<div style="display:flex;line-height:20px;margin-top: 15px;font-size: 14px;color: #999999;">
<p style="flex:1;text-align:left;">建筑面积(㎡):</p>
@@ -71,7 +71,7 @@
</div>
<div style="display:flex;line-height:20px;margin-top: 5px;font-size: 14px;color: #999999;">
<p style="flex:1;text-align:left;">建筑物情况:</p>
<p style="flex:1;text-align:right;">{{item.jzwqk}}</p>
<p style="flex:1;text-align:right;">{{ formatDict(jzwqkList, item.jzwqk) }} </p>
</div>
<div style="text-align:center;overflow:auto;display: flex;justify-content: center;margin-top: 10px;">
<p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(item)">
@@ -173,6 +173,8 @@ export default {
permission:false,
bztp:"",
ycbz:"",
jzwqkList:[],
fssslxList:[],
examineData:[{dictLabel:"审批通过",dictValue:"5"},{dictLabel:"审批驳回",dictValue:"4"}],
zjdzdxx:{surveyStatus:"5"},
fssslist:[],
@@ -187,13 +189,19 @@ export default {
};
},
created(){
this.houseGetDicts("jzwqk").then((response) => {
this.jzwqkList = response.data;
});
this.houseGetDicts("fsss_type").then((response) => {
this.fssslxList = response.data;
});
this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
this.permission = localStorage.getItem("executePermission");
let businessLevel = this.$store.state.user.businessLevel;
console.info(this.zjdzdxx);
if(this.zjdzdxx.surveySign != null){
this.signature.resultImg = this.$store.getters.baseRoutingUrl+this.zjdzdxx.surveySign;
}
console.info(businessLevel);
if(this.zjdzdxx.id !== undefined){
getZjdzd(this.zjdzdxx.id).then((response) => {
if(response.data.surveyStatus !== "1" && businessLevel === "2"){
@@ -293,12 +301,12 @@ export default {
zjddcSign(param, this.zjdzdxx.zjddm).then(response => {
this.$notify({type: 'success', message: '签字成功'});
this.showesign = false;
// location.reload();
getZjdzd(this.zjdzdxx.id).then((response) => {
localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data))
location.reload();
});

this.getList();
});

})
@@ -307,6 +315,9 @@ export default {
this.$toast.fail('请签名后再保存签字');
});
},
formatDict(dict, value) {
return this.selectDictLabel(dict, value);
},
dataURLtoBlob (dataurl, filename = 'file') {
let arr = dataurl.split(',')
let mime = arr[0].match(/:(.*?);/)[1]


+ 13
- 49
src/views/homesteadSurvey/hncyList2.vue View File

@@ -566,57 +566,21 @@
},
//删除户主
deletenh(item,index){
let yes = true
let params={
nhdm : item.nhdm,
deptId: item.deptId
}
listNhhncy(params).then((res) => {
console.log(res.rows.length)
if(res.rows.length>0){
yes = false
this.$toast({
icon: 'error', // 找到自己需要的图标
message: '无法删除,此户主存在户内成员!',
duration:"1000",
onClose:function(){
Dialog.confirm({
title: '警告',
message: '确认删除户内成员么?',
})
.then(() => {
// on confirm
delNhhncy(item.id).then(res => {
if(res.code=="200"){
this.hncylist.splice(index,1);
}
})
}else{
listShyqr(params).then((res) => {
if(res.rows.length>0){
yes = false
this.$toast({
icon: 'error', // 找到自己需要的图标
message: '无法删除,此户主已经成为使用权人!',
duration:"1000",
onClose:function(){
}
})
}else{
if(yes){
Dialog.confirm({
title: '警告',
message: '确认删除此使用权人么?',
})
.then(() => {
// on confirm
delNh(item.id).then(res => {
if(res.code=="200"){
this.nhlist.splice(index,1);
this.totalH--
this.totalR--
}
})
})
.catch(() => {
// on cancel
});
}
}
});
}
});
})
.catch(() => {
// on cancel
});

},
// 设为户主


+ 3
- 3
src/views/homesteadSurvey/index.vue View File

@@ -84,7 +84,7 @@
size="70%"
layer-color="#ebedf0"
:color="chooseColor(item)"
:text="item.zjdwcsl!=0?(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%':0+'%'"
:text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%'):0+'%'"
/>
</template>
<template #label>
@@ -111,7 +111,7 @@
size="70%"
layer-color="#ebedf0"
:color="chooseColor(item)"
:text="item.zjdwcsl!=0?(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%':0+'%'"
:text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%'):0+'%'"
/>
</template>
<template #label>
@@ -137,7 +137,7 @@
size="70%"
layer-color="#ebedf0"
:color="chooseColor(item)"
:text="item.zjdwcsl!=0?(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%':0+'%'"
:text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%'):0+'%'"
/>
</template>
<template #label>


+ 0
- 4
src/views/homesteadSurvey/list.vue View File

@@ -436,10 +436,6 @@
showUploadList(){
this.showImageList = true;
},
onCancel(){
console.info(2321)
this.zjdvalue = "";
},
submitUploadList(){
submitUploadImageList(this.uploadImgList1).then(res => {
let _this = this


+ 19
- 1
src/views/homesteadSurvey/nhcyList.vue View File

@@ -73,7 +73,7 @@
</div>
</div>
<template #right>
<van-button v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletesyqr(item.id,index)"/>
<van-button v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletehncy(item.id,index)"/>
</template>
</van-swipe-cell>
<div v-if="permission == 'true'" style=" width:95%;margin:20px auto;display: flex;justify-content: space-between;">
@@ -147,6 +147,24 @@ export default {
showPopuphncy(val){
this.$router.push({name:'nhcyAdd',query:val});
},
// 删除户内成员
deletehncy(id,index){
Dialog.confirm({
title: '警告',
message: '确认删除户内成员么?',
})
.then(() => {
// on confirm
delNhhncy(id).then(res => {
if(res.code=="200"){
this.hnnylist.splice(index,1);
}
})
})
.catch(() => {
// on cancel
});
},
}
}
</script>


+ 1
- 1
src/views/homesteadSurvey/nmfwAdd.vue View File

@@ -515,7 +515,7 @@ export default {
}
},
cancel(){
this.$router.push({path:'/homesteadSurvey/nmfwList',query: {zjddm: this.form.zjddm}});
this.$router.push({path:'/homesteadSurvey/nmfwList',query: {nmfwzh:this.form.nmfwzh}});
},
// 获取登录人位置坐标
getLandCoord(func) {


+ 3
- 2
src/views/sunVillage_info/familyMember/familyMemberList.vue View File

@@ -65,9 +65,11 @@ export default {
loading: false,
finished: false,
idcard:null,
farmerCode:null,
queryParams:{
pageNum:1,
pageSize:10,
farmerCode:null,
deptId: Cookies.get('deptId'),
orderByColumn:'createTime',
isAsc:'desc',
@@ -88,8 +90,7 @@ export default {
this.houseGetDicts("tcfs").then((res) => {
this.tcfsStatus = res.data;
});
this.idcard = Cookies.get('idcard');
this.$set(this.queryParams, "sqrzjhm", this.idcard);
this.queryParams.farmerCode = Cookies.get('farmerCode');
this.houseGetDicts("yctcsp_status").then((res) => {
// this.auditStatus = res.data;
let _this = this;


+ 8
- 2
src/views/sunVillage_info/login_code.vue View File

@@ -58,6 +58,7 @@
<script>
import { getCodeImg, getSmsCode } from "@/api/login";
import { checkFarmer } from "@/api/sunVillage_info/fixedAssets";
import { getFamilyMemberList } from "@/api/sunVillage_info/homestead/familyMember";
import Cookies from "js-cookie";
import { encrypt, decrypt } from "../../utils/jsencrypt";
//引用wx sdk
@@ -96,6 +97,7 @@
idcard: idcard === undefined ? this.formData.idcard : idcard,
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
};

},
handleLogin(values) {
if (this.formData.rememberMe) {
@@ -125,9 +127,13 @@
let seconds = 3600;

let expires = new Date(new Date() * 1 + seconds * 1000);
getFamilyMemberList({idcard:this.formData.idcard,familyStatus:"02"}).then(res => {
const farmerCode = res.rows[0].farmerCode;
Cookies.set("farmerCode",farmerCode, { expires: 30 });
Cookies.set("user", response.data, { expires: expires });
this.$router.push({path:'/sunVillage_info/index_code_rights'})
})

Cookies.set("user", response.data, { expires: expires });
this.$router.push({path:'/sunVillage_info/index_code_rights'})
}
});
},


Loading…
Cancel
Save