|
|
@@ -21,11 +21,11 @@
|
|
|
v-show="showSearch"
|
|
|
label-width="100px"
|
|
|
>
|
|
|
- <el-form-item label="履职计划" prop="planId">
|
|
|
+ <el-form-item label="任务名称" prop="planId">
|
|
|
<el-select
|
|
|
v-model="queryParams.planId"
|
|
|
filterable
|
|
|
- placeholder="请选择履职计划"
|
|
|
+ placeholder="请选择任务名称"
|
|
|
clearable
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -37,10 +37,10 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="履职角色" prop="executeRole">
|
|
|
+ <el-form-item label="履职人员" prop="executeRole">
|
|
|
<el-select
|
|
|
v-model="queryParams.executeRole"
|
|
|
- placeholder="请选择履职角色"
|
|
|
+ placeholder="请选择履职人员"
|
|
|
clearable
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -51,24 +51,10 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="履职周期" prop="executeCycle">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.executeCycle"
|
|
|
- placeholder="请选择履职周期"
|
|
|
- @change="changeType($event)"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in dict.type.resumption_plan_cycle"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="履职进度" prop="status">
|
|
|
+ <el-form-item label="任务进度" prop="status">
|
|
|
<el-select
|
|
|
v-model="queryParams.status"
|
|
|
- placeholder="请选择履职进度"
|
|
|
+ placeholder="请选择任务进度"
|
|
|
clearable
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -79,15 +65,7 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- class="searchTitle"
|
|
|
- label="计划时间"
|
|
|
- v-if="
|
|
|
- queryParams.executeCycle == 1 ||
|
|
|
- queryParams.executeCycle == 2 ||
|
|
|
- queryParams.executeCycle == null
|
|
|
- "
|
|
|
- >
|
|
|
+ <el-form-item class="searchTitle" label="任务时间">
|
|
|
<DataRangePicker
|
|
|
v-model="queryParams.range"
|
|
|
key="daterange"
|
|
|
@@ -95,160 +73,10 @@
|
|
|
:clearable="timeClearable"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- class="searchTitle"
|
|
|
- label="履职时间"
|
|
|
- v-if="queryParams.executeCycle == 3"
|
|
|
- >
|
|
|
- <!-- :format='weekStart+" 到 "+weekEnd+ 第WW周' format=" yyyy 第 WW 周"-->
|
|
|
- <el-date-picker
|
|
|
- :picker-options="{ firstDayOfWeek: 1 }"
|
|
|
- key="week"
|
|
|
- v-model="week"
|
|
|
- @change="weekChanged"
|
|
|
- :clearable="timeClearable"
|
|
|
- type="week"
|
|
|
- format=" yyyy 第 WW 周"
|
|
|
- placeholder="选择周"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <el-form-item
|
|
|
- class="searchTitle"
|
|
|
- label="计划时间"
|
|
|
- v-if="queryParams.executeCycle == 4"
|
|
|
- >
|
|
|
- <el-date-picker
|
|
|
- v-model="monthRange"
|
|
|
- @change="monthChanged"
|
|
|
- type="monthrange"
|
|
|
- key="monthRange"
|
|
|
- align="right"
|
|
|
- :clearable="timeClearable"
|
|
|
- unlink-panels
|
|
|
- range-separator="-"
|
|
|
- start-placeholder="开始月份"
|
|
|
- end-placeholder="结束月份"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <el-form-item
|
|
|
- class="searchTitle"
|
|
|
- label="计划时间"
|
|
|
- v-if="queryParams.executeCycle == 5"
|
|
|
- >
|
|
|
- <el-date-picker
|
|
|
- :clearable="timeClearable"
|
|
|
- type="year"
|
|
|
- align="right"
|
|
|
- key="quarterSyearS"
|
|
|
- v-model="yearS"
|
|
|
- />
|
|
|
- -
|
|
|
- <el-select v-model="quarterS" placeholder="请选择">
|
|
|
- <el-option
|
|
|
- v-for="item in optionsQS"
|
|
|
- :key="item.key"
|
|
|
- :label="item.text"
|
|
|
- :value="item.value"
|
|
|
- :clearable="timeClearable"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
-
|
|
|
- <label
|
|
|
- class="el-form-item__label"
|
|
|
- style="margin: 0 10px; padding: 0"
|
|
|
- >至</label
|
|
|
- >
|
|
|
- <el-date-picker
|
|
|
- :clearable="timeClearable"
|
|
|
- type="year"
|
|
|
- v-model="yearE"
|
|
|
- key="quarterSyearE"
|
|
|
- align="right"
|
|
|
- />
|
|
|
- -
|
|
|
- <el-select v-model="quarterE" placeholder="请选择">
|
|
|
- <el-option
|
|
|
- v-for="item in optionsQE"
|
|
|
- :key="item.key"
|
|
|
- :label="item.text"
|
|
|
- :value="item.value"
|
|
|
- :clearable="timeClearable"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <el-form-item label="计划时间" v-if="queryParams.executeCycle == 6">
|
|
|
- <el-date-picker
|
|
|
- :clearable="timeClearable"
|
|
|
- type="year"
|
|
|
- align="right"
|
|
|
- key="halfyearS"
|
|
|
- v-model="yearS"
|
|
|
- />
|
|
|
- -
|
|
|
- <el-select v-model="halfyearS" placeholder="请选择">
|
|
|
- <el-option
|
|
|
- v-for="item in optionsHS"
|
|
|
- :key="item.key"
|
|
|
- :label="item.text"
|
|
|
- :value="item.value"
|
|
|
- :clearable="timeClearable"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
-
|
|
|
- <label
|
|
|
- class="el-form-item__label"
|
|
|
- style="margin: 0 10px; padding: 0"
|
|
|
- >至</label
|
|
|
- >
|
|
|
- <el-date-picker
|
|
|
- :clearable="timeClearable"
|
|
|
- type="year"
|
|
|
- v-model="yearE"
|
|
|
- key="halfyearE"
|
|
|
- align="right"
|
|
|
- />
|
|
|
- -
|
|
|
- <el-select v-model="halfyearE" placeholder="请选择">
|
|
|
- <el-option
|
|
|
- v-for="item in optionsHE"
|
|
|
- :key="item.key"
|
|
|
- :label="item.text"
|
|
|
- :value="item.value"
|
|
|
- :clearable="timeClearable"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <el-form-item
|
|
|
- class="searchTitle"
|
|
|
- label="计划时间"
|
|
|
- v-if="queryParams.executeCycle == 7"
|
|
|
- >
|
|
|
- <el-date-picker
|
|
|
- :clearable="timeClearable"
|
|
|
- type="year"
|
|
|
- align="right"
|
|
|
- v-model="yearS"
|
|
|
- key="yearS"
|
|
|
- />
|
|
|
- <label
|
|
|
- class="el-form-item__label"
|
|
|
- style="margin: 0 10px; padding: 0"
|
|
|
- >至</label
|
|
|
- >
|
|
|
- <el-date-picker
|
|
|
- :clearable="timeClearable"
|
|
|
- type="year"
|
|
|
- v-model="yearE"
|
|
|
- align="right"
|
|
|
- key="yearE"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item>
|
|
|
+ </el-form>
|
|
|
+ <!-- 按纽 -->
|
|
|
+ <el-row :gutter="10" class="mb8">
|
|
|
+ <el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
icon="el-icon-search"
|
|
|
@@ -259,11 +87,6 @@
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
>重置</el-button
|
|
|
>
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
- <!-- 按纽 -->
|
|
|
- <el-row :gutter="10" class="mb8">
|
|
|
- <el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
plain
|
|
|
@@ -285,18 +108,21 @@
|
|
|
border
|
|
|
height="600"
|
|
|
size="small"
|
|
|
- v-loading="loading" :data="pageData">
|
|
|
- <el-table-column
|
|
|
- type="index"
|
|
|
- fixed
|
|
|
- min-width="50"
|
|
|
- label="序号"
|
|
|
- v-if="columns[0].visible"
|
|
|
+ v-loading="loading"
|
|
|
+ :data="pageData"
|
|
|
+ header-cell-class-name="table-header_cell"
|
|
|
>
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ type="index"
|
|
|
+ fixed
|
|
|
+ min-width="50"
|
|
|
+ label="序号"
|
|
|
+ v-if="columns[0].visible"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="name"
|
|
|
- label="履职任务"
|
|
|
+ label="任务名称"
|
|
|
min-width="120"
|
|
|
v-if="columns[1].visible"
|
|
|
>
|
|
|
@@ -310,61 +136,40 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="roleName"
|
|
|
- label="履职角色"
|
|
|
+ label="履职人员"
|
|
|
min-width="120"
|
|
|
v-if="columns[3].visible"
|
|
|
- >
|
|
|
+ >
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="status"
|
|
|
- label="履职进度"
|
|
|
+ label="任务进度"
|
|
|
width="100px"
|
|
|
v-if="columns[4].visible"
|
|
|
>
|
|
|
<template slot-scope="r">
|
|
|
- <span>
|
|
|
- <i class="circle" :style="statusColor(r.row.status, true)" />
|
|
|
- <label :style="statusColor(r.row.status, false)">
|
|
|
- {{
|
|
|
- getLabel(dict.type.resumption_status, r.row.status)
|
|
|
- }}</label
|
|
|
- >
|
|
|
- </span>
|
|
|
+ {{ getLabel(dict.type.resumption_status, r.row.status) }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="planStartTime"
|
|
|
- label="开始时间"
|
|
|
- min-width="140"
|
|
|
+ label="任务时间"
|
|
|
+ width="200px"
|
|
|
v-if="columns[5].visible"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- prop="planEndTime"
|
|
|
- label="截止时间"
|
|
|
- min-width="140"
|
|
|
- v-if="columns[6].visible"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- prop="submitter"
|
|
|
- label="提交人"
|
|
|
- min-width="120"
|
|
|
- v-if="columns[7].visible"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="提交时间"
|
|
|
- min-width="120"
|
|
|
- v-if="columns[8].visible"
|
|
|
>
|
|
|
- <template slot-scope="r">{{
|
|
|
- r.row.submitTime | dateTime
|
|
|
- }}</template>
|
|
|
- </el-table-column>
|
|
|
+ <template slot-scope="r">
|
|
|
+ {{dayjs(r.row.planStartTime).format("YYYY年MM月DD日")}}-{{dayjs(r.row.planEndTime).format("YYYY年MM月DD日")}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="abnormalDataNums"
|
|
|
label="隐患问题数"
|
|
|
min-width="80"
|
|
|
- v-if="columns[9].visible"
|
|
|
+ v-if="columns[6].visible"
|
|
|
>
|
|
|
+ <template slot-scope="r">
|
|
|
+ <span v-if="r.row.status==2 || r.row.status==3">{{r.row.abnormalDataNums}}</span>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column label="操作" fixed="right" min-width="120px">
|
|
|
@@ -380,10 +185,11 @@
|
|
|
" type="text" @click="onEdit(r.row.id, { isRead: true })">查看</el-button> -->
|
|
|
<el-button
|
|
|
type="text"
|
|
|
+ icon="el-icon-view"
|
|
|
@click="showDetail(r.row)"
|
|
|
v-show="r.row.status == 2 || r.row.status == 3"
|
|
|
v-hasPermi="['resumption:taskManager:query']"
|
|
|
- >查看</el-button
|
|
|
+ >详情</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
type="text"
|
|
|
@@ -405,13 +211,13 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<!-- 详情 -->
|
|
|
- <dialog-detail ref="detaildialog"></dialog-detail>
|
|
|
+ <dialog-detail ref="detaildialog" :statusOptions="dict.type.resumption_status"></dialog-detail>
|
|
|
<dialog-scan-record ref="scanrecorddialog"></dialog-scan-record>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import {mapGetters } from "vuex";
|
|
|
+import { mapGetters } from "vuex";
|
|
|
// import { Message } from "element-ui";
|
|
|
import DialogDetail from "./dialog.detail";
|
|
|
import DialogScanRecord from "./dialog.scanrecord";
|
|
|
@@ -426,43 +232,9 @@ export default {
|
|
|
dicts: ["resumption_plan_cycle", "resumption_status"],
|
|
|
components: { DialogDetail, DialogScanRecord, DataRangePicker, OrgTree },
|
|
|
data() {
|
|
|
- // const { params, query } = this.$route;
|
|
|
let sDate = new Date();
|
|
|
let eDate = new Date();
|
|
|
- // if (query.startDate != undefined) {
|
|
|
- // sDate = new Date(query.startDate);
|
|
|
- // }
|
|
|
- // if (query.endDate != undefined) {
|
|
|
- // eDate = new Date(query.endDate);
|
|
|
- // }
|
|
|
- // let tempType = 1;
|
|
|
- // let tempOrgId = 1;
|
|
|
- // let tempRole = null;
|
|
|
- // let tempstatus = null;
|
|
|
- // if (query.executeCycle != undefined) tempType = query.executeCycle;
|
|
|
- // if (query.orgId != undefined) tempOrgId = parseInt(query.orgId);
|
|
|
- // else {
|
|
|
- // if (
|
|
|
- // this.loginUser != undefined &&
|
|
|
- // this.loginUser.org != undefined &&
|
|
|
- // this.loginUser.org.id != undefined
|
|
|
- // )
|
|
|
- // tempOrgId = parseInt(this.loginUser.org.id);
|
|
|
- // }
|
|
|
- // if (query.executeRole != undefined && query.executeRole != "all")
|
|
|
- // tempRole = query.executeRole;
|
|
|
- // if (query.status != undefined && query.status != "all")
|
|
|
- // tempstatus = query.status;
|
|
|
|
|
|
- let temphalfyearE = 1;
|
|
|
- let temphalfyearS = 1;
|
|
|
- let tempquarterE = 1;
|
|
|
- let tempquarterS = 1;
|
|
|
-
|
|
|
- // if (query.halfyearE != undefined) temphalfyearE = parseInt(query.halfyearE);
|
|
|
- // if (query.halfyearS != undefined) temphalfyearS = parseInt(query.halfyearS);
|
|
|
- // if (query.quarterE != undefined) tempquarterE = parseInt(query.quarterE);
|
|
|
- // if (query.quarterS != undefined) tempquarterS = parseInt(query.quarterS);
|
|
|
return {
|
|
|
loading: false,
|
|
|
showSearch: true,
|
|
|
@@ -471,38 +243,7 @@ export default {
|
|
|
options: [],
|
|
|
roleList: [],
|
|
|
planList: [],
|
|
|
- yearS: sDate,
|
|
|
- yearE: eDate,
|
|
|
- halfyearE: temphalfyearE,
|
|
|
- halfyearS: temphalfyearS,
|
|
|
- quarterE: tempquarterE,
|
|
|
- quarterS: tempquarterS,
|
|
|
- monthRange: [sDate, eDate],
|
|
|
- week: sDate,
|
|
|
- weekStart: null,
|
|
|
- weekEnd: null,
|
|
|
- optionsHS: [
|
|
|
- { key: "1", value: 1, text: "上半年" },
|
|
|
- { key: "2", value: 2, text: "下半年" },
|
|
|
- ],
|
|
|
- optionsHE: [
|
|
|
- { key: "1", value: 1, text: "上半年" },
|
|
|
- { key: "2", value: 2, text: "下半年" },
|
|
|
- ],
|
|
|
- optionsQS: [
|
|
|
- { key: "1", value: 1, text: "第一季度" },
|
|
|
- { key: "2", value: 2, text: "第二季度" },
|
|
|
- { key: "3", value: 3, text: "第三季度" },
|
|
|
- { key: "4", value: 4, text: "第四季度" },
|
|
|
- ],
|
|
|
- optionsQE: [
|
|
|
- { key: "1", value: 1, text: "第一季度" },
|
|
|
- { key: "2", value: 2, text: "第二季度" },
|
|
|
- { key: "3", value: 3, text: "第三季度" },
|
|
|
- { key: "4", value: 4, text: "第四季度" },
|
|
|
- ],
|
|
|
queryParams: {
|
|
|
- executeCycle: "2",
|
|
|
checkSub: true,
|
|
|
orgId: null,
|
|
|
range: [sDate, eDate],
|
|
|
@@ -512,20 +253,16 @@ export default {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
},
|
|
|
- selectedOrgName:null,
|
|
|
+ selectedOrgName: null,
|
|
|
pageData: [],
|
|
|
columns: [
|
|
|
{ key: 0, label: `序号`, visible: true },
|
|
|
{ key: 1, label: `任务名称`, visible: true },
|
|
|
{ key: 2, label: `履职机构`, visible: true },
|
|
|
- { key: 3, label: `履职角色`, visible: true },
|
|
|
- { key: 4, label: `履职进度`, visible: true },
|
|
|
- { key: 5, label: `开始时间`, visible: true },
|
|
|
- { key: 6, label: `截止时间`, visible: true },
|
|
|
- { key: 7, label: `提交人`, visible: true },
|
|
|
- { key: 8, label: `提交时间`, visible: true },
|
|
|
- { key: 9, label: `隐患问题数`, visible: true },
|
|
|
-
|
|
|
+ { key: 3, label: `履职人员`, visible: true },
|
|
|
+ { key: 4, label: `任务进度`, visible: true },
|
|
|
+ { key: 5, label: `任务时间`, visible: true },
|
|
|
+ { key: 6, label: `隐患问题数`, visible: true },
|
|
|
],
|
|
|
};
|
|
|
},
|
|
|
@@ -558,93 +295,13 @@ export default {
|
|
|
$route(v) {
|
|
|
//this.queryParams.type = this.$route.params.type.toUpperCase();
|
|
|
},
|
|
|
- // 0每日；1每周；2每月；3每季度；4每半年；5每年
|
|
|
- yearS(val) {
|
|
|
- if (this.yearE < val) {
|
|
|
- this.yearE = val;
|
|
|
- if (this.queryParams.executeCycle == 3) {
|
|
|
- if (this.quarterS > this.quarterE) {
|
|
|
- this.quarterS = this.quarterE;
|
|
|
- } else this.resetRangeParam();
|
|
|
- } else if (this.queryParams.executeCycle == 4) {
|
|
|
- if (this.halfyearS > this.halfyearE) {
|
|
|
- this.halfyearS = this.quarterE;
|
|
|
- } else this.resetRangeParam();
|
|
|
- }
|
|
|
- } else this.resetRangeParam();
|
|
|
- },
|
|
|
- yearE(val) {
|
|
|
- if (val < this.yearS) {
|
|
|
- this.yearS = val;
|
|
|
- if (this.queryParams.executeCycle == 3) {
|
|
|
- if (this.quarterS > this.quarterE) {
|
|
|
- this.quarterS = this.quarterE;
|
|
|
- } else this.resetRangeParam();
|
|
|
- } else if (this.queryParams.executeCycle == 4) {
|
|
|
- if (this.halfyearS > this.halfyearE) {
|
|
|
- this.halfyearS = this.halfyearE;
|
|
|
- } else this.resetRangeParam();
|
|
|
- }
|
|
|
- } else this.resetRangeParam();
|
|
|
- },
|
|
|
- quarterS(val) {
|
|
|
- if (this.yearS == this.yearE) {
|
|
|
- if (val > this.quarterE) this.quarterE = val;
|
|
|
- else this.resetRangeParam();
|
|
|
- } else this.resetRangeParam();
|
|
|
- },
|
|
|
- quarterE(val) {
|
|
|
- if (this.yearS == this.yearE) {
|
|
|
- if (val < this.quarterS) this.quarterS = val;
|
|
|
- else this.resetRangeParam();
|
|
|
- } else this.resetRangeParam();
|
|
|
- },
|
|
|
- halfyearS(val) {
|
|
|
- console.log("ccccccccc", val);
|
|
|
- if (this.yearS == this.yearE) {
|
|
|
- if (val > this.halfyearE) this.halfyearE = val;
|
|
|
- else this.resetRangeParam();
|
|
|
- } else this.resetRangeParam();
|
|
|
- },
|
|
|
- halfyearE(val) {
|
|
|
- console.log("dddddddddd", val);
|
|
|
- if (this.yearS == this.yearE) {
|
|
|
- if (val < this.halfyearS) this.halfyearS = val;
|
|
|
- else this.resetRangeParam();
|
|
|
- } else this.resetRangeParam();
|
|
|
- },
|
|
|
- monthRange(val) {
|
|
|
- this.resetRangeParam();
|
|
|
- },
|
|
|
},
|
|
|
computed: {
|
|
|
- ...mapGetters(["orgName"])
|
|
|
+ ...mapGetters(["orgName"]),
|
|
|
},
|
|
|
methods: {
|
|
|
-
|
|
|
getLabel,
|
|
|
- toName(row) {
|
|
|
- // const ymd = row.ymd;
|
|
|
- const ymd = new Date(row.ymdDate);
|
|
|
- switch (row.executeCycle) {
|
|
|
- case 0:
|
|
|
- return `${ymd.year}年${ymd.month}月${ymd.day}日-${row.formTypeText}`;
|
|
|
- case 1:
|
|
|
- return `${ymd.year}年第${ymd.week}周-${row.formTypeText}`;
|
|
|
- case 2:
|
|
|
- return `${ymd.year}年第${ymd.month}月`;
|
|
|
- case 3:
|
|
|
- return `${ymd.year}年第${ymd.quarter}季`;
|
|
|
- case 4:
|
|
|
- let text = ymd.halfyear == 1 ? "上" : "下";
|
|
|
- return `${ymd.year}年${text}每半年`;
|
|
|
- case 5:
|
|
|
- return `${ymd.year}年`;
|
|
|
- case 6:
|
|
|
- return `${ymd.year}年${ymd.month}月${ymd.day}日${ymd.hour}小时${ymd.minute}分钟-${row.formTypeText}`;
|
|
|
- }
|
|
|
- },
|
|
|
-
|
|
|
+ dayjs,
|
|
|
async exportExcel() {
|
|
|
if (!this.isTableHaveData) {
|
|
|
this.$message.error({
|
|
|
@@ -655,9 +312,15 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- this.download('/core/resumption/record/export', {
|
|
|
- ...this.queryParams
|
|
|
- }, `【${this.selectedOrgName}】-履职任务管理${dayjs(new Date()).format("YYYYMMDDHHmmss")}.xlsx`)
|
|
|
+ this.download(
|
|
|
+ "/core/resumption/record/export",
|
|
|
+ {
|
|
|
+ ...this.queryParams,
|
|
|
+ },
|
|
|
+ `【${this.selectedOrgName}】-履职情况跟踪-${dayjs(new Date()).format(
|
|
|
+ "YYYYMMDD"
|
|
|
+ )}.xlsx`
|
|
|
+ );
|
|
|
|
|
|
// await api.exportResumptionRecord(this.queryParams);
|
|
|
},
|
|
|
@@ -671,7 +334,7 @@ export default {
|
|
|
|
|
|
getDefaultKey(key) {
|
|
|
this.queryParams.orgId = key;
|
|
|
- this.selectedOrgName=this.orgName;
|
|
|
+ this.selectedOrgName = this.orgName;
|
|
|
this.getList();
|
|
|
this.loadRoles(key);
|
|
|
this.loadPlanList();
|
|
|
@@ -685,15 +348,13 @@ export default {
|
|
|
// 节点单击事件
|
|
|
clickTreeNode(data) {
|
|
|
this.queryParams.orgId = data.id;
|
|
|
- this.selectedOrgName=data.name;
|
|
|
+ this.selectedOrgName = data.name;
|
|
|
this.loadPlanList();
|
|
|
this.loadRoles();
|
|
|
this.getList();
|
|
|
},
|
|
|
resetQuery() {
|
|
|
this.resetForm("queryParams");
|
|
|
- this.queryParams.executeCycle = "2";
|
|
|
- this.changeType("2");
|
|
|
// this.queryParams.orgId = undefined;
|
|
|
// this.queryParams.checkSub = false;
|
|
|
// this.$refs.tree.setCurrentKey(null);
|
|
|
@@ -717,7 +378,6 @@ export default {
|
|
|
api
|
|
|
.getRoles({
|
|
|
orgId: this.queryParams.orgId,
|
|
|
- planCycle: this.queryParams.executeCycle,
|
|
|
})
|
|
|
.then((r) => (this.roleList = r.data));
|
|
|
},
|
|
|
@@ -726,54 +386,15 @@ export default {
|
|
|
api
|
|
|
.getPlans({
|
|
|
orgId: this.queryParams.orgId,
|
|
|
- planCycle: this.queryParams.executeCycle,
|
|
|
})
|
|
|
.then((r) => {
|
|
|
this.planList = r.data;
|
|
|
- if(!this.planList.find(p=>p.id==this.queryParams.planId)){
|
|
|
-
|
|
|
- this.queryParams.planId=null
|
|
|
+ if (!this.planList.find((p) => p.id == this.queryParams.planId)) {
|
|
|
+ this.queryParams.planId = null;
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- async changeType(selectValue) {
|
|
|
- // console.log("selectValue",selectValue.target.value)
|
|
|
- // this.planVal = -1;
|
|
|
- this.queryParams.executeCycle = selectValue;
|
|
|
|
|
|
- let nowDate = new Date();
|
|
|
- let nowMonth = nowDate.getMonth();
|
|
|
- if (nowMonth <= 2) {
|
|
|
- this.quarterS = 1;
|
|
|
- this.quarterE = 1;
|
|
|
- this.halfyearS = 1;
|
|
|
- this.halfyearE = 1;
|
|
|
- } else if (nowMonth <= 5) {
|
|
|
- this.quarterS = 2;
|
|
|
- this.quarterE = 2;
|
|
|
- this.halfyearS = 1;
|
|
|
- this.halfyearE = 1;
|
|
|
- } else if (nowMonth <= 8) {
|
|
|
- this.quarterS = 3;
|
|
|
- this.quarterE = 3;
|
|
|
- this.halfyearS = 2;
|
|
|
- this.halfyearE = 2;
|
|
|
- } else if (nowMonth <= 11) {
|
|
|
- this.quarterS = 4;
|
|
|
- this.quarterE = 4;
|
|
|
- this.halfyearS = 2;
|
|
|
- this.halfyearE = 2;
|
|
|
- }
|
|
|
- // 1每小时；2每天.......；3每月；4每季度；4每半年；5每年
|
|
|
- if (this.queryParams.executeCycle == 3) {
|
|
|
- if (!this.week) this.week = new Date();
|
|
|
-
|
|
|
- this.updateWeekDateRange(this.week);
|
|
|
- }
|
|
|
- this.resetRangeParam();
|
|
|
- this.loadPlanList();
|
|
|
- this.loadRoles();
|
|
|
- },
|
|
|
weekChanged() {
|
|
|
this.updateWeekDateRange(this.week);
|
|
|
this.resetRangeParam();
|
|
|
@@ -791,197 +412,6 @@ export default {
|
|
|
week.valueOf() + (c_day == 0 ? 0 : 7 - c_day) * oneDayLong
|
|
|
);
|
|
|
},
|
|
|
- async resetRangeParam() {
|
|
|
- if (this.queryParams.executeCycle == 5) {
|
|
|
- let yearSval = this.yearS.getFullYear();
|
|
|
- let yearEval = this.yearE.getFullYear();
|
|
|
- let sQDate = yearSval + "-";
|
|
|
- let eQData = yearEval + "-";
|
|
|
-
|
|
|
- switch (this.quarterS) {
|
|
|
- case 1:
|
|
|
- sQDate += "01-01";
|
|
|
- break;
|
|
|
- case 2:
|
|
|
- sQDate += "04-01";
|
|
|
- break;
|
|
|
- case 3:
|
|
|
- sQDate += "07-01";
|
|
|
- break;
|
|
|
- case 4:
|
|
|
- sQDate += "10-01";
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- switch (this.quarterE) {
|
|
|
- case 1:
|
|
|
- eQData += "03-31";
|
|
|
- break;
|
|
|
- case 2:
|
|
|
- eQData += "06-30";
|
|
|
- break;
|
|
|
- case 3:
|
|
|
- eQData += "09-30";
|
|
|
- break;
|
|
|
- case 4:
|
|
|
- eQData += "12-31";
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- this.queryParams.range = [new Date(sQDate), new Date(eQData)];
|
|
|
- } else if (this.queryParams.executeCycle == 6) {
|
|
|
- let yearSval = this.yearS.getFullYear();
|
|
|
- let yearEval = this.yearE.getFullYear();
|
|
|
- let sHDate = yearSval + "-";
|
|
|
- let eHData = yearEval + "-";
|
|
|
-
|
|
|
- switch (this.halfyearS) {
|
|
|
- case 1:
|
|
|
- sHDate += "01-01";
|
|
|
- break;
|
|
|
- case 2:
|
|
|
- sHDate += "07-01";
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- switch (this.halfyearE) {
|
|
|
- case 1:
|
|
|
- eHData += "06-30";
|
|
|
- break;
|
|
|
- case 2:
|
|
|
- eHData += "12-31";
|
|
|
- break;
|
|
|
- }
|
|
|
- this.queryParams.range = [new Date(sHDate), new Date(eHData)];
|
|
|
- } else if (this.queryParams.executeCycle == 7) {
|
|
|
- let yearSval = this.yearS.getFullYear();
|
|
|
- let yearEval = this.yearE.getFullYear();
|
|
|
- let sYDate = yearSval + "-01-01";
|
|
|
- let eYData = yearEval + "-12-31";
|
|
|
-
|
|
|
- this.queryParams.range = [new Date(sYDate), new Date(eYData)];
|
|
|
- } else if (this.queryParams.executeCycle == 4) {
|
|
|
- if (!this.monthRange || this.monthRange.length != 2) {
|
|
|
- this.queryParams.range = null;
|
|
|
- } else {
|
|
|
- let dateObjS = this.monthRange[0];
|
|
|
- let dateObjE = this.monthRange[1];
|
|
|
- if (dateObjS.getFullYear == undefined) {
|
|
|
- dateObjS = new Date(dateObjS);
|
|
|
- dateObjE = new Date(dateObjE);
|
|
|
- }
|
|
|
- let sMDate =
|
|
|
- dateObjS.getFullYear() + "-" + (dateObjS.getMonth() + 1) + "-1";
|
|
|
- let eMData =
|
|
|
- dateObjE.getFullYear() + "-" + (dateObjE.getMonth() + 1) + "-1";
|
|
|
-
|
|
|
- let tempDate = new Date(
|
|
|
- dateObjE.getFullYear(),
|
|
|
- dateObjE.getMonth(),
|
|
|
- 29
|
|
|
- );
|
|
|
- if (dateObjE.getMonth() == 1 && tempDate.getDate() === 29) {
|
|
|
- eMData =
|
|
|
- dateObjE.getFullYear() + "-" + (dateObjE.getMonth() + 1) + "-29";
|
|
|
- } else {
|
|
|
- switch (dateObjE.getMonth()) {
|
|
|
- case 0:
|
|
|
- eMData =
|
|
|
- dateObjE.getFullYear() +
|
|
|
- "-" +
|
|
|
- (dateObjE.getMonth() + 1) +
|
|
|
- "-31";
|
|
|
- break;
|
|
|
- case 1:
|
|
|
- eMData =
|
|
|
- dateObjE.getFullYear() +
|
|
|
- "-" +
|
|
|
- (dateObjE.getMonth() + 1) +
|
|
|
- "-28";
|
|
|
- break;
|
|
|
- case 2:
|
|
|
- eMData =
|
|
|
- dateObjE.getFullYear() +
|
|
|
- "-" +
|
|
|
- (dateObjE.getMonth() + 1) +
|
|
|
- "-31";
|
|
|
- break;
|
|
|
- case 3:
|
|
|
- eMData =
|
|
|
- dateObjE.getFullYear() +
|
|
|
- "-" +
|
|
|
- (dateObjE.getMonth() + 1) +
|
|
|
- "-30";
|
|
|
- break;
|
|
|
- case 4:
|
|
|
- eMData =
|
|
|
- dateObjE.getFullYear() +
|
|
|
- "-" +
|
|
|
- (dateObjE.getMonth() + 1) +
|
|
|
- "-31";
|
|
|
- break;
|
|
|
- case 5:
|
|
|
- eMData =
|
|
|
- dateObjE.getFullYear() +
|
|
|
- "-" +
|
|
|
- (dateObjE.getMonth() + 1) +
|
|
|
- "-30";
|
|
|
- break;
|
|
|
- case 6:
|
|
|
- eMData =
|
|
|
- dateObjE.getFullYear() +
|
|
|
- "-" +
|
|
|
- (dateObjE.getMonth() + 1) +
|
|
|
- "-31";
|
|
|
- break;
|
|
|
- case 7:
|
|
|
- eMData =
|
|
|
- dateObjE.getFullYear() +
|
|
|
- "-" +
|
|
|
- (dateObjE.getMonth() + 1) +
|
|
|
- "-31";
|
|
|
- break;
|
|
|
- case 8:
|
|
|
- eMData =
|
|
|
- dateObjE.getFullYear() +
|
|
|
- "-" +
|
|
|
- (dateObjE.getMonth() + 1) +
|
|
|
- "-30";
|
|
|
- break;
|
|
|
- case 9:
|
|
|
- eMData =
|
|
|
- dateObjE.getFullYear() +
|
|
|
- "-" +
|
|
|
- (dateObjE.getMonth() + 1) +
|
|
|
- "-31";
|
|
|
- break;
|
|
|
- case 10:
|
|
|
- eMData =
|
|
|
- dateObjE.getFullYear() +
|
|
|
- "-" +
|
|
|
- (dateObjE.getMonth() + 1) +
|
|
|
- "-30";
|
|
|
- break;
|
|
|
- case 11:
|
|
|
- eMData =
|
|
|
- dateObjE.getFullYear() +
|
|
|
- "-" +
|
|
|
- (dateObjE.getMonth() + 1) +
|
|
|
- "-31";
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- this.queryParams.range = [new Date(sMDate), new Date(eMData)];
|
|
|
- }
|
|
|
- } else if (this.queryParams.executeCycle == 3) {
|
|
|
- this.queryParams.range = [this.weekStart, this.weekEnd];
|
|
|
- } else if (
|
|
|
- this.queryParams.executeCycle === 1 ||
|
|
|
- this.queryParams.executeCycle == 2
|
|
|
- ) {
|
|
|
- this.queryParams.range = this.$dateRange.before(0);
|
|
|
- }
|
|
|
- },
|
|
|
statusColor(status, isBackground) {
|
|
|
let color = "";
|
|
|
switch (status) {
|
|
|
@@ -1021,16 +451,4 @@ export default {
|
|
|
};
|
|
|
</script>
|
|
|
|
|
|
-<style lang="scss">
|
|
|
-// .searchItem {
|
|
|
-// margin-right: 10px;
|
|
|
-// margin-top: 5px;
|
|
|
-// margin-bottom: 5px;
|
|
|
-// }
|
|
|
-
|
|
|
-// .searchTitle {
|
|
|
-// margin-right: 10px !important;
|
|
|
-// margin-bottom: 0 !important;
|
|
|
-// margin-top: 0 !important;
|
|
|
-// }
|
|
|
-</style>
|
|
|
+<style lang="scss"></style>
|
jiawuxian