@@ -0,0 +1,55 @@ | |||
import request from '@/utils/request' | |||
import da from "element-ui/src/locale/lang/da"; | |||
//查询列表 | |||
export function getList(data){ | |||
return request({ | |||
url:'/house/mobile/zjdjg/list', | |||
method:'get', | |||
params:data | |||
}) | |||
} | |||
//立案 | |||
export function registerOn(id){ | |||
return request({ | |||
url:'/house/jg/register/'+id, | |||
method:'post' | |||
}) | |||
} | |||
//违法监管修改接口 | |||
export function supervisionAdd(data){ | |||
return request({ | |||
url:'/house/jg/edit', | |||
method:'post', | |||
data:data | |||
}) | |||
} | |||
//违法监管修改接口 | |||
export function closeCase(data){ | |||
return request({ | |||
url:'/house/jg/closeCase', | |||
method:'post', | |||
data:data | |||
}) | |||
} | |||
//监管信息查看接口 | |||
export function getSupervision(id){ | |||
return request({ | |||
url:'/house/jg/get/'+id, | |||
method:'get' | |||
}) | |||
} | |||
//监管信息查看接口 | |||
export function removeList(id){ | |||
return request({ | |||
url:'/house/jg/remove/'+id, | |||
method:'get' | |||
}) | |||
} | |||
@@ -1,178 +1,258 @@ | |||
<template> | |||
<div class="app-container"> | |||
<van-nav-bar | |||
left-arrow | |||
fixed | |||
placeholder | |||
@click-left="$router.back(-1)" | |||
> | |||
<template #title> | |||
<p style="font-weight: bold;">添加宅基地监管</p> | |||
</template> | |||
</van-nav-bar> | |||
<div class="main_box"> | |||
<van-field | |||
readonly | |||
clickable | |||
label="是否在建建筑物" | |||
placeholder="请选择" | |||
@click="showZjd = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
label-width="auto" | |||
<div class="app-container"> | |||
<van-nav-bar | |||
left-arrow | |||
fixed | |||
placeholder | |||
@click-left="$router.back(-1)" | |||
> | |||
<template #title> | |||
<p style="font-weight: bold;">添加违法监管</p> | |||
</template> | |||
</van-nav-bar> | |||
<div class="main_box"> | |||
<van-field | |||
readonly | |||
clickable | |||
label="是否在建建筑物" | |||
placeholder="请选择" | |||
v-model="sfzjjzw" | |||
@click="showSys = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
label-width="auto" | |||
/> | |||
<van-popup v-model="showSys" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
:columns="sysDictionaries" | |||
@confirm="onConfirmSys" | |||
@cancel="showSys = false" | |||
/> | |||
<van-popup v-model="showZjd" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
@cancel="showZjd = false" | |||
/> | |||
</van-popup> | |||
<van-field | |||
readonly | |||
clickable | |||
label="宅基地代码" | |||
placeholder="请选择" | |||
@click="showZjd = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
</van-popup> | |||
<van-field label="宅基地代码" v-model="jgList.zjddm" placeholder="请输入宅基地代码" input-align="right" /> | |||
<!-- <van-popup v-model="showZjd" position="bottom">--> | |||
<!-- <van-picker--> | |||
<!-- show-toolbar--> | |||
<!-- @cancel="showZjd = false"--> | |||
<!-- />--> | |||
<!-- </van-popup>--> | |||
<van-field | |||
readonly | |||
clickable | |||
label="监管类型" | |||
placeholder="请选择" | |||
v-model="jglx" | |||
@click="showjglx = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showjglx" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
:columns="jglxDictionaries" | |||
@confirm="onConfirmJglx" | |||
@cancel="showjglx = false" | |||
/> | |||
<van-popup v-model="showZjd" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
@cancel="showZjd = false" | |||
/> | |||
</van-popup> | |||
<van-field | |||
readonly | |||
clickable | |||
label="监管类型" | |||
placeholder="请选择" | |||
@click="showZjd = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
</van-popup> | |||
<van-field | |||
readonly | |||
clickable | |||
v-model="jgList.lasj" | |||
label="立案时间" | |||
placeholder="请选择立案时间" | |||
@click="showlasj = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showlasj" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
@confirm="onConfirmLasj" | |||
/> | |||
<van-popup v-model="showZjd" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
@cancel="showZjd = false" | |||
/> | |||
</van-popup> | |||
<van-field | |||
readonly | |||
clickable | |||
label="立案时间" | |||
placeholder="请选择立案时间" | |||
@click="showlzjsrq = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
</van-popup> | |||
<van-field label="巡查人" v-model="jgList.inspector" placeholder="请输入巡查人" input-align="right" label-width="auto"/> | |||
<van-field | |||
readonly | |||
clickable | |||
label="巡查时间" | |||
v-model="jgList.inspectorTime" | |||
placeholder="请选择巡查时间" | |||
@click="showinspectorTime = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showinspectorTime" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
@confirm="onConfirmInspectorTime" | |||
/> | |||
<van-popup v-model="showlzjsrq" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
/> | |||
</van-popup> | |||
<van-field label="巡查人" placeholder="请输入巡查人" input-align="right" label-width="auto"/> | |||
<van-field | |||
readonly | |||
clickable | |||
label="巡查时间" | |||
placeholder="请选择巡查时间" | |||
@click="showlzjsrq = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showlzjsrq" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
/> | |||
</van-popup> | |||
</div> | |||
</van-popup> | |||
<van-field label="备注" v-model="jgList.bz" placeholder="填写备注" input-align="right" label-width="auto"/> | |||
</div> | |||
<p class="main_title">违法信息</p> | |||
<div class="main_box"> | |||
<van-field | |||
readonly | |||
clickable | |||
label="违法用地类型" | |||
placeholder="请选择" | |||
@click="showZjd = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
<p class="main_title">违法信息</p> | |||
<div class="main_box"> | |||
<van-field | |||
readonly | |||
clickable | |||
label="违法用地类型" | |||
placeholder="请选择" | |||
v-model="wfydlx" | |||
@click="showwfydlx = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showwfydlx" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
:columns="wfydlxDictionaries" | |||
@confirm="onConfirmWfydlx" | |||
@cancel="showwfydlx = false" | |||
/> | |||
<van-popup v-model="showZjd" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
@cancel="showZjd = false" | |||
/> | |||
</van-popup> | |||
<van-field label="违法用地面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field label="罚没款金额" placeholder="请输入金额" input-align="right" label-width="auto"/> | |||
<van-field label="没收面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field label="拆除面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field | |||
readonly | |||
clickable | |||
label="整改截止时间" | |||
placeholder="选择整改截止时间" | |||
@click="showlzjsrq = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
</van-popup> | |||
<van-field v-model="jgList.wfydmj" label="违法用地面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field v-model="jgList.fmkje" label="罚没款金额" placeholder="请输入金额" input-align="right" label-width="auto"/> | |||
<van-field v-model="jgList.msmj" label="没收面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field v-model="jgList.ccmj" label="拆除面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field | |||
readonly | |||
clickable | |||
label="整改截止时间" | |||
placeholder="选择整改截止时间" | |||
v-model="jgList.reformDeadline" | |||
@click="showReformDeadline = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showReformDeadline" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
@confirm="onConfirmReformDeadline" | |||
/> | |||
<van-popup v-model="showlzjsrq" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
/> | |||
</van-popup> | |||
</div> | |||
<div style="padding: 16px 0;"> | |||
<van-row> | |||
<van-col span="12" align="center"> | |||
<van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton" @click="goEdit">取<i style="margin-right: 1em;"></i>消</van-button> | |||
</van-col> | |||
<van-col span="12" align="center"> | |||
<van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">保<i style="margin-right: 1em;"></i>存</van-button> | |||
</van-col> | |||
</van-row> | |||
<div class="clear"></div> | |||
</div> | |||
</van-popup> | |||
</div> | |||
<div style="padding: 16px 0;"> | |||
<van-row> | |||
<van-col span="12" align="center"> | |||
<van-button type="info" color="#B4B0B0" native-type="submit" @click="goBack" class="submitButton">取<i style="margin-right: 1em;"></i>消</van-button> | |||
</van-col> | |||
<van-col span="12" align="center"> | |||
<van-button type="info" native-type="submit" @click="goAdd" class="submitButton">添<i style="margin-right: 1em;"></i>加</van-button> | |||
</van-col> | |||
</van-row> | |||
<div class="clear"></div> | |||
</div> | |||
</div> | |||
</template> | |||
<script> | |||
export default { | |||
name: "taskRelease", | |||
data() { | |||
return { | |||
showZjd:false, | |||
showlzjsrq:false, | |||
minDate: new Date(), | |||
maxDate: new Date(2025, 10, 1), | |||
currentDate: new Date(), | |||
import { jgAdd } from "@/api/onlineHome/homestead/reporting"; | |||
export default { | |||
name: "supervisionAdd", | |||
data() { | |||
return { | |||
showSys:false, | |||
showjglx:false, | |||
showlasj:false, | |||
showinspectorTime:false, | |||
showwfydlx:false, | |||
showReformDeadline:false, | |||
minDate: new Date(), | |||
maxDate: new Date(2025, 10, 1), | |||
currentDate: new Date(), | |||
jgList:{}, | |||
}; | |||
}, | |||
created() { | |||
sfzjjzw:'', | |||
jglx:'', | |||
wfydlx:'', | |||
}, | |||
methods: { | |||
onConfirmApplyTime(date){ | |||
this.time = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`; | |||
this.showApplyTime = false; | |||
} | |||
}, | |||
} | |||
wfydlxDictionaries:[], | |||
jglxDictionaries:[], | |||
sysDictionaries:[], | |||
}; | |||
}, | |||
created() { | |||
this.getDictionaries(); | |||
}, | |||
methods: { | |||
getDictionaries(){ | |||
//违法用地类型 | |||
this.houseGetDicts("villations_type").then((res) => { | |||
for(var i = 0 ; i < res.data.length ; i++){ | |||
this.wfydlxDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); | |||
} | |||
}); | |||
//监管类型 | |||
this.houseGetDicts("jglx").then((res) => { | |||
for(var i = 0 ; i < res.data.length ; i++){ | |||
this.jglxDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); | |||
} | |||
}); | |||
//是否在建建筑物 | |||
this.houseGetDicts("sys_yes_no").then((res) => { | |||
for(var i = 0 ; i < res.data.length ; i++){ | |||
this.sysDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); | |||
} | |||
}); | |||
}, | |||
onConfirmSys(data){ | |||
this.sfzjjzw = data.text; | |||
this.jgList.sfzjjzw = data.value; | |||
this.showSys = false; | |||
}, | |||
onConfirmJglx(data){ | |||
this.jglx = data.text; | |||
this.jgList.jglx = data.value; | |||
this.showjglx = false; | |||
}, | |||
onConfirmWfydlx(data){ | |||
this.wfydlx = data.text; | |||
this.jgList.wfydlx = data.value; | |||
this.showwfydlx = false; | |||
}, | |||
onConfirmLasj(data){ | |||
this.jgList.lasj = this.getNowFormatDate(data).substr(0,10); | |||
this.showlasj = false; | |||
}, | |||
onConfirmInspectorTime(data){ | |||
this.jgList.inspectorTime = this.getNowFormatDate(data).substr(0,10); | |||
this.showinspectorTime = false; | |||
}, | |||
onConfirmReformDeadline(data){ | |||
this.jgList.reformDeadline = this.getNowFormatDate(data).substr(0,10); | |||
this.showReformDeadline = false; | |||
}, | |||
goAdd(){ | |||
console.log(this.jgList) | |||
jgAdd(this.jgList).then(response => { | |||
console.log(response); | |||
this.$toast.success('保存成功'); | |||
setTimeout(function(){ | |||
history.go(-1) | |||
},2000) | |||
}); | |||
}, | |||
goBack(){ | |||
window.history.go(-1) | |||
} | |||
}, | |||
} | |||
</script> | |||
<style scoped lang="scss"> | |||
@@ -10,128 +10,21 @@ | |||
<p style="font-weight: bold;">结案</p> | |||
</template> | |||
</van-nav-bar> | |||
<p class="main_title">基本信息</p> | |||
<div class="main_box"> | |||
<van-field | |||
readonly | |||
clickable | |||
label="是否在建建筑物" | |||
placeholder="请选择" | |||
@click="showZjd = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
label-width="auto" | |||
/> | |||
<van-popup v-model="showZjd" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
@cancel="showZjd = false" | |||
/> | |||
</van-popup> | |||
<van-field | |||
readonly | |||
clickable | |||
label="宅基地代码" | |||
placeholder="请选择" | |||
@click="showZjd = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showZjd" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
@cancel="showZjd = false" | |||
/> | |||
</van-popup> | |||
<van-field | |||
readonly | |||
clickable | |||
label="监管类型" | |||
placeholder="请选择" | |||
@click="showZjd = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showZjd" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
@cancel="showZjd = false" | |||
/> | |||
</van-popup> | |||
<van-field | |||
readonly | |||
clickable | |||
label="立案时间" | |||
placeholder="请选择立案时间" | |||
@click="showlzjsrq = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showlzjsrq" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
/> | |||
</van-popup> | |||
<van-field label="巡查人" placeholder="请输入巡查人" input-align="right" label-width="auto"/> | |||
<van-field | |||
readonly | |||
clickable | |||
label="巡查时间" | |||
placeholder="请选择巡查时间" | |||
@click="showlzjsrq = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showlzjsrq" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
/> | |||
</van-popup> | |||
<van-field | |||
readonly | |||
clickable | |||
label="违法用地类型" | |||
placeholder="请选择" | |||
@click="showZjd = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showZjd" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
@cancel="showZjd = false" | |||
/> | |||
</van-popup> | |||
<van-field label="违法用地面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field label="罚没款金额" placeholder="请输入金额" input-align="right" label-width="auto"/> | |||
<van-field label="没收面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field label="拆除面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field | |||
readonly | |||
clickable | |||
label="整改截止时间" | |||
placeholder="选择整改截止时间" | |||
@click="showlzjsrq = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showlzjsrq" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
/> | |||
</van-popup> | |||
<van-field label="备注" input-align="right" label-width="auto"/> | |||
<van-field readonly label="是否在建建筑物" v-model="sfzjjzw" input-align="right" label-width="auto" /> | |||
<van-field readonly label="宅基地代码" v-model="jgList.zjddm" input-align="right" label-width="auto" /> | |||
<van-field readonly label="监管类型" v-model="jglx" input-align="right"/> | |||
<van-field readonly label="立案时间" v-model="jgList.lasj" input-align="right" /> | |||
<van-field readonly label="巡查人" v-model="jgList.inspector" input-align="right" label-width="auto"/> | |||
<van-field readonly label="巡查时间" v-model="jgList.inspectorTime" input-align="right" /> | |||
<van-field readonly label="违法用地类型" v-model="wfydlx" input-align="right" /> | |||
<van-field readonly label="违法用地面积" v-model="jgList.wfydmj" input-align="right" label-width="auto"/> | |||
<van-field readonly label="罚没款金额" v-model="jgList.fmkje" input-align="right" label-width="auto"/> | |||
<van-field readonly label="请输入面积" v-model="jgList.msmj" input-align="right" label-width="auto"/> | |||
<van-field readonly label="拆除面积" v-model="jgList.ccmj" input-align="right" label-width="auto"/> | |||
<van-field readonly label="整改截止时间" v-model="jgList.reformDeadline" input-align="right" /> | |||
<van-field readonly label="备注" v-model="jgList.bz" input-align="right" label-width="auto"/> | |||
</div> | |||
<p class="main_title">结案信息</p> | |||
@@ -141,31 +34,33 @@ | |||
clickable | |||
label="结案时间" | |||
placeholder="选择结案时间" | |||
@click="showlzjsrq = true" | |||
v-model="jgList.jasj" | |||
@click="showjasj = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showlzjsrq" position="bottom"> | |||
<van-popup v-model="showjasj" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
@confirm="onConfirmJasj" | |||
/> | |||
</van-popup> | |||
<van-field label="执法人姓名" placeholder="请输入姓名" input-align="right" label-width="auto"/> | |||
<van-field label="执法单位" placeholder="请输入执法单位" input-align="right" label-width="auto"/> | |||
<van-field label="其他监管原因" placeholder="请输入监管原因" input-align="right" label-width="auto"/> | |||
<van-field label="其他监管结果" placeholder="请输入监管结果" input-align="right" label-width="auto"/> | |||
<van-field v-model="jgList.zfrxm" label="执法人姓名" placeholder="请输入姓名" input-align="right" label-width="auto"/> | |||
<van-field v-model="jgList.zfdw" label="执法单位" placeholder="请输入执法单位" input-align="right" label-width="auto"/> | |||
<van-field v-model="jgList.qtjgyy" label="其他监管原因" placeholder="请输入监管原因" input-align="right" label-width="auto"/> | |||
<van-field v-model="jgList.qtjgjg" label="其他监管结果" placeholder="请输入监管结果" input-align="right" label-width="auto"/> | |||
</div> | |||
<div style="padding: 16px 0;"> | |||
<van-row> | |||
<van-col span="12" align="center"> | |||
<van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton" @click="goEdit">取<i style="margin-right: 1em;"></i>消</van-button> | |||
<van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton" @click="goBack">取<i style="margin-right: 1em;"></i>消</van-button> | |||
</van-col> | |||
<van-col span="12" align="center"> | |||
<van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">结<i style="margin-right: 1em;"></i>案</van-button> | |||
<van-button type="info" native-type="submit" class="submitButton" @click="goAdd">结<i style="margin-right: 1em;"></i>案</van-button> | |||
</van-col> | |||
</van-row> | |||
<div class="clear"></div> | |||
@@ -174,25 +69,107 @@ | |||
</template> | |||
<script> | |||
import { supervisionAdd , getSupervision , closeCase } from "@/api/onlineHome/homestead/supervision"; | |||
export default { | |||
name: "taskRelease", | |||
name: "supervisionCloseCase", | |||
data() { | |||
return { | |||
showZjd:false, | |||
showlzjsrq:false, | |||
showSys:false, | |||
showjglx:false, | |||
showlasj:false, | |||
showinspectorTime:false, | |||
showwfydlx:false, | |||
showReformDeadline:false, | |||
showjasj:false, | |||
minDate: new Date(), | |||
maxDate: new Date(2025, 10, 1), | |||
currentDate: new Date(), | |||
jgList:{}, | |||
sfzjjzw:'', | |||
jglx:'', | |||
wfydlx:'', | |||
wfydlxDictionaries:[], | |||
jglxDictionaries:[], | |||
sysDictionaries:[], | |||
}; | |||
}, | |||
created() { | |||
this.getTaskGet(); | |||
}, | |||
methods: { | |||
onConfirmApplyTime(date){ | |||
this.time = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`; | |||
this.showApplyTime = false; | |||
getTaskGet(){ | |||
getSupervision(this.$route.query.id).then(response => { | |||
console.log(response) | |||
//违法用地类型 | |||
this.houseGetDicts("villations_type").then((res) => { | |||
for(var i = 0 ; i < res.data.length ; i++){ | |||
this.wfydlxDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); | |||
} | |||
this.wfydlx = this.selectDictLabel(res.data, response.data.wfydlx); | |||
}); | |||
//监管类型 | |||
this.houseGetDicts("jglx").then((res) => { | |||
for(var i = 0 ; i < res.data.length ; i++){ | |||
this.jglxDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); | |||
} | |||
this.jglx = this.selectDictLabel(res.data, response.data.jglx); | |||
}); | |||
//是否在建建筑物 | |||
this.houseGetDicts("sys_yes_no").then((res) => { | |||
for(var i = 0 ; i < res.data.length ; i++){ | |||
this.sysDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); | |||
} | |||
this.sfzjjzw = this.selectDictLabel(res.data, response.data.sfzjjzw); | |||
}); | |||
this.jgList = response.data; | |||
}); | |||
}, | |||
onConfirmSys(data){ | |||
this.sfzjjzw = data.text; | |||
this.jgList.sfzjjzw = data.value; | |||
this.showSys = false; | |||
}, | |||
onConfirmJglx(data){ | |||
this.jglx = data.text; | |||
this.jgList.jglx = data.value; | |||
this.showjglx = false; | |||
}, | |||
onConfirmWfydlx(data){ | |||
this.wfydlx = data.text; | |||
this.jgList.wfydlx = data.value; | |||
this.showwfydlx = false; | |||
}, | |||
onConfirmLasj(data){ | |||
this.jgList.lasj = this.getNowFormatDate(data).substr(0,10); | |||
this.showlasj = false; | |||
}, | |||
onConfirmInspectorTime(data){ | |||
this.jgList.inspectorTime = this.getNowFormatDate(data).substr(0,10); | |||
this.showinspectorTime = false; | |||
}, | |||
onConfirmReformDeadline(data){ | |||
this.jgList.reformDeadline = this.getNowFormatDate(data).substr(0,10); | |||
this.showReformDeadline = false; | |||
}, | |||
onConfirmJasj(data){ | |||
this.jgList.jasj = this.getNowFormatDate(data).substr(0,10); | |||
this.showjasj = false; | |||
}, | |||
goAdd(){ | |||
closeCase(this.jgList).then(response => { | |||
this.$toast.success('结案成功'); | |||
setTimeout(function(){ | |||
history.go(-1) | |||
},2000) | |||
}); | |||
}, | |||
goBack(){ | |||
window.history.go(-1) | |||
} | |||
}, | |||
} | |||
@@ -8,7 +8,7 @@ | |||
@click-right="goAdd" | |||
> | |||
<template #title> | |||
<p style="font-weight: bold;">任务上报</p> | |||
<p style="font-weight: bold;">违法监管</p> | |||
</template> | |||
<template #right> | |||
<van-icon name="add" size="18" /> | |||
@@ -21,27 +21,27 @@ | |||
@load="getList" | |||
> | |||
<van-swipe-cell v-for="(item,index) in applicationList" :key="index"> | |||
<van-cell title="关于什么的主题主题内容" value="已下发" center :to="{name:'paidExitDetail', query: {id:item.id}}" > | |||
<van-cell :title="item.zjddm" :value="item.status" center > | |||
<template #icon> | |||
<van-icon name="../../../static/images/icon/icon_tr.png" size="22" color="#539FFD" style="margin-right: 10px;" /> | |||
</template> | |||
<template #label> | |||
<p>违法用地查处<i style="margin-right: 0.5rem;"></i>任务下发</p> | |||
<p>{{item.jglx}}<i style="margin-right: 0.5rem;"></i>{{item.taskSource}}</p> | |||
</template> | |||
</van-cell> | |||
<template #right> | |||
<van-row> | |||
<van-col> | |||
<van-button color="#FFA63E" text="立案" square :to="{name:'paidExitModify', query: {id:item.id}}" type="info" class="delete-button" /> | |||
<van-button v-if="item.status != '已结案' && item.status == '未立案'" color="#FFA63E" text="立案" square @click="onRegister(item.id)" type="info" class="delete-button" /> | |||
</van-col> | |||
<van-col> | |||
<van-button color="#7DDA4F" square text="结案" @click="deleteList(item.id,index)" type="danger" class="delete-button" /> | |||
<van-button v-if="item.status != '已结案' && item.status == '已立案'" color="#7DDA4F" square text="结案" :to="{name:'supervisionCloseCase', query: {id:item.id}}" type="danger" class="delete-button" /> | |||
</van-col> | |||
<van-col> | |||
<van-button square text="修改" :to="{name:'paidExitModify', query: {id:item.id}}" type="info" class="delete-button" /> | |||
<van-button v-if="item.status != '已结案' && item.status == '未立案'" square text="修改" :to="{name:'supervisionModify', query: {id:item.id}}" type="info" class="delete-button" /> | |||
</van-col> | |||
<van-col> | |||
<van-button color="#FF4646" square text="删除" @click="deleteList(item.id,index)" type="danger" class="delete-button" /> | |||
<van-button v-if="item.status != '已结案' && item.status == '未立案'" color="#FF4646" square text="删除" @click="deleteList(item.id,index)" type="danger" class="delete-button" /> | |||
</van-col> | |||
</van-row> | |||
</template> | |||
@@ -51,9 +51,9 @@ | |||
</template> | |||
<script> | |||
import { getList , removeList } from "@/api/onlineHome/homestead/paidExit"; | |||
import { getList , removeList , registerOn } from "@/api/onlineHome/homestead/supervision"; | |||
export default { | |||
name: "paidExit", | |||
name: "supervisionList", | |||
data() { | |||
return { | |||
applicationList:[], | |||
@@ -67,38 +67,36 @@ export default { | |||
queryParams:{ | |||
pageNum:1, | |||
pageSize:10, | |||
orderByColumn:'createTime', | |||
isAsc:'desc' | |||
} | |||
}; | |||
}, | |||
created() { | |||
this.houseGetDicts("tcqllx").then((res) => { | |||
this.tcqllxStatus = res.data; | |||
}); | |||
this.houseGetDicts("tclx").then((res) => { | |||
this.tclxStatus = res.data; | |||
this.houseGetDicts("regulatory_status").then((res) => { | |||
this.auditStatus = res.data; | |||
}); | |||
this.houseGetDicts("tcfs").then((res) => { | |||
this.tcfsStatus = res.data; | |||
//违法用地类型 | |||
this.houseGetDicts("task_source").then((res) => { | |||
console.log(res.data) | |||
this.taskSourceDictionaries = res.data; | |||
}); | |||
this.houseGetDicts("audit_status").then((res) => { | |||
this.auditStatus = res.data; | |||
//违法用地类型 | |||
this.houseGetDicts("jglx").then((res) => { | |||
this.jglxDictionaries = res.data; | |||
}); | |||
}, | |||
methods: { | |||
goAdd(){ | |||
window.location = 'paidExitAdd'; | |||
window.location = 'supervisionAdd'; | |||
}, | |||
getList(){ | |||
setTimeout(() => { | |||
getList(this.queryParams).then(response => { | |||
console.log(response) | |||
for (var i = 0; i < response.rows.length; i++) { | |||
response.rows[i].tclx = this.selectDictLabel(this.tcqllxStatus, response.rows[i].tclx) | |||
response.rows[i].tclx = this.selectDictLabel(this.tclxStatus, response.rows[i].tclx) | |||
response.rows[i].tcfs = this.selectDictLabel(this.tcfsStatus, response.rows[i].tcfs) | |||
response.rows[i].auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus) | |||
response.rows[i].status = this.selectDictLabel(this.auditStatus, response.rows[i].status); | |||
response.rows[i].jglx = this.selectDictLabel(this.jglxDictionaries, response.rows[i].jglx); | |||
response.rows[i].taskSource = this.selectDictLabel(this.taskSourceDictionaries, response.rows[i].taskSource); | |||
this.applicationList.push(response.rows[i]); | |||
} | |||
if(this.applicationList.length >= response.total){ | |||
@@ -113,7 +111,7 @@ export default { | |||
}, | |||
deleteList(id,index){ | |||
this.$dialog.confirm({ | |||
message: '您确认删除申请草稿?', | |||
message: '您确认删除监管记录?', | |||
}) | |||
.then(() => { | |||
// on confirm | |||
@@ -127,6 +125,16 @@ export default { | |||
.catch(() => { | |||
// on cancel | |||
}); | |||
}, | |||
onRegister(id){ | |||
registerOn(id).then(res => { | |||
if(res.code = 200){ | |||
this.$toast.success('立案成功'); | |||
setTimeout(function(){ | |||
window.location.reload() | |||
},1000) | |||
} | |||
}); | |||
} | |||
}, | |||
} | |||
@@ -1,178 +1,264 @@ | |||
<template> | |||
<div class="app-container"> | |||
<van-nav-bar | |||
left-arrow | |||
fixed | |||
placeholder | |||
@click-left="$router.back(-1)" | |||
> | |||
<template #title> | |||
<p style="font-weight: bold;">修改宅基地监管</p> | |||
</template> | |||
</van-nav-bar> | |||
<div class="main_box"> | |||
<van-field | |||
readonly | |||
clickable | |||
label="是否在建建筑物" | |||
placeholder="请选择" | |||
@click="showZjd = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
label-width="auto" | |||
<div class="app-container"> | |||
<van-nav-bar | |||
left-arrow | |||
fixed | |||
placeholder | |||
@click-left="$router.back(-1)" | |||
> | |||
<template #title> | |||
<p style="font-weight: bold;">修改违法监管</p> | |||
</template> | |||
</van-nav-bar> | |||
<div class="main_box"> | |||
<van-field | |||
readonly | |||
clickable | |||
label="是否在建建筑物" | |||
placeholder="请选择" | |||
v-model="sfzjjzw" | |||
@click="showSys = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
label-width="auto" | |||
/> | |||
<van-popup v-model="showSys" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
:columns="sysDictionaries" | |||
@confirm="onConfirmSys" | |||
@cancel="showSys = false" | |||
/> | |||
<van-popup v-model="showZjd" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
@cancel="showZjd = false" | |||
/> | |||
</van-popup> | |||
<van-field | |||
readonly | |||
clickable | |||
label="宅基地代码" | |||
placeholder="请选择" | |||
@click="showZjd = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
</van-popup> | |||
<van-field label="宅基地代码" v-model="jgList.zjddm" placeholder="请输入宅基地代码" input-align="right" /> | |||
<!-- <van-popup v-model="showZjd" position="bottom">--> | |||
<!-- <van-picker--> | |||
<!-- show-toolbar--> | |||
<!-- @cancel="showZjd = false"--> | |||
<!-- />--> | |||
<!-- </van-popup>--> | |||
<van-field | |||
readonly | |||
clickable | |||
label="监管类型" | |||
placeholder="请选择" | |||
v-model="jglx" | |||
@click="showjglx = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showjglx" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
:columns="jglxDictionaries" | |||
@confirm="onConfirmJglx" | |||
@cancel="showjglx = false" | |||
/> | |||
<van-popup v-model="showZjd" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
@cancel="showZjd = false" | |||
/> | |||
</van-popup> | |||
<van-field | |||
readonly | |||
clickable | |||
label="监管类型" | |||
placeholder="请选择" | |||
@click="showZjd = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
</van-popup> | |||
<van-field | |||
readonly | |||
clickable | |||
v-model="jgList.lasj" | |||
label="立案时间" | |||
placeholder="请选择立案时间" | |||
@click="showlasj = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showlasj" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
@confirm="onConfirmLasj" | |||
/> | |||
<van-popup v-model="showZjd" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
@cancel="showZjd = false" | |||
/> | |||
</van-popup> | |||
<van-field | |||
readonly | |||
clickable | |||
label="立案时间" | |||
placeholder="请选择立案时间" | |||
@click="showlzjsrq = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
</van-popup> | |||
<van-field label="巡查人" v-model="jgList.inspector" placeholder="请输入巡查人" input-align="right" label-width="auto"/> | |||
<van-field | |||
readonly | |||
clickable | |||
label="巡查时间" | |||
v-model="jgList.inspectorTime" | |||
placeholder="请选择巡查时间" | |||
@click="showinspectorTime = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showinspectorTime" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
@confirm="onConfirmInspectorTime" | |||
/> | |||
<van-popup v-model="showlzjsrq" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
/> | |||
</van-popup> | |||
<van-field label="巡查人" placeholder="请输入巡查人" input-align="right" label-width="auto"/> | |||
<van-field | |||
readonly | |||
clickable | |||
label="巡查时间" | |||
placeholder="请选择巡查时间" | |||
@click="showlzjsrq = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showlzjsrq" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
/> | |||
</van-popup> | |||
</div> | |||
</van-popup> | |||
<van-field label="备注" v-model="jgList.bz" placeholder="填写备注" input-align="right" label-width="auto"/> | |||
</div> | |||
<p class="main_title">违法信息</p> | |||
<div class="main_box"> | |||
<van-field | |||
readonly | |||
clickable | |||
label="违法用地类型" | |||
placeholder="请选择" | |||
@click="showZjd = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
<p class="main_title">违法信息</p> | |||
<div class="main_box"> | |||
<van-field | |||
readonly | |||
clickable | |||
label="违法用地类型" | |||
placeholder="请选择" | |||
v-model="wfydlx" | |||
@click="showwfydlx = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showwfydlx" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
:columns="wfydlxDictionaries" | |||
@confirm="onConfirmWfydlx" | |||
@cancel="showwfydlx = false" | |||
/> | |||
<van-popup v-model="showZjd" position="bottom"> | |||
<van-picker | |||
show-toolbar | |||
@cancel="showZjd = false" | |||
/> | |||
</van-popup> | |||
<van-field label="违法用地面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field label="罚没款金额" placeholder="请输入金额" input-align="right" label-width="auto"/> | |||
<van-field label="没收面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field label="拆除面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field | |||
readonly | |||
clickable | |||
label="整改截止时间" | |||
placeholder="选择整改截止时间" | |||
@click="showlzjsrq = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
</van-popup> | |||
<van-field v-model="jgList.wfydmj" label="违法用地面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field v-model="jgList.fmkje" label="罚没款金额" placeholder="请输入金额" input-align="right" label-width="auto"/> | |||
<van-field v-model="jgList.msmj" label="没收面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field v-model="jgList.ccmj" label="拆除面积" placeholder="请输入面积" input-align="right" label-width="auto"/> | |||
<van-field | |||
readonly | |||
clickable | |||
label="整改截止时间" | |||
placeholder="选择整改截止时间" | |||
v-model="jgList.reformDeadline" | |||
@click="showReformDeadline = true" | |||
input-align="right" | |||
right-icon="arrow-down" | |||
/> | |||
<van-popup v-model="showReformDeadline" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
@confirm="onConfirmReformDeadline" | |||
/> | |||
<van-popup v-model="showlzjsrq" position="bottom"> | |||
<van-datetime-picker | |||
v-model="currentDate" | |||
type="date" | |||
title="选择年月日" | |||
:min-date="minDate" | |||
:max-date="maxDate" | |||
/> | |||
</van-popup> | |||
</div> | |||
<div style="padding: 16px 0;"> | |||
<van-row> | |||
<van-col span="12" align="center"> | |||
<van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton" @click="goEdit">取<i style="margin-right: 1em;"></i>消</van-button> | |||
</van-col> | |||
<van-col span="12" align="center"> | |||
<van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">保<i style="margin-right: 1em;"></i>存</van-button> | |||
</van-col> | |||
</van-row> | |||
<div class="clear"></div> | |||
</div> | |||
</van-popup> | |||
</div> | |||
<div style="padding: 16px 0;"> | |||
<van-row> | |||
<van-col span="12" align="center"> | |||
<van-button type="info" color="#B4B0B0" native-type="submit" @click="goBack" class="submitButton">取<i style="margin-right: 1em;"></i>消</van-button> | |||
</van-col> | |||
<van-col span="12" align="center"> | |||
<van-button type="info" native-type="submit" @click="goAdd" class="submitButton">修<i style="margin-right: 1em;"></i>改</van-button> | |||
</van-col> | |||
</van-row> | |||
<div class="clear"></div> | |||
</div> | |||
</div> | |||
</template> | |||
<script> | |||
export default { | |||
name: "taskRelease", | |||
data() { | |||
return { | |||
showZjd:false, | |||
showlzjsrq:false, | |||
minDate: new Date(), | |||
maxDate: new Date(2025, 10, 1), | |||
currentDate: new Date(), | |||
import { supervisionAdd , getSupervision } from "@/api/onlineHome/homestead/supervision"; | |||
export default { | |||
name: "supervisionModify", | |||
data() { | |||
return { | |||
showSys:false, | |||
showjglx:false, | |||
showlasj:false, | |||
showinspectorTime:false, | |||
showwfydlx:false, | |||
showReformDeadline:false, | |||
minDate: new Date(), | |||
maxDate: new Date(2025, 10, 1), | |||
currentDate: new Date(), | |||
jgList:{}, | |||
}; | |||
}, | |||
created() { | |||
sfzjjzw:'', | |||
jglx:'', | |||
wfydlx:'', | |||
}, | |||
methods: { | |||
onConfirmApplyTime(date){ | |||
this.time = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`; | |||
this.showApplyTime = false; | |||
} | |||
}, | |||
} | |||
wfydlxDictionaries:[], | |||
jglxDictionaries:[], | |||
sysDictionaries:[], | |||
}; | |||
}, | |||
created() { | |||
this.getTaskGet(); | |||
}, | |||
methods: { | |||
getTaskGet(){ | |||
getSupervision(this.$route.query.id).then(response => { | |||
console.log(response) | |||
//违法用地类型 | |||
this.houseGetDicts("villations_type").then((res) => { | |||
for(var i = 0 ; i < res.data.length ; i++){ | |||
this.wfydlxDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); | |||
} | |||
this.wfydlx = this.selectDictLabel(res.data, response.data.wfydlx); | |||
}); | |||
//监管类型 | |||
this.houseGetDicts("jglx").then((res) => { | |||
for(var i = 0 ; i < res.data.length ; i++){ | |||
this.jglxDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); | |||
} | |||
this.jglx = this.selectDictLabel(res.data, response.data.jglx); | |||
}); | |||
//是否在建建筑物 | |||
this.houseGetDicts("sys_yes_no").then((res) => { | |||
for(var i = 0 ; i < res.data.length ; i++){ | |||
this.sysDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); | |||
} | |||
this.sfzjjzw = this.selectDictLabel(res.data, response.data.sfzjjzw); | |||
}); | |||
this.jgList = response.data; | |||
}); | |||
}, | |||
onConfirmSys(data){ | |||
this.sfzjjzw = data.text; | |||
this.jgList.sfzjjzw = data.value; | |||
this.showSys = false; | |||
}, | |||
onConfirmJglx(data){ | |||
this.jglx = data.text; | |||
this.jgList.jglx = data.value; | |||
this.showjglx = false; | |||
}, | |||
onConfirmWfydlx(data){ | |||
this.wfydlx = data.text; | |||
this.jgList.wfydlx = data.value; | |||
this.showwfydlx = false; | |||
}, | |||
onConfirmLasj(data){ | |||
this.jgList.lasj = this.getNowFormatDate(data).substr(0,10); | |||
this.showlasj = false; | |||
}, | |||
onConfirmInspectorTime(data){ | |||
this.jgList.inspectorTime = this.getNowFormatDate(data).substr(0,10); | |||
this.showinspectorTime = false; | |||
}, | |||
onConfirmReformDeadline(data){ | |||
this.jgList.reformDeadline = this.getNowFormatDate(data).substr(0,10); | |||
this.showReformDeadline = false; | |||
}, | |||
goAdd(){ | |||
supervisionAdd(this.jgList).then(response => { | |||
console.log(response); | |||
this.$toast.success('保存成功'); | |||
setTimeout(function(){ | |||
history.go(-1) | |||
},2000) | |||
}); | |||
}, | |||
goBack(){ | |||
window.history.go(-1) | |||
} | |||
}, | |||
} | |||
</script> | |||
<style scoped lang="scss"> | |||
@@ -7,7 +7,7 @@ | |||
@click-left="$router.back(-1)" | |||
> | |||
<template #title> | |||
<p style="font-weight: bold;">添加任务下发</p> | |||
<p style="font-weight: bold;">修改任务下发</p> | |||
</template> | |||
</van-nav-bar> | |||
<div class="main_box"> | |||
@@ -366,6 +366,14 @@ | |||
</div> | |||
<p style="margin-top: 5px;color: #666666;">任务发布</p> | |||
</van-grid-item> | |||
<van-grid-item text="违法监管" :to="{name:'supervisionList'}" > | |||
<div slot="default"> | |||
<div style="background:#c568f5;padding: 10px;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px "> | |||
<img src="../../../static/images/onlineHome/icon_zjd3.png" style="width: 25px" alt /> | |||
</div> | |||
</div> | |||
<p style="margin-top: 5px;color: #666666;">违法监管</p> | |||
</van-grid-item> | |||
</van-grid> | |||
</van-row> | |||
<onlineHomeIndex></onlineHomeIndex> | |||