This commit is contained in:
duanxiaohai
parent
bb4ef50c88
commit
6818873d4a
|
|
@ -68,7 +68,7 @@
|
|||
<template v-for="item in data.columns" :key="item.label">
|
||||
<el-table-column
|
||||
v-if="item.type === 'slot'"
|
||||
:show-overflow-tooltip="true"
|
||||
|
||||
:label="item.label"
|
||||
:property="item.property"
|
||||
:width="item.width || ''"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="width: 97.5%; position: relative" >
|
||||
<div style="width: 97.5%; position: relative">
|
||||
<div class="backgroundVirtual"></div>
|
||||
<el-table
|
||||
border
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="width: 97.5%; position: relative" >
|
||||
<div style="width: 97.5%; position: relative">
|
||||
<div class="backgroundVirtual"></div>
|
||||
<el-table
|
||||
border
|
||||
|
|
@ -191,7 +191,7 @@
|
|||
<!-- <div v-else class="text_1">未享受对象</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<div style="width: 97.5%; position: relative" >
|
||||
<div style="width: 97.5%; position: relative">
|
||||
<div class="backgroundVirtual"></div>
|
||||
<el-table
|
||||
border
|
||||
|
|
@ -214,15 +214,15 @@
|
|||
<template #default="scope">
|
||||
<!-- 姓名 -->
|
||||
<div v-if="item.property == 'xm'">
|
||||
<div @click="handleRowClick(scope.row)">
|
||||
<div >
|
||||
{{ scope.row.xm }}
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="item.property == 'fullName'">
|
||||
<!-- <div v-if="item.property == 'fullName'">
|
||||
<div @click="handleRowClick(scope.row)">
|
||||
{{ scope.row.fullName }}
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<!-- 状态 -->
|
||||
<div v-if="item.property == 'zt'">
|
||||
<div v-for="index in 3" :key="index">
|
||||
|
|
@ -361,7 +361,7 @@ const formData = reactive({
|
|||
column_2: [
|
||||
{
|
||||
label: "姓名",
|
||||
property: "fullName",
|
||||
property: "xm",
|
||||
width: "90",
|
||||
type: "slot",
|
||||
},
|
||||
|
|
@ -374,16 +374,16 @@ const formData = reactive({
|
|||
},
|
||||
{
|
||||
label: "地址",
|
||||
property: "address",
|
||||
property: "dz",
|
||||
},
|
||||
{
|
||||
label: "年龄",
|
||||
property: "age",
|
||||
property: "nl",
|
||||
width: "60",
|
||||
},
|
||||
{
|
||||
label: "人口标签",
|
||||
property: "PopulationLabel",
|
||||
property: "bq",
|
||||
},
|
||||
],
|
||||
column_3: [
|
||||
|
|
@ -649,105 +649,52 @@ const formData = reactive({
|
|||
resultsList: [],
|
||||
tableData2: [
|
||||
{
|
||||
fullName: "伍*凤",
|
||||
zt: 1,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "46",
|
||||
PopulationLabel: "收入型低保",
|
||||
xm: "叶*星",
|
||||
zt: 3,
|
||||
dz: "浙江省龙游县东华街道******",
|
||||
nl: "43",
|
||||
bq: "低保救助",
|
||||
sfzhm: "281889",
|
||||
},
|
||||
{
|
||||
fullName: "伍*凤",
|
||||
zt: 2,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "46",
|
||||
PopulationLabel: "收入型低保",
|
||||
sfzhm: "281889",
|
||||
},
|
||||
{
|
||||
fullName: "伍*凤",
|
||||
xm: "洪宝珠",
|
||||
zt: 3,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "46",
|
||||
PopulationLabel: "收入型低保",
|
||||
sfzhm: "281889",
|
||||
dz: "浙江省龙游县东华街道******",
|
||||
nl: "54",
|
||||
bq: "低保救助",
|
||||
sfzhm: null,
|
||||
},
|
||||
{
|
||||
fullName: "吴*琴",
|
||||
zt: 1,
|
||||
address: "龙游户籍的公民...",
|
||||
age: "57",
|
||||
PopulationLabel: "自主申报",
|
||||
},
|
||||
{
|
||||
fullName: "吴*琴",
|
||||
zt: 1,
|
||||
address: "龙游户籍的公民...",
|
||||
age: "57",
|
||||
PopulationLabel: "自主申报",
|
||||
},
|
||||
{
|
||||
fullName: "吴*琴",
|
||||
zt: 1,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "57",
|
||||
PopulationLabel: "自主申报",
|
||||
},
|
||||
{
|
||||
fullName: "吴*琴",
|
||||
zt: 2,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "57",
|
||||
PopulationLabel: "自主申报",
|
||||
},
|
||||
{
|
||||
fullName: "吴*琴",
|
||||
zt: 2,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "57",
|
||||
PopulationLabel: "自主申报",
|
||||
},
|
||||
{
|
||||
fullName: "吴*琴",
|
||||
zt: 2,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "57",
|
||||
PopulationLabel: "自主申报",
|
||||
},
|
||||
{
|
||||
fullName: "吴*琴",
|
||||
zt: 2,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "57",
|
||||
PopulationLabel: "自主申报",
|
||||
},
|
||||
{
|
||||
fullName: "吴*琴",
|
||||
zt: 2,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "57",
|
||||
PopulationLabel: "自主申报",
|
||||
},
|
||||
{
|
||||
fullName: "吴*琴",
|
||||
xm: "舒洪珍",
|
||||
zt: 3,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "57",
|
||||
PopulationLabel: "自主申报",
|
||||
dz: "衢州市龙游县詹家镇******",
|
||||
nl: "43",
|
||||
bq: "低保救助",
|
||||
sfzhm: null,
|
||||
},
|
||||
{
|
||||
fullName: "吴*琴",
|
||||
xm: "周小军",
|
||||
zt: 3,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "57",
|
||||
PopulationLabel: "自主申报",
|
||||
dz: "衢州市龙游县小南海镇******",
|
||||
nl: "48",
|
||||
bq: "低保救助",
|
||||
sfzhm: null,
|
||||
},
|
||||
{
|
||||
fullName: "吴*琴",
|
||||
xm: "莫东明",
|
||||
zt: 3,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "57",
|
||||
PopulationLabel: "自主申报",
|
||||
dz: "衢州市龙游县湖镇镇******",
|
||||
nl: "55",
|
||||
bq: "低保救助",
|
||||
sfzhm: null,
|
||||
},
|
||||
{
|
||||
xm: "张于新",
|
||||
zt: 3,
|
||||
dz: "浙江省龙游县湖镇镇******",
|
||||
nl: "39",
|
||||
bq: "低保救助",
|
||||
sfzhm: null,
|
||||
},
|
||||
],
|
||||
tableData3: [
|
||||
|
|
@ -2289,11 +2236,16 @@ const handlePagination1 = (val) => {
|
|||
data.pagedData = data.tableData1.slice(startIndex, endIndex);
|
||||
};
|
||||
const handlePagination2 = (current) => {
|
||||
console.log('页数',current);
|
||||
|
||||
pagination2.currentPage = current;
|
||||
|
||||
switch (data.name) {
|
||||
case "最低生活保障":
|
||||
// getTable(pagination);
|
||||
|
||||
pagination2.url = "/api/ggfwyth/pg/shjzShbz";//假数据
|
||||
getTable3(pagination2);
|
||||
break;
|
||||
case "老年人福利补贴":
|
||||
getServiceList(pagination2, 0);
|
||||
|
|
@ -2385,6 +2337,7 @@ const lampScreen = (val, val2) => {
|
|||
return;
|
||||
}
|
||||
selectedLamp.value = val;
|
||||
console.log('绿灯',val2);
|
||||
|
||||
const filteredData = val2.filter((element) => element.zt === val);
|
||||
data.tableData2 = filteredData;
|
||||
|
|
@ -2418,49 +2371,7 @@ const tableType = reactive({
|
|||
columns: [],
|
||||
character: [],
|
||||
});
|
||||
//表格column列表
|
||||
const columns = reactive({
|
||||
聚集数据: {
|
||||
column: [
|
||||
{
|
||||
label: "姓名",
|
||||
property: "xm",
|
||||
},
|
||||
{
|
||||
label: "出生日期",
|
||||
property: "birth",
|
||||
},
|
||||
{
|
||||
label: "性别",
|
||||
property: "sex",
|
||||
},
|
||||
{
|
||||
label: "迁出地址",
|
||||
property: "ydz",
|
||||
},
|
||||
{
|
||||
label: "地址",
|
||||
property: "xdz",
|
||||
},
|
||||
],
|
||||
},
|
||||
培训: {
|
||||
column: [
|
||||
{
|
||||
label: "姓名",
|
||||
property: "xm",
|
||||
},
|
||||
{
|
||||
label: "培训机构名称",
|
||||
property: "pxjgmc",
|
||||
},
|
||||
{
|
||||
label: "培训项目",
|
||||
property: "pxxm",
|
||||
},
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
const statusDetails = (val) => {
|
||||
tableType.title = `服务详情`;
|
||||
console.log(111, val);
|
||||
|
|
@ -2470,7 +2381,7 @@ const statusDetails = (val) => {
|
|||
data.identNo = val.sfzhm;
|
||||
if (data.identNo == null) {
|
||||
ElMessage.warning({
|
||||
message: `${val.fullName}无id!`,
|
||||
message: `${val.xm}无id!`,
|
||||
offset: 100, // 距离窗口顶部的偏移量
|
||||
});
|
||||
} else {
|
||||
|
|
@ -2479,8 +2390,8 @@ const statusDetails = (val) => {
|
|||
pagination3.total = formData.dbTableData.tableData3.length;
|
||||
tableType.character = {
|
||||
...val,
|
||||
xm: val.fullName,
|
||||
dz: val.address,
|
||||
age: val.nl,
|
||||
// dz: val.address,
|
||||
titleName: formData.name,
|
||||
};
|
||||
dialogShow.value = true;
|
||||
|
|
@ -2592,6 +2503,26 @@ const getTable1 = (pagination) => {
|
|||
}
|
||||
});
|
||||
};
|
||||
const getTable3 = (pagination) => {
|
||||
http
|
||||
.get(
|
||||
`${pagination.url}?page=${pagination.currentPage}&size=${pagination.pageSize}`
|
||||
)
|
||||
.then((res) => {
|
||||
if (res.code == 200) {
|
||||
data.tableData2 = res.data;
|
||||
data.tableData2 = res.data.map((item) => {
|
||||
return {
|
||||
...item,
|
||||
zt: 1,
|
||||
};
|
||||
});
|
||||
|
||||
pagination2.total = res.count - 6;
|
||||
// lampScreen(1, data.tableData2);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 服务清单
|
||||
|
|
@ -2625,7 +2556,7 @@ const handleRowClick = (row) => {
|
|||
data.identNo = row.sfzhm;
|
||||
if (data.identNo == null) {
|
||||
ElMessage.warning({
|
||||
message: `${row.fullName}无id!`,
|
||||
message: `${row.xm}无id!`,
|
||||
offset: 100, // 距离窗口顶部的偏移量
|
||||
});
|
||||
} else {
|
||||
|
|
@ -2696,6 +2627,7 @@ const handleRowClick = (row) => {
|
|||
}
|
||||
};
|
||||
const updateFormDataAndTable = (formDataName, tableData) => {
|
||||
|
||||
formData.name = formDataName;
|
||||
data.columns = tableData.columns;
|
||||
data.column_1 = tableData.column_1;
|
||||
|
|
@ -2703,12 +2635,15 @@ const updateFormDataAndTable = (formDataName, tableData) => {
|
|||
data.tableData = tableData.resultsList;
|
||||
data.tableData1 = tableData.tableData;
|
||||
data.tableData2 = tableData.tableData2; //假数据
|
||||
data.tableData3 = tableData.tableData2; //假数据
|
||||
data.tableData3 = tableData.tableData2; //状态假数据
|
||||
pagination1.total = tableData.tableData.length;
|
||||
handleCurrentChange(1);
|
||||
if(formDataName == "低保"){
|
||||
return
|
||||
}
|
||||
// console.log(6666, data.tableData2);
|
||||
|
||||
lampScreen(1, data.tableData3);
|
||||
handleCurrentChange(1);
|
||||
};
|
||||
|
||||
const listAssignment = () => {
|
||||
|
|
@ -2722,6 +2657,8 @@ const listAssignment = () => {
|
|||
// data.tableData2 = formData.dbTableData.resultsList;
|
||||
pagination.url = "/api/ggfwyth/pg/shjzShbz";
|
||||
getTable(pagination);
|
||||
getTable3(pagination);
|
||||
|
||||
break;
|
||||
case "老年人福利补贴":
|
||||
data.tabelshow = false;
|
||||
|
|
@ -2760,7 +2697,7 @@ const listAssignment = () => {
|
|||
}
|
||||
};
|
||||
onMounted(() => {
|
||||
// tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
|
||||
tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
|
||||
if (routers.query.name) {
|
||||
data.name = routers.query.name;
|
||||
listAssignment();
|
||||
|
|
@ -3278,38 +3215,37 @@ onMounted(() => {
|
|||
<style lang="scss" scoped>
|
||||
// 分页
|
||||
|
||||
:deep(.el-pagination > .is-last) {
|
||||
:deep(.el-pagination > .is-last) {
|
||||
color: #fff !important ;
|
||||
}
|
||||
:deep(.el-pagination.is-background .el-pager li) {
|
||||
}
|
||||
:deep(.el-pagination.is-background .el-pager li) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
margin: 0;
|
||||
}
|
||||
:deep(.el-pagination.is-background .el-pager li.is-active) {
|
||||
}
|
||||
:deep(.el-pagination.is-background .el-pager li.is-active) {
|
||||
background: rgba(0, 144, 255, 0.49);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-prev:disabled) {
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-prev:disabled) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-next:disabled) {
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-next:disabled) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-prev) {
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-prev) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-next) {
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-next) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -676,7 +676,7 @@ const sevenYX = (name) => {
|
|||
};
|
||||
|
||||
onMounted(() => {
|
||||
// tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
|
||||
tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
|
||||
|
||||
if (localStorage.getItem("taps1") !== undefined) {
|
||||
data.tapbody = JSON.parse(localStorage.getItem("taps1"));
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ export default defineConfig({
|
|||
// 第一个代理
|
||||
"/api": {
|
||||
// 匹配到啥来进行方向代理
|
||||
target: "http://10.0.0.65:8095/", //刘进
|
||||
// target: "http://220.191.238.50:996/", //线上
|
||||
// target: "http://10.0.0.65:8095/", //刘进
|
||||
target: "http://220.191.238.50:996/", //线上
|
||||
changeOrigin: true, //是否支持跨域
|
||||
//rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空，这个
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue