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

bug#416,#417,#380,#422,共性需求,服务找人,公共服务中批量删除按钮布局

feature
mk 2 years ago
parent
b1d088aef4
commit
90af45b4fe
8 changed files with 879 additions and 832 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/main-content.vue
  2. 9
      src/views/main-sidebar.vue
  3. 10
      src/views/modules/base/huji/immigration/index.vue
  4. 508
      src/views/modules/communityService/commonDemand/index.vue
  5. 13
      src/views/modules/communityService/fuwuzhaoren/index.vue
  6. 29
      src/views/modules/communityService/gxxq/index.vue
  7. 2
      src/views/modules/plugins/change/changedeath.vue
  8. 2
      src/views/modules/plugins/change/changerelocation.vue

2
src/views/main-content.vue
View File

@ -183,6 +183,8 @@ export default {
tab = this.$store.state.contentTabs.filter( tab = this.$store.state.contentTabs.filter(
(item) => item.name === tab.name (item) => item.name === tab.name
)[0]; )[0];
this.$store.state.LevelTowMenuActiveName = tab.menuId || "";
if (tab) { if (tab) {
this.$router.push({ this.$router.push({
name: tab.name, name: tab.name,

9
src/views/main-sidebar.vue
View File

@ -126,7 +126,6 @@ export default {
}, },
methods: { methods: {
toIndexPage() { toIndexPage() {
// this.$store.state.LevelOneMenuActiveName = "";
this.$router.push({ name: "home" }); this.$router.push({ name: "home" });
// this.$router.replace("/index"); // this.$router.replace("/index");
}, },
@ -143,10 +142,12 @@ export default {
this.$router.push({ name: route.name }); this.$router.push({ name: route.name });
} }
} }
this.$store.state.LevelOneMenuActiveName = menuId;
this.$store.state.sidebarActiveSubMenuList =
this.$store.state.sidebarMenuList[idx].children || []; this.$store.state.sidebarMenuList[idx].children || [];
this.$store.state.LevelTowMenuActiveName = ""; const { sidebarMenuList } = this.$store.state;
const firstChild = sidebarMenuList[idx].children[0];
const id = firstChild.children.length === 0 ? firstChild.id : firstChild.children[0].id;
this.$store.state.LevelTowMenuActiveName = id;
}, },
}, },
}; };

10
src/views/modules/base/huji/immigration/index.vue
View File

@ -423,13 +423,13 @@
<div> <div>
<el-pagination <el-pagination
:current-page="pageNo"
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total"
:total="total"
> >
</el-pagination> </el-pagination>
</div> </div>

508
src/views/modules/communityService/commonDemand/index.vue
View File

