|
|
@@ -79,8 +79,8 @@
|
|
|
icon="el-icon-search"
|
|
|
size="mini"
|
|
|
@click="handleQuery"
|
|
|
- v-hasPermi="['core:accessPlan:list']"
|
|
|
- >搜索
|
|
|
+ v-hasPermi="['core:reminder:list']"
|
|
|
+ >搜索
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
@@ -89,7 +89,8 @@
|
|
|
icon="el-icon-refresh"
|
|
|
size="mini"
|
|
|
@click="resetQuery"
|
|
|
- >重置</el-button
|
|
|
+ >重置
|
|
|
+ </el-button
|
|
|
>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
@@ -98,8 +99,8 @@
|
|
|
icon="el-icon-plus"
|
|
|
size="mini"
|
|
|
@click="handleAdd"
|
|
|
- v-hasPermi="['core:accessPlan:add']"
|
|
|
- >新增短信提醒配置
|
|
|
+ v-hasPermi="['core:reminder:edit']"
|
|
|
+ >新增短信提醒配置
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<right-toolbar
|
|
|
@@ -113,7 +114,7 @@
|
|
|
height="600"
|
|
|
size="small"
|
|
|
v-loading="loading"
|
|
|
- :data="planList"
|
|
|
+ :data="configList"
|
|
|
row-key="id"
|
|
|
>
|
|
|
<el-table-column
|
|
|
@@ -124,75 +125,46 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{
|
|
|
- (queryParams.pageNum - 1) * queryParams.pageSize +
|
|
|
- scope.$index +
|
|
|
- 1
|
|
|
- }}</span>
|
|
|
+ (queryParams.pageNum - 1) * queryParams.pageSize +
|
|
|
+ scope.$index +
|
|
|
+ 1
|
|
|
+ }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- width="140"
|
|
|
- label="任务名称"
|
|
|
+ label="提醒类型"
|
|
|
align="center"
|
|
|
- prop="planName"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- width="140"
|
|
|
- label="创建机构"
|
|
|
- align="center"
|
|
|
- prop="orgName"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- width="140"
|
|
|
- label="行社名称"
|
|
|
- align="center"
|
|
|
- prop="organization"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="机构类型"
|
|
|
- align="center"
|
|
|
- key="orgType"
|
|
|
- prop="orgType"
|
|
|
+ prop="reminderType"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<dict-tag
|
|
|
- :options="dict.type.sys_org_type"
|
|
|
- :value="scope.row.orgType"
|
|
|
+ :options="dict.type.reminder_type"
|
|
|
+ :value="scope.row.reminderType"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="调阅人员" align="center" prop="roleName" />
|
|
|
-
|
|
|
<el-table-column
|
|
|
- label="任务周期"
|
|
|
+ label="业务类型"
|
|
|
align="center"
|
|
|
- key="planCycle"
|
|
|
- prop="planCycle"
|
|
|
+ prop="sendModule"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<dict-tag
|
|
|
- :options="dict.type.sys_access_cycle"
|
|
|
- :value="scope.row.planCycle"
|
|
|
+ :options="dict.type.reminder_business_type"
|
|
|
+ :value="scope.row.sendModule"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+
|
|
|
<el-table-column
|
|
|
- label="任务次数"
|
|
|
+ label="计划名称"
|
|
|
align="center"
|
|
|
- prop="planFrequency"
|
|
|
+ prop="planName"
|
|
|
/>
|
|
|
|
|
|
- <el-table-column
|
|
|
- label="任务状态"
|
|
|
- align="center"
|
|
|
- key="planStatus"
|
|
|
- prop="planStatus"
|
|
|
- >
|
|
|
+ <el-table-column label="启用状态" align="center" key="enabled" prop="enabled">
|
|
|
<template slot-scope="scope">
|
|
|
- <dict-tag
|
|
|
- :options="dict.type.edu_plan_status"
|
|
|
- :value="scope.row.planStatus"
|
|
|
- />
|
|
|
+ <span>{{ scope.row.enabled ? '启用' : '停用' }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
@@ -207,52 +179,19 @@
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
- icon="el-icon-arrow-down"
|
|
|
- v-show="
|
|
|
- scope.row.parentId == null &&
|
|
|
- scope.row.orgId == isEdit &&
|
|
|
- scope.row.isDistribute == 0 &&
|
|
|
- (scope.row.planStatus == 0 || scope.row.planStatus == 2)
|
|
|
- "
|
|
|
- @click="handDistribute(scope.row)"
|
|
|
- v-hasPermi="['core:accessPlan:release']"
|
|
|
- >下发
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-top-left"
|
|
|
- v-show="
|
|
|
- scope.row.orgId == isEdit &&
|
|
|
- scope.row.isDistribute == 1 &&
|
|
|
- scope.row.planStatus == 1 &&
|
|
|
- scope.row.parentId == null
|
|
|
- "
|
|
|
- @click="handWithdraw(scope.row)"
|
|
|
- v-hasPermi="['core:accessPlan:withdraw']"
|
|
|
- >撤回
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
icon="el-icon-edit-outline"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
- v-show="scope.row.orgId == isEdit"
|
|
|
- v-hasPermi="['core:accessPlan:edit']"
|
|
|
- >编辑
|
|
|
+ v-hasPermi="['core:reminder:edit']"
|
|
|
+ >编辑
|
|
|
</el-button>
|
|
|
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
- v-if="
|
|
|
- scope.row.parentOrgId == isEdit &&
|
|
|
- scope.row.parentId == null
|
|
|
- "
|
|
|
icon="el-icon-delete"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
- v-hasPermi="['core:accessPlan:remove']"
|
|
|
- >删除
|
|
|
+ v-hasPermi="['core:reminder:remove']"
|
|
|
+ >删除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -268,166 +207,135 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
- <!-- 添加或修改监控调阅计划对话框 -->
|
|
|
- <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
+ <!-- 添加或修改短信提醒配置对话框 -->
|
|
|
+ <DialogCom :title="title" :visible.sync="open" width="600px" append-to-body>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
|
|
- <el-form-item label="任务名称" prop="planName">
|
|
|
- <el-input
|
|
|
- v-model="form.planName"
|
|
|
- placeholder="请输入任务名称"
|
|
|
- maxlength="50"
|
|
|
- :disabled="form.isEdit"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <el-form-item label="机构类型" prop="orgType">
|
|
|
-
|
|
|
+ <el-form-item label="提醒类型" prop="reminderType">
|
|
|
<el-select
|
|
|
- :disabled="form.isEdit || form.isComplete"
|
|
|
style="width: 100%"
|
|
|
- v-model="form.orgType"
|
|
|
- placeholder="请选择机构类型"
|
|
|
- @change="changeSelect"
|
|
|
+ v-model="form.reminderType"
|
|
|
+ placeholder="请选择提醒类型"
|
|
|
+ @change="checkReminderType()"
|
|
|
+ clearable
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in dict.type.monitor_org"
|
|
|
+ v-for="dict in dict.type.reminder_type"
|
|
|
:key="dict.value"
|
|
|
:label="dict.label"
|
|
|
:value="`${dict.value}`"
|
|
|
-
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
- <el-form-item label="调阅周期" prop="planCycle">
|
|
|
+ <el-form-item label="业务类型" prop="sendModule">
|
|
|
<el-select
|
|
|
- :disabled="form.isEdit || form.isComplete"
|
|
|
style="width: 100%"
|
|
|
- v-model="form.planCycle"
|
|
|
- placeholder="请选择调阅周期"
|
|
|
- @change="planCycleChanged"
|
|
|
+ v-model="form.sendModule"
|
|
|
+ placeholder="请选择业务类型"
|
|
|
+ clearable
|
|
|
+ @change="selectPlan(form.sendModule)"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in dict.type.sys_access_cycle"
|
|
|
+ v-for="dict in dict.type.reminder_business_type"
|
|
|
:key="dict.value"
|
|
|
:label="dict.label"
|
|
|
:value="`${dict.value}`"
|
|
|
-
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="调阅人员" prop="roleId">
|
|
|
+
|
|
|
+ <el-form-item label="业务计划" prop="planId">
|
|
|
<el-select
|
|
|
- :disabled="form.isEdit || form.isComplete"
|
|
|
style="width: 100%"
|
|
|
- v-model="form.roleId"
|
|
|
- placeholder="请选择用户角色"
|
|
|
- @change="changeSelectOrgType"
|
|
|
+ v-model="form.planId"
|
|
|
+ placeholder="请选择业务计划"
|
|
|
+ @change="selectTimeUnit(form.sendModule, form.planId)"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="item in roleList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.roleName"
|
|
|
- :value="item.id"
|
|
|
-
|
|
|
+ v-for="item in planList"
|
|
|
+ :key="item.planId"
|
|
|
+ :label="item.planName"
|
|
|
+ :value="item.planId"
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="调阅次数"
|
|
|
- prop="planFrequency"
|
|
|
- v-if="form.isEdit == true"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- type="number"
|
|
|
- @change="numChange"
|
|
|
- v-model.number="form.planFrequency"
|
|
|
- placeholder="请输入调阅次数"
|
|
|
- :disabled="form.isComplete"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="调阅次数"
|
|
|
- prop="planFrequency"
|
|
|
- v-if="form.isEdit == false || form.isEdit == null"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- type="number"
|
|
|
- :min="1"
|
|
|
- oninput="if(value<0)value=1"
|
|
|
- v-model.number="form.planFrequency"
|
|
|
- placeholder="请输入调阅次数"
|
|
|
- :disabled="form.isComplete"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <!-- <el-form-item
|
|
|
- label="立即生效"
|
|
|
- prop="immediately"
|
|
|
- v-if="form.planCycle != 0 && this.issue == null"
|
|
|
- >
|
|
|
- <el-checkbox
|
|
|
- v-model="form.immediately"
|
|
|
- :disabled="form.isEdit || form.isComplete"
|
|
|
+ <el-form-item label="对比时间" prop="compareTimeType">
|
|
|
+ <el-select
|
|
|
+ style="width: 100%"
|
|
|
+ v-model="form.compareTimeType"
|
|
|
+ placeholder="请选择对比时间"
|
|
|
+ clearable
|
|
|
>
|
|
|
- 默认从下个周期生成任务，
|
|
|
- <br />
|
|
|
- 勾选后从当前周期立即生成任务
|
|
|
- </el-checkbox>
|
|
|
- </el-form-item> -->
|
|
|
- <el-form-item
|
|
|
- prop="startTime"
|
|
|
- v-if="form.planCycle == 0"
|
|
|
- label="开始日期"
|
|
|
- >
|
|
|
- <el-date-picker
|
|
|
+ <el-option
|
|
|
+ v-for="item in compareTimeOptions"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="时间单位" prop="timeUnit">
|
|
|
+ <el-select
|
|
|
style="width: 100%"
|
|
|
- v-model="form.startTime"
|
|
|
- @change="startDateChanged"
|
|
|
- :picker-options="startDatepickerOptions"
|
|
|
- align="right"
|
|
|
- type="date"
|
|
|
- placeholder="选择开始日期"
|
|
|
- :disabled="form.isEdit || form.isComplete"
|
|
|
+ v-model="form.timeUnit"
|
|
|
+ placeholder="请选择时间单位"
|
|
|
+ clearable
|
|
|
>
|
|
|
- </el-date-picker>
|
|
|
+ <el-option
|
|
|
+ v-for="item in timeUnitList"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <el-form-item label="提醒时间" prop="reminderTime">
|
|
|
+ <template>
|
|
|
+ <el-input-number
|
|
|
+ style="width: 100%"
|
|
|
+ v-model="form.reminderTime"
|
|
|
+ :min="1"
|
|
|
+ placeholder="请输入提醒时间"
|
|
|
+ ></el-input-number>
|
|
|
+ </template>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- prop="endTime"
|
|
|
- v-if="form.planCycle == 0"
|
|
|
- label="结束日期"
|
|
|
- >
|
|
|
- <el-date-picker
|
|
|
+
|
|
|
+ <el-form-item label="提醒角色" prop="roleIdList">
|
|
|
+ <el-select
|
|
|
+ :multiple="true"
|
|
|
style="width: 100%"
|
|
|
- v-model="form.endTime"
|
|
|
- :picker-options="endDatepickerOptions"
|
|
|
- align="right"
|
|
|
- type="date"
|
|
|
- placeholder="选择结束日期"
|
|
|
- :disabled="form.isEdit || form.isComplete"
|
|
|
+ v-model="form.roleIdList"
|
|
|
+ placeholder="请选择提醒角色"
|
|
|
>
|
|
|
- </el-date-picker>
|
|
|
+ <el-option
|
|
|
+ v-for="item in roleList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.roleName"
|
|
|
+ :value="item.id"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item v-show="form.orgType" label="调阅机构" prop="planExecOrgIdList">
|
|
|
- <org-tree-select
|
|
|
- v-model="form.planExecOrgIdList"
|
|
|
- :queryData="form.orgType"
|
|
|
+
|
|
|
+ <el-form-item label="提醒机构" prop="orgIdList">
|
|
|
+ <org-tree-select
|
|
|
+ v-model="form.orgIdList"
|
|
|
+ :queryData="4"
|
|
|
ref="orgTreeSelect"
|
|
|
:checkShow="true"
|
|
|
- :disable="true"
|
|
|
- :disabled="form.isEdit || form.isComplete"
|
|
|
>
|
|
|
</org-tree-select>
|
|
|
- <!-- :enabledCheckOrgTypes="parseInt(form.orgType)" -->
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="备注" prop="description">
|
|
|
- <el-input
|
|
|
- v-model="form.description"
|
|
|
- type="textarea"
|
|
|
- placeholder="请输入备注"
|
|
|
- maxlength="200"
|
|
|
- :disabled="form.isEdit || form.isComplete"
|
|
|
- />
|
|
|
+ <el-form-item label="是否启用" prop="enable">
|
|
|
+ <el-switch
|
|
|
+ v-model="form.enabled"
|
|
|
+ active-color="#13ce66"
|
|
|
+ inactive-color="#ff4949">
|
|
|
+ </el-switch>
|
|
|
</el-form-item>
|
|
|
+
|
|
|
+
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
|
@@ -435,29 +343,20 @@
|
|
|
|
|
|
</div>
|
|
|
</DialogCom>
|
|
|
- <DialogThreeState ref="DialogThreeState"> </DialogThreeState>
|
|
|
+ <DialogThreeState ref="DialogThreeState"></DialogThreeState>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import {
|
|
|
- listPlan,
|
|
|
- getPlan,
|
|
|
- delPlan,
|
|
|
- addPlan,
|
|
|
- updatePlan,
|
|
|
- distribute,
|
|
|
- withdraw,
|
|
|
-} from "@/api/core/accessPlan";
|
|
|
import OrgTreeSelect from "@/components/orgTreeSelect";
|
|
|
-import { listRole, findRoleByType, getRole, allRole } from "@/api/system/role";
|
|
|
+import {list, detail, edit, del, queryPlanBySendModule, selectTimeUnit} from "@/api/reminder/reminder";
|
|
|
import tableList from "@/mixins/tableList";
|
|
|
import orgTree from "@/components/orgTree/orgQuerySelector.vue";
|
|
|
-import { deptTreeSelect } from "@/api/system/public";
|
|
|
-import KFileUpload from "@/components/K-FileUpload/index.vue";
|
|
|
-import { mapGetters } from "vuex";
|
|
|
+import {deptTreeSelect} from "@/api/system/public";
|
|
|
+import {mapGetters} from "vuex";
|
|
|
import DialogThreeState from "@/components/message/threeStateMessageBox.vue";
|
|
|
-import * as api from "@/api/core/accessPlan";
|
|
|
+import {allRole} from "@/api/system/role";
|
|
|
+
|
|
|
export default {
|
|
|
dicts: [
|
|
|
'sys_org_type',
|
|
|
@@ -475,13 +374,6 @@ export default {
|
|
|
|
|
|
data() {
|
|
|
return {
|
|
|
- startDatepickerOptions: {
|
|
|
- disabledDate(time) {
|
|
|
- const date = new Date();
|
|
|
- date.setTime(date.getTime() - 3600 * 1000 * 24);
|
|
|
- return time.getTime() < date;
|
|
|
- },
|
|
|
- },
|
|
|
enabledOptions: [{
|
|
|
label: "启用",
|
|
|
value: true
|
|
|
@@ -489,10 +381,14 @@ export default {
|
|
|
label: "禁用",
|
|
|
value: false
|
|
|
}],
|
|
|
+ compareTimeOptions: [{
|
|
|
+ label: "计划开始时间",
|
|
|
+ value: 0
|
|
|
+ }, {
|
|
|
+ label: "计划结束时间",
|
|
|
+ value: 1
|
|
|
+ }],
|
|
|
|
|
|
- endDatepickerOptions: {
|
|
|
- disabledDate: this.disabledDate,
|
|
|
- },
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
// 选中数组
|
|
|
@@ -507,11 +403,12 @@ export default {
|
|
|
// 总条数
|
|
|
total: 0,
|
|
|
// 监控调阅计划表格数据
|
|
|
+ configList: [],
|
|
|
planList: [],
|
|
|
+ timeUnitList: [],
|
|
|
check: null,
|
|
|
//角色列表
|
|
|
roleList: [],
|
|
|
- allRoleList:[],
|
|
|
// 弹出层标题
|
|
|
title: "",
|
|
|
// 是否显示弹出层
|
|
|
@@ -521,39 +418,45 @@ export default {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
reminderType: null,
|
|
|
- remindBusinessType: null,
|
|
|
sendModule: null,
|
|
|
enabled: null,
|
|
|
-
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {
|
|
|
- isEdit: null,
|
|
|
- parentOrgId: null,
|
|
|
- isComplete: null,
|
|
|
- parentFrequency: null,
|
|
|
+ configId: null,
|
|
|
+ reminderType: null,
|
|
|
+ sendModule: null,
|
|
|
+ planId: null,
|
|
|
+ compareTimeType: null,
|
|
|
+ timeUnit: null,
|
|
|
+ reminderTime: null,
|
|
|
+ roleIdList: [],
|
|
|
+ orgIdList: [],
|
|
|
+ enabled: null,
|
|
|
},
|
|
|
- isEdit: null,
|
|
|
- isComplete: null,
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
- planName: [
|
|
|
- { required: true, message: "请输入任务名称", trigger: "change" },
|
|
|
+ reminderType: [
|
|
|
+ {required: true, message: "请输入提醒类型", trigger: "change"},
|
|
|
+ ],
|
|
|
+ sendModule: [
|
|
|
+ {required: true, message: "请选择业务类型", trigger: "change"},
|
|
|
],
|
|
|
- orgType: [
|
|
|
- { required: true, message: "请选择机构类型", trigger: "change" },
|
|
|
+ planId: [
|
|
|
+ {required: true, message: "请选择提醒角色", trigger: "change"},
|
|
|
],
|
|
|
- planCycle: [
|
|
|
- { required: true, message: "请选择调阅周期", trigger: "change" },
|
|
|
+ compareTimeType: [
|
|
|
+ {required: true, message: "请选择对比时间", trigger: "change"},
|
|
|
],
|
|
|
- roleId: [
|
|
|
- { required: true, message: "请选择调阅人员", trigger: "change" },
|
|
|
+ timeUnit: [
|
|
|
+ {required: true, message: "请选择时间单位", trigger: "change"},
|
|
|
],
|
|
|
- planFrequency: [
|
|
|
- { required: true, message: "请选择调阅频次", trigger: "change" },
|
|
|
+ reminderTime: [
|
|
|
+ {required: true, message: "请输入提醒时间", trigger: "change"},
|
|
|
+ ],
|
|
|
+ roleIdList: [
|
|
|
+ {required: true, message: "请选择提醒角色", trigger: "change"},
|
|
|
],
|
|
|
- startTime: [{ required: true, message: "请选择开始日期" }],
|
|
|
- endTime: [{ required: true, message: "请选择结束日期" }],
|
|
|
},
|
|
|
initNum: null,
|
|
|
issue: null,
|
|
|
@@ -565,17 +468,47 @@ export default {
|
|
|
},
|
|
|
|
|
|
created() {
|
|
|
- allRole().then((response) => {
|
|
|
- this.roleList = response.data;
|
|
|
- this.allRoleList=response.data;
|
|
|
- });
|
|
|
+ this.initRoleList()
|
|
|
},
|
|
|
|
|
|
methods: {
|
|
|
- numChange(value) {
|
|
|
- if (value <= 0) this.form.planFrequency = 0;
|
|
|
- if (value <= this.initNum) this.form.planFrequency = this.initNum;
|
|
|
- //value = parseInt(value);
|
|
|
+ initRoleList() {
|
|
|
+ allRole().then((response) => {
|
|
|
+ this.roleList = response.data;
|
|
|
+ });
|
|
|
+ },
|
|
|
+ checkReminderType() {
|
|
|
+ if (this.form.reminderType == 0) {
|
|
|
+ this.form.compareTimeType = 1;
|
|
|
+ this.compareTimeOptions = [{
|
|
|
+ label: "计划结束时间",
|
|
|
+ value: 1
|
|
|
+ }];
|
|
|
+ } else {
|
|
|
+ this.form.compareTimeType = null;
|
|
|
+ this.compareTimeOptions = [
|
|
|
+ {
|
|
|
+ label: "计划开始时间",
|
|
|
+ value: 0
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "计划结束时间",
|
|
|
+ value: 1
|
|
|
+ }
|
|
|
+ ];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ ,
|
|
|
+ selectPlan(sendModule) {
|
|
|
+ queryPlanBySendModule(sendModule).then((response) => {
|
|
|
+ this.planList = response.data;
|
|
|
+ });
|
|
|
+ },
|
|
|
+
|
|
|
+ selectTimeUnit(sendModule, planId) {
|
|
|
+ selectTimeUnit(sendModule, planId).then((response) => {
|
|
|
+ this.timeUnitList = response.data;
|
|
|
+ });
|
|
|
},
|
|
|
|
|
|
getPageIndex($index) {
|
|
|
@@ -590,12 +523,9 @@ export default {
|
|
|
/** 查询监控调阅计划列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
- listPlan(this.queryParams).then((response) => {
|
|
|
- this.planList = response.data.rows;
|
|
|
- this.check = response.check;
|
|
|
- this.isEdit = response.isEdit;
|
|
|
- this.xf = response.xf;
|
|
|
- this.total = response.data.total;
|
|
|
+ list(this.queryParams).then((response) => {
|
|
|
+ this.configList = response.rows;
|
|
|
+ this.total = response.total;
|
|
|
this.loading = false;
|
|
|
});
|
|
|
},
|
|
|
@@ -607,23 +537,15 @@ export default {
|
|
|
// 表单重置
|
|
|
reset() {
|
|
|
this.form = {
|
|
|
- id: null,
|
|
|
- planName: null,
|
|
|
- orgId: null,
|
|
|
- orgPath: null,
|
|
|
- orgName: null,
|
|
|
- orgType: null,
|
|
|
- roleId: "121",
|
|
|
- planCycle: "2",
|
|
|
- planFrequency: 1,
|
|
|
- planStatus: "0",
|
|
|
- immediately: false,
|
|
|
- createTime: null,
|
|
|
- createBy: null,
|
|
|
- updateTime: null,
|
|
|
- updateBy: null,
|
|
|
- description: null,
|
|
|
- isDeleted: null,
|
|
|
+ configId: null,
|
|
|
+ reminderType: null,
|
|
|
+ sendModule: null,
|
|
|
+ planId: null,
|
|
|
+ compareTimeType: null,
|
|
|
+ timeUnit: null,
|
|
|
+ roleIdList: [],
|
|
|
+ orgIdList: [],
|
|
|
+ enabled: true,
|
|
|
};
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
@@ -636,32 +558,8 @@ export default {
|
|
|
this.queryParams.checkSub = state;
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
- startDateChanged(time) {
|
|
|
- if (this.form.startTime > this.form.endTime) {
|
|
|
- this.form.endTime = this.form.startTime;
|
|
|
- }
|
|
|
- },
|
|
|
- planCycleChanged()
|
|
|
- {
|
|
|
- if(this.form.planCycle!=0)
|
|
|
- {
|
|
|
- this.form.startTime=null;
|
|
|
- this.form.endTime=null;
|
|
|
- }
|
|
|
|
|
|
- },
|
|
|
- disabledDate(time) {
|
|
|
- //小于开始日期禁止选择
|
|
|
- let startTime = new Date();
|
|
|
- startTime.setTime(startTime.getTime() - 3600 * 1000 * 24);
|
|
|
- if (this.form.startTime) {
|
|
|
- startTime = new Date(
|
|
|
- this.formatTime(this.form.startTime, "YYYY-MM-DD")
|
|
|
- );
|
|
|
- startTime.setTime(startTime.getTime() - 3600 * 1000 * 24);
|
|
|
- }
|
|
|
- return time.getTime() < new Date(startTime).getTime();
|
|
|
- },
|
|
|
+
|
|
|
/** 搜索按钮操作 */
|
|
|
handleQuery() {
|
|
|
this.queryParams.pageNum = 1;
|
|
|
@@ -669,26 +567,9 @@ export default {
|
|
|
},
|
|
|
// 节点单击事件
|
|
|
clickTreeNode(data) {
|
|
|
- //this.initPlanRoleList();
|
|
|
this.queryParams.orgId = data.id;
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
- changeSelectOrgType(val) {
|
|
|
- getRole(val).then((response) => {
|
|
|
- this.form.orgType = response.data.orgType;
|
|
|
- });
|
|
|
- },
|
|
|
- changeSelect(val) {
|
|
|
- if(!val) {
|
|
|
- this.roleList=this.allRoleList;
|
|
|
- return;
|
|
|
- };
|
|
|
- findRoleByType(val).then((response) => {
|
|
|
- this.roleList = response;
|
|
|
- this.queryParams.roleId = null;
|
|
|
- this.form.roleId = null;
|
|
|
- });
|
|
|
- },
|
|
|
/** 查询机构树数据 */
|
|
|
getDeptTree() {
|
|
|
deptTreeSelect().then((response) => {
|
|
|
@@ -704,9 +585,7 @@ export default {
|
|
|
this.queryParams.checkSub = false;
|
|
|
this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub)
|
|
|
this.handleQuery();
|
|
|
- allRole().then((response) => {
|
|
|
- this.roleList = response.data;
|
|
|
- });
|
|
|
+ this.initRoleList();
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
@@ -720,119 +599,30 @@ export default {
|
|
|
this.reset();
|
|
|
this.issue = null;
|
|
|
this.open = true;
|
|
|
- this.title = "新增监控调阅任务";
|
|
|
+ this.title = "新增短信提醒配置";
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
this.reset();
|
|
|
- const id = row.id || this.ids;
|
|
|
- getPlan(id).then((response) => {
|
|
|
+ const id = row.configId
|
|
|
+ detail(id).then((response) => {
|
|
|
+
|
|
|
+ this.selectPlan(response.data.sendModule)
|
|
|
+ this.selectTimeUnit(response.data.sendModule, response.data.planId)
|
|
|
this.form = response.data;
|
|
|
- this.initNum = response.data.parentFrequency;
|
|
|
- this.issue = response.data.updateBy;
|
|
|
this.open = true;
|
|
|
- this.title = "编辑监控调阅任务";
|
|
|
- findRoleByType(this.form.orgType).then((response) => {
|
|
|
- this.roleList = response;
|
|
|
- });
|
|
|
+ this.title = "编辑短信提醒配置";
|
|
|
});
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- let request = {...this.form};
|
|
|
- if (request.id != null) {
|
|
|
- let msg = "";
|
|
|
- if (request.planStatus == 1) {
|
|
|
- if(request.isComplete==true){
|
|
|
- if (request.planCycle==0) {
|
|
|
- this.$modal
|
|
|
- .confirm("因存在已完成任务，无周期任务如需修改，请删除后重新下发”。")
|
|
|
- .then(() => {
|
|
|
-
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
-
|
|
|
- })
|
|
|
- }else{
|
|
|
- msg = "因存在已完成任务，本次修改内容将下周期生效";
|
|
|
- this.$modal
|
|
|
- .confirm(msg)
|
|
|
- .then(function () {
|
|
|
- return updatePlan(request);
|
|
|
- })
|
|
|
- .then(() => {
|
|
|
- this.$modal.msgSuccess("编辑成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
-
|
|
|
- })
|
|
|
- .catch(() => {
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- }else{
|
|
|
- if (request.isHaveTask==false) {
|
|
|
- msg = "是否确认修改?";
|
|
|
- this.$modal
|
|
|
- .confirm(msg)
|
|
|
- .then(function () {
|
|
|
- return updatePlan(request);
|
|
|
- })
|
|
|
- .then(() => {
|
|
|
- this.$modal.msgSuccess("编辑成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
-
|
|
|
- })
|
|
|
- .catch(() => {
|
|
|
- });
|
|
|
- }else{
|
|
|
- msg = "因不存在已完成任务，本次修改内容将立即生效";
|
|
|
-
|
|
|
- this.$modal
|
|
|
- .confirm(msg)
|
|
|
- .then(function () {
|
|
|
- return updatePlan(request);
|
|
|
- })
|
|
|
- .then(() => {
|
|
|
- this.$modal.msgSuccess("编辑成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
-
|
|
|
- })
|
|
|
- .catch(() => {
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- }else{
|
|
|
- msg = "是否确认修改?";
|
|
|
- this.$modal
|
|
|
- .confirm(msg)
|
|
|
- .then(function () {
|
|
|
- return updatePlan(request);
|
|
|
- })
|
|
|
- .then(() => {
|
|
|
- this.$modal.msgSuccess("编辑成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
-
|
|
|
- })
|
|
|
- .catch(() => {
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- } else {
|
|
|
- addPlan(this.form).then((response) => {
|
|
|
- this.$modal.msgSuccess("新增成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
- });
|
|
|
- }
|
|
|
+ edit(this.form).then((response) => {
|
|
|
+ this.$modal.msgSuccess("提交成功");
|
|
|
+ this.open = false;
|
|
|
+ this.getList();
|
|
|
+ });
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -842,12 +632,12 @@ export default {
|
|
|
const names = row.planName || this.names;
|
|
|
let msg = "";
|
|
|
if (row.planStatus == 1) {
|
|
|
- if(row.planCycle==1){
|
|
|
- msg = "本次删除将强制删除今日所有任务?";
|
|
|
- }else{
|
|
|
- msg = "本次删除将强制删除当前任务时间及以后所有任务";
|
|
|
- }
|
|
|
- }else {
|
|
|
+ if (row.planCycle == 1) {
|
|
|
+ msg = "本次删除将强制删除今日所有任务?";
|
|
|
+ } else {
|
|
|
+ msg = "本次删除将强制删除当前任务时间及以后所有任务";
|
|
|
+ }
|
|
|
+ } else {
|
|
|
msg = '是否确认删除名称为"' + row.planName + '"的任务？';
|
|
|
}
|
|
|
// this.$modal
|
|
|
@@ -883,121 +673,8 @@ export default {
|
|
|
this.loading = false;
|
|
|
});
|
|
|
},
|
|
|
- // handDistribute(row) {
|
|
|
- // let msg = "";
|
|
|
- // if(row.planStatus==0){
|
|
|
- // this.$modal
|
|
|
- // .confirm("请选择下发后立即生成或下周期生成任务")
|
|
|
- // .then(function () {
|
|
|
- // return distribute(row.id);
|
|
|
- // })
|
|
|
- // .then(() => {
|
|
|
- // this.getList();
|
|
|
- // this.$modal.msgSuccess("下发成功");
|
|
|
- // })
|
|
|
- // .catch(() => {});
|
|
|
- // }
|
|
|
-
|
|
|
- // },
|
|
|
-
|
|
|
- handDistribute(row) {
|
|
|
- let msg = "";
|
|
|
- if(row.planStatus==0){
|
|
|
- if (row.planCycle==0) {
|
|
|
- this.$modal
|
|
|
- .confirm("确定下发任务并立即生成任务？")
|
|
|
- .then(() => {
|
|
|
- this.distribute(row.id, true);
|
|
|
- });
|
|
|
- }else{
|
|
|
- let msg = "请选择下发后立即生成或下周期生成任务?";
|
|
|
- this.$refs["DialogThreeState"].show(
|
|
|
- msg,
|
|
|
- (state) => {
|
|
|
- if (state == 0 || state == 1) {
|
|
|
- this.distribute(row.id, state == 1);
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- yesText: "立即生成",
|
|
|
- noText: "下周期",
|
|
|
- cancelText: "取消",
|
|
|
- }
|
|
|
- );
|
|
|
- }
|
|
|
|
|
|
- }else if(row.planCycle==0 &&row.planStatus==2){
|
|
|
- this.distribute(row.id, true);
|
|
|
- // this.$modal
|
|
|
- // .confirm("确定下发任务并立即生成任务？")
|
|
|
- // .then(() => {
|
|
|
- // this.distribute(row.id, true);
|
|
|
- // });
|
|
|
- } else{
|
|
|
- this.$modal
|
|
|
- .confirm("因存在已完成任务，是否确定从下周期生成任务？")
|
|
|
- .then(() => {
|
|
|
- this.distribute(row.id, false);
|
|
|
- });
|
|
|
- }
|
|
|
|
|
|
- },
|
|
|
- distribute(id, immediateEffect) {
|
|
|
- this.loading = true;
|
|
|
- api
|
|
|
- .distribute(id, immediateEffect)
|
|
|
- .then((response) => {
|
|
|
- if (response.data == 0) {
|
|
|
- this.getList();
|
|
|
- this.loading = false;
|
|
|
- } else {
|
|
|
- this.getList();
|
|
|
- this.loading = false;
|
|
|
- }
|
|
|
- })
|
|
|
- .catch((response) => {
|
|
|
- this.getList();
|
|
|
- this.loading = false;
|
|
|
- });
|
|
|
- },
|
|
|
- handWithdraw(row) {
|
|
|
- getPlan(row.id).then((response) => {
|
|
|
- console.log("handWithdraw",response)
|
|
|
- if (response.data.isComplete) {
|
|
|
- if (row.planCycle==0) {
|
|
|
- this.$modal
|
|
|
- .confirm("存在已完成任务，无周期任务不允许撤回，如需删除下发任务请点击“删除”。")
|
|
|
- .then(() => {
|
|
|
- this.getList();
|
|
|
-
|
|
|
- })
|
|
|
- }else{
|
|
|
- this.$modal
|
|
|
- .confirm("因存在已完成任务，撤回后下周期起将不再生成任务")
|
|
|
- .then(function () {
|
|
|
- return withdraw(row.id);
|
|
|
- })
|
|
|
- .then(() => {
|
|
|
- this.getList();
|
|
|
- this.$modal.msgSuccess("撤回成功");
|
|
|
- })
|
|
|
- .catch(() => {});
|
|
|
- }
|
|
|
-
|
|
|
- }else{
|
|
|
-
|
|
|
- this.$modal.confirm("因不存在已完成任务，撤回后将删除所有生成任务")
|
|
|
- .then(function () {
|
|
|
- return withdraw(row.id);
|
|
|
- })
|
|
|
- .then(() => {
|
|
|
- this.getList();
|
|
|
- this.$modal.msgSuccess("撤回成功");
|
|
|
- })
|
|
|
- .catch(() => {});
|
|
|
- }
|
|
|
- });
|
|
|
- },
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
this.download(
|
jingyuanchao