elink-star
/
epmet-work-pc
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

临沂...

feature
是小王呀\24601 1 year ago
parent
63d72f0b74
commit
1abbd092df
15 changed files with 346 additions and 267 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .env.development
  2. 34
      src/views/dataBoardMain/main.vue
  3. 32
      src/views/main-shuju/main.vue
  4. 31
      src/views/main.vue
  5. 4
      src/views/modules/base/organization/organization.vue
  6. 95
      src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue
  7. 63
      src/views/modules/informationArchive/elderlyArchives/index.vue
  8. 11
      src/views/modules/informationArchive/serviceTeamManagement/index.vue
  9. 26
      src/views/modules/informationArchive/toexamine/index.vue
  10. 19
      src/views/modules/informationArchive/volunteerProfile/index.vue
  11. 2
      src/views/modules/servicePointsManagement/index.vue
  12. 6
      src/views/modules/volunteerService/pairingRecords/cpts/service-team.vue
  13. 24
      src/views/modules/volunteerService/pairingRecords/index.vue
  14. 259
      src/views/modules/volunteerService/serviceRecord/index.vue
  15. 3
      src/views/pages/login.vue

4
.env.development
View File

@ -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

34
src/views/dataBoardMain/main.vue
View File

@ -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);

32
src/views/main-shuju/main.vue
View File

@ -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);

31
src/views/main.vue
View File

@ -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);

4
src/views/modules/base/organization/organization.vue
View File

@ -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;

95
src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue
View File

@ -25,7 +25,7 @@
<el-col :span="12">
<el-form-item label="身份证号" prop="idNum" label-width="100px">
<el-input v-model.trim="formData.idNum" size="small" clearable placeholder="请输入"
class="u-item-width-normal"></el-input>
class="u-item-width-normal" @input="parseIdCard"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@ -66,12 +66,11 @@
<el-form-item label="" prop="albumName" label-width="100px">
<el-upload :headers="$getElUploadHeaders()" ref="upload" :action="uploadUlr" :limit="1"
:accept="'.jpg,.png,.jpeg,.bmp'" :with-credentials="true" :show-file-list="false"
:auto-upload="true" :on-success="handleExcelSuccess"
:auto-upload="true" :on-success="handleExcelSuccess" :before-upload="beforeUpload"
>
<img style="width: 180px;height: 180px;" v-if="formData.headImg"
:src="formData.headImg">
<img style="width: 180px;height: 180px;" v-else
src="../../../../../assets/images/linyi/upload.png">
<img style="width: 180px;height: 180px;"
:src="formData.headImg"></img>
</el-upload>
</el-form-item>
</el-col>
@ -81,8 +80,8 @@
<el-form-item label="健康状况" prop="healthStatus" label-width="100px">
<el-select class="u-item-width-normal" v-model.trim="formData.healthStatus" size="small"
placeholder="请选择" clearable>
<el-option v-for="item in healthStatusList" :key="item.typeName" :label="item.typeName"
:value="item.id">
<el-option v-for="item in healthStatusList" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
@ -278,6 +277,10 @@
</el-row>
</el-form>
</div>
<!-- 加一个loading旋转图标 -->
<div v-if="uploadLoading" class="upload-loading">
<i class="el-icon-loading" style="font-size: 32px; color: #409EFF;"></i>
</div>
<div style="text-align: right ; margin-right: 20px;">
<el-button size="small" @click="handleCancle">取 消</el-button>
<el-button size="small" type="primary" @click="handleComfirm">确 定</el-button>
@ -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%);
}
</style>

63
src/views/modules/informationArchive/elderlyArchives/index.vue
View File

