|
|
@ -4,37 +4,43 @@ |
|
|
|
<div class="m-search"> |
|
|
|
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'"> |
|
|
|
<div> |
|
|
|
<el-form-item label="发布组织" prop="orgId"> |
|
|
|
<!-- <el-form-item label="发布组织" prop="orgId"> |
|
|
|
<el-cascader class="u-item-width-normal" size="small" ref="myCascader" v-model.trim="formData.orgId" |
|
|
|
:options="orgOptions" :props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency" |
|
|
|
clearable></el-cascader> |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> --> |
|
|
|
|
|
|
|
<el-form-item label="任务主题" prop="taskTitle"> |
|
|
|
<el-input v-model.trim="formData.taskTitle" class="u-item-width-normal" size="small" clearable |
|
|
|
placeholder="请输入"> |
|
|
|
</el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="创建时间" prop="taskIntroduction"> |
|
|
|
<el-date-picker v-model.trim="formData.taskIntroduction" :picker-options="startPickerOptions" |
|
|
|
<el-form-item label="创建时间" prop="startTime"> |
|
|
|
<el-date-picker v-model.trim="formData.startTime" :picker-options="startPickerOptions" |
|
|
|
class="u-item-width-daterange" size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss" |
|
|
|
value="yyyy-MM-dd" placeholder="开始时间"> |
|
|
|
</el-date-picker> |
|
|
|
<span class="u-data-tag">至</span> |
|
|
|
<el-date-picker v-model.trim="formData.startTime" :picker-options="endPickerOptions" |
|
|
|
<el-date-picker v-model.trim="formData.endTime" :picker-options="endPickerOptions" |
|
|
|
class="u-item-width-daterange u-data-tag" size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss" |
|
|
|
value="yyyy-MM-dd" placeholder="结束时间"> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<!-- <el-form-item label="状态" prop="status"> |
|
|
|
<el-select class="u-item-width-normal" v-model.trim="formData.status" placeholder="请选择" size="small" |
|
|
|
<el-form-item label="状态" prop="taskType"> |
|
|
|
<el-select class="u-item-width-normal" v-model.trim="formData.taskType" placeholder="请选择" size="small" |
|
|
|
clearable> |
|
|
|
<el-option v-for="item in statusArray" :key="item.value" :label="item.label" :value="item.value"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> --> |
|
|
|
|
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="创建人" prop="createdBy"> |
|
|
|
<el-select class="u-item-width-normal" v-model.trim="formData.createdBy" placeholder="请选择" size="small" |
|
|
|
clearable :disabled="manager"> |
|
|
|
<el-option v-for="item in createdByArray" :key="item.staffId" :label="item.name" :value="item.staffId"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-row> |
|
|
|
<el-col :span="24" align="right"> |
|
|
|
<el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button> |
|
|
@ -54,14 +60,16 @@ |
|
|
|
<el-table-column label="" fixed="left" type="selection" align="center" width="50" /> |
|
|
|
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" /> |
|
|
|
|
|
|
|
<el-table-column prop="gridName" align="center" label="发布组织" :show-overflow-tooltip="true"> |
|
|
|
<el-table-column prop="agencyName" align="center" label="发布组织" :show-overflow-tooltip="true"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="categoryName" label="任务主题" min-width="140" align="center" |
|
|
|
:show-overflow-tooltip="true" /> |
|
|
|
<el-table-column prop="taskTitle" label="任务主题" min-width="140" align="center" :show-overflow-tooltip="true" /> |
|
|
|
<el-table-column prop="eventContent" label="分发人数" align="center" :show-overflow-tooltip="true" width="100"> |
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
<el-table-column prop="responsibleName" align="center" width="100" label="任务周期" :show-overflow-tooltip="true"> |
|
|
|
<el-table-column prop="taskPeriod" align="center" width="100" label="任务周期" :show-overflow-tooltip="true"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
{{ scope.row.taskPeriod === 'once' ? '一次性' : '每周' }} |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
<el-table-column prop="responsibleMobile" align="center" width="110" label="任务进度" |
|
|
@ -69,12 +77,15 @@ |
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
<el-table-column prop="name" align="center" width="100" label="任务状态" :show-overflow-tooltip="true"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span>{{ scope.row.taskState === 'resolved' ? '已完成' : scope.row.taskState === 'cancel' ? '已取消' : '进行中' }}</span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
<el-table-column prop="createdBy" align="center" width="100" label="创建人" :show-overflow-tooltip="true"> |
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
<el-table-column prop="happenTime" align="center" width="140" :show-overflow-tooltip="true" label="创建时间"> |
|
|
|
<el-table-column prop="createdTime" align="center" width="140" :show-overflow-tooltip="true" label="创建时间"> |
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
<el-table-column fixed="right" label="操作" align="center" width="200px"> |
|
|
@ -106,25 +117,25 @@ |
|
|
|
</template> |
|
|
|
|
|
|
|
<script> |
|
|
|
import { requestPost } from "@/js/dai/request"; |
|
|
|
import { requestPost, requestGet } from "@/js/dai/request"; |
|
|
|
import nextTick from "dai-js/tools/nextTick"; |
|
|
|
import { mapGetters } from "vuex"; |
|
|
|
import excelInfo from "./cpts/excel-info"; |
|
|
|
import excelAdd from "./cpts/excel-add"; |
|
|
|
|
|
|
|
export default { |
|
|
|
components: { excelInfo,excelAdd }, |
|
|
|
components: { excelInfo, excelAdd }, |
|
|
|
|
|
|
|
data() { |
|
|
|
let endDisabledDate = (time) => { |
|
|
|
//这个关键属性我们一定要写在data的里面并且return的外面,这是动态改变区间的关键 |
|
|
|
let nowData = Date.now(); |
|
|
|
if (this.formData.taskIntroduction) { |
|
|
|
let taskIntroduction = new Date(this.formData.taskIntroduction); |
|
|
|
if (this.formData.startTime) { |
|
|
|
let startTime = new Date(this.formData.startTime); |
|
|
|
return ( |
|
|
|
time.getTime() > nowData || |
|
|
|
time.getTime() < taskIntroduction || |
|
|
|
time.getTime() === taskIntroduction |
|
|
|
time.getTime() < startTime || |
|
|
|
time.getTime() === startTime |
|
|
|
); |
|
|
|
} else { |
|
|
|
return time.getTime() > nowData; |
|
|
@ -136,27 +147,27 @@ export default { |
|
|
|
return time.getTime() > nowData; |
|
|
|
}; |
|
|
|
|
|
|
|
let orgOptionProps = { |
|
|
|
multiple: false, |
|
|
|
value: 'agencyId', |
|
|
|
label: 'agencyName', |
|
|
|
children: 'subAgencyList', |
|
|
|
checkStrictly: true |
|
|
|
} |
|
|
|
// let orgOptionProps = { |
|
|
|
// multiple: false, |
|
|
|
// value: 'agencyId', |
|
|
|
// label: 'agencyName', |
|
|
|
// children: 'subAgencyList', |
|
|
|
// checkStrictly: true |
|
|
|
// } |
|
|
|
return { |
|
|
|
pageType: "list", // 列表list 新增add 详情info |
|
|
|
tableData: [], |
|
|
|
formData: { |
|
|
|
orgId: '',//组织Id |
|
|
|
taskTitle:'',//任务主题 |
|
|
|
taskTitle: '',//任务主题 |
|
|
|
taskType: '',//任务类型 |
|
|
|
taskIntroduction: '',//开始时间 |
|
|
|
startTime: '',//结束时间 |
|
|
|
createdBy:''//创建人 |
|
|
|
startTime: '',//开始时间 |
|
|
|
endTime: '',//结束时间 |
|
|
|
createdBy: ''//创建人 |
|
|
|
}, |
|
|
|
|
|
|
|
orgOptionProps, |
|
|
|
orgOptions: [], |
|
|
|
|
|
|
|
// orgOptionProps, |
|
|
|
// orgOptions: [], |
|
|
|
pageNo: 1, |
|
|
|
pageSize: window.localStorage.getItem("pageSize") || 20, |
|
|
|
total: 1, |
|
|
@ -168,6 +179,22 @@ export default { |
|
|
|
disabledDate: startDisabledDate, |
|
|
|
}, |
|
|
|
searchH: 180, |
|
|
|
createdByArray: [], |
|
|
|
statusArray: [ |
|
|
|
{ |
|
|
|
label: '已完成', |
|
|
|
value: 'resolved' |
|
|
|
}, |
|
|
|
{ |
|
|
|
label: '已取消', |
|
|
|
value: 'cancel', |
|
|
|
}, |
|
|
|
{ |
|
|
|
label: '进行中', |
|
|
|
value: 'deal', |
|
|
|
} |
|
|
|
], |
|
|
|
manager: false |
|
|
|
}; |
|
|
|
}, |
|
|
|
computed: { |
|
|
@ -180,12 +207,34 @@ export default { |
|
|
|
}, |
|
|
|
watch: { |
|
|
|
}, |
|
|
|
mounted() { |
|
|
|
async mounted() { |
|
|
|
const user = this.$store.state.user; |
|
|
|
await this.getStafflist() |
|
|
|
if (user) { |
|
|
|
if (user.roleList.findIndex(item => item === "manager") !== -1) { |
|
|
|
this.manager = false; |
|
|
|
}else { |
|
|
|
this.manager = true; |
|
|
|
this.formData.createdBy = this.createdByArray.find(item=>item.mobile === user.phone).staffId |
|
|
|
} |
|
|
|
} |
|
|
|
this.getTableData() |
|
|
|
this.getOrgTreeList() |
|
|
|
// this.getOrgTreeList() |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
handleShowPage(){ |
|
|
|
async getStafflist() { |
|
|
|
let parms = { |
|
|
|
orgId:this.$store.state.user.agencyId, |
|
|
|
orgType: 'agency', |
|
|
|
pageNo: 1, |
|
|
|
pageSize: 100, |
|
|
|
}; |
|
|
|
let {data,code} = await requestPost('/data/aggregator/org/stafflist',parms) |
|
|
|
if(code === 0){ |
|
|
|
this.createdByArray = data.staffList; |
|
|
|
} |
|
|
|
}, |
|
|
|
handleShowPage() { |
|
|
|
this.pageType = 'list'; |
|
|
|
}, |
|
|
|
handleAdd() { |
|
|
@ -195,15 +244,15 @@ export default { |
|
|
|
handleInfo() { |
|
|
|
this.pageType = 'info' |
|
|
|
}, |
|
|
|
handleChangeAgency(val) { |
|
|
|
this.sarr = [] |
|
|
|
this.getLastItem( |
|
|
|
this.orgOptions, |
|
|
|
val, |
|
|
|
"agencyId" |
|
|
|
); |
|
|
|
this.level = this.sarr[this.sarr.length - 1].level |
|
|
|
}, |
|
|
|
// handleChangeAgency(val) { |
|
|
|
// this.sarr = [] |
|
|
|
// this.getLastItem( |
|
|
|
// this.orgOptions, |
|
|
|
// val, |
|
|
|
// "agencyId" |
|
|
|
// ); |
|
|
|
// this.level = this.sarr[this.sarr.length - 1].level |
|
|
|
// }, |
|
|
|
getLastItem(list, vals, key) { |
|
|
|
let LIST = list || []; |
|
|
|
for (let item of LIST) { |
|
|
@ -217,21 +266,21 @@ export default { |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
getOrgTreeList() { |
|
|
|
this.$http |
|
|
|
.post('/gov/org/customeragency/agencygridtree', {}) |
|
|
|
.then(({ data: res }) => { |
|
|
|
if (res.code !== 0) { |
|
|
|
return this.$message.error(res.msg) |
|
|
|
} else { |
|
|
|
this.orgOptions = [] |
|
|
|
this.orgOptions.push(res.data) |
|
|
|
} |
|
|
|
}) |
|
|
|
.catch(() => { |
|
|
|
return this.$message.error('网络错误') |
|
|
|
}) |
|
|
|
}, |
|
|
|
// getOrgTreeList() { |
|
|
|
// this.$http |
|
|
|
// .post('/gov/org/customeragency/agencygridtree', {}) |
|
|
|
// .then(({ data: res }) => { |
|
|
|
// if (res.code !== 0) { |
|
|
|
// return this.$message.error(res.msg) |
|
|
|
// } else { |
|
|
|
// this.orgOptions = [] |
|
|
|
// this.orgOptions.push(res.data) |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// .catch(() => { |
|
|
|
// return this.$message.error('网络错误') |
|
|
|
// }) |
|
|
|
// }, |
|
|
|
handleSizeChange(val) { |
|
|
|
this.pageSize = val; |
|
|
|
window.localStorage.setItem("pageSize", val); |
|
|
@ -242,24 +291,12 @@ export default { |
|
|
|
this.getTableData(); |
|
|
|
}, |
|
|
|
async getTableData() { |
|
|
|
const url = "/governance/icEventOld/list"; |
|
|
|
if (Array.isArray(this.formData.agencyId) && this.formData.agencyId.length) { |
|
|
|
if (this.level == "grid") { |
|
|
|
this.formData.gridId = this.formData.agencyId[this.formData.agencyId.length - 1]; |
|
|
|
this.formData.agencyId = ""; |
|
|
|
} else { |
|
|
|
this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length - 1]; |
|
|
|
this.formData.gridId = ""; |
|
|
|
} |
|
|
|
} else { |
|
|
|
this.formData.agencyId = ""; |
|
|
|
this.formData.gridId = ""; |
|
|
|
} |
|
|
|
const url = "/actual/base/communityOneTablePublish/page"; |
|
|
|
const { pageSize, pageNo, formData } = this; |
|
|
|
const { data, code, msg } = await requestPost(url, { |
|
|
|
const { data, code, msg } = await requestGet(url, { |
|
|
|
pageSize, |
|
|
|
pageNo, |
|
|
|
...formData, |
|
|
|
...formData |
|
|
|
}); |
|
|
|
if (code === 0) { |
|
|
|
this.total = data.total || 0; |
|
|
|