@ -2,131 +2,150 @@
<div class="g-main"> <div class="g-main">
<div> <div>
<div class="m-search"> <div class="m-search">
<el-form :inline="true" <el-form
:inline="true"
:model="formData" :model="formData"
ref="ref_searchform" ref="ref_searchform"
:label-width="'100px'"> :label-width="'100px'"
<el-form-item prop="serviceType"
label="服务类别"
> >
<el-select class="u-item-width-daterange" <el-form-item prop="serviceType" label="服务类别">
<el-select
class="u-item-width-daterange"
v-model.trim="formData.serviceTypeLevel1Id" v-model.trim="formData.serviceTypeLevel1Id"
placeholder="请选择" placeholder="请选择"
size="small" size="small"
clearable> clearable
<el-option v-for="item in serviceTypesLevel1" >
<el-option
v-for="item in serviceTypesLevel1"
@click.native="handleChangeServiceTypeLevel1" @click.native="handleChangeServiceTypeLevel1"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="serviceType"> <el-form-item prop="serviceType">
<el-select class="u-item-width-daterange" <el-select
class="u-item-width-daterange"
v-model.trim="formData.serviceTypeLevel2Id" v-model.trim="formData.serviceTypeLevel2Id"
placeholder="请选择" placeholder="请选择"
size="small" size="small"
clearable> clearable
<el-option v-for="item in serviceTypesLevel2" >
<el-option
v-for="item in serviceTypesLevel2"
@click.native="" @click.native=""
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="服务时间" <el-form-item label="服务时间" prop="serviceTimeStart">
prop="serviceTimeStart"> <el-date-picker
<el-date-picker v-model="formData.serviceTimeStart" v-model="formData.serviceTimeStart"
:picker-options="startPickerOptions" :picker-options="startPickerOptions"
class="u-item-width-daterange" class="u-item-width-daterange"
size="small" size="small"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
value="yyyy-MM-dd" value="yyyy-MM-dd"
placeholder="开始时间"> placeholder="开始时间"
>
</el-date-picker> </el-date-picker>
<span class="u-data-tag">至</span> <span class="u-data-tag">至</span>
<el-date-picker v-model="formData.serviceTimeEnd" <el-date-picker
v-model="formData.serviceTimeEnd"
:picker-options="endPickerOptions" :picker-options="endPickerOptions"
class="u-item-width-daterange u-data-tag" class="u-item-width-daterange u-data-tag"
size="small" size="small"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
value="yyyy-MM-dd" value="yyyy-MM-dd"
placeholder="结束时间"> placeholder="结束时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="服务事项" prop="serviceName">
<el-form-item label="服务事项" <el-input
prop="serviceName"> v-model="formData.serviceName"
<el-input v-model="formData.serviceName"
class="u-item-width-normal" class="u-item-width-normal"
size="small" size="small"
clearable clearable
placeholder="请输入"> placeholder="请输入"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="服务单位" <el-form-item label="服务单位" prop="serviceOrgName">
prop="serviceOrgName"> <el-input
<el-input v-model="formData.serviceOrgName" v-model="formData.serviceOrgName"
class="u-item-width-normal" class="u-item-width-normal"
size="small" size="small"
clearable clearable
placeholder="请输入"> placeholder="请输入"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="服务状态" prop="serviceStatus">
<el-select
<el-form-item label="服务状态" class="u-item-width-normal"
prop="serviceStatus">
<el-select class="u-item-width-normal"
v-model="formData.serviceStatus" v-model="formData.serviceStatus"
placeholder="全部" placeholder="全部"
size="small" size="small"
clearable> clearable
<el-option v-for="item in statusArray" >
<el-option
v-for="item in statusArray"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="满意度" <el-form-item label="满意度" prop="satisfaction">
prop="satisfaction"> <el-select
<el-select class="u-item-width-normal" class="u-item-width-normal"
v-model="formData.satisfaction" v-model="formData.satisfaction"
placeholder="全部" placeholder="全部"
size="small" size="small"
clearable> clearable
<el-option v-for="item in satisfyArray" >
<el-option
v-for="item in satisfyArray"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-row type="flex"> <el-row type="flex">
<el-col :span="24" align="right"> <el-col :span="24" align="right">
<el-button style="margin-left:30px" <el-button
style="margin-left: 30px"
size="small" size="small"
type="primary " type="primary "
@click="handleSearch">查询</el-button> @click="handleSearch"
<el-button style="margin-left:10px" >查询</el-button
>
<el-button
style="margin-left: 10px"
is-plain is-plain
class="diy-button--white el-button--default" class="diy-button--white el-button--default"
size="small" size="small"
@click="resetSearch">重置</el-button> @click="resetSearch"
>重置</el-button
>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
@ -139,82 +158,110 @@
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
style="margin-right: 10px" style="margin-right: 10px"
>新增</el-button> >新增</el-button
>
</div> </div>
<el-button <el-button
@click="handleExport" @click="handleExport"
type="primary" type="primary"
size="small" size="small"
class="diy-button--white el-button--default">导出</el-button> class="diy-button--white el-button--default"
>导出</el-button
>
<el-button
@click="onDeleteBatch"
size="small"
type="primary"
>
批量删除
</el-button>
</div> </div>
<el-table :data="tableData" <el-table
:data="tableData"
border border
v-loading="tableLoading" v-loading="tableLoading"
class="m-table-item" class="m-table-item"
style="width: 100%" style="width: 100%"
:height="maxTableHeight" :height="maxTableHeight"
@selection-change="onMultiSelection"> @selection-change="onMultiSelection"
>
<el-table-column <el-table-column
type="selection" type="selection"
fixed="left" fixed="left"
align="center" align="center"
width="50" width="50"
/> />
<el-table-column label="序号" <el-table-column
label="序号"
fixed="left" fixed="left"
type="index" type="index"
align="center" align="center"
width="50" /> width="50"
/>
<el-table-column prop="serviceTypeName" <el-table-column
prop="serviceTypeName"
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>
<el-table-column prop="serviceName" <el-table-column
prop="serviceName"
label="服务事项" label="服务事项"
align="center" align="center"
min-width="150" min-width="150"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true"
>
</el-table-column> </el-table-column>
<el-table-column prop="serviceTimeStart" <el-table-column
prop="serviceTimeStart"
align="center" align="center"
width="200" width="200"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
label="服务时间"> label="服务时间"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.serviceTimeStart}}至{{scope.row.serviceTimeEnd}}</span> <span
>{{ scope.row.serviceTimeStart }}至{{
scope.row.serviceTimeEnd
}}</span
>
</template> </template>
</el-table-column> </el-table-column>
<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>
<el-table-column prop="createdTime" <el-table-column
prop="createdTime"
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>
<el-table-column prop="serviceStatus" <el-table-column
prop="serviceStatus"
align="center" align="center"
width="100" width="100"
label="服务状态" label="服务状态"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.serviceStatus==='in_service'?'进行中':'已完成'}}</span> <span>{{
scope.row.serviceStatus === "in_service" ? "进行中" : "已完成"
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <!--
@ -225,26 +272,34 @@
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> --> </el-table-column> -->
<el-table-column fixed="right" <el-table-column
fixed="right"
label="操作" label="操作"
align="center" align="center"
width="220"> width="220"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="handleDetail(scope.row)" <el-button
@click="handleDetail(scope.row)"
type="text" type="text"
size="small" size="small"
>查看</el-button> >查看</el-button
<el-button v-if="scope.row.serviceStatus==='in_service'" >
<el-button
v-if="scope.row.serviceStatus === 'in_service'"
@click="handleEdit(scope.row)" @click="handleEdit(scope.row)"
type="text" type="text"
size="small" size="small"
>编辑</el-button> >编辑</el-button
>
<!-- 临时去掉人员名单与反馈 --> <!-- 临时去掉人员名单与反馈 -->
<el-button v-if="scope.row.serviceStatus==='in_service'" <el-button
v-if="scope.row.serviceStatus === 'in_service'"
@click="handleFeedback(scope.row)" @click="handleFeedback(scope.row)"
type="text" type="text"
size="small" size="small"
>反馈</el-button> >反馈</el-button
>
<!-- <el-button v-if="scope.row.policyId" <!-- <el-button v-if="scope.row.policyId"
@click="handlePersonList(scope.row)" @click="handlePersonList(scope.row)"
type="text" type="text"
@ -253,34 +308,29 @@
<!-- 产品说：不限制太多，不要求状态,都能删除 --> <!-- 产品说：不限制太多，不要求状态,都能删除 -->
<!-- v-if="scope.row.serviceStatus==='in_service'" --> <!-- v-if="scope.row.serviceStatus==='in_service'" -->
<el-button <el-button @click="handleDel(scope.row)" type="text" size="small"
@click="handleDel(scope.row)" >删除</el-button
type="text" >
size="small"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div> <div>
<el-button @click="onDeleteBatch" size="small" style="margin-top: 15px;"> <el-pagination
批量删除 @size-change="handleSizeChange"
</el-button>
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="pageNo" :current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]" :page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)" :page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total" layout="sizes, prev, pager, next, total"
:total="total"> :total="total"
>
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
<el-dialog v-if="showAdd" <el-dialog
v-if="showAdd"
:visible.sync="showAdd" :visible.sync="showAdd"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -289,8 +339,10 @@
width="720px" width="720px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="showAdd = false"> @closed="showAdd = false"
<add-form ref="ref_add_form" >
<add-form
ref="ref_add_form"
:formType="formType" :formType="formType"
:serviceCategoryKey="serviceCategoryKey" :serviceCategoryKey="serviceCategoryKey"
:statusArray="statusArray" :statusArray="statusArray"
@ -298,9 +350,11 @@
:serviceRecordId="serviceRecordId" :serviceRecordId="serviceRecordId"
:serviceName="serviceName" :serviceName="serviceName"
@handleOk="handleOk" @handleOk="handleOk"
@handleClose="handleClose"></add-form> @handleClose="handleClose"
></add-form>
</el-dialog> </el-dialog>
<el-dialog v-if="showEdit" <el-dialog
v-if="showEdit"
:visible.sync="showEdit" :visible.sync="showEdit"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -309,18 +363,22 @@
width="850px" width="850px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="showEdit = false"> @closed="showEdit = false"
<edit-form ref="ref_edit_form" >
<edit-form
ref="ref_edit_form"
:serviceRecordId="serviceRecordId" :serviceRecordId="serviceRecordId"
:serviceOrgName="serviceOrgName" :serviceOrgName="serviceOrgName"
:satisfyArray="satisfyArray" :satisfyArray="satisfyArray"
:statusArray="statusArray" :statusArray="statusArray"
@handleOk="handleOk" @handleOk="handleOk"
@handleClose="handleClose" @handleClose="handleClose"
:formType="formType"> :formType="formType"
>
</edit-form> </edit-form>
</el-dialog> </el-dialog>
<el-dialog v-if="showDetail" <el-dialog
v-if="showDetail"
:visible.sync="showDetail" :visible.sync="showDetail"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -329,16 +387,20 @@
width="850px" width="850px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="diaDetailClose"> @closed="diaDetailClose"
<detail-form ref="ref_detail_form" >
<detail-form
ref="ref_detail_form"
:serviceRecordId="serviceRecordId" :serviceRecordId="serviceRecordId"
:serviceOrgName="serviceOrgName" :serviceOrgName="serviceOrgName"
:satisfyArray="satisfyArray" :satisfyArray="satisfyArray"
:statusArray="statusArray" :statusArray="statusArray"
@diaDetailClose="diaDetailClose"> @diaDetailClose="diaDetailClose"
>
</detail-form> </detail-form>
</el-dialog> </el-dialog>
<el-dialog v-if="showPersonList" <el-dialog
v-if="showPersonList"
:visible.sync="showPersonList" :visible.sync="showPersonList"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -346,16 +408,18 @@
width="1150px" width="1150px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="showPersonList = false"> @closed="showPersonList = false"
<person-list ref="ref_detail_form" >
<person-list
ref="ref_detail_form"
:policyId="policyId" :policyId="policyId"
:ruleList="ruleList" :ruleList="ruleList"
@handleOk="handleOk" @handleOk="handleOk"
@handleClose="handleClose" @handleClose="handleClose"
:formType="formType"> :formType="formType"
>
</person-list> </person-list>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -385,7 +449,7 @@
time.getTime() === serviceTimeStart - 24 * 60 * 60 * 1000 time.getTime() === serviceTimeStart - 24 * 60 * 60 * 1000
); );
} else { } else {
return (time.getTime() > nowData || time.getTime() === nowData) ; return time.getTime() > nowData || time.getTime() === nowData;
} }
}; };
// let startDisabledDate = (time) => { // let startDisabledDate = (time) => {
@ -400,7 +464,7 @@
serviceTypesLevel2: [], serviceTypesLevel2: [],
tableLoading: false, tableLoading: false,
user: {}, user: {},
agencyId: '', agencyId: "",
searchH: 170, searchH: 170,
tableData: [], tableData: [],
@ -427,47 +491,45 @@
value: "perfect", value: "perfect",
label: "非常满意", label: "非常满意",
}, },
], ],
formData: { formData: {
serviceTypeLevel1Id:'',// 公共服务（政策级别）一级分类id serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
serviceTypeLevel2Id:'',// 公共服务（政策级别）二级分类id serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
serviceName: '',//项目名称 serviceName: "", //项目名称
// serviceOrgType: '',//服务组织类型 // serviceOrgType: '',//服务组织类型
// serviceOrgId: '',//服务组织Id // serviceOrgId: '',//服务组织Id
serviceOrgName:'', serviceOrgName: "",
serviceTimeStart: '',//服务开始时间yyyy-MM-dd serviceTimeStart: "", //服务开始时间yyyy-MM-dd
serviceTimeEnd: '',//服务结束时间yyyy-MM-dd serviceTimeEnd: "", //服务结束时间yyyy-MM-dd
serviceStatus: '',//服务状态。in_service服务中；completed:已完成 serviceStatus: "", //服务状态。in_service服务中；completed:已完成
satisfaction: '',//满意度.不满意:bad、基本满意:good、非常满意:perfect satisfaction: "", //满意度.不满意:bad、基本满意:good、非常满意:perfect
}, },
pageNo: 1, pageNo: 1,
pageSize: window.localStorage.getItem("pageSize") || 20, pageSize: window.localStorage.getItem("pageSize") || 20,
total: 1, total: 1,
endPickerOptions: { endPickerOptions: {
disabledDate: endDisabledDate disabledDate: endDisabledDate,
}, },
startPickerOptions: { startPickerOptions: {
// disabledDate: startDisabledDate // disabledDate: startDisabledDate
}, },
serviceRecordId: '', serviceRecordId: "",
serviceName: '', serviceName: "",
serviceOrgName: '', serviceOrgName: "",
showAdd: false, showAdd: false,
showEdit: false, showEdit: false,
showDetail: false, showDetail: false,
showFeedback: false, showFeedback: false,
formType: 'add', formType: "add",
addDiaTitle: '发起服务', addDiaTitle: "发起服务",
detailDiaTitle: '服务详情', detailDiaTitle: "服务详情",
serviceOptions: [], serviceOptions: [],
serviceOptiondList: [], serviceOptiondList: [],
policyId: '', policyId: "",
showPersonList: false, showPersonList: false,
ruleList: [], ruleList: [],
multiSelection: [], // 多选结果 multiSelection: [], // 多选结果
@ -475,9 +537,8 @@
}, },
computed: { computed: {
maxTableHeight() { maxTableHeight() {
const h = const h = this.clientHeight - this.searchH - 330 + this.iframeHeight;
this.clientHeight - this.searchH - 275 + this.iframeHeight; const _h = this.clientHeight - 330 - this.searchH;
const _h = this.clientHeight - 275 - this.searchH;
return this.$store.state.inIframe ? h : _h; return this.$store.state.inIframe ? h : _h;
}, },
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
@ -488,22 +549,24 @@
// let arrayTemp = val.split(' ') // let arrayTemp = val.split(' ')
// this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59' // this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
// } // }
// }, // },
}, },
mounted() { mounted() {
console.log(this.$store.state) console.log(this.$store.state);
this.user = this.$store.state.user this.user = this.$store.state.user;
this.agencyId = this.user.agencyId this.agencyId = this.user.agencyId;
this.getDictOptions() this.getDictOptions();
this.getTableData(); this.getTableData();
}, },
methods: { methods: {
// 服务类型下拉框选中事件 // 服务类型下拉框选中事件
handleChangeServiceTypeLevel1() { handleChangeServiceTypeLevel1() {
this.formData.serviceTypeLevel2Id = '' this.formData.serviceTypeLevel2Id = "";
this.$http this.$http
.get("/governance/commonServiceType/selectList/" + this.formData.serviceTypeLevel1Id) .get(
"/governance/commonServiceType/selectList/" +
this.formData.serviceTypeLevel1Id
)
.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);
@ -513,7 +576,7 @@
}) })
.catch(() => { .catch(() => {
return this.$message.error("网络错误"); return this.$message.error("网络错误");
}) });
}, },
handleSearch(val) { handleSearch(val) {
@ -523,18 +586,18 @@
}, },
// 获取服务组织 // 获取服务组织
async getDictOptions() { async getDictOptions() {
const url = "/sys/dict/data/dictlist" const url = "/sys/dict/data/dictlist";
let params = { let params = {
dictType: 'user_demand_service_type' dictType: "user_demand_service_type",
} };
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;
} else { } else {
this.$message.error(msg) this.$message.error(msg);
} }
this.$http this.$http
@ -552,7 +615,7 @@
}, },
handleServiceChange(type, val) { handleServiceChange(type, val) {
this.formData.serviceOrgId = '' this.formData.serviceOrgId = "";
if (val === "social_org") { if (val === "social_org") {
if (type === "add") { if (type === "add") {
this.getServiceuserList(val, "add_demand"); this.getServiceuserList(val, "add_demand");
@ -606,115 +669,99 @@
}, },
//加载组织数据 //加载组织数据
async handlePersonList(row) { async handlePersonList(row) {
this.policyId = row.policyId;
this.policyId = row.policyId await this.loadRuleList();
await this.loadRuleList() this.formType = "personList";
this.formType = 'personList'
this.showPersonList = true; this.showPersonList = true;
}, },
async loadRuleList() { async loadRuleList() {
const url = "/governance/policy/rulelist/" + this.policyId;
const url = "/governance/policy/rulelist/" + this.policyId let params = {};
let params = {}
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params);
if (code === 0) { if (code === 0) {
this.ruleList = data this.ruleList = data;
} else { } else {
this.$message.error(msg) this.$message.error(msg);
} }
}, },
async handleAdd() { async handleAdd() {
this.addDiaTitle = '发起服务' this.addDiaTitle = "发起服务";
this.formType = 'add' this.formType = "add";
this.showAdd = true; this.showAdd = true;
}, },
async handleDetail(row) { async handleDetail(row) {
this.detailDiaTitle = "服务详情" this.detailDiaTitle = "服务详情";
this.serviceRecordId = row.serviceRecordId this.serviceRecordId = row.serviceRecordId;
this.serviceOrgName = row.serviceOrgName this.serviceOrgName = row.serviceOrgName;
// this.formType = 'detail' // this.formType = 'detail'
this.showDetail = true this.showDetail = true;
}, },
diaDetailClose() { diaDetailClose() {
console.log(this.$refs.ref_detail) console.log(this.$refs.ref_detail);
this.$refs.ref_detail_form.diaDestroy() this.$refs.ref_detail_form.diaDestroy();
this.showDetail = false this.showDetail = false;
}, },
async handleEdit(row) { async handleEdit(row) {
// this.detailDiaTitle = "编辑服务" // this.detailDiaTitle = "编辑服务"
this.serviceRecordId = row.serviceRecordId this.serviceRecordId = row.serviceRecordId;
this.serviceOrgName = row.serviceOrgName this.serviceOrgName = row.serviceOrgName;
this.formType = 'edit' this.formType = "edit";
this.showEdit = true this.showEdit = true;
}, },
//加载组织数据 //加载组织数据
async handleFeedback(row) { async handleFeedback(row) {
this.serviceRecordId = row.serviceRecordId this.serviceRecordId = row.serviceRecordId;
this.serviceName = row.serviceName this.serviceName = row.serviceName;
this.addDiaTitle = '服务反馈' this.addDiaTitle = "服务反馈";
this.formType = 'feedback' this.formType = "feedback";
this.showAdd = true; this.showAdd = true;
}, },
handleClose() { handleClose() {
this.serviceRecordId = "" this.serviceRecordId = "";
this.formType = '' this.formType = "";
this.showAdd = false
this.showDetail = false
this.showEdit = false
this.showAdd = false;
this.showDetail = false;
this.showEdit = false;
}, },
handleOk() { handleOk() {
this.handleClose() this.handleClose();
this.pageNo = 1 this.pageNo = 1;
this.getTableData() this.getTableData();
}, },
async handleDel(row) { async handleDel(row) {
this.serviceRecordId = row.serviceRecordId;
this.serviceRecordId = row.serviceRecordId
this.$confirm("确认删除服务?", "提示", { this.$confirm("确认删除服务?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
}) })
.then(() => { .then(() => {
this.cancelFuwu([row.serviceRecordId]) this.cancelFuwu([row.serviceRecordId]);
}) })
.catch(err => { .catch((err) => {
if (err == "cancel") { if (err == "cancel") {
// this.$message({ // this.$message({
// type: "info", // type: "info",
// message: "已取消删除" // message: "已取消删除"
// }); // });
} }
}); });
}, },
async cancelFuwu(serviceRecordIds) { async cancelFuwu(serviceRecordIds) {
const url = "/governance/icServiceRecordV2/delete";
const url = '/governance/icServiceRecordV2/delete';
const { data, code, msg } = await requestPost(url, serviceRecordIds); const { data, code, msg } = await requestPost(url, serviceRecordIds);
@ -727,7 +774,7 @@
}, },
async getTableData() { async getTableData() {
this.tableLoading = true this.tableLoading = true;
const url = "/governance/icServiceRecordV2/list"; const url = "/governance/icServiceRecordV2/list";
const { pageSize, pageNo, formData } = this; const { pageSize, pageNo, formData } = this;
@ -738,14 +785,10 @@
...formData, ...formData,
}); });
this.tableLoading = false this.tableLoading = false;
if (code === 0) { if (code === 0) {
this.total = data.total || 0; this.total = data.total || 0;
this.tableData = data.list this.tableData = data.list;
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
@ -770,7 +813,9 @@
res.headers["content-disposition"].split(";")[1].split("=")[1] res.headers["content-disposition"].split(";")[1].split("=")[1]
); );
console.log("filename", fileName); console.log("filename", fileName);
let blob = new Blob([res.data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }); let blob = new Blob([res.data], {
type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
});
var url = window.URL.createObjectURL(blob); var url = window.URL.createObjectURL(blob);
var aLink = document.createElement("a"); var aLink = document.createElement("a");
aLink.style.display = "none"; aLink.style.display = "none";
@ -788,34 +833,31 @@
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.pageSize = val; this.pageSize = val;
window.localStorage.setItem("pageSize", val); window.localStorage.setItem("pageSize", val);
this.getTableData(); this.getTableData();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.pageNo = val; this.pageNo = val;
this.getTableData(); this.getTableData();
}, },
resetSearch() { resetSearch() {
this.formData = { this.formData = {
serviceTypeLevel1Id:'',// 公共服务（政策级别）一级分类id serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
serviceTypeLevel2Id:'',// 公共服务（政策级别）二级分类id serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
serviceName: '',//项目名称 serviceName: "", //项目名称
// serviceOrgType: '',//服务组织类型 // serviceOrgType: '',//服务组织类型
// serviceOrgId: '',//服务组织Id // serviceOrgId: '',//服务组织Id
serviceOrgName:'', serviceOrgName: "",
serviceTimeStart: '',//服务开始时间yyyy-MM-dd serviceTimeStart: "", //服务开始时间yyyy-MM-dd
serviceTimeEnd: '',//服务结束时间yyyy-MM-dd serviceTimeEnd: "", //服务结束时间yyyy-MM-dd
serviceStatus: '',//服务状态。in_service服务中；completed:已完成 serviceStatus: "", //服务状态。in_service服务中；completed:已完成
satisfaction: '',//满意度.不满意:bad、基本满意:good、非常满意:perfect satisfaction: "", //满意度.不满意:bad、基本满意:good、非常满意:perfect
} };
this.pageNo = 1 this.pageNo = 1;
this.getTableData() this.getTableData();
}, },
// 多选事件 // 多选事件
onMultiSelection(rows) { onMultiSelection(rows) {
@ -825,31 +867,31 @@
// 批量删除 // 批量删除
onDeleteBatch() { onDeleteBatch() {
if (this.multiSelection.length == 0) { if (this.multiSelection.length == 0) {
this.$message.warning('请先选中至少一项'); this.$message.warning("请先选中至少一项");
return; return;
} }
this.$confirm('删除之后无法恢复，确认删除？', '提示', { this.$confirm("删除之后无法恢复，确认删除？", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}).then(() => { })
this.cancelFuwu(this.multiSelection.map(e => e.serviceRecordId)); .then(() => {
}).catch((err) => { this.cancelFuwu(this.multiSelection.map((e) => e.serviceRecordId));
})
.catch((err) => {
console.error(err); console.error(err);
this.$message.error('删除失败'); this.$message.error("删除失败");
}); });
}, },
}, },
props: { props: {
serviceCategoryKey: { serviceCategoryKey: {
type: String, type: String,
required: 'true' required: "true",
},
}, },
}
}; };
</script> </script>