@ -71,7 +71,7 @@
:accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :auto-upload="true"
:before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
<el-button type="primary" size="small" class="diy-button--white el-button--default"
:loading="importLoading">导入</el-button>
>导入</el-button>
</el-upload>
</div>
@ -147,17 +147,17 @@
</div>
<el-dialog :visible.sync="initShow" v-if="initShow" :close-on-click-modal="false" :close-on-press-escape="false"
:title="formTitle" width="1050px" top="5vh" class="dialog-h" @closed="diaInitClose">
<add-old v-if="initShow" ref="ref_form" :unitList="corganizerList" :gridList="gridList" @closeAdd="closeAdd"
<add-old v-if="initShow" ref="ref_form" :gridList="gridList" @closeAdd="closeAdd"
@dialogCancle="addFormCancleInit" @dialogOk="addFormOkInit"></add-old>
</el-dialog>
<el-dialog :visible.sync="detailShow" v-if="detailShow" :close-on-click-modal="false" :close-on-press-escape="false"
title="详情" width="1050px" top="5vh" class="dialog-h" @closed="diaInitClose">
<info-old v-if="detailShow" ref="ref_detail" :unitList="corganizerList" :gridList="gridList" @closeAdd="closeAdd"
<info-old v-if="detailShow" ref="ref_detail" :gridList="gridList" @closeAdd="closeAdd"
@dialogCancle="addFormCancleInit" @dialogOk="addFormOkInit"></info-old>
</el-dialog>
<el-dialog :visible.sync="showList" v-if="showList" :close-on-click-modal="false" :close-on-press-escape="false"
title="结对志愿者" width="1050px" top="5vh" class="dialog-h" @closed="diaInitClose">
<pairup-volunteers v-if="showList" ref="ref_vol" :unitList="corganizerList" :gridList="gridList"
<pairup-volunteers v-if="showList" ref="ref_vol" :gridList="gridList"
@closeAdd="closeAdd" @dialogCancle="addFormCancleInit" @dialogOk="addFormOkInit"></pairup-volunteers>
</el-dialog>
<el-dialog :visible.sync="serviceRecordShow" v-if="serviceRecordShow" :close-on-click-modal="false" :close-on-press-escape="false"
@ -221,7 +221,7 @@
selection: [],
loading: false,
total: 0,
pageSize: 10,
pageSize: 20,
pageNo: 1,
tableLoading: false,
agencyId: '',
@ -248,6 +248,8 @@
type: "",
searchKey: "",
},
userH5DTO:{},
volunteerDTO:{}
}
},
components: {
@ -257,18 +259,19 @@
},
async mounted () {
const { user } = this.$store.state
if (user.commander) {
this.disabled=true
this.formData.volunteerOrgId=user.volunteerOrgId
}
this.agencyId = user.agencyId
this.searchData.searchKey = localStorage.getItem("homeSearchKey") || "";
this.searchData.type = localStorage.getItem("homeSearchType") || "";
this.getVolunteerOrg()
await this.getVolunteerOrg()
this.getElderlyInfo()
this.getelderlyStatus()
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: {
@ -290,6 +293,11 @@
}
},
async uploadHttpRequest(file) {
console.log(this.formData.volunteerOrgId,"dskdksl");
if (!this.formData.volunteerOrgId) {
this.$message.error('请选择服务团')
return
}
this.$message({
showClose: true,
dangerouslyUseHTMLString: true,
@ -303,12 +311,18 @@
});
const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
formData.append("file", file.file); //添加文件对象
// console.log(this.userH5DTO.volunteerOrgId,"sdjlksdjl;")
// formData.append("volunteerOrg;Id", "1916407902797398017");
if (this.formData.volunteerOrgId) {
formData.append("volunteerOrgId", this.formData.volunteerOrgId); //添加文件对象
}
await this.$http
.post("/voluntary/elderlyInfo/import", formData)
.then((res) => {
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()
},
// 开启加载动画

11
src/views/modules/informationArchive/serviceTeamManagement/index.vue
View File

@ -5,7 +5,7 @@
<div>
<el-form-item label="所属组织" prop="orgName">
<el-cascader ref="org" v-model.trim="formData.agencyId" :options="organizationList" :show-all-levels="false"
:props="{ checkStrictly: true, multiple: false, emitPath:false }" style="width: 200px" clearable
:props="{ label: 'objectName', value: 'objectId',children: 'children',checkStrictly: true, multiple: false, emitPath:false }" style="width: 200px" clearable
>
</el-cascader>
</el-form-item>
@ -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()
},

26
src/views/modules/informationArchive/toexamine/index.vue
View File

@ -4,9 +4,9 @@
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'120px'">
<div>
<el-form-item label="所属组织" prop="agencyId">
<el-cascader ref="org" v-model.trim="formData.agencyId" :options="organizationList"
:props="{ checkStrictly: true, multiple: false, emitPath: true }" style="width: 200px" clearable
@change="orgChangeHandle">
<el-cascader ref="org" v-model.trim="formData.agencyId" :options="organizationList" :show-all-levels="false"
:props="{ label: 'objectName', value: 'objectId',children: 'children',checkStrictly: true, multiple: false, emitPath:false }" style="width: 200px" clearable
>
</el-cascader>
</el-form-item>
<el-form-item label="服务团名称" prop="orgName">
@ -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()
},
// 开启加载动画

