Browse Source

找人页面搜索栏内容修改,服务方改为服务组织

feature
mk 2 years ago
parent
commit
2347a9d00c
  1. 30
      src/views/modules/communityService/fuwuzhaoren/addForm.vue
  2. 34
      src/views/modules/communityService/fuwuzhaoren/index.vue
  3. 12
      src/views/modules/communityService/gangweizhaoren/addForm.vue
  4. 147
      src/views/modules/communityService/gangweizhaoren/index.vue
  5. 12
      src/views/modules/communityService/gxxq/addForm.vue
  6. 2
      src/views/modules/communityService/gxxq/detailForm.vue
  7. 12
      src/views/modules/communityService/jinengzhaoren/addForm.vue
  8. 32
      src/views/modules/communityService/jinengzhaoren/index.vue
  9. 12
      src/views/modules/communityService/wennuanzhaoren/addForm.vue
  10. 32
      src/views/modules/communityService/wennuanzhaoren/index.vue

30
src/views/modules/communityService/fuwuzhaoren/addForm.vue

@ -12,7 +12,7 @@
:rules="dataRule" :rules="dataRule"
class="div_form" class="div_form"
> >
<el-form-item label="需求类型" prop="categoryCode" label-width="150px"> <el-form-item label="服务类别" prop="categoryCode" label-width="150px">
<el-cascader <el-cascader
v-model="formData.categoryCode" v-model="formData.categoryCode"
:options="demandOptions" :options="demandOptions"
@ -22,22 +22,6 @@
class="u-item-width-normal" class="u-item-width-normal"
></el-cascader> ></el-cascader>
</el-form-item> </el-form-item>
<!-- <el-form-item label="政策依据"
prop="policyId"
label-width="150px"
style="display: block">
<el-select :disabled="formType==='detail'"
v-model="formData.policyId"
class="input-width-small"
placeholder="请选择"
clearable>
<el-option v-for="item in policyList"
:key="item.policyId"
:label="item.title"
:value="item.policyId">
</el-option>
</el-select>
</el-form-item> -->
<el-form-item <el-form-item
label="服务事项" label="服务事项"
prop="serviceName" prop="serviceName"
@ -96,7 +80,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="服务" label="服务组织"
prop="serviceOrgId" prop="serviceOrgId"
label-width="150px" label-width="150px"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
@ -136,7 +120,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
prop="noticeApproches" prop="noticeApproches"
label="自动通知服务" label="自动通知服务组织"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
@ -413,10 +397,10 @@ export default {
resiSearchTagId: "", // resiSearchTagId: "", //
resiSearchTagName: "", // resiSearchTagName: "", //
serviceName: "", // serviceName: "", //
noticeApproches: [], // noticeApproches: [], //
policyId: "", // policyId: "", //
serviceOrgType: "", // community_org ic_user_volunteer party_unit serviceOrgType: "", // community_org ic_user_volunteer party_unit
serviceOrgId: "", //Id serviceOrgId: "", //Id
gridIdList: [], // gridIdList: [], //
principalName: "", //() principalName: "", //()
principalContact: "", // principalContact: "", //
@ -444,7 +428,7 @@ export default {
{ required: true, message: "服务事项不能为空", trigger: "change" }, { required: true, message: "服务事项不能为空", trigger: "change" },
], ],
serviceOrgId: [ serviceOrgId: [
{ required: true, message: "服务不能为空", trigger: "change" }, { required: true, message: "服务组织不能为空", trigger: "change" },
], ],
serviceTimeStart: [ serviceTimeStart: [

34
src/views/modules/communityService/fuwuzhaoren/index.vue

@ -203,7 +203,7 @@
<el-table-column prop="serviceOrgName" <el-table-column prop="serviceOrgName"
align="center" align="center"
min-width="150" min-width="150"
label="服务" label="服务组织"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
@ -484,7 +484,7 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg);
} else { } else {
this.searchdemandOptions = this.getTreeData(res.data); this.searchdemandOptions = this.getTreeData(res.data).filter((item) => item.categoryCode == '1038' ||item.categoryCode == '1039'||item.categoryCode == '1041');
} }
}) })
.catch(() => { .catch(() => {
@ -522,7 +522,7 @@ export default {
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
this.serviceOptions = data; this.serviceOptions = data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'||item.value == 'publicWelfare');
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
@ -544,24 +544,18 @@ export default {
async getServiceuserList (serviceType, query) { async getServiceuserList (serviceType, query) {
if (!serviceType) return false; if (!serviceType) return false;
const url = "/actual/base/serviceitem/listServerOrgNewTask";
const params = { let params = {
serviceName: "", serverOrgCategoryCode: this.formData.categoryCode,
serviceType: serviceType, serverParentOrgCategoryCode:this.formData.parentCategoryCode,
queryPurpose: query, serverOrgType: serviceType,
}; };
await this.$http let { data, code, msg } = await requestPost(url, params);
.post("/governance/userdemand/servicelist", params) if (code == 0) {
.then(({ data: res }) => { this.serviceOptiondList = data;
if (res.code !== 0) { } else if (code >= 8000) {
return this.$message.error(res.msg); this.$message.error(msg);
} else { }
this.serviceOptiondList = res.data
}
})
.catch(() => {
return this.$message.error("网络错误");
});
}, },
// //
async handlePersonList (row) { async handlePersonList (row) {

12
src/views/modules/communityService/gangweizhaoren/addForm.vue

@ -96,7 +96,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="服务" label="服务组织"
prop="serviceOrgId" prop="serviceOrgId"
label-width="150px" label-width="150px"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
@ -136,7 +136,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
prop="noticeApproches" prop="noticeApproches"
label="自动通知服务" label="自动通知服务组织"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
@ -414,10 +414,10 @@ export default {
resiSearchTagId: "", // resiSearchTagId: "", //
resiSearchTagName: "", // resiSearchTagName: "", //
serviceName: "", // serviceName: "", //
noticeApproches: [], // noticeApproches: [], //
policyId: "", // policyId: "", //
serviceOrgType: "", // community_org ic_user_volunteer party_unit serviceOrgType: "", // community_org ic_user_volunteer party_unit
serviceOrgId: "", //Id serviceOrgId: "", //Id
gridIdList: [], // gridIdList: [], //
principalName: "", //() principalName: "", //()
principalContact: "", // principalContact: "", //
@ -445,7 +445,7 @@ export default {
{ required: true, message: "服务事项不能为空", trigger: "change" }, { required: true, message: "服务事项不能为空", trigger: "change" },
], ],
serviceOrgId: [ serviceOrgId: [
{ required: true, message: "服务不能为空", trigger: "change" }, { required: true, message: "服务组织不能为空", trigger: "change" },
], ],
serviceTimeStart: [ serviceTimeStart: [

147
src/views/modules/communityService/gangweizhaoren/index.vue

@ -6,36 +6,17 @@
:model="formData" :model="formData"
ref="ref_searchform" ref="ref_searchform"
:label-width="'100px'"> :label-width="'100px'">
<el-form-item prop="serviceType" <el-form-item label="服务类别" prop="categoryCode">
label="服务类别" <el-cascader
> v-model="formData.categoryCode"
<el-select class="u-item-width-daterange" class="u-item-width-daterange2"
v-model.trim="formData.serviceTypeLevel1Id" size="small"
placeholder="请选择" :options="searchdemandOptions"
size="small" :props="{ checkStrictly: true, label: 'categoryName', value: 'categoryCode', children: 'childCateList' }"
clearable> clearable
<el-option v-for="item in serviceTypesLevel1" @change="handleCateCHange"
@click.native="handleChangeServiceTypeLevel1" ></el-cascader>
:key="item.id" </el-form-item>
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="serviceType">
<el-select class="u-item-width-daterange"
v-model.trim="formData.serviceTypeLevel2Id"
placeholder="请选择"
size="small"
clearable>
<el-option v-for="item in serviceTypesLevel2"
@click.native=""
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="服务时间" <el-form-item label="服务时间"
prop="serviceTimeStart"> prop="serviceTimeStart">
@ -222,7 +203,7 @@
<el-table-column prop="serviceOrgName" <el-table-column prop="serviceOrgName"
align="center" align="center"
min-width="150" min-width="150"
label="服务" label="服务组织"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
@ -411,9 +392,6 @@ export default {
} }
return { return {
//
serviceTypesLevel1:[],
serviceTypesLevel2:[],
tableLoading: false, tableLoading: false,
user: {}, user: {},
agencyId: '', agencyId: '',
@ -447,8 +425,8 @@ export default {
], ],
formData: { formData: {
serviceTypeLevel1Id:'',// id categoryCode:'',
serviceTypeLevel2Id:'',// id parentCategoryCode:'',
serviceName: '',// serviceName: '',//
serviceOrgType: '',// serviceOrgType: '',//
serviceOrgId: '',//Id serviceOrgId: '',//Id
@ -488,7 +466,8 @@ export default {
ruleList: [], ruleList: [],
// //
multiSelectedRows: [] multiSelectedRows: [],
searchdemandOptions:[]
}; };
}, },
computed: { computed: {
@ -515,26 +494,44 @@ export default {
this.agencyId = this.user.agencyId this.agencyId = this.user.agencyId
this.getDictOptions() this.getDictOptions()
this.getTableData(); this.getTableData();
this.getDemandOptions()
}, },
methods: { methods: {
// async getDemandOptions() {
handleChangeServiceTypeLevel1() {
this.formData.serviceTypeLevel2Id = ''
this.$http this.$http
.get("/governance/commonServiceType/selectList/" + this.formData.serviceTypeLevel1Id) .post("/actual/base/serviceitem/listAllCategory")
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg);
} else { } else {
this.serviceTypesLevel2 = res.data; this.searchdemandOptions = this.getTreeData(res.data).filter((item) => item.categoryCode == '1043');
} }
}) })
.catch(() => { .catch(() => {
return this.$message.error("网络错误"); return this.$message.error("网络错误");
}) });
},
getTreeData(data) {
if (!Array.isArray(data)) return [];
let arr = data.map((item) => {
let _item = {};
if (item.childCateList) {
if (item.childCateList.length === 0)
_item = { ...item, childCateList: undefined };
else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
} else {
_item = { ...item };
}
return _item;
});
return arr;
},
handleCateCHange(val) {
this.formData.parentCategoryCode = val[0];
this.formData.categoryCode = val[1];
}, },
handleSearch (val) { handleSearch (val) {
console.log(this.formData); console.log(this.formData);
this.pageNo = 1; this.pageNo = 1;
@ -551,23 +548,10 @@ export default {
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
this.serviceOptions = data; this.serviceOptions = data.filter(item=>item.value == 'party_unit'||item.value == 'community_org');
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
this.$http
.get("/governance/commonServiceType/selectList/0")
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
this.serviceTypesLevel1 = res.data;
}
})
.catch(() => {
return this.$message.error("网络错误");
});
}, },
handleServiceChange (type, val) { handleServiceChange (type, val) {
@ -585,24 +569,18 @@ export default {
async getServiceuserList (serviceType, query) { async getServiceuserList (serviceType, query) {
if (!serviceType) return false; if (!serviceType) return false;
const url = "/actual/base/serviceitem/listServerOrgNewTask";
const params = { let params = {
serviceName: "", serverOrgCategoryCode: this.formData.categoryCode,
serviceType: serviceType, serverParentOrgCategoryCode:this.formData.parentCategoryCode,
queryPurpose: query, serverOrgType: serviceType,
}; };
await this.$http let { data, code, msg } = await requestPost(url, params);
.post("/governance/userdemand/servicelist", params) if (code == 0) {
.then(({ data: res }) => { this.serviceOptiondList = data;
if (res.code !== 0) { } else if (code >= 8000) {
return this.$message.error(res.msg); this.$message.error(msg);
} else { }
this.serviceOptiondList = res.data
}
})
.catch(() => {
return this.$message.error("网络错误");
});
}, },
// //
async handlePersonList (row) { async handlePersonList (row) {
@ -799,8 +777,7 @@ export default {
resetSearch () { resetSearch () {
this.formData = { this.formData = {
serviceTypeLevel1Id:'',// id categoryCode:'',
serviceTypeLevel2Id:'',// id
serviceName: '',// serviceName: '',//
serviceOrgType: '',// serviceOrgType: '',//
serviceOrgId: '',//Id serviceOrgId: '',//Id

12
src/views/modules/communityService/gxxq/addForm.vue

@ -86,7 +86,7 @@
<el-form :model="newFormData" :rules="newDataRule" ref="ref_gxxq_form1" class="div_form"> <el-form :model="newFormData" :rules="newDataRule" ref="ref_gxxq_form1" class="div_form">
<el-form-item <el-form-item
v-if="formData.assignFlag" v-if="formData.assignFlag"
label="服务" label="服务组织"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
prop="serverOrgId" prop="serverOrgId"
@ -126,7 +126,7 @@
<el-form-item <el-form-item
v-if="formData.assignFlag" v-if="formData.assignFlag"
prop="noticeApproches" prop="noticeApproches"
label="自动通知服务" label="自动通知服务组织"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
@ -319,7 +319,7 @@ export default {
}, },
newFormData: { newFormData: {
noticeApproches: [], // noticeApproches: [], //
serviceScopeList: [], // serviceScopeList: [], //
serviceTimeStart: "", //yyyy-MM-dd serviceTimeStart: "", //yyyy-MM-dd
serviceTimeEnd: "", //yyyy-MM-dd serviceTimeEnd: "", //yyyy-MM-dd
serverOrgType: "", // community_org ic_user_volunteer party_unit serverOrgType: "", // community_org ic_user_volunteer party_unit
@ -346,7 +346,7 @@ export default {
}, },
newDataRule: { newDataRule: {
serverOrgId: [ serverOrgId: [
{ required: true, message: "服务不能为空", trigger: "bulr" }, { required: true, message: "服务组织不能为空", trigger: "bulr" },
], ],
serviceScopeList: [ serviceScopeList: [
{ required: true, message: "服务范围不能为空", trigger: "bulr" }, { required: true, message: "服务范围不能为空", trigger: "bulr" },
@ -467,7 +467,7 @@ export default {
}, },
// //
// //
handleChangeServiceTypeLevel2() { handleChangeServiceTypeLevel2() {
if (this.newFormData.serverOrgType) { if (this.newFormData.serverOrgType) {
this.getServiceuserList(this.newFormData.serverOrgType); this.getServiceuserList(this.newFormData.serverOrgType);
@ -716,7 +716,7 @@ export default {
}, },
async addFuwu() { async addFuwu() {
// ,'0' // ,'0'
if (this.newFormData.noticeApproches.length == 0) { if (this.newFormData.noticeApproches.length == 0) {
this.newFormData.noticeApproches.push(0); this.newFormData.noticeApproches.push(0);
} }

2
src/views/modules/communityService/gxxq/detailForm.vue

@ -39,7 +39,7 @@
}}</span> }}</span>
</div> </div>
<div class="info-prop" v-if="formData.assignFlag == 1"> <div class="info-prop" v-if="formData.assignFlag == 1">
<span class="info-title-2">服务</span> <span class="info-title-2">服务组织</span>
<span>{{ serverOrgType }} - {{serverOrgName}}</span> <span>{{ serverOrgType }} - {{serverOrgName}}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">

12
src/views/modules/communityService/jinengzhaoren/addForm.vue

@ -96,7 +96,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="服务" label="服务组织"
prop="serviceOrgId" prop="serviceOrgId"
label-width="150px" label-width="150px"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
@ -136,7 +136,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
prop="noticeApproches" prop="noticeApproches"
label="自动通知服务" label="自动通知服务组织"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
@ -413,10 +413,10 @@ export default {
resiSearchTagId: "", // resiSearchTagId: "", //
resiSearchTagName: "", // resiSearchTagName: "", //
serviceName: "", // serviceName: "", //
noticeApproches: [], // noticeApproches: [], //
policyId: "", // policyId: "", //
serviceOrgType: "", // community_org ic_user_volunteer party_unit serviceOrgType: "", // community_org ic_user_volunteer party_unit
serviceOrgId: "", //Id serviceOrgId: "", //Id
gridIdList: [], // gridIdList: [], //
principalName: "", //() principalName: "", //()
principalContact: "", // principalContact: "", //
@ -445,7 +445,7 @@ export default {
{ required: true, message: "服务事项不能为空", trigger: "change" }, { required: true, message: "服务事项不能为空", trigger: "change" },
], ],
serviceOrgId: [ serviceOrgId: [
{ required: true, message: "服务不能为空", trigger: "change" }, { required: true, message: "服务组织不能为空", trigger: "change" },
], ],
serviceTimeStart: [ serviceTimeStart: [

32
src/views/modules/communityService/jinengzhaoren/index.vue

@ -482,7 +482,7 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg);
} else { } else {
this.searchdemandOptions = this.getTreeData(res.data); this.searchdemandOptions = this.getTreeData(res.data).filter((item) => item.categoryCode == '1043');
} }
}) })
.catch(() => { .catch(() => {
@ -521,7 +521,7 @@ export default {
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
this.serviceOptions = data; this.serviceOptions = data.filter(item=>item.value == 'party_unit'||item.value == 'community_org'||item.value == 'publicWelfare');;
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
@ -545,24 +545,18 @@ export default {
async getServiceuserList (serviceType, query) { async getServiceuserList (serviceType, query) {
if (!serviceType) return false; if (!serviceType) return false;
const url = "/actual/base/serviceitem/listServerOrgNewTask";
const params = { let params = {
serviceName: "", serverOrgCategoryCode: this.formData.categoryCode,
serviceType: serviceType, serverParentOrgCategoryCode:this.formData.parentCategoryCode,
queryPurpose: query, serverOrgType: serviceType,
}; };
await this.$http let { data, code, msg } = await requestPost(url, params);
.post("/governance/userdemand/servicelist", params) if (code == 0) {
.then(({ data: res }) => { this.serviceOptiondList = data;
if (res.code !== 0) { } else if (code >= 8000) {
return this.$message.error(res.msg); this.$message.error(msg);
} else { }
this.serviceOptiondList = res.data
}
})
.catch(() => {
return this.$message.error("网络错误");
});
}, },
// //
async handlePersonList (row) { async handlePersonList (row) {

12
src/views/modules/communityService/wennuanzhaoren/addForm.vue

@ -96,7 +96,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="服务" label="服务组织"
prop="serviceOrgId" prop="serviceOrgId"
label-width="150px" label-width="150px"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
@ -136,7 +136,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
prop="noticeApproches" prop="noticeApproches"
label="自动通知服务" label="自动通知服务组织"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
@ -414,10 +414,10 @@ export default {
resiSearchTagId: "", // resiSearchTagId: "", //
resiSearchTagName: "", // resiSearchTagName: "", //
serviceName: "", // serviceName: "", //
noticeApproches: [], // noticeApproches: [], //
policyId: "", // policyId: "", //
serviceOrgType: "", // community_org ic_user_volunteer party_unit serviceOrgType: "", // community_org ic_user_volunteer party_unit
serviceOrgId: "", //Id serviceOrgId: "", //Id
gridIdList: [], // gridIdList: [], //
principalName: "", //() principalName: "", //()
principalContact: "", // principalContact: "", //
@ -446,7 +446,7 @@ export default {
{ required: true, message: "服务事项不能为空", trigger: "change" }, { required: true, message: "服务事项不能为空", trigger: "change" },
], ],
serviceOrgId: [ serviceOrgId: [
{ required: true, message: "服务不能为空", trigger: "change" }, { required: true, message: "服务组织不能为空", trigger: "change" },
], ],
serviceTimeStart: [ serviceTimeStart: [

32
src/views/modules/communityService/wennuanzhaoren/index.vue

@ -506,7 +506,7 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg);
} else { } else {
this.searchdemandOptions = this.getTreeData(res.data); this.searchdemandOptions = this.getTreeData(res.data).filter((item) => item.categoryCode == '1040');
} }
}) })
.catch(() => { .catch(() => {
@ -549,7 +549,7 @@ export default {
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
this.serviceOptions = data; this.serviceOptions = data.filter(item=>item.value == 'party_unit'||item.value == 'community_org');
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
@ -570,24 +570,18 @@ export default {
async getServiceuserList (serviceType, query) { async getServiceuserList (serviceType, query) {
if (!serviceType) return false; if (!serviceType) return false;
const url = "/actual/base/serviceitem/listServerOrgNewTask";
const params = { let params = {
serviceName: "", serverOrgCategoryCode: this.formData.categoryCode,
serviceType: serviceType, serverParentOrgCategoryCode:this.formData.parentCategoryCode,
queryPurpose: query, serverOrgType: serviceType,
}; };
await this.$http let { data, code, msg } = await requestPost(url, params);
.post("/governance/userdemand/servicelist", params) if (code == 0) {
.then(({ data: res }) => { this.serviceOptiondList = data;
if (res.code !== 0) { } else if (code >= 8000) {
return this.$message.error(res.msg); this.$message.error(msg);
} else { }
this.serviceOptiondList = res.data
}
})
.catch(() => {
return this.$message.error("网络错误");
});
}, },
// //
async handlePersonList (row) { async handlePersonList (row) {

Loading…
Cancel
Save