13
src/views/modules/communityService/fuwuzhaoren/index.vue
View File

@ -164,6 +164,9 @@
size="small" size="small"
class="diy-button--white el-button--default" class="diy-button--white el-button--default"
>导出</el-button> >导出</el-button>
<el-button type="primary" @click="onDeleteBatch" size="small">
批量删除
</el-button>
</div> </div>
<el-table :data="tableData" <el-table :data="tableData"
@ -284,9 +287,7 @@
</el-table> </el-table>
<div> <div>
<el-button @click="onDeleteBatch" size="small" style="margin-top: 15px;">
批量删除
</el-button>
<el-pagination @size-change="handleSizeChange" <el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="pageNo" :current-page.sync="pageNo"
@ -416,7 +417,7 @@ export default {
tableLoading: false, tableLoading: false,
user: {}, user: {},
agencyId: '', agencyId: '',
searchH:170, searchH:0,
tableData: [], tableData: [],
statusArray: [ statusArray: [
@ -493,8 +494,8 @@ export default {
computed: { computed: {
maxTableHeight () { maxTableHeight () {
const h = const h =
this.clientHeight - this.searchH - 275 + this.iframeHeight; this.clientHeight - this.searchH - 450 + this.iframeHeight;
const _h = this.clientHeight - 275 - this.searchH; const _h = this.clientHeight - 450 - this.searchH;
return this.$store.state.inIframe ? h : _h; return this.$store.state.inIframe ? h : _h;
}, },
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),

29
src/views/modules/communityService/gxxq/index.vue
View File

@ -138,6 +138,9 @@
> >
导出</el-button 导出</el-button
> >
<el-button @click="deleteBatch" type="primary" size="small">
批量删除
</el-button>
</div> </div>
<el-table <el-table
ref="gxxq_table" ref="gxxq_table"
@ -211,11 +214,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="div-flex"> <div>
<div class="m-page"> <div class="m-page">
<el-button @click="deleteBatch" size="small" style="margin-top: 15px;">
批量删除
</el-button>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
@ -296,10 +296,11 @@ export default {
return time.getTime() > nowData; return time.getTime() > nowData;
} }
}; };
let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 let startDisabledDate = (time) => {
let nowData = Date.now() //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
return time.getTime() > nowData let nowData = Date.now();
} return time.getTime() > nowData;
};
return { return {
// 公共服务分类 // 公共服务分类
serviceTypesLevel1: [], serviceTypesLevel1: [],
@ -327,10 +328,10 @@ export default {
}, },
], ],
endPickerOptions: { endPickerOptions: {
disabledDate: endDisabledDate disabledDate: endDisabledDate,
}, },
startPickerOptions: { startPickerOptions: {
disabledDate: startDisabledDate disabledDate: startDisabledDate,
}, },
selection: [], selection: [],
selAllFlag: false, selAllFlag: false,
@ -366,14 +367,14 @@ export default {
}, },
addFormCancle() { addFormCancle() {
this.formShow = false; this.formShow = false;
this.formEditShow = false this.formEditShow = false;
}, },
handelSelection(row) { handelSelection(row) {
this.selection = row this.selection = row;
}, },
addFormOk() { addFormOk() {
this.formShow = false; this.formShow = false;
this.formEditShow = false this.formEditShow = false;
this.getCommonDemandList(); this.getCommonDemandList();
}, },
selectAll(selection) { selectAll(selection) {
@ -402,7 +403,7 @@ export default {
handleEdit(row) { handleEdit(row) {
this.gxxqId = row.id; this.gxxqId = row.id;
this.commonServiceTypeName = row.commonServiceTypeName; this.commonServiceTypeName = row.commonServiceTypeName;
this.serviceTypesLevel1 = this.serviceTypesLevel1 this.serviceTypesLevel1 = this.serviceTypesLevel1;
this.formEditShow = true; this.formEditShow = true;
}, },
async handleChu() { async handleChu() {

2
src/views/modules/plugins/change/changedeath.vue
View File

@ -218,7 +218,7 @@
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
:page-size="pageSize" :page-size="pageSize"
:total="total" :total="total"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next"
@size-change="pageSizeChangeHandle" @size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle" @current-change="pageCurrentChangeHandle"
> >

2
src/views/modules/plugins/change/changerelocation.vue
View File

@ -333,7 +333,7 @@
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
:page-size="pageSize" :page-size="pageSize"
:total="total" :total="total"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next"
@size-change="pageSizeChangeHandle" @size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle" @current-change="pageCurrentChangeHandle"
> >

Write Preview
Loading…
Cancel
Save