19
src/views/modules/informationArchive/volunteerProfile/index.vue
View File

@ -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()

2
src/views/modules/servicePointsManagement/index.vue
View File

@ -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,

6
src/views/modules/volunteerService/pairingRecords/cpts/service-team.vue
View File

@ -12,10 +12,10 @@
</div>
</el-form-item>
<el-form-item label="审核结果" prop="name">
<el-radio v-model="formData.auditStatus" :label="0">通过</el-radio>
<el-radio v-model="formData.auditStatus" :label="1">不通过</el-radio>
<el-radio v-model="formData.auditStatus" :label="1">通过</el-radio>
<el-radio v-model="formData.auditStatus" :label="0">不通过</el-radio>
</el-form-item>
<el-form-item label="不通过原因" prop="mobile" v-if="formData.auditStatus===1">
<el-form-item label="不通过原因" prop="mobile" v-if="formData.auditStatus===0">
<el-input v-model.trim="formData.cancelRejectRemark" size="small" class="item_width_1" clearable
placeholder="请输入">
</el-input>

24
src/views/modules/volunteerService/pairingRecords/index.vue
View File

@ -4,9 +4,9 @@
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'120px'">
<div>
<el-form-item label="所属组织" prop="agencyId">
<el-cascader ref="org" v-model.trim="formData.agencyId" :options="organizationList"
:props="{ checkStrictly: true, multiple: false, emitPath: true }" style="width: 200px" clearable
>
<el-cascader ref="org" v-model.trim="formData.agencyId" :options="organizationList" :show-all-levels="false"
:props="{ label: 'objectName', value: 'objectId',children: 'children',checkStrictly: true, multiple: false, emitPath:false }" style="width: 200px" clearable
>
</el-cascader>
</el-form-item>
<el-form-item label="服务团名称" prop="orgName">
@ -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?'待审核结对':'已取消结对' }}</span>
}">{{ scope.row.status===1?'正常结对':scope.row.status===2?'待审核取消结对':'已取消结对' }}</span>
</div>
</template>
</el-table-column>
@ -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()
},
// 开启加载动画

259
src/views/modules/volunteerService/serviceRecord/index.vue
View File

