庞东旭 pirms 3 gadiem
vecāks
revīzija
ec59d85de2
5 mainītis faili ar 97 papildinājumiem un 51 dzēšanām
  1. +1
    -1
      src/components/Map/MapGisDrawing.vue
  2. +63
    -33
      src/views/homesteadSurvey/add.vue
  3. +10
    -5
      src/views/homesteadSurvey/list.vue
  4. +3
    -2
      src/views/homesteadSurvey/settle.vue
  5. +20
    -10
      src/views/onlineHome/workbench.vue

+ 1
- 1
src/components/Map/MapGisDrawing.vue Parādīt failu

@@ -62,7 +62,7 @@ export default {
},
//地图查看
drawingPaceCountryDarw() {
console.log(this.message);
/* console.log(this.message);*/
//加载地图编辑
var that = this;
var map;


+ 63
- 33
src/views/homesteadSurvey/add.vue Parādīt failu

@@ -248,6 +248,8 @@
type="date"
@confirm="onConfirmxzkssj"
@cancel="showPickerxzkssj = false"
:min-date="minDate"
:max-date="maxDate"
/>
</van-popup>
<van-field name="radio" label="流转意向" input-align="right" autocomplete="off">
@@ -468,8 +470,8 @@
<p style="flex:1;text-align:right;">{{item.nhdm}}</p>
</div>
<div style="text-align:center;overflow:auto;">
<van-button plain round color="#7AC943" size="mini" style="margin:0 5px;" @click="showPopupsyqr(item)">查看使用权人</van-button>
<van-button plain round color="#7AC943" size="mini" style="margin:0 5px;" @click="showPopupnh(item)">查看户主</van-button>
<van-button plain round color="#7AC943" size="mini" style="margin:0 5px;" @click="showPopupsyqr(item)">查看使用权人</van-button>
<van-button plain round color="#7AC943" size="mini" style="margin:0 5px;" @click="showPopuphncylist(item)">查看成员</van-button>
</div>
</div>
@@ -1981,6 +1983,8 @@
type="date"
@confirm="onConfirmdjsj"
@cancel="showPickerdjsj = false"
:min-date="minDate"
:max-date="maxDate"
/>
</van-popup>
<van-popup v-model:show="showPickerdjsj" position="bottom">
@@ -1988,6 +1992,8 @@
type="date"
@confirm="onConfirmdjsj"
@cancel="showPickerdjsj = false"
:min-date="minDate"
:max-date="maxDate"
/>
</van-popup>
<van-popup v-model:show="showPickercfqssj" position="bottom">
@@ -1995,6 +2001,8 @@
type="date"
@confirm="onConfirmcfqssj"
@cancel="showPickercfqssj = false"
:min-date="minDate"
:max-date="maxDate"
/>
</van-popup>
<van-popup v-model:show="showPickercfjssj" position="bottom">
@@ -2002,6 +2010,8 @@
type="date"
@confirm="onConfirmcfjssj"
@cancel="showPickercfjssj = false"
:min-date="minDate"
:max-date="maxDate"
/>
</van-popup>
<van-popup v-model:show="showPickerzwlxsj1" position="bottom">
@@ -2009,6 +2019,8 @@
type="date"
@confirm="onConfirmzwlxsj1"
@cancel="showPickerzwlxsj1 = false"
:min-date="minDate"
:max-date="maxDate"
/>
</van-popup>
<van-popup v-model:show="showPickerzwlxsj2" position="bottom">
@@ -2016,6 +2028,8 @@
type="date"
@confirm="onConfirmzwlxsj2"
@cancel="showPickerzwlxsj2 = false"
:min-date="minDate"
:max-date="maxDate"
/>
</van-popup>
<van-popup v-model="showhx" position="bottom">
@@ -2542,6 +2556,7 @@
label="成员备注"
placeholder="成员备注"
@click="showhncycybz = true"
readonly
/>
<van-field
autocomplete="off"
@@ -3186,7 +3201,7 @@
this.getDicts("hyzk").then(response => {
this.hyzkOptions = response.data;
});
this.getDicts("cybz").then(response => {
this.getDicts("member_remark").then(response => {
this.cybzOptions = response.data;
});
this.getDicts("living_condition").then(response => {
@@ -3243,6 +3258,7 @@
this.getZjd();

}
let a = document.cookie.split(';');
},
mounted(){
if(this.active ==1){
@@ -3275,7 +3291,6 @@
},
// 验证
validator(val){
console.log(val.length)
if(val>1||val<0||val.length>4){
return false
}else{
@@ -3283,7 +3298,6 @@
}
},
validator1(val){
console.log(val)
if(val>=1000||val<0||val.length>6){
return false
}else{
@@ -3304,7 +3318,7 @@
deletehncy(id,index){
Dialog.confirm({
title: '警告',
message: '删除后无法恢复,确认删除么?',
message: '删除后无法恢复,确认删除此成员么?',
})
.then(() => {
// on confirm
@@ -3322,7 +3336,7 @@
deletefsss(id,index){
Dialog.confirm({
title: '警告',
message: '删除后无法恢复,确认删除么?',
message: '确认删除此附属物么?',
})
.then(() => {
// on confirm
@@ -3356,7 +3370,7 @@
}else{
Dialog.confirm({
title: '警告',
message: '删除后无法恢复,确认删除么?',
message: '删除后无法恢复,确认删除此自然幢么?',
})
.then(() => {
// on confirm
@@ -3378,7 +3392,7 @@
deletesyqr(id,index){
Dialog.confirm({
title: '警告',
message: '删除后无法恢复,确认删除么?',
message: '确认删除使用权人么?',
})
.then(() => {
// on confirm
@@ -3456,7 +3470,6 @@
const data2 = new FormData();
data2.append("file", new Blob([new Uint8Array(d)],{type:'image/jpeg'}));
uploadFile(data2).then(res => {
console.log(res)
if(this.form.zjdxctp!=null&&this.form.zjdxctp!=""){
this.form.zjdxctp = this.form.zjdxctp + "," + res.fileName
}else{
@@ -3467,7 +3480,6 @@
},
// 图片删除
deleteFilezjd(file){
console.log(this.form.zjdxctp,file.baseUrl)
let url = ","+file.baseUrl
let url1 = file.baseUrl+","
this.form.zjdxctp = this.form.zjdxctp.replaceAll(url,"")
@@ -3506,10 +3518,10 @@
const data2 = new FormData();
data2.append("file", new Blob([new Uint8Array(d)],{type:'image/jpeg'}));
uploadFile(data2).then(res => {
if(this.form5.zjdxctp!=null&&this.form5.zjdxctp!=""){
this.form5.zjdxctp = this.form5.zjdxctp + "," + res.fileName
if(this.nmfwform.zjdxctp!=null&&this.nmfwform.zjdxctp!=""){
this.nmfwform.zjdxctp = this.nmfwform.zjdxctp + "," + res.fileName
}else{
this.form5.zjdxctp = res.fileName
this.nmfwform.zjdxctp = res.fileName
}
})
}
@@ -3519,8 +3531,8 @@
deleteFilefw(file){
let url = ","+file.baseUrl
let url1 = file.baseUrl+","
this.form5.zjdxctp = this.form5.zjdxctp.replaceAll(url,"")
this.form5.zjdxctp = this.form5.zjdxctp.replaceAll(url1,"")
this.nmfwform.zjdxctp = this.nmfwform.zjdxctp.replaceAll(url,"")
this.nmfwform.zjdxctp = this.nmfwform.zjdxctp.replaceAll(url1,"")
},
onConfirmhzsjly(value){
this.nhform.sjlyName = value.dictLabel
@@ -3559,6 +3571,8 @@
this.form1.shyqrdbxm = value.hzxm
this.form1.shyqrdbzjhm = value.hzzjhm
this.form1.shyqrdbzjlx = value.hzzjlx
this.form1.dh = value.phone
this.form1.dz = value.TXDZ
this.zjlxOptions.map(res => {
if(res.dictValue == this.form1.shyqrdbzjlx){
this.form1.shyqrdbzjlxName = res.dictLabel
@@ -3657,7 +3671,6 @@
},
// 户内成员与户主关系弹出框
onConfirmyhzgx(value){
console.log(value)
this.form5.yhzgxName = value.dictLabel
this.form5.yhzgx = value.dictValue
this.showyhzgx = false
@@ -3914,9 +3927,10 @@
let pnh = {
deptId : item.deptId,
nhdm : item.nhdm,
hzxm:item.xm,
hzzjlx :item.zjlx,
hzzjhm :item.zjhm
hzxm : item.xm,
hzzjlx : item.zjlx,
hzzjhm : item.zjhm,
phone : item.lxdh
}
setNhInfo(pnh).then(res => {
})
@@ -3927,7 +3941,8 @@
shyqrdbxm : item.xm,
shyqrdbzjlx : item.zjlx,
shyqrdbzjhm : item.zjhm,
xb : item.xb
xb : item.xb,
dh : item.lxdh
}
setSyqrInfo(psyqr).then(res => {
})
@@ -3940,7 +3955,7 @@
deletefw(id,index){
Dialog.confirm({
title: '警告',
message: '删除后无法恢复,确认删除么?',
message: '确认删除此房屋么?',
})
.then(() => {
// on confirm
@@ -4067,7 +4082,6 @@
}
listZjdzd(params).then(response => {
this.form = response.rows[0];
console.log(this.form)
if(this.form.sffz==null||this.form.sffz==""){
this.form.sffz = "Y"
}
@@ -4111,7 +4125,6 @@
this.form.sjly = "04"
this.form.sjlyName = "农村宅基地使用权确权登记发证"
}else{
console.log(this.form.sjly)
this.sjlyOptions.map(res => {
if(res.dictValue == this.form.sjly){
this.form.sjlyName = res.dictLabel
@@ -4240,7 +4253,7 @@
_this.showhncy = false
let params = {
"nhdm":_this.form5.nhdm,
deptId:this.item.deptId
deptId:_this.form5.deptId
}
listNhhncy(params).then((response) => {
_this.hncylist = response.rows
@@ -4259,7 +4272,7 @@
_this.showhncy = false
let params = {
"nhdm":_this.form5.nhdm,
deptId:this.item.deptId
deptId:_this.form5.deptId
}
listNhhncy(params).then((response) => {
_this.hncylist = response.rows
@@ -4319,7 +4332,6 @@
});
} else {
addNmfw(this.nmfwform).then(response => {
console.log(this.nmfwform)
let _this =this
this.$toast({
icon: 'success', // 找到自己需要的图标
@@ -4441,6 +4453,7 @@
duration:"1000",
onClose:function(){
_this.active = 2
_this.getSyqrList()
}
})
});
@@ -4455,6 +4468,7 @@
duration:"1000",
onClose:function(){
_this.active = 2
_this.getSyqrList()
}
})
});
@@ -4539,6 +4553,11 @@
this.form1.gyfsName = res.dictLabel
}
})
this.hjszssOptions.map(res => {
if(res.dictValue == this.form1.hjszss){
this.form1.hjszssName = res.dictLabel
}
})
}
this.showsyqr = true;
}
@@ -4546,8 +4565,8 @@
showPopuphncy(item){
if(item==""){
this.form5 = {
"nhdm":this.form1.nhdm,
"deptId":this.form1.deptId,
"nhdm":this.nhdm,
"deptId":this.item.deptId,
"zjlx":'01',
"zjlxName":"身份证",
"yhzgx":"14",
@@ -4565,6 +4584,8 @@
"sfwbh":'N',
"sjly":'07',
"sjlyName":'农村集体产权制度改革',
"cybz":'9',
"cybzName":'其他备注'
}
}else{
this.form5 = item
@@ -4615,6 +4636,10 @@
this.form5.sjly = "07"
this.form5.sjlyName = "农村集体产权制度改革"
}
if(this.form5.cybz==null||this.form5.cybz==""){
this.form5.cybz = "9"
this.form5.cybzName = "其他备注"
}
this.jzhcssfyzfOptions.map(res => {
if(res.dictValue == item.jzhcssfyzf){
this.form5.jzhcssfyzfName = res.dictLabel
@@ -4654,7 +4679,6 @@
this.showhncy = true
},
showPopupzrz(item) {
console.log(item)
if(this.form.id==null||this.form.id==""){
Notify({ type: 'danger', message: '请先保存宅基地信息' });
}else{
@@ -4712,6 +4736,7 @@
}
},
showPopupfw(item) {
this.fileListfw = []
if(this.form.id==null||this.form.id==""){
Notify({ type: 'danger', message: '请先保存宅基地信息' });
}else{
@@ -4756,6 +4781,12 @@
}
}else{
this.nmfwform = item
if(this.nmfwform.zjdxctp!=null&&this.nmfwform.zjdxctp!=""&&this.nmfwform.zjdxctp.length>0){
let li = this.nmfwform.zjdxctp.split(",");
li.map(res => {
this.fileListfw.push({"url":this.baseUrl+res,"baseUrl":res})
})
}
if(this.nmfwform.sfkjgj==null||this.nmfwform.sfkjgj==""){
this.nmfwform.sfkjgj = "N"
}
@@ -4906,6 +4937,7 @@
this.nmfwform.qslyName = res.dictLabel
}
})

}}
},
showPopuphncylist(item){
@@ -4916,6 +4948,7 @@
if(item==""){
this.hncylist=[]
}else{
this.nhdm = item.nhdm
this.hncylist=[]
let params = {
"nhdm":item.nhdm,
@@ -5035,7 +5068,6 @@
this.mapClickLoading();
},
onSubmit(values) {
console.log('submit', values);
},
changeActive(){
if(this.active<4){
@@ -5209,8 +5241,6 @@
},
//地图加载js------start
mapClickLoading(){
console.log(1)
console.log(this.form);
setTimeout(() => {
this.$refs.drewingClickLoading.drawingPaceCountryDarw();
}, 500);
@@ -5257,6 +5287,6 @@
height: 100%;
}
>>> .van-swipe-cell__wrapper{
margin-right:-1px;
margin-right:-3px;
}
</style>

+ 10
- 5
src/views/homesteadSurvey/list.vue Parādīt failu

@@ -1401,11 +1401,10 @@

/*this.yhzgxOptions = response.data;*/
});
this.getDicts("cybz").then(response => {
this.getDicts("member_remark").then(response => {
this.cybzOptions = response.data;
});
if(this.$cookies.get("item")){
console.log(this.$cookies.get("item"));
if(this.$cookies.get("item").activeBtn !=null){
if(this.$cookies.get("item").activeBtn == 4){
this.activeBtn = this.$cookies.get("item").activeBtn;
@@ -1485,7 +1484,7 @@
if(yes){
Dialog.confirm({
title: '警告',
message: '删除后无法恢复,确认删除么?',
message: '确认删除此使用权人么?',
})
.then(() => {
// on confirm
@@ -1548,7 +1547,7 @@
deletehncy(id,index){
Dialog.confirm({
title: '警告',
message: '删除后无法恢复,确认删除么?',
message: '删除后无法恢复,确认删除此成员么?',
})
.then(() => {
// on confirm
@@ -1991,6 +1990,8 @@
"sfwbh":'N',
"sjly":'07',
"sjlyName":'农村集体产权制度改革',
"cybz":'9',
"cybzName":'其他备注'
}
}else{
let _this = this
@@ -2042,6 +2043,10 @@
this.form5.sjly = "07"
this.form5.sjlyName = "农村集体产权制度改革"
}
if(this.form5.cybz==null||this.form5.cybz==""){
this.form5.cybz = "9"
this.form5.cybzName = "其他备注"
}
this.jzhcssfyzfOptions.map(res => {
if(res.dictValue == item.jzhcssfyzf){
this.form5.jzhcssfyzfName = res.dictLabel
@@ -5038,7 +5043,7 @@

<style scoped lang="scss">
/deep/ .van-swipe-cell__wrapper{
margin-right:-1px;
margin-right:-3px;
}
.hzlxBtn{
font-size: 0.3rem;


+ 3
- 2
src/views/homesteadSurvey/settle.vue Parādīt failu

@@ -19,7 +19,7 @@
</template>

</van-cell>-->
<van-cell title="修改密码" @click="showPassword=true" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
<van-cell title="修改密码" @click="showPassword=true,oldPassword='',newPassword='',confirmPassword='' " style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
<template #icon>
<van-icon :name="require('../../assets/images/housesteadSurvey/little2.png')" size="18" color="#fff" style="margin:10px;"/>
</template>
@@ -54,7 +54,8 @@
newPassword: "",
confirmPassword: "",
}},
methods:{

methods:{
submit() {
if(this.confirmPassword
!=this.newPassword){


+ 20
- 10
src/views/onlineHome/workbench.vue Parādīt failu

@@ -42,6 +42,7 @@
</template>
</van-cell>
</van-row>
<!--
<van-row class="indexCard">
<van-cell style="border-radius: 6px;">
<template #title>
@@ -114,6 +115,7 @@
</van-grid-item>
</van-grid>
</van-row>

<van-row class="indexCard">
<van-cell style="border-radius: 6px;">
<template #title>
@@ -333,6 +335,8 @@
</van-grid-item>
</van-grid>
</van-row>
-->

<van-row class="indexCard">
<van-cell style="border-radius: 6px;">
<template #title>
@@ -340,29 +344,31 @@
</template>
</van-cell>
<van-grid :border="false">
<van-grid-item text="常用转账" :to="{name:'approvalList'}" >
<van-grid-item text="村户转账" :to="{name:'approvalList'}" >
<div class="icon" slot="default" style="background:#FF4646;" >
<img src="../../../static/images/onlineHome/icon_Y1.png" alt />
</div>
<p style="margin-top: 5px;color: #666666;">常用转账</p>
<p style="margin-top: 5px;color: #666666;">村户转账</p>
</van-grid-item>
<van-grid-item text="信用卡转账" :to="{name:'approvalList2'}" >
<div class="icon" slot="default" style="background:#3ac2db;" >
<img src="../../../static/images/onlineHome/icon_Y2.png" alt />
<van-grid-item text="代管转账" :to="{name:'approvalList4'}" >
<div class="icon" slot="default" style="background:#c568f5;" >
<img src="../../../static/images/onlineHome/icon_Y4.png" alt />
</div>
<p style="margin-top: 5px;color: #666666;">信用卡转账</p>
<p style="margin-top: 5px;color: #666666;">代管转账</p>
</van-grid-item>

<!--
<van-grid-item text="虚拟挂账" :to="{name:'approvalList3'}" >
<div class="icon" slot="default" style="background:#FFA63E;" >
<img src="../../../static/images/onlineHome/icon_Y3.png" alt />
</div>
<p style="margin-top: 5px;color: #666666;">虚拟挂账</p>
</van-grid-item>
<van-grid-item text="虚拟转账" :to="{name:'approvalList4'}" >
<div class="icon" slot="default" style="background:#c568f5;" >
<img src="../../../static/images/onlineHome/icon_Y4.png" alt />
<van-grid-item text="公务卡转账" :to="{name:'approvalList2'}" >
<div class="icon" slot="default" style="background:#3ac2db;" >
<img src="../../../static/images/onlineHome/icon_Y2.png" alt />
</div>
<p style="margin-top: 5px;color: #666666;">虚拟转账</p>
<p style="margin-top: 5px;color: #666666;">信用卡转账</p>
</van-grid-item>
<van-grid-item text="母子转账" :to="{name:'approvalList5'}" >
<div class="icon" slot="default" style="background:#1D6FE9;" >
@@ -370,6 +376,7 @@
</div>
<p style="margin-top: 5px;color: #666666;">母子转账</p>
</van-grid-item>
-->
<van-grid-item text="现金提现" :to="{name:'approvalList10'}" >
<div class="icon" slot="default" style="background:#FF6464;" >
<img src="../../../static/images/onlineHome/icon_Y6.png" alt />
@@ -402,6 +409,8 @@
</van-grid-item>
</van-grid>
</van-row>

<!--
<van-row class="indexCard">
<van-cell style="border-radius: 6px;">
<template #title>
@@ -505,6 +514,7 @@
</van-grid-item>
</van-grid>
</van-row>
-->
<onlineHomeIndex></onlineHomeIndex>
</div>
</template>


Notiek ielāde…
Atcelt
Saglabāt