Browse Source

公共服务

V1.0
mk 3 years ago
parent
commit
aab3c8ac10
  1. 2227
      src/views/modules/communityService/commonDemand/addForm.vue
  2. 43
      src/views/modules/communityService/commonDemand/detailForm.vue
  3. 115
      src/views/modules/communityService/commonDemand/editForm.vue
  4. 9
      src/views/modules/communityService/commonDemand/index.vue
  5. 1217
      src/views/modules/communityService/labelConfig/addForm.vue
  6. 2
      src/views/modules/communityService/policy/personListItem.vue

2227
src/views/modules/communityService/commonDemand/addForm.vue

File diff suppressed because it is too large

43
src/views/modules/communityService/commonDemand/detailForm.vue

@ -21,14 +21,14 @@
<div class="info-prop">
<span class="info-title-2">政策依据</span>
<span>{{ formData.policyTitle || "--" }}</span>
<el-button
<!-- <el-button
v-if="formData.policyId"
style="margin-left: 10px"
type="primary"
size="small"
@click="handlePersonList"
>预览</el-button
>
> -->
</div>
<div class="info-prop">
<span class="info-title-2">经办人</span>
@ -44,6 +44,11 @@
>
<span>{{ formData.serviceTimeEnd || "--" }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">享受服务人员: </span>
<span>{{ resiSearchTagName }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">备注</span>
<span>{{ formData.remark || "--" }}</span>
@ -148,7 +153,7 @@
keyWords: "",
formData: {},
resiSearchTagName:"",
feedbackFormData: {
serviceProjectId: "", // id
serviceName: "",
@ -251,7 +256,7 @@
this.formData.gridIdListName = "";
this.feedbackFormData.serviceStatusShow = "";
this.feedbackFormData.satisfactionShow = "";
await this.getTagName()
let arr = [];
this.formData.gridIdList.forEach((element) => {
arr.push(element.objectName);
@ -293,7 +298,26 @@
this.$message.error(msg);
}
},
async getTagName() {
const url = "/governance/resiSearchTag/listResiSearchTags";
let params = {
pageSize: 99,
};
let { data, msg, code } = await requestPost(url, params);
if (code == 0) {
let showAddProduct = data.list.filter(item=>{
return [this.formData.resiSearchTagId].includes(item.tagId)
})
if(this.formData.resiSearchTagId){
this.resiSearchTagName = showAddProduct[0].tagName
}else{
this.resiSearchTagName = '--'
}
} else {
this.$message.error(msg);
}
},
handleCancle() {
this.resetData();
this.$emit("diaDetailClose");
@ -348,6 +372,15 @@
],
};
},
// resiSearchTagNameText(){
// let text = ""
// if(this.resiSearchTagName){
// text = this.resiSearchTagName
// }else {
// text = '--'
// }
// return text
// },
},
props: {
serviceRecordId: {

115
src/views/modules/communityService/commonDemand/editForm.vue

@ -79,11 +79,11 @@
:value="item.policyId">
</el-option>
</el-select>
<!--
<el-button style="margin-left: 10px"
type="primary"
size="small"
@click="handlePersonList">预览</el-button>
@click="handlePersonList">预览</el-button> -->
</el-form-item>
<el-form-item label="经办人"
@ -106,10 +106,32 @@
v-model="formData.principalContact">
</el-input>
</el-form-item>
<el-form-item label="指派服务" label-width="150px">
<el-switch v-model="assignSwitch"> </el-switch>
</el-form-item>
<el-form-item
label="查找享受服务人员"
prop="principalContact"
label-width="150px"
style="display: block"
v-show="this.assignSwitch"
>
<input type="text" v-model="formData.resiSearchTagId" v-show="false">
<template v-if="this.resiSearchTagName">
<el-tag @close="handleCloseTag" closable style="margin-right:10px;">
{{this.resiSearchTagName }}
</el-tag>
</template>
<el-button type="primary" @click="handleClickLabel" size="mini">
<span> <i class="el-icon-plus"></i> 按标签查找 </span>
</el-button>
</el-form-item>
<el-form-item label="服务时间"
label-width="150px"
prop="serviceTimeStart">
prop="serviceTimeStart"
style="display: block">
<el-date-picker :disabled="formType==='detail'"
v-model="formData.serviceTimeStart"
:picker-options="startPickerOptions"
@ -119,11 +141,11 @@
value="yyyy-MM-dd"
placeholder="开始时间">
</el-date-picker>
<span class="data-tag"></span>
<span class="u-data-tag"></span>
<el-date-picker :disabled="formType==='detail'"
v-model="formData.serviceTimeEnd"
:picker-options="endPickerOptions"
class="item_width_2 data-tag"
class="item_width_2 u-data-tag"
type="date"
value-format="yyyy-MM-dd"
value="yyyy-MM-dd"
@ -302,7 +324,7 @@
:append-to-body="true"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'政策预览'"
:title="'标签查找'"
width="1150px"
top="5vh"
class="dialog-h"
@ -314,6 +336,29 @@
@handleClose="handleClose">
</person-list>
</el-dialog>
<el-dialog
v-if="showLabelForm"
:visible.sync="showLabelForm"
:append-to-body="true"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'标签配置'"
width="900px"
top="5vh"
class="dialog-h"
@closed="showLabelForm = false"
>
<label-form
ref="ref_label_form"
:policyId="policyId"
:ruleList="ruleList"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"
>
<!-- @handleOk="handleOk"
@handleClose="handleClose" -->
</label-form>
</el-dialog>
</div>
</template>
@ -322,7 +367,8 @@
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import personList from "../policy/personList";
import labelForm from "../labelConfig/addForm.vue";
import { nextTick } from 'vue';
var map
var search
@ -349,13 +395,14 @@
}
return {
btnDisable: false,
keyWords: '',
formData: {},
assignSwitch: true,
formData: {
},
showLabelForm: false,
resiSearchTagName:'',
feedbackFormData: {
serviceProjectId: '',// id
serviceName: '',
@ -387,7 +434,7 @@
ruleList: []
}
},
components: { personList },
components: { personList ,labelForm},
mounted () {
this.getPolicyList()
if (this.serviceRecordId) {//
@ -440,7 +487,12 @@
},
handleClickLabel() {
this.showLabelForm = true;
this.$nextTick(() => {
this.$refs["ref_label_form"].initForm("info");
});
},
async getPolicyList () {
const url = '/governance/policy/policyListSelect'
@ -468,7 +520,7 @@
this.formData = { ...data }
this.formData.serviceRecordId = this.serviceRecordId
this.feedbackFormData = { ...data.feedback }
await this.getTagName()
this.fileList = []
if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
data.feedback.fileList.forEach(element => {
@ -486,7 +538,23 @@
this.$message.error(msg)
}
},
async getTagName() {
const url = "/governance/resiSearchTag/listResiSearchTags";
let params = {
pageSize: 99,
};
let { data, msg, code } = await requestPost(url, params);
if (code == 0) {
let showAddProduct = data.list.filter(item=>{
return [this.formData.resiSearchTagId].includes(item.tagId)
})
this.resiSearchTagName = showAddProduct[0].tagName
this.assignSwitch = true
} else {
this.$message.error(msg);
}
},
async handleComfirm () {
this.btnDisable = true
@ -515,7 +583,7 @@
})
return false;
}
console.log(this.formData);
let url = '/governance/icServiceRecordV2/edit'
// let url = "http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/update"
@ -542,7 +610,18 @@
this.$emit('handleClose')
},
addFormOk(val) {
this.showLabelForm = false;
this.formData.resiSearchTagId = val.tagId;
this.resiSearchTagName = val.tagName;
},
addFormCancle() {
this.showLabelForm = false;
},
handleCloseTag(){
this.resiSearchTagName = ''
this.formData.resiSearchTagId = ''
},
//
handleFileDownload (file) {

9
src/views/modules/communityService/commonDemand/index.vue

@ -229,16 +229,17 @@
type="text"
size="small"
>编辑</el-button>
<el-button v-if="scope.row.serviceStatus==='in_service'"
<!-- 临时去掉人员名单与反馈 -->
<!-- <el-button v-if="scope.row.serviceStatus==='in_service'"
@click="handleFeedback(scope.row)"
type="text"
size="small"
>反馈</el-button>
<el-button v-if="scope.row.policyId"
>反馈</el-button> -->
<!-- <el-button v-if="scope.row.policyId"
@click="handlePersonList(scope.row)"
type="text"
size="small"
>人员名单</el-button>
>人员名单</el-button> -->
<el-button v-if="scope.row.serviceStatus==='in_service'"
@click="handleDel(scope.row)"
type="text"

1217
src/views/modules/communityService/labelConfig/addForm.vue

File diff suppressed because it is too large

2
src/views/modules/communityService/policy/personListItem.vue

@ -286,7 +286,7 @@ export default {
async loadTable () {
this.tableLoading = true
const url = "/data/aggregator/icuser/listByPolicyRules"
const url = "actual/base/residentBaseInfo/listByTag"
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list"
let params = {
pageSize: this.pageSize,

Loading…
Cancel
Save