From 1abbd092df8580b6228729b7ec46c3d798a8e995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
<819653817@qq.com>
Date: Tue, 29 Apr 2025 17:57:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=B2=82...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 +-
src/views/dataBoardMain/main.vue | 34 +--
src/views/main-shuju/main.vue | 32 +--
src/views/main.vue | 31 +--
.../base/organization/organization.vue | 4 +-
.../elderlyArchives/cpts/add-old.vue | 95 +++++--
.../elderlyArchives/index.vue | 63 +++--
.../serviceTeamManagement/index.vue | 11 +-
.../informationArchive/toexamine/index.vue | 26 +-
.../volunteerProfile/index.vue | 19 +-
.../modules/servicePointsManagement/index.vue | 2 +-
.../pairingRecords/cpts/service-team.vue | 6 +-
.../volunteerService/pairingRecords/index.vue | 24 +-
.../volunteerService/serviceRecord/index.vue | 259 +++++++++---------
src/views/pages/login.vue | 3 +
15 files changed, 346 insertions(+), 267 deletions(-)
diff --git a/.env.development b/.env.development
index 5f6766d0e..c5ce3ef70 100644
--- a/.env.development
+++ b/.env.development
@@ -3,12 +3,12 @@ NODE_ENV=development
# VUE_APP_API_SERVER = https://epmet-preview.elinkservice.cn/api
# VUE_APP_API_SERVER = http://192.168.1.60:8080/api
# VUE_APP_API_SERVER = http://192.168.1.144/api
-VUE_APP_API_SERVER = http://192.168.1.140/api
+VUE_APP_API_SERVER = https://zl.linyicszh.com/api
# VUE_APP_API_SERVER = http://219.146.91.110:30801/api219.146.91.110:30801
# VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api
-# VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api
+# VUE_APP_API_SERVER = https://epdc-shibei.elinelderlyArchivesservice.cn/api
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api
diff --git a/src/views/dataBoardMain/main.vue b/src/views/dataBoardMain/main.vue
index 08c52ac89..9db1928b4 100644
--- a/src/views/dataBoardMain/main.vue
+++ b/src/views/dataBoardMain/main.vue
@@ -109,24 +109,24 @@ export default {
this.$store.state.mainShuju.activeName = tab.menuId;
this.$store.state.mainShuju.contentTabsActiveName = tab.name;
},
- //获取团长信息
- async getCommanderByUserId(userId){
- const url = "/voluntary/volunteerOrg/getCommanderByUserId/"+userId;
- const { data, code, msg } = await requestGet(url);
- console.log(data,"sdfjldsflk1;");
- if (code === 0) {
- console.log(this.$store.state.user, "sd;klfdslk");
- this.$store.state.user = {
- volunteerOrgId: data.volunteerOrgId,
- volunteerOrgName: data.volunteerOrgName,
- commander: data.commander,
- ...this.$store.state.user
- };
- console.log(this.$store.state.user, "sd;klfdslk");
+ // //获取团长信息
+ // async getCommanderByUserId(userId){
+ // const url = "/voluntary/volunteerOrg/getCommanderByUserId/"+userId;
+ // const { data, code, msg } = await requestGet(url);
+ // console.log(data,"sdfjldsflk1;");
+ // if (code === 0) {
+ // console.log(this.$store.state.user, "sd;klfdslk");
+ // this.$store.state.user = {
+ // volunteerOrgId: data.volunteerOrgId,
+ // volunteerOrgName: data.volunteerOrgName,
+ // commander: data.commander,
+ // ...this.$store.state.user
+ // };
+ // console.log(this.$store.state.user, "sd;klfdslk");
- }
+ // }
- },
+ // },
// 获取当前管理员信息
async getWorkUserInfo() {
const url = "/epmetuser/customerstaff/staffbasicinfo";
@@ -136,7 +136,7 @@ export default {
this.$store.state.user = {
...data,
};
- this.getCommanderByUserId(data.id);
+ // this.getCommanderByUserId(data.id);
localStorage.setItem("roleList", data.roleList);
localStorage.setItem("customerId", data.customerId);
localStorage.setItem("staffId", data.id);
diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue
index c0141eb48..74c863141 100644
--- a/src/views/main-shuju/main.vue
+++ b/src/views/main-shuju/main.vue
@@ -111,23 +111,23 @@ export default {
this.$store.state.mainShuju.contentTabsActiveName = tab.name;
},
//获取团长信息
- async getCommanderByUserId(userId){
- const url = "/voluntary/volunteerOrg/getCommanderByUserId/"+userId;
- const { data, code, msg } = await requestGet(url);
- console.log(data,"sdfjldsflk1;");
- if (code === 0) {
- console.log(this.$store.state.user, "sd;klfdslk");
- this.$store.state.user = {
- volunteerOrgId: data.volunteerOrgId,
- volunteerOrgName: data.volunteerOrgName,
- commander: data.commander,
- ...this.$store.state.user
- };
- console.log(this.$store.state.user, "sd;klfdslk");
+ // async getCommanderByUserId(userId){
+ // const url = "/voluntary/volunteerOrg/getCommanderByUserId/"+userId;
+ // const { data, code, msg } = await requestGet(url);
+ // console.log(data,"sdfjldsflk1;");
+ // if (code === 0) {
+ // console.log(this.$store.state.user, "sd;klfdslk");
+ // this.$store.state.user = {
+ // volunteerOrgId: data.volunteerOrgId,
+ // volunteerOrgName: data.volunteerOrgName,
+ // commander: data.commander,
+ // ...this.$store.state.user
+ // };
+ // console.log(this.$store.state.user, "sd;klfdslk");
- }
+ // }
- },
+ // },
// 获取当前管理员信息
async getWorkUserInfo() {
const url = "/epmetuser/customerstaff/staffbasicinfo";
@@ -135,7 +135,7 @@ export default {
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.$store.state.user = { ...data };
- await this.getCommanderByUserId(data.id);
+ // await this.getCommanderByUserId(data.id);
localStorage.setItem("roleList", data.roleList);
localStorage.setItem("customerId", data.customerId);
localStorage.setItem("staffId", data.id);
diff --git a/src/views/main.vue b/src/views/main.vue
index 8d86a7be0..0194830b7 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -139,23 +139,23 @@ export default {
},
//获取团长信息
//获取团长信息
- async getCommanderByUserId(userId) {
- const url = "/voluntary/volunteerOrg/getCommanderByUserId/" + userId;
- const { data, code, msg } = await requestGet(url);
- console.log(data, "sdfjldsflk1;");
- if (code === 0) {
- console.log(this.$store.state.user, "sd;klfdslk");
- this.$store.state.user = {
- volunteerOrgId: data.volunteerOrgId,
- volunteerOrgName: data.volunteerOrgName,
- commander: data.commander,
- ...this.$store.state.user
- };
- console.log(this.$store.state.user, "sd;klfdslk");
+ // async getCommanderByUserId(userId) {
+ // const url = "/voluntary/volunteerOrg/getCommanderByUserId/" + userId;
+ // const { data, code, msg } = await requestGet(url);
+ // console.log(data, "sdfjldsflk1;");
+ // if (code === 0) {
+ // console.log(this.$store.state.user, "sd;klfdslk");
+ // this.$store.state.user = {
+ // volunteerOrgId: data.volunteerOrgId,
+ // volunteerOrgName: data.volunteerOrgName,
+ // commander: data.commander,
+ // ...this.$store.state.user
+ // };
+ // console.log(this.$store.state.user, "sd;klfdslk");
- }
+ // }
- },
+ // },
// 获取当前管理员信息
async getWorkUserInfo() {
const url = "/epmetuser/customerstaff/staffbasicinfo";
@@ -166,7 +166,6 @@ export default {
if (data) {
this.$store.state.user = { ...data };
- this.getCommanderByUserId(data.id);
console.log("user---hahha", this.$store.state.user);
localStorage.setItem("roleList", data.roleList);
localStorage.setItem("customerId", data.customerId);
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 7c46c43c6..139a5c7fd 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1479,7 +1479,9 @@ export default {
}
},
handleRoleChange(selectedValues) {
- if (selectedValues.includes("1911685481883824130")) {
+ console.log(selectedValues,"所属服务团");
+
+ if (selectedValues.includes("1916410440953024514")) {
this.serviceGroupShow=true
} else {
this.serviceGroupShow = false;
diff --git a/src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue b/src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue
index f0337a494..1a1ce28be 100644
--- a/src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue
+++ b/src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue
@@ -25,7 +25,7 @@
+ class="u-item-width-normal" @input="parseIdCard">
@@ -66,12 +66,11 @@
-
-
+
+
@@ -81,8 +80,8 @@
-
+
@@ -278,6 +277,10 @@
+
+
+
+
取 消
确 定
@@ -363,11 +366,12 @@
ethnicList:[],
formType:"add",
agencyIdArray: [],
+ uploadLoading: false, // 控制上传中状态
formData: {
volunteers:1,
volunteerOrgId: '',
orgIdPath: '',
- headImg: '',
+ headImg: "",
name: '',
gender: '',
idNum: '',
@@ -457,27 +461,54 @@
},
],
ServiceGroupList:[],
- disabled:false
+ disabled: false,
+ userH5DTO: {},
+ volunteerDTO: {}
}
},
components: {Tinymce, UploadImage },
- mounted() {
- // const { user } = this.$store.state
- // if (user.commander) {
- // this.disabled = true
- // this.formData.volunteerOrgId = user.volunteerOrgId
- // }
- this.getelderlyStatus()
- this.gethealthStatus()
- this.loadNations()
- this.getVolunteerOrg()
- this.loadTable()
+ async mounted() {
+
+ await this.getelderlyStatus()
+ await this.gethealthStatus()
+ await this.loadNations()
+ await this.getVolunteerOrg()
+ await this.loadTable()
+ this.userH5DTO = JSON.parse(localStorage.getItem("userH5DTO"));
+ this.volunteerDTO = JSON.parse(localStorage.getItem("volunteerDTO"));
+ const { user } = this.$store.state
+ if (this.userH5DTO.volunteerOrgId) {
+ this.disabled = true
+ this.formData.volunteerOrgId = this.userH5DTO.volunteerOrgId
+ }
+
},
methods: {
+ parseIdCard(value) {
+ const idNum = this.formData.idNum;
+ if (idNum.length === 18) {
+ // 解析生日
+ const birthYear = idNum.substring(6, 10);
+ const birthMonth = idNum.substring(10, 12);
+ const birthDay = idNum.substring(12, 14);
+ this.formData.birthday = `${birthYear}-${birthMonth}-${birthDay}` + " 00:00:00";
+ // 解析性别
+
+ const genderCode = idNum.charAt(16); // 倒数第二位
+ this.formData.gender = (parseInt(genderCode) % 2 === 1) ? "1" : "2";
+ // 这里假设 男=1,女=2,你可以根据自己表单需要调整
+ console.log(this.formData, "dsfsd");
+ }else{
+ this.formData.idNum = value.toUpperCase().replace(/[^0-9X]/g, '');
+ }
+ },
+ handleIdInput(value){
+
+ },
async handleChidren(row) {
console.log(row, "sdfkl");
const url = "/voluntary/serviceCategory/page"
@@ -555,12 +586,19 @@
this.$message.error(msg);
}
},
+ beforeUpload(file) {
+ this.startLoading()
+ },
+
handleExcelSuccess(res, file) {
console.log(res,file,"vsdkljjlskvdvlisd");
if (res.code === 0 && res.msg === "success") {
this.formData.headImg=res.data.url
+ console.log(this.formData.headImg,"sdfkjsdfkl");
+ this.endLoading()
} else {
this.$message.error(res.msg);
+ this.endLoading()
}
},
async initForm(row, type) {
@@ -582,6 +620,7 @@
} else {
this.formData = {
+ headImg:"https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/prod/internal/20250429/6cbeb1fb92a14f8688264d17f9d4046b.png"
}
}
// this.endLoading()
@@ -682,7 +721,8 @@
{ required: true, message: '请输入姓名', trigger: 'blur' }
],
idNum: [
- { required: true, message: '请输入身份证号', trigger: 'blur' }
+ { required: true, message: '请输入身份证号', trigger: 'blur' },
+ { pattern: /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[0-9X]$/, message: '请输入正确的身份证号', trigger: 'blur' }
],
gender: [
{ required: true, message: '请选择性别', trigger: 'blur' }
@@ -783,4 +823,15 @@
font-size: 15px;
font-weight: 600;
}
+ .upload-wrapper {
+ position: relative;
+ width: 180px;
+ height: 180px;
+}
+.upload-loading {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+}
\ No newline at end of file
diff --git a/src/views/modules/informationArchive/elderlyArchives/index.vue b/src/views/modules/informationArchive/elderlyArchives/index.vue
index d1be7a6c7..1fae538bb 100644
--- a/src/views/modules/informationArchive/elderlyArchives/index.vue
+++ b/src/views/modules/informationArchive/elderlyArchives/index.vue
@@ -71,7 +71,7 @@
:accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :auto-upload="true"
:before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
导入
+ >导入
@@ -147,17 +147,17 @@
-
-
-
{
const { fileCode, msg } = res.data.data;
this.importCode = fileCode;
- this.handleComfirmUpload()
+ this.getElderlyInfo()
})
.catch((err) => {
console.log("失败", err);
@@ -318,6 +332,7 @@
},
// 导入
beforeExcelUpload(file) {
+
console.log("file", file);
const isType = file.type === "application/vnd.ms-excel";
const isTypeComputer =
@@ -369,11 +384,13 @@
}
},
async delPolicyBatch(policyIds) {
- const url = `/governance/policy/deletePolicyBatch`;
+ console.log(policyIds,"sdflkjsd");
+ let id=[policyIds]
+ const url = `/voluntary/elderlyInfo/delete`;
const { data, code, msg } = await requestPost(url, policyIds);
if (code === 0) {
this.$message.success("删除成功!");
- this.getTableData();
+ this.getElderlyInfo();
} else {
this.$message.error("操作失败!");
}
@@ -402,6 +419,8 @@
const url =this.searchData.type?"/voluntary/elderlyInfo/homePage/selectPage":"/voluntary/elderlyInfo/page"
let params = !this.searchData.type?{
...this.formData,
+ pageNo:this.pageNo,
+ pageSize:this.pageSize
}:{
searchContent:this.searchData.searchKey,
pageNo:this.pageNo,
@@ -460,7 +479,7 @@
this.$nextTick(() => {
this.$refs.ref_form.initForm('summary', row)
})
- this.communityActivityList()
+ this.getElderlyInfo()
},
handleAdd () {
@@ -493,13 +512,13 @@
addFormOk () {
this.formShow = false
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
addFormOkInit () {
this.initShow = false
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
@@ -555,6 +574,7 @@
resetSearch () {
this.timeRange = []
this.formData = {
+ volunteerOrgId:this.userH5DTO.volunteerOrgId,
activityName: "",
status: "",
typeId: "",
@@ -563,10 +583,9 @@
address: "",
assistingParty: ""
}
- this.pageSize = 10
+ this.pageSize = 20
this.pageNo = 1
- // this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
//导出表格
@@ -690,12 +709,12 @@
this.pageSize = val
this.pageNo = 1
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
handleCurrentChange (val) {
this.pageNo = val
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
// 开启加载动画
diff --git a/src/views/modules/informationArchive/serviceTeamManagement/index.vue b/src/views/modules/informationArchive/serviceTeamManagement/index.vue
index d632bfbd9..68cb44a4b 100644
--- a/src/views/modules/informationArchive/serviceTeamManagement/index.vue
+++ b/src/views/modules/informationArchive/serviceTeamManagement/index.vue
@@ -5,7 +5,7 @@
@@ -112,7 +112,7 @@
selection: [],
loading: false,
total: 0,
- pageSize: 10,
+ pageSize: 20,
pageNo: 0,
tableLoading: false,
gridList: [],//所属网格
@@ -128,7 +128,7 @@
formShow: false,
initShow:false,
formTitle: '新增活动',
- detailShow: false,
+ detailShow: false
}
},
components: {
@@ -138,6 +138,7 @@
},
async mounted () {
+
const { user } = this.$store.state
this.formData.agencyId = user.agencyId
this.getFormInfo()
@@ -148,7 +149,7 @@
// 获取所属组织列表
getFormInfo() {
this.$http
- .post(`/gov/org/agency/getOrgTreeListByCustomerId`)
+ .post(`/gov/org/userhouse/service/serviceScopeTree`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
@@ -287,7 +288,7 @@
this.formData = {
}
- this.pageSize = 10
+ this.pageSize = 20
this.pageNo = 1
this.getElderlyInfo()
},
diff --git a/src/views/modules/informationArchive/toexamine/index.vue b/src/views/modules/informationArchive/toexamine/index.vue
index d3f053e38..878485fb3 100644
--- a/src/views/modules/informationArchive/toexamine/index.vue
+++ b/src/views/modules/informationArchive/toexamine/index.vue
@@ -4,9 +4,9 @@
-
+
@@ -147,7 +147,7 @@
selection: [],
loading: false,
total: 0,
- pageSize: 10,
+ pageSize: 20,
pageNo: 0,
tableLoading: false,
agencyId: '',
@@ -189,7 +189,7 @@
// 获取所属组织列表
getFormInfo() {
this.$http
- .post(`/gov/org/agency/getOrgTreeListByCustomerId`)
+ .post(`/gov/org/userhouse/service/serviceScopeTree`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
@@ -261,6 +261,8 @@
const url = "/voluntary/volunteerOrg/applicationList"
let params = {
...this.formData,
+ pageNo: this.pageNo,
+ pageSize: this.pageSize
}
@@ -313,13 +315,13 @@
addFormOk () {
this.formShow = false
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
addFormOkInit () {
this.initShow = false
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
@@ -383,10 +385,10 @@
address: "",
assistingParty: ""
}
- this.pageSize = 10
+ this.pageSize = 20
this.pageNo = 1
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
//导出表格
@@ -485,7 +487,7 @@
});
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
} else {
this.$message.error(msg)
}
@@ -510,12 +512,12 @@
this.pageSize = val
this.pageNo = 1
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
handleCurrentChange (val) {
this.pageNo = val
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
// 开启加载动画
diff --git a/src/views/modules/informationArchive/volunteerProfile/index.vue b/src/views/modules/informationArchive/volunteerProfile/index.vue
index 03e025407..4a3190ce7 100644
--- a/src/views/modules/informationArchive/volunteerProfile/index.vue
+++ b/src/views/modules/informationArchive/volunteerProfile/index.vue
@@ -166,7 +166,7 @@
selection: [],
loading: false,
total: 0,
- pageSize: 10,
+ pageSize: 20,
pageNo: 0,
tableLoading: false,
gridList: [],//所属网格
@@ -192,6 +192,8 @@
initShow:false,
formTitle: '新增活动',
detailShow: false,
+ userH5DTO:{},
+ volunteerDTO:{},
}
},
components: {
@@ -200,18 +202,21 @@
async created () {
},
async mounted () {
+
//获取服务事项
const { user } = this.$store.state
- if (user.commander) {
- this.disabled=true
- this.formData.volunteerOrgId=user.volunteerOrgId
- }
this.formData.agencyId = user.agencyId
this.searchData.searchKey = localStorage.getItem("homeSearchKey") || "";
this.searchData.type = localStorage.getItem("homeSearchType") || "";
this.getFormInfo()
this.getElderlyInfo()
- this.getVolunteerOrg()
+ await this.getVolunteerOrg()
+ this.userH5DTO = JSON.parse(localStorage.getItem("userH5DTO"));
+ this.volunteerDTO = JSON.parse(localStorage.getItem("volunteerDTO"));
+ if (this.userH5DTO.volunteerOrgId) {
+ this.disabled = true
+ this.formData.volunteerOrgId = this.userH5DTO.volunteerOrgId
+ }
},
methods: {
@@ -421,7 +426,7 @@
startTime: "",
endTime: ""
}
- this.pageSize = 10
+ this.pageSize = 20
this.pageNo = 1
// this.loadTable()
this.getElderlyInfo()
diff --git a/src/views/modules/servicePointsManagement/index.vue b/src/views/modules/servicePointsManagement/index.vue
index a464a11d8..10cda2cb2 100644
--- a/src/views/modules/servicePointsManagement/index.vue
+++ b/src/views/modules/servicePointsManagement/index.vue
@@ -211,9 +211,9 @@ import serviceAdd from './cpts/service-add'
type: "success",
message: "启用成功"
})
+ this.loadChildren(); // 重新加载主列表
}
;
- this.loadTable()
} else if (code > 8000) {
this.$message({
message: msg,
diff --git a/src/views/modules/volunteerService/pairingRecords/cpts/service-team.vue b/src/views/modules/volunteerService/pairingRecords/cpts/service-team.vue
index eed454a3a..1ad95407c 100644
--- a/src/views/modules/volunteerService/pairingRecords/cpts/service-team.vue
+++ b/src/views/modules/volunteerService/pairingRecords/cpts/service-team.vue
@@ -12,10 +12,10 @@
- 通过
- 不通过
+ 通过
+ 不通过
-
+
diff --git a/src/views/modules/volunteerService/pairingRecords/index.vue b/src/views/modules/volunteerService/pairingRecords/index.vue
index 98e337518..4a21b43fc 100644
--- a/src/views/modules/volunteerService/pairingRecords/index.vue
+++ b/src/views/modules/volunteerService/pairingRecords/index.vue
@@ -4,9 +4,9 @@
-
+
@@ -73,7 +73,7 @@
'orange': scope.row.status === 0, // 未审核
'green': scope.row.status === 1, // 已通过
'black': scope.row.status === 2 // 未通过
- }">{{ scope.row.status===1?'正常结对':scope.row.status===2?'待审核结对':'已取消结对' }}
+ }">{{ scope.row.status===1?'正常结对':scope.row.status===2?'待审核取消结对':'已取消结对' }}
@@ -212,7 +212,7 @@
// 获取所属组织列表
getFormInfo() {
this.$http
- .post(`/gov/org/agency/getOrgTreeListByCustomerId`)
+ .post(`/gov/org/userhouse/service/serviceScopeTree`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
@@ -327,7 +327,7 @@
this.$nextTick(() => {
this.$refs.ref_form.initForm('summary', row)
})
- this.communityActivityList()
+ this.getElderlyInfo()
},
handleAdd () {
@@ -354,13 +354,13 @@
addFormOk () {
this.formShow = false
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
addFormOkInit () {
this.initShow = false
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
@@ -427,7 +427,7 @@
this.pageSize = 10
this.pageNo = 1
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
//导出表格
@@ -524,7 +524,7 @@
});
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
} else {
this.$message.error(msg)
}
@@ -549,12 +549,12 @@
this.pageSize = val
this.pageNo = 1
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
handleCurrentChange (val) {
this.pageNo = val
// this.loadTable()
- this.communityActivityList()
+ this.getElderlyInfo()
},
// 开启加载动画
diff --git a/src/views/modules/volunteerService/serviceRecord/index.vue b/src/views/modules/volunteerService/serviceRecord/index.vue
index 3ccefbd6f..2cfb05a6f 100644
--- a/src/views/modules/volunteerService/serviceRecord/index.vue
+++ b/src/views/modules/volunteerService/serviceRecord/index.vue
@@ -1,131 +1,126 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 至
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.categoryLabels.join(",") }}
-
-
-
-
-
-
-
-
-
-
-
-
- 查看
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.categoryLabels.join(",") }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+