|
|
@@ -21,14 +21,14 @@
|
|
|
size="small"
|
|
|
:inline="true"
|
|
|
v-show="showSearch"
|
|
|
- label-width="100px"
|
|
|
+ label-width="70px"
|
|
|
>
|
|
|
- <el-form-item prop="planType" label="计划类型">
|
|
|
+ <el-form-item prop="planType" label="任务类型">
|
|
|
<el-select
|
|
|
prop="planType"
|
|
|
- label="计划类型"
|
|
|
+ label="任务类型"
|
|
|
v-model="queryParams.planType"
|
|
|
- placeholder="请选择计划类型"
|
|
|
+ placeholder="请选择任务类型"
|
|
|
clearable
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -39,13 +39,13 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item prop="resumptionRole" label="履职角色">
|
|
|
+ <el-form-item prop="resumptionRole" label="履职人员">
|
|
|
<el-select
|
|
|
@visible-change="getRolesByOrg"
|
|
|
prop="resumptionRole"
|
|
|
- label="履职角色"
|
|
|
+ label="履职人员"
|
|
|
v-model="queryParams.resumptionRole"
|
|
|
- placeholder="请选择履职角色"
|
|
|
+ placeholder="请选择用户角色"
|
|
|
clearable
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -57,12 +57,12 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item prop="planCycle" label="履职周期">
|
|
|
+ <el-form-item prop="planCycle" label="任务周期">
|
|
|
<el-select
|
|
|
prop="planCycle"
|
|
|
- label="履职周期"
|
|
|
+ label="任务周期"
|
|
|
v-model="queryParams.planCycle"
|
|
|
- placeholder="请选择履职周期"
|
|
|
+ placeholder="请选择任务周期"
|
|
|
clearable
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -74,12 +74,12 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item prop="planStatus" label="计划状态">
|
|
|
+ <el-form-item prop="planStatus" label="任务状态">
|
|
|
<el-select
|
|
|
prop="planStatus"
|
|
|
label="任务状态"
|
|
|
v-model="queryParams.planStatus"
|
|
|
- placeholder="请选择计划状态"
|
|
|
+ placeholder="请选择任务状态"
|
|
|
clearable
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -92,12 +92,12 @@
|
|
|
</el-select>
|
|
|
<!-- <el-switch v-model="queryParams.planStatus" active-value="1" inactive-value="0"></el-switch> -->
|
|
|
</el-form-item>
|
|
|
- <el-form-item prop="planName" label="计划名称">
|
|
|
+ <el-form-item prop="planName" label="任务名称">
|
|
|
<el-input
|
|
|
v-model="queryParams.planName"
|
|
|
:maxlength="50"
|
|
|
name="planName"
|
|
|
- placeholder="请输入计划名称"
|
|
|
+ placeholder="请输入任务名称"
|
|
|
clearable
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -112,52 +112,27 @@
|
|
|
<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"
|
|
|
icon="el-icon-plus"
|
|
|
size="mini"
|
|
|
@click="handleAdd()"
|
|
|
v-hasPermi="['system:user:add']"
|
|
|
- >新增</el-button
|
|
|
- >
|
|
|
- </el-col>
|
|
|
- <!-- <el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="success"
|
|
|
- plain
|
|
|
- icon="el-icon-edit-outline"
|
|
|
- size="mini"
|
|
|
- :disabled="single"
|
|
|
- @click="handleUpdate"
|
|
|
- v-hasPermi="['system:user:edit']"
|
|
|
- >修改</el-button
|
|
|
+ >新增任务</el-button
|
|
|
>
|
|
|
- </el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="danger"
|
|
|
- plain
|
|
|
- icon="el-icon-delete"
|
|
|
- size="mini"
|
|
|
- :disabled="multiple"
|
|
|
- @click="handleDelete"
|
|
|
- v-hasPermi="['system:user:remove']"
|
|
|
- >删除</el-button
|
|
|
- >
|
|
|
- </el-col>-->
|
|
|
+ </el-form-item>
|
|
|
+ <el-row :gutter="10" class="mb8">
|
|
|
+ <el-col :span="1.5"> </el-col>
|
|
|
|
|
|
- <right-toolbar
|
|
|
- :showSearch.sync="showSearch"
|
|
|
- @queryTable="getList"
|
|
|
- :columns="columns"
|
|
|
- ></right-toolbar>
|
|
|
- </el-row>
|
|
|
+ <right-toolbar
|
|
|
+ :showSearch.sync="showSearch"
|
|
|
+ @queryTable="getList"
|
|
|
+ :columns="columns"
|
|
|
+ ></right-toolbar>
|
|
|
+ </el-row>
|
|
|
+ </el-form>
|
|
|
+
|
|
|
+ <!-- 按纽 -->
|
|
|
|
|
|
<el-table
|
|
|
border
|
|
|
@@ -177,12 +152,12 @@
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
prop="planName"
|
|
|
- label="计划名称"
|
|
|
+ label="任务名称"
|
|
|
v-if="columns[1].visible"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
prop="planType"
|
|
|
- label="计划类型"
|
|
|
+ label="任务类型"
|
|
|
width="120"
|
|
|
v-if="columns[2].visible"
|
|
|
>
|
|
|
@@ -194,7 +169,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="planCreateOrgName"
|
|
|
- label="计划创建机构"
|
|
|
+ label="创建机构"
|
|
|
width="120"
|
|
|
v-if="columns[3].visible"
|
|
|
>
|
|
|
@@ -204,14 +179,14 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="planOfOrgName"
|
|
|
- label="计划所属机构"
|
|
|
+ label="行社名称"
|
|
|
width="120"
|
|
|
v-if="columns[4].visible"
|
|
|
></el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
prop="execOrgType"
|
|
|
- label="履职机构类型"
|
|
|
+ label="机构类型"
|
|
|
width="100px"
|
|
|
v-if="columns[5].visible"
|
|
|
>
|
|
|
@@ -222,12 +197,12 @@
|
|
|
|
|
|
<el-table-column
|
|
|
prop="roleNames"
|
|
|
- label="履职角色"
|
|
|
+ label="履职人员"
|
|
|
v-if="columns[6].visible"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
prop="planCycle"
|
|
|
- label="履职周期"
|
|
|
+ label="任务周期"
|
|
|
width="80px"
|
|
|
v-if="columns[7].visible"
|
|
|
>
|
|
|
@@ -238,15 +213,9 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
- <!-- <el-table-column
|
|
|
- prop="count"
|
|
|
- label="履职次数"
|
|
|
- v-if="columns[7].visible"
|
|
|
- ></el-table-column> -->
|
|
|
-
|
|
|
<el-table-column
|
|
|
prop="planExec"
|
|
|
- label="履职时间"
|
|
|
+ label="任务时间"
|
|
|
width="80px"
|
|
|
v-if="columns[8].visible"
|
|
|
>
|
|
|
@@ -256,17 +225,14 @@
|
|
|
}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
<el-table-column
|
|
|
- prop="updateName"
|
|
|
- label="修改人"
|
|
|
- width="100px"
|
|
|
- v-if="columns[9].visible"
|
|
|
+ prop="count"
|
|
|
+ label="任务次数"
|
|
|
+ v-if="columns[7].visible"
|
|
|
></el-table-column>
|
|
|
-
|
|
|
<el-table-column
|
|
|
prop="planStatus"
|
|
|
- label="计划状态"
|
|
|
+ label="任务状态"
|
|
|
width="80px"
|
|
|
v-if="columns[10].visible"
|
|
|
>
|
|
|
@@ -279,6 +245,12 @@
|
|
|
}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="updateName"
|
|
|
+ label="修改人"
|
|
|
+ width="100px"
|
|
|
+ v-if="false"
|
|
|
+ ></el-table-column>
|
|
|
|
|
|
<el-table-column fixed="right" width="120" label="操作">
|
|
|
<template slot-scope="r">
|
|
|
@@ -301,7 +273,10 @@
|
|
|
v-hasPermi="['system:user:remove']"
|
|
|
>删除</el-button
|
|
|
>
|
|
|
- <el-divider direction="vertical" v-if="eqOrg2(r.row)"></el-divider>
|
|
|
+ <el-divider
|
|
|
+ direction="vertical"
|
|
|
+ v-if="eqOrg2(r.row)"
|
|
|
+ ></el-divider>
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
@@ -311,7 +286,10 @@
|
|
|
v-hasPermi="['system:user:remove']"
|
|
|
>下发</el-button
|
|
|
>
|
|
|
- <el-divider direction="vertical" v-if="checkCanPublish(r.row)"></el-divider>
|
|
|
+ <el-divider
|
|
|
+ direction="vertical"
|
|
|
+ v-if="checkCanPublish(r.row)"
|
|
|
+ ></el-divider>
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
@@ -321,7 +299,10 @@
|
|
|
v-hasPermi="['system:user:remove']"
|
|
|
>下发</el-button
|
|
|
>
|
|
|
- <el-divider direction="vertical" v-if="newcheckCanPublish(r.row)"></el-divider>
|
|
|
+ <el-divider
|
|
|
+ direction="vertical"
|
|
|
+ v-if="newcheckCanPublish(r.row)"
|
|
|
+ ></el-divider>
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
@@ -434,7 +415,12 @@ export default {
|
|
|
eqOrg(row) {
|
|
|
// console.log(row.planOfOrgId,"row.planOfOrgId");
|
|
|
// console.log(this.orgId,"this.orgId");
|
|
|
- if (row != null && row != undefined && (row.planCreateOrgId == this.orgId||(row.planOfOrgType==3&&row.planOfOrgId==this.orgId))) {
|
|
|
+ if (
|
|
|
+ row != null &&
|
|
|
+ row != undefined &&
|
|
|
+ (row.planCreateOrgId == this.orgId ||
|
|
|
+ (row.planOfOrgType == 3 && row.planOfOrgId == this.orgId))
|
|
|
+ ) {
|
|
|
return true;
|
|
|
}
|
|
|
return false;
|
|
|
@@ -442,21 +428,25 @@ export default {
|
|
|
eqOrg2(row) {
|
|
|
// console.log(row.planCreateOrgId,"row.planCreateOrgId");
|
|
|
// console.log(this.orgId,"this.orgId");
|
|
|
- if (row != null && row != undefined && row.planCreateOrgId == this.orgId&& row.planOfOrgId == this.orgId) {
|
|
|
+ if (
|
|
|
+ row != null &&
|
|
|
+ row != undefined &&
|
|
|
+ row.planCreateOrgId == this.orgId &&
|
|
|
+ row.planOfOrgId == this.orgId
|
|
|
+ ) {
|
|
|
return true;
|
|
|
}
|
|
|
return false;
|
|
|
},
|
|
|
//已完成下发的计划不显示下发按钮
|
|
|
checkCanPublish(row) {
|
|
|
-
|
|
|
// console.log(row.planStatus,"row.planStatus")
|
|
|
- if ((row.planOfOrgType == "1" && row.distribute == 0)) {
|
|
|
+ if (row.planOfOrgType == "1" && row.distribute == 0) {
|
|
|
return true;
|
|
|
}
|
|
|
return false;
|
|
|
},
|
|
|
- newcheckCanPublish(row){
|
|
|
+ newcheckCanPublish(row) {
|
|
|
//如果计划所属机构类型为行社并且计划不为进行中并且计划创建机构为当前机构或者
|
|
|
//计划状态为停用并且不属于子计划并且计划所属机构类型为省联社
|
|
|
if (
|
|
|
@@ -489,7 +479,7 @@ export default {
|
|
|
},
|
|
|
//已下发的显示撤回
|
|
|
chehui(row) {
|
|
|
- if (row.distribute == 1&&row.planCreateOrgId == this.orgId) {
|
|
|
+ if (row.distribute == 1 && row.planCreateOrgId == this.orgId) {
|
|
|
return true;
|
|
|
}
|
|
|
return false;
|
|
|
@@ -539,40 +529,34 @@ export default {
|
|
|
onEdit(id, other = {}) {
|
|
|
this.$refs.editDialog.show(id, other);
|
|
|
},
|
|
|
- newshowDialogDistribute(row){
|
|
|
+ newshowDialogDistribute(row) {
|
|
|
this.$modal
|
|
|
.confirm("是否下发!", "提示")
|
|
|
.then(() => {
|
|
|
// 用户点击了确认按钮
|
|
|
console.log("执行操作...");
|
|
|
this.loading = true;
|
|
|
- api
|
|
|
- .distributeCheHui(row.id)
|
|
|
- .then((response) => {
|
|
|
- // console.log(response, "then");
|
|
|
- if (response.data == 0) {
|
|
|
- this.loading = false;
|
|
|
- } else {
|
|
|
- this.getList();
|
|
|
- this.loading = false;
|
|
|
- }
|
|
|
- })
|
|
|
- .catch((response) => {
|
|
|
- // console.log(response, "catch");
|
|
|
- this.getList();
|
|
|
- this.loading = false;
|
|
|
- });
|
|
|
+ api
|
|
|
+ .distributeCheHui(row.id)
|
|
|
+ .then((response) => {
|
|
|
+ // console.log(response, "then");
|
|
|
+ if (response.data == 0) {
|
|
|
+ this.loading = false;
|
|
|
+ } else {
|
|
|
+ this.getList();
|
|
|
+ this.loading = false;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .catch((response) => {
|
|
|
+ // console.log(response, "catch");
|
|
|
+ this.getList();
|
|
|
+ this.loading = false;
|
|
|
+ });
|
|
|
})
|
|
|
.catch(() => {
|
|
|
// 用户点击了取消按钮
|
|
|
console.log("取消操作...");
|
|
|
});
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
},
|
|
|
showDialogDistribute(row) {
|
|
|
// this.loading = true;
|
|
|
@@ -603,14 +587,16 @@ export default {
|
|
|
// 用户点击了确认按钮
|
|
|
console.log("执行操作...");
|
|
|
this.loading = true;
|
|
|
- api.delelte(id).then(() => {
|
|
|
- this.getList();
|
|
|
- this.loading = false;
|
|
|
- this.$modal.msgSuccess("删除成功");
|
|
|
-
|
|
|
- }).catch(()=>{
|
|
|
- this.loading = false;
|
|
|
- });
|
|
|
+ api
|
|
|
+ .delelte(id)
|
|
|
+ .then(() => {
|
|
|
+ this.getList();
|
|
|
+ this.loading = false;
|
|
|
+ this.$modal.msgSuccess("删除成功");
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ this.loading = false;
|
|
|
+ });
|
|
|
})
|
|
|
.catch(() => {
|
|
|
// 用户点击了取消按钮
|
jiawuxian