@ -1,131 +1,126 @@
<template>
<div class="g-main">
<div class="m-search">
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'120px'">
<div>
<el-form-item label="所属组织" prop="agencyId">
<el-cascader ref="org" v-model.trim="formData.agencyId" :options="organizationList"
:props="{ checkStrictly: true, multiple: false, emitPath: true }" style="width: 200px"
clearable @change="orgChangeHandle">
</el-cascader>
</el-form-item>
<el-form-item label="所属服务团" prop="orgName">
<el-select class="item_width_1" v-model.trim="formData.volunteerOrgId" size="small" :disabled="disabled"
placeholder="请选择" clearable>
<el-option v-for="item in typeList" :key="item.id" :label="item.orgName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="志愿者姓名" prop="volunteerName">
<el-input v-model.trim="formData.volunteerName" size="small" class="item_width_1" clearable
placeholder="请输入关键字">
</el-input>
</el-form-item>
<el-form-item label="志愿者手机号" prop="volunteerMobile">
<el-input v-model.trim="formData.volunteerMobile" size="small" class="item_width_1" clearable
placeholder="请输入关键字">
</el-input>
</el-form-item>
<el-form-item label="老人姓名" prop="oldPeopleName">
<el-input v-model.trim="formData.oldPeopleName" size="small" class="item_width_1" clearable
placeholder="请输入关键字">
</el-input>
</el-form-item>
<el-form-item label="老人身份证" prop="oldPeopleIdCard">
<el-input v-model.trim="formData.oldPeopleIdCard" size="small" class="item_width_1" clearable
placeholder="请输入关键字">
</el-input>
</el-form-item>
<el-form-item label="服务类别" prop="serviceCategory">
<el-select class="u-item-width-normal" v-model.trim="formData.serviceCategory" size="small"
placeholder="请选择" clearable>
<el-option v-for="item in elderlyList" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="打卡时间" prop="signInTimeFrom" label-width="100px">
<el-date-picker class="u-item-width-normal" v-model="formData.signInTimeFrom" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd HH:mm:ss" placeholder="选择日期">
</el-date-picker>
<span style="margin: 0 10px;">至</span>
<el-date-picker class="u-item-width-normal" v-model="formData.signInTimeTo" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd HH:mm:ss" placeholder="选择日期">
</el-date-picker>
</el-form-item>
<div class="g-main">
<div class="m-search">
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'120px'">
<div>
<el-form-item label="所属组织" prop="agencyId">
<el-cascader ref="org" v-model.trim="formData.agencyId" :options="organizationList" :show-all-levels="false"
:props="{ label: 'objectName', value: 'objectId', children: 'children', checkStrictly: true, multiple: false, emitPath: false }"
style="width: 200px" clearable>
</el-cascader>
</el-form-item>
<el-form-item label="所属服务团" prop="orgName">
<el-select class="item_width_1" v-model.trim="formData.volunteerOrgId" size="small" :disabled="disabled"
placeholder="请选择" clearable>
<el-option v-for="item in typeList" :key="item.id" :label="item.orgName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="志愿者姓名" prop="volunteerName">
<el-input v-model.trim="formData.volunteerName" size="small" class="item_width_1" clearable
placeholder="请输入关键字">
</el-input>
</el-form-item>
<el-form-item label="志愿者手机号" prop="volunteerMobile">
<el-input v-model.trim="formData.volunteerMobile" size="small" class="item_width_1" clearable
placeholder="请输入关键字">
</el-input>
</el-form-item>
<el-form-item label="老人姓名" prop="oldPeopleName">
<el-input v-model.trim="formData.oldPeopleName" size="small" class="item_width_1" clearable
placeholder="请输入关键字">
</el-input>
</el-form-item>
<el-form-item label="老人身份证" prop="oldPeopleIdCard">
<el-input v-model.trim="formData.oldPeopleIdCard" size="small" class="item_width_1" clearable
placeholder="请输入关键字">
</el-input>
</el-form-item>
<el-form-item label="服务类别" prop="serviceCategory">
<el-select class="u-item-width-normal" v-model.trim="formData.serviceCategory" size="small"
placeholder="请选择" clearable>
<el-option v-for="item in elderlyList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="打卡时间" prop="signInTimeFrom" label-width="100px">
<el-date-picker class="u-item-width-normal" v-model="formData.signInTimeFrom" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd HH:mm:ss" placeholder="选择日期">
</el-date-picker>
<span style="margin: 0 10px;">至</span>
<el-date-picker class="u-item-width-normal" v-model="formData.signInTimeTo" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd HH:mm:ss" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</div>
<div>
<div style="display: flex; justify-content: flex-end;">
<el-button style="margin-left:10px" class="diy-button--blue" size="small"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px" class="diy-button--white" size="small"
@click="resetSearch">重置</el-button>
</div>
</div>
</el-form>
</div>
<div class="m-table">
<el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
style="width: 100%;margin-top:16px" @select-all="selectAll" @selection-change="handelSelection">
<el-table-column type="selection" fixed="left" align="center" width="50"></el-table-column>
<el-table-column prop="orgNamePath" header-align="center" align="center" label="所属组织">
</el-table-column>
<el-table-column prop="volunteerOrgName" header-align="center" align="center" label="所属服务团">
</el-table-column>
<el-table-column prop="oldPeopleName" header-align="center" align="center" label="老人姓名">
</el-table-column>
<el-table-column prop="oldPeopleIdCard" header-align="center" align="center" label="老人身份证号">
</el-table-column>
<el-table-column prop="categoryLabels" header-align="center" align="center" label="服务项目">
<template slot-scope="scope">
<div>{{ scope.row.categoryLabels.join("，") }}</div>
</template>
</el-table-column>
<el-table-column prop="serviceTime" header-align="center" align="center" label="服务时长(小时)">
</el-table-column>
<el-table-column prop="pointNum" header-align="center" align="center" label="积分">
</el-table-column>
<el-table-column prop="signInTime" header-align="center" align="center" label="到岗打卡时间">
</el-table-column>
<el-table-column prop="signOutTime" header-align="center" align="center" label="离岗打卡时间">
</el-table-column>
<el-table-column label="操作" fixed="right" width="230" header-align="center" align="center"
class="operate">
<template slot-scope="scope">
<el-button type="text" style="color:#1C6AFD;" size="small"
@click="handleDetail(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page.sync="pageNo" :page-sizes="[10, 20, 50]" :page-size="pageSize"
layout="sizes, prev, pager, next, total" :total="total">
</el-pagination>
</div>
<div>
<div style="display: flex; justify-content: flex-end;">
<el-button style="margin-left:10px" class="diy-button--blue" size="small"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px" class="diy-button--white" size="small"
@click="resetSearch">重置</el-button>
</div>
</div>
<el-dialog :visible.sync="initShow" v-if="initShow" :close-on-click-modal="false" :close-on-press-escape="false"
:title="formTitle" width="1050px" top="5vh" class="dialog-h" @closed="diaInitClose">
<add-old v-if="initShow" ref="ref_form" :unitList="corganizerList" :gridList="gridList" @closeAdd="closeAdd"
@dialogCancle="addFormCancleInit" @dialogOk="addFormOkInit"></add-old>
</el-dialog>
<el-dialog :visible.sync="detailShow" v-if="detailShow" :close-on-click-modal="false"
:close-on-press-escape="false" title="详情" width="1050px" top="5vh" class="dialog-h" @closed="diaInitClose">
<service-info v-if="detailShow" ref="ref_detail" :unitList="corganizerList" :gridList="gridList"
@closeDetail="closeDetail" @dialogCancle="addFormCancleInit" @dialogOk="addFormOkInit"></service-info>
</el-dialog>
<el-dialog :visible.sync="showList" v-if="showList" :close-on-click-modal="false" :close-on-press-escape="false"
title="志愿者成员" width="1050px" top="5vh" class="dialog-h" @closed="diaInitClose">
<volunteers-list v-if="showList" ref="ref_vol" @closeAdd="closeAdd"></volunteers-list>
</el-dialog>
<el-dialog :visible.sync="toExamineShow" v-if="toExamineShow" :close-on-click-modal="false"
:close-on-press-escape="false" title="审核" width="750px" top="5vh" class="dialog-h" @closed="diaInitClose">
<service-team v-if="toExamineShow" ref="ref_examine" @closeExamine="closeExamine"></service-team>
</el-dialog>
</el-form>
</div>
<div class="m-table">
<el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
style="width: 100%;margin-top:16px" @select-all="selectAll" @selection-change="handelSelection">
<el-table-column type="selection" fixed="left" align="center" width="50"></el-table-column>
<el-table-column prop="orgNamePath" header-align="center" align="center" label="所属组织">
</el-table-column>
<el-table-column prop="volunteerOrgName" header-align="center" align="center" label="所属服务团">
</el-table-column>
<el-table-column prop="oldPeopleName" header-align="center" align="center" label="老人姓名">
</el-table-column>
<el-table-column prop="oldPeopleIdCard" header-align="center" align="center" label="老人身份证号">
</el-table-column>
<el-table-column prop="categoryLabels" header-align="center" align="center" label="服务项目">
<template slot-scope="scope">
<div>{{ scope.row.categoryLabels.join("，") }}</div>
</template>
</el-table-column>
<el-table-column prop="serviceTime" header-align="center" align="center" label="服务时长(小时)">
</el-table-column>
<el-table-column prop="pointNum" header-align="center" align="center" label="积分">
</el-table-column>
<el-table-column prop="signInTime" header-align="center" align="center" label="到岗打卡时间">
</el-table-column>
<el-table-column prop="signOutTime" header-align="center" align="center" label="离岗打卡时间">
</el-table-column>
<el-table-column label="操作" fixed="right" width="230" header-align="center" align="center" class="operate">
<template slot-scope="scope">
<el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
:page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
</el-pagination>
</div>
</div>
<el-dialog :visible.sync="initShow" v-if="initShow" :close-on-click-modal="false" :close-on-press-escape="false"
:title="formTitle" width="1050px" top="5vh" class="dialog-h" @closed="diaInitClose">
<add-old v-if="initShow" ref="ref_form" :unitList="corganizerList" :gridList="gridList" @closeAdd="closeAdd"
@dialogCancle="addFormCancleInit" @dialogOk="addFormOkInit"></add-old>
</el-dialog>
<el-dialog :visible.sync="detailShow" v-if="detailShow" :close-on-click-modal="false" :close-on-press-escape="false"
title="详情" width="1050px" top="5vh" class="dialog-h" @closed="diaInitClose">
<service-info v-if="detailShow" ref="ref_detail" :unitList="corganizerList" :gridList="gridList"
@closeDetail="closeDetail" @dialogCancle="addFormCancleInit" @dialogOk="addFormOkInit"></service-info>
</el-dialog>
<el-dialog :visible.sync="showList" v-if="showList" :close-on-click-modal="false" :close-on-press-escape="false"
title="志愿者成员" width="1050px" top="5vh" class="dialog-h" @closed="diaInitClose">
<volunteers-list v-if="showList" ref="ref_vol" @closeAdd="closeAdd"></volunteers-list>
</el-dialog>
<el-dialog :visible.sync="toExamineShow" v-if="toExamineShow" :close-on-click-modal="false"
:close-on-press-escape="false" title="审核" width="750px" top="5vh" class="dialog-h" @closed="diaInitClose">
<service-team v-if="toExamineShow" ref="ref_examine" @closeExamine="closeExamine"></service-team>
</el-dialog>
</div>
</template>
<script>
@ -248,7 +243,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);
@ -320,6 +315,8 @@
const url = "/voluntary/op/service/pc/serviceRecs"
let params = {
...this.formData,
pageNo:this.pageNo,
pageSize:this.pageSize
}
const { data, code, msg } = await requestPost(url, params)
@ -372,7 +369,7 @@
this.$nextTick(() => {
this.$refs.ref_form.initForm('summary', row)
})
this.communityActivityList()
this.getElderlyInfo()
},
handleAdd () {
@ -399,13 +396,13 @@
addFormOk () {
this.formShow = false
// this.loadTable()
this.communityActivityList()
this.getElderlyInfo()
},
addFormOkInit () {
this.initShow = false
// this.loadTable()
this.communityActivityList()
this.getElderlyInfo()
},
@ -472,7 +469,7 @@
this.pageSize = 10
this.pageNo = 1
// this.loadTable()
this.communityActivityList()
this.getElderlyInfo()
},
//导出表格
@ -571,7 +568,7 @@
});
// this.loadTable()
this.communityActivityList()
this.getElderlyInfo()
} else {
this.$message.error(msg)
}
@ -596,12 +593,12 @@
this.pageSize = val
this.pageNo = 1
// this.loadTable()
this.communityActivityList()
this.getElderlyInfo()
},
handleCurrentChange (val) {
this.pageNo = val
// this.loadTable()
this.communityActivityList()
this.getElderlyInfo()
},
// 开启加载动画

3
src/views/pages/login.vue
View File

@ -266,6 +266,9 @@ export default {
this.diaVisible = false;
localStorage.setItem("userType", "work");
localStorage.setItem("token", res.data.token);
localStorage.setItem("userH5DTO", JSON.stringify(res.data.userH5DTO));
localStorage.setItem("volunteerDTO", JSON.stringify(res.data.volunteerDTO));
this.skipAfterLogin();
})
.catch(() => {

Write Preview
Loading…
Cancel
Save