|
|
@@ -79,7 +79,13 @@
|
|
|
@click="handleQuery"
|
|
|
>搜索</el-button
|
|
|
>-->
|
|
|
- <el-button type="btr" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
+ <el-button
|
|
|
+ type="btr"
|
|
|
+ icon="el-icon-refresh"
|
|
|
+ size="mini"
|
|
|
+ @click="resetQuery"
|
|
|
+ >重置</el-button
|
|
|
+ >
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
@@ -91,7 +97,8 @@
|
|
|
size="mini"
|
|
|
@click="handleAdd"
|
|
|
v-hasPermi="['workingArrangements:workTask:add']"
|
|
|
- >新增</el-button>
|
|
|
+ >新增</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<!-- <el-col :span="1.5">
|
|
|
<el-button
|
|
|
@@ -151,20 +158,44 @@
|
|
|
/>-->
|
|
|
<el-table-column label="发布人" align="center" prop="username" />
|
|
|
<el-table-column label="任务类型" align="center" prop="type" />
|
|
|
- <el-table-column label="执行人" align="center" prop="peopleId" :formatter="unit2Format" />
|
|
|
+ <el-table-column
|
|
|
+ label="执行人"
|
|
|
+ align="center"
|
|
|
+ prop="peopleId"
|
|
|
+ :formatter="unit2Format"
|
|
|
+ />
|
|
|
<!-- <el-table-column label="编号" align="center" prop="number" /> -->
|
|
|
- <el-table-column label="任务开始时间" align="center" prop="startTime" width="180">
|
|
|
+ <el-table-column
|
|
|
+ label="任务开始时间"
|
|
|
+ align="center"
|
|
|
+ prop="startTime"
|
|
|
+ width="180"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.startTime) }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="任务结束时间" align="center" prop="endTime" width="180">
|
|
|
+ <el-table-column
|
|
|
+ label="任务结束时间"
|
|
|
+ align="center"
|
|
|
+ prop="endTime"
|
|
|
+ width="180"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.endTime) }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="描述" align="center" prop="contents" show-overflow-tooltip />
|
|
|
- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
+ <el-table-column
|
|
|
+ label="描述"
|
|
|
+ align="center"
|
|
|
+ prop="contents"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="操作"
|
|
|
+ align="center"
|
|
|
+ class-name="small-padding fixed-width"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
size="btlook"
|
|
|
@@ -198,14 +229,16 @@
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['workingArrangements:planTask:edit']"
|
|
|
v-if="scope.row.common == 2"
|
|
|
- >修改</el-button>
|
|
|
+ >修改</el-button
|
|
|
+ >
|
|
|
<el-button
|
|
|
size="btd"
|
|
|
type="text"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-if="scope.row.common == 2"
|
|
|
v-hasPermi="['workingArrangements:planTask:remove']"
|
|
|
- >删除</el-button>
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -224,10 +257,20 @@
|
|
|
append-to-body
|
|
|
:close-on-click-modal="false"
|
|
|
>
|
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
|
|
|
+ <el-form
|
|
|
+ ref="form"
|
|
|
+ :model="form"
|
|
|
+ :rules="rules"
|
|
|
+ label-width="100px"
|
|
|
+ :inline="true"
|
|
|
+ >
|
|
|
<div class="jiben">基本信息</div>
|
|
|
<el-form-item label="任务名称" prop="name">
|
|
|
- <el-input placeholder="请选择任务名称" v-model="form.name" @click.native="planName" />
|
|
|
+ <el-input
|
|
|
+ placeholder="请选择任务名称"
|
|
|
+ v-model="form.name"
|
|
|
+ @click.native="planName"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="任务编号" prop="number">
|
|
|
<el-input
|
|
|
@@ -273,10 +316,19 @@
|
|
|
>
|
|
|
</el-option>
|
|
|
</el-select>-->
|
|
|
- <el-input placeholder="请输入任务类型" v-model="form.type" style="width: 200px"></el-input>
|
|
|
+ <el-input
|
|
|
+ placeholder="请输入任务类型"
|
|
|
+ v-model="form.type"
|
|
|
+ style="width: 200px"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="发布人" prop="username">
|
|
|
- <el-input placeholder="请输入发布人" v-model="form.username" :disabled="true" class="ipt"></el-input>
|
|
|
+ <el-input
|
|
|
+ placeholder="请输入发布人"
|
|
|
+ v-model="form.username"
|
|
|
+ :disabled="true"
|
|
|
+ class="ipt"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
<div>
|
|
|
<el-form-item label="执行人" prop="peopleName" label-width="100px">
|
|
|
@@ -336,7 +388,12 @@
|
|
|
</el-form-item>
|
|
|
<div class="jiben">备注</div>
|
|
|
<el-form-item prop="remark">
|
|
|
- <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" style="width: 950px" />
|
|
|
+ <el-input
|
|
|
+ v-model="form.remark"
|
|
|
+ type="textarea"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ style="width: 950px"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -353,7 +410,13 @@
|
|
|
class="el-dialog__header"
|
|
|
:close-on-click-modal="false"
|
|
|
>
|
|
|
- <el-form ref="Progress" :model="Progress" :rules="rules1" label-width="100px" :inline="true">
|
|
|
+ <el-form
|
|
|
+ ref="Progress"
|
|
|
+ :model="Progress"
|
|
|
+ :rules="rules1"
|
|
|
+ label-width="100px"
|
|
|
+ :inline="true"
|
|
|
+ >
|
|
|
<div class="jiben">完成进度</div>
|
|
|
<el-form-item prop="planProgress">
|
|
|
<div>
|
|
|
@@ -378,7 +441,11 @@
|
|
|
</el-form-item>
|
|
|
<div class="jiben">备注</div>
|
|
|
<el-form-item prop="remark">
|
|
|
- <el-input v-model="Progress.remark" type="textarea" placeholder="请输入内容" />
|
|
|
+ <el-input
|
|
|
+ v-model="Progress.remark"
|
|
|
+ type="textarea"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
<div class="jiben">完成时间</div>
|
|
|
<el-form-item prop="accomplishTime">
|
|
|
@@ -454,12 +521,18 @@
|
|
|
v-model="singleTable."
|
|
|
class="big"
|
|
|
/>-->
|
|
|
- <div style="width: 350px">{{ singleTable.startTime }} 至 {{ singleTable.endTime }}</div>
|
|
|
+ <div style="width: 350px">
|
|
|
+ {{ singleTable.startTime }} 至 {{ singleTable.endTime }}
|
|
|
+ </div>
|
|
|
</el-form-item>
|
|
|
<!-- <div class="thistext"></div> -->
|
|
|
<div class="jiben">附件文档</div>
|
|
|
<el-form-item prop="file">
|
|
|
- <el-input label="附件名称" v-model="singleTable.fileName" style="width: 820px" />
|
|
|
+ <el-input
|
|
|
+ label="附件名称"
|
|
|
+ v-model="singleTable.fileName"
|
|
|
+ style="width: 820px"
|
|
|
+ />
|
|
|
<!-- <div>{{singleTableb.fileName}}</div> -->
|
|
|
<a
|
|
|
:href="singleTable.file"
|
|
|
@@ -467,7 +540,8 @@
|
|
|
title="下载"
|
|
|
style="color: white; margin-left: 10px"
|
|
|
class="downloadfile"
|
|
|
- >下载附件</a>
|
|
|
+ >下载附件</a
|
|
|
+ >
|
|
|
</el-form-item>
|
|
|
<div class="jiben">任务描述</div>
|
|
|
<div class="thistext">{{ singleTable.contents }}</div>
|
|
|
@@ -488,7 +562,13 @@
|
|
|
class="el-dialog__header jinduchakan"
|
|
|
:close-on-click-modal="false"
|
|
|
>
|
|
|
- <el-form ref="moreTable" :model="moreTable" :rules="rules" label-width="100px" :inline="true">
|
|
|
+ <el-form
|
|
|
+ ref="moreTable"
|
|
|
+ :model="moreTable"
|
|
|
+ :rules="rules"
|
|
|
+ label-width="100px"
|
|
|
+ :inline="true"
|
|
|
+ >
|
|
|
<div class="jiben">完成进度</div>
|
|
|
<el-progress
|
|
|
:text-inside="true"
|
|
|
@@ -523,7 +603,7 @@
|
|
|
v-model="moreTable.username"
|
|
|
:disabled="true"
|
|
|
class="ipt"
|
|
|
- style="color:#fff;width:350px;"
|
|
|
+ style="color: #fff; width: 350px"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="comWeek" label="任务周期" label-width="100px">
|
|
|
@@ -541,9 +621,11 @@
|
|
|
line-height: 35px;
|
|
|
text-indent: 1em;
|
|
|
margin-bottom: 20px;
|
|
|
- color:#fff;
|
|
|
+ color: #fff;
|
|
|
"
|
|
|
- >{{ moreTable.startTime }} 至 {{ moreTable.endTime }}</div>
|
|
|
+ >
|
|
|
+ {{ moreTable.startTime }} 至 {{ moreTable.endTime }}
|
|
|
+ </div>
|
|
|
</el-form-item>
|
|
|
<!-- <div class="jiben">任务周期</div>
|
|
|
<div class="thistext">
|
|
|
@@ -554,7 +636,11 @@
|
|
|
<el-form-item prop="file">
|
|
|
<!-- <el-input label="计划名称" v-model="ProgressLook.file" class="big" /> -->
|
|
|
<!-- <a :href="moreTable.file" download title="下载" style="color:white;margin-left:10px">下载附件</a> -->
|
|
|
- <el-input label="附件名称" v-model="moreTable.fileName" style="width: 820px" />
|
|
|
+ <el-input
|
|
|
+ label="附件名称"
|
|
|
+ v-model="moreTable.fileName"
|
|
|
+ style="width: 820px"
|
|
|
+ />
|
|
|
<!-- <div>{{singleTableb.fileName}}</div> -->
|
|
|
<a
|
|
|
:href="moreTable.file"
|
|
|
@@ -562,7 +648,8 @@
|
|
|
title="下载"
|
|
|
style="color: white; margin-left: 10px"
|
|
|
class="downloadfile"
|
|
|
- >下载附件</a>
|
|
|
+ >下载附件</a
|
|
|
+ >
|
|
|
</el-form-item>
|
|
|
<div class="jiben">任务描述</div>
|
|
|
<div class="thistext">{{ moreTable.contents }}</div>
|
|
|
@@ -575,7 +662,11 @@
|
|
|
style="width: 100%; background: #004d86"
|
|
|
class="tabless"
|
|
|
>
|
|
|
- <el-table-column prop="peopleName" label="执行人" width="180"></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="peopleName"
|
|
|
+ label="执行人"
|
|
|
+ width="180"
|
|
|
+ ></el-table-column>
|
|
|
<el-table-column label="任务周期" width="190">
|
|
|
<template slot-scope="scope">
|
|
|
<div>{{ scope.row.taskCycle }}</div>
|
|
|
@@ -592,7 +683,11 @@
|
|
|
></el-progress>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="accomplishTime" label="完成时间" width="180"></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="accomplishTime"
|
|
|
+ label="完成时间"
|
|
|
+ width="180"
|
|
|
+ ></el-table-column>
|
|
|
<el-table-column label="状态" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
<div>{{ scope.row.schedule == 100 ? "完成" : "未完成" }}</div>
|
|
|
@@ -666,7 +761,7 @@
|
|
|
v-model="singleTable.username"
|
|
|
:disabled="true"
|
|
|
class="ipt"
|
|
|
- style="color:#fff;width:350px;"
|
|
|
+ style="color: #fff; width: 350px"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="comWeek" label="任务周期" label-width="100px">
|
|
|
@@ -684,14 +779,20 @@
|
|
|
line-height: 35px;
|
|
|
text-indent: 1em;
|
|
|
margin-bottom: 20px;
|
|
|
- color:#fff;
|
|
|
+ color: #fff;
|
|
|
"
|
|
|
- >{{ singleTable.startTime }} 至 {{ singleTable.endTime }}</div>
|
|
|
+ >
|
|
|
+ {{ singleTable.startTime }} 至 {{ singleTable.endTime }}
|
|
|
+ </div>
|
|
|
</el-form-item>
|
|
|
<!-- <div class="thistext"></div> -->
|
|
|
<div class="jiben">附件文档</div>
|
|
|
<el-form-item prop="file">
|
|
|
- <el-input label="附件名称" v-model="singleTable.fileName" style="width: 820px" />
|
|
|
+ <el-input
|
|
|
+ label="附件名称"
|
|
|
+ v-model="singleTable.fileName"
|
|
|
+ style="width: 820px"
|
|
|
+ />
|
|
|
<!-- <div>{{singleTableb.fileName}}</div> -->
|
|
|
<a
|
|
|
:href="singleTable.file"
|
|
|
@@ -699,7 +800,8 @@
|
|
|
title="下载"
|
|
|
style="color: white; margin-left: 10px"
|
|
|
class="downloadfile"
|
|
|
- >下载附件</a>
|
|
|
+ >下载附件</a
|
|
|
+ >
|
|
|
</el-form-item>
|
|
|
<div class="jiben">备注</div>
|
|
|
<div class="thistext">{{ singleTable.remark }}</div>
|
|
|
@@ -720,7 +822,13 @@
|
|
|
class="el-dialog__header jinduchakan"
|
|
|
:close-on-click-modal="false"
|
|
|
>
|
|
|
- <el-form ref="moreTable" :model="daoruobj" :rules="rules" label-width="100px" :inline="true">
|
|
|
+ <el-form
|
|
|
+ ref="moreTable"
|
|
|
+ :model="daoruobj"
|
|
|
+ :rules="rules"
|
|
|
+ label-width="100px"
|
|
|
+ :inline="true"
|
|
|
+ >
|
|
|
<el-form-item label="开始时间" prop="startTime">
|
|
|
<el-date-picker
|
|
|
placeholder="请选择开始时间"
|
|
|
@@ -763,13 +871,13 @@ import {
|
|
|
exportWorkTask,
|
|
|
singProgress,
|
|
|
moreProgress,
|
|
|
- uploadProgress
|
|
|
+ uploadProgress,
|
|
|
} from "@/api/workingArrangements/workTask";
|
|
|
import {
|
|
|
deptUser,
|
|
|
allUser,
|
|
|
getDept,
|
|
|
- getDeptList
|
|
|
+ getDeptList,
|
|
|
} from "@/api/workingArrangements/workTask";
|
|
|
import { getDicts } from "@/api/system/dict/data";
|
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
|
@@ -831,41 +939,41 @@ export default {
|
|
|
unitName2: null,
|
|
|
taskProgress: null,
|
|
|
releaseUnit: null,
|
|
|
- executableUnit: null
|
|
|
+ executableUnit: null,
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
name: [
|
|
|
- { required: true, message: "任务名称不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "任务名称不能为空", trigger: "blur" },
|
|
|
],
|
|
|
number: [{ required: true, message: "编号不能为空", trigger: "blur" }],
|
|
|
peopleName: [
|
|
|
- { required: true, message: "执行人不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "执行人不能为空", trigger: "blur" },
|
|
|
],
|
|
|
// name: [{ required: true, message: "不能为空", trigger: "blur" }],
|
|
|
adminId: {
|
|
|
required: true,
|
|
|
message: "发布单位不能为空",
|
|
|
- trigger: "blur"
|
|
|
+ trigger: "blur",
|
|
|
},
|
|
|
unitId: {
|
|
|
required: true,
|
|
|
message: "执行单位不能为空",
|
|
|
- trigger: "blur"
|
|
|
+ trigger: "blur",
|
|
|
},
|
|
|
type: { required: true, message: "计划类型不能为空", trigger: "blur" },
|
|
|
startTime: {
|
|
|
required: true,
|
|
|
message: "开始时间不能为空",
|
|
|
- trigger: "blur"
|
|
|
+ trigger: "blur",
|
|
|
},
|
|
|
endTime: {
|
|
|
required: true,
|
|
|
message: "结束时间不能为空",
|
|
|
- trigger: "blur"
|
|
|
- }
|
|
|
+ trigger: "blur",
|
|
|
+ },
|
|
|
},
|
|
|
rules1: {
|
|
|
// planProgress: [
|
|
|
@@ -881,7 +989,7 @@ export default {
|
|
|
rylist: [],
|
|
|
// 查询字典
|
|
|
dictType: {
|
|
|
- dictType: "work_type"
|
|
|
+ dictType: "work_type",
|
|
|
},
|
|
|
ziDian: [],
|
|
|
// 部门列表
|
|
|
@@ -900,11 +1008,11 @@ export default {
|
|
|
accomplishTime: "",
|
|
|
taskId: "",
|
|
|
id: "",
|
|
|
- publisherId: ""
|
|
|
+ publisherId: "",
|
|
|
},
|
|
|
defaultTime: null,
|
|
|
daoruobj: {},
|
|
|
- open4: null
|
|
|
+ open4: null,
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -914,10 +1022,10 @@ export default {
|
|
|
window.location.reload();
|
|
|
}
|
|
|
Cookies.set("shuaxin", "true");
|
|
|
- allUser().then(res => {
|
|
|
+ allUser().then((res) => {
|
|
|
this.rylist = res.rows;
|
|
|
});
|
|
|
- getDeptList().then(res => {
|
|
|
+ getDeptList().then((res) => {
|
|
|
this.getdeptList = res.data;
|
|
|
});
|
|
|
this.getdict();
|
|
|
@@ -957,7 +1065,7 @@ export default {
|
|
|
this.open1 = true;
|
|
|
this.title = "进度录入";
|
|
|
this.jinduId = row.id;
|
|
|
- singProgress(this.jinduId).then(res => {
|
|
|
+ singProgress(this.jinduId).then((res) => {
|
|
|
console.log(res.data);
|
|
|
this.Progress.id = res.data.workProgress.id;
|
|
|
this.Progress.taskId = res.data.id;
|
|
|
@@ -973,10 +1081,11 @@ export default {
|
|
|
this.title = "进度查看";
|
|
|
// 获取当前行的id
|
|
|
// console.log(row.id);
|
|
|
- singProgress(row.id).then(res => {
|
|
|
+ singProgress(row.id).then((res) => {
|
|
|
console.log(res);
|
|
|
this.singleTable = res.data;
|
|
|
- this.singleTable.planProgresses = this.singleTable.workProgress.schedule;
|
|
|
+ this.singleTable.planProgresses =
|
|
|
+ this.singleTable.workProgress.schedule;
|
|
|
this.Progress.id = this.singleTable.workProgress.id;
|
|
|
|
|
|
this.singleTable.file =
|
|
|
@@ -1000,17 +1109,17 @@ export default {
|
|
|
this.open3 = true;
|
|
|
this.title = "进度查看";
|
|
|
// 获取当前行的id
|
|
|
- moreProgress(row.id).then(res => {
|
|
|
+ moreProgress(row.id).then((res) => {
|
|
|
// console.log(res)
|
|
|
this.comstatus = 0;
|
|
|
this.moreTable = res.data;
|
|
|
console.log(this.moreTable);
|
|
|
this.moreTable.file =
|
|
|
process.env.VUE_APP_BASE_API + this.moreTable.file;
|
|
|
- this.moreTable.workProgresses.map(item => {
|
|
|
+ this.moreTable.workProgresses.map((item) => {
|
|
|
item.file = process.env.VUE_APP_BASE_API + item.file;
|
|
|
});
|
|
|
- this.moreTable.workProgresses.forEach(item => {
|
|
|
+ this.moreTable.workProgresses.forEach((item) => {
|
|
|
this.comstatus +=
|
|
|
item.schedule / this.moreTable.workProgresses.length;
|
|
|
});
|
|
|
@@ -1020,7 +1129,7 @@ export default {
|
|
|
/** 查询工作任务列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
- listWorkTask(this.queryParams).then(response => {
|
|
|
+ listWorkTask(this.queryParams).then((response) => {
|
|
|
this.workTaskList = response.rows;
|
|
|
console.log(this.workTaskList);
|
|
|
this.total = response.total;
|
|
|
@@ -1060,7 +1169,7 @@ export default {
|
|
|
unitName2: null,
|
|
|
taskProgress: null,
|
|
|
releaseUnit: null,
|
|
|
- executableUnit: null
|
|
|
+ executableUnit: null,
|
|
|
};
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
@@ -1071,7 +1180,7 @@ export default {
|
|
|
},
|
|
|
// 发布单位选中触发
|
|
|
selectPeo3(val) {
|
|
|
- getDept2().then(res => {
|
|
|
+ getDept2().then((res) => {
|
|
|
this.users = res.data;
|
|
|
});
|
|
|
this.queryParams.adminId = val.id;
|
|
|
@@ -1092,13 +1201,13 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- this.ids = selection.map(item => item.id);
|
|
|
+ this.ids = selection.map((item) => item.id);
|
|
|
this.single = selection.length !== 1;
|
|
|
this.multiple = !selection.length;
|
|
|
},
|
|
|
// 获取执行人
|
|
|
getZhuChi(id) {
|
|
|
- deptUser(id).then(res => {
|
|
|
+ deptUser(id).then((res) => {
|
|
|
// this.renYuan = res.data;
|
|
|
this.executor = res.data;
|
|
|
console.log(this.executor);
|
|
|
@@ -1118,7 +1227,7 @@ export default {
|
|
|
|
|
|
// 查询计划类型
|
|
|
getdict() {
|
|
|
- getDicts(this.dictType.dictType).then(res => {
|
|
|
+ getDicts(this.dictType.dictType).then((res) => {
|
|
|
this.ziDian = res.data;
|
|
|
});
|
|
|
},
|
|
|
@@ -1157,7 +1266,7 @@ export default {
|
|
|
// this.form.endTime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
|
|
|
|
|
|
// 获取执行单位列表
|
|
|
- getDept2().then(res => {
|
|
|
+ getDept2().then((res) => {
|
|
|
// console.log(res,2)
|
|
|
this.users = res.data;
|
|
|
|
|
|
@@ -1167,15 +1276,15 @@ export default {
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
this.reset();
|
|
|
- getDept2().then(res => {
|
|
|
+ getDept2().then((res) => {
|
|
|
// console.log(res,2)
|
|
|
this.users = res.data;
|
|
|
console.log(this.users);
|
|
|
});
|
|
|
const id = row.id || this.ids;
|
|
|
- getWorkTask(id).then(response => {
|
|
|
+ getWorkTask(id).then((response) => {
|
|
|
this.form = response.data;
|
|
|
- this.form.type = parseInt(this.form.type);
|
|
|
+ // this.form.type = parseInt(this.form.type);
|
|
|
// this.getDept2()
|
|
|
this.getZhuChi(this.form.unitId);
|
|
|
this.form.peopleName = this.form.peopleName.split(",").map(Number);
|
|
|
@@ -1189,7 +1298,7 @@ export default {
|
|
|
parseInt(this.workTaskList[0].common) == 1 ||
|
|
|
this.workTaskList[0].common == 2
|
|
|
) {
|
|
|
- this.rylist.map(item => {
|
|
|
+ this.rylist.map((item) => {
|
|
|
row.peopleName.split(",").forEach((items, index) => {
|
|
|
if (item.userId == items) {
|
|
|
// console.log(item.nickName)
|
|
|
@@ -1198,7 +1307,7 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
} else if (parseInt(this.workTaskList[0].common) == 0) {
|
|
|
- this.rylist.map(item => {
|
|
|
+ this.rylist.map((item) => {
|
|
|
row.peopleName.split(",").forEach((items, index) => {
|
|
|
if (item.userId == items) {
|
|
|
// console.log(item.nickName)
|
|
|
@@ -1215,13 +1324,13 @@ export default {
|
|
|
parseInt(this.workTaskList[0].common) == 1 ||
|
|
|
this.workTaskList[0].common == 2
|
|
|
) {
|
|
|
- this.getdeptList.map(item => {
|
|
|
+ this.getdeptList.map((item) => {
|
|
|
if (item.deptId == row.adminId) {
|
|
|
deptName = item.deptName;
|
|
|
}
|
|
|
});
|
|
|
} else if (parseInt(this.workTaskList[0].common) == 0) {
|
|
|
- this.getdeptList.map(item => {
|
|
|
+ this.getdeptList.map((item) => {
|
|
|
if (item.deptId == row.adminId) {
|
|
|
deptName = item.deptName;
|
|
|
}
|
|
|
@@ -1231,7 +1340,7 @@ export default {
|
|
|
},
|
|
|
unit4Format(row, column) {
|
|
|
var deptName = "";
|
|
|
- this.ziDian.map(item => {
|
|
|
+ this.ziDian.map((item) => {
|
|
|
if (item.dictSort == row.type) {
|
|
|
deptName = item.dictLabel;
|
|
|
}
|
|
|
@@ -1248,7 +1357,7 @@ export default {
|
|
|
this.form.fileName = this.form.file[0].name;
|
|
|
this.form.file = this.form.file[0].url;
|
|
|
}
|
|
|
- this.$refs["form"].validate(valid => {
|
|
|
+ this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
if (this.form.adminId === this.form.unitId) {
|
|
|
alert("发布单位和执行单位不能相同");
|
|
|
@@ -1257,14 +1366,14 @@ export default {
|
|
|
this.form.peopleId = this.form.peopleName;
|
|
|
console.log(this.form);
|
|
|
if (this.form.id != null) {
|
|
|
- updateWorkTask(this.form).then(response => {
|
|
|
+ updateWorkTask(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
this.queryParams.type = "";
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
});
|
|
|
} else {
|
|
|
- addWorkTask(this.form).then(response => {
|
|
|
+ addWorkTask(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
@@ -1296,7 +1405,7 @@ export default {
|
|
|
},
|
|
|
submitForm1() {
|
|
|
// console.log(this.Progress)
|
|
|
- this.$refs["Progress"].validate(valid => {
|
|
|
+ this.$refs["Progress"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
this.Progress.taskId = this.jinduId;
|
|
|
this.Progress.schedule = this.Progress.planProgress;
|
|
|
@@ -1306,7 +1415,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
console.log(this.Progress);
|
|
|
- uploadProgress(this.Progress).then(res1 => {
|
|
|
+ uploadProgress(this.Progress).then((res1) => {
|
|
|
this.$modal.msgSuccess("上传成功");
|
|
|
// this.Progress
|
|
|
this.reset();
|
|
|
@@ -1326,7 +1435,7 @@ export default {
|
|
|
const ids = row.id || this.ids;
|
|
|
this.$modal
|
|
|
.confirm("是否确认删除？")
|
|
|
- .then(function() {
|
|
|
+ .then(function () {
|
|
|
return delWorkTask(ids);
|
|
|
})
|
|
|
.then(() => {
|
|
|
@@ -1360,7 +1469,7 @@ export default {
|
|
|
this.exportLoading = true;
|
|
|
return exportWorkTask(this.daoruobj);
|
|
|
})
|
|
|
- .then(response => {
|
|
|
+ .then((response) => {
|
|
|
this.$download.name(response.msg);
|
|
|
this.exportLoading = false;
|
|
|
this.open4 = false;
|
|
|
@@ -1369,13 +1478,13 @@ export default {
|
|
|
},
|
|
|
// 发布单位接口
|
|
|
getdept() {
|
|
|
- getDept().then(res => {
|
|
|
+ getDept().then((res) => {
|
|
|
this.part = res.data;
|
|
|
});
|
|
|
},
|
|
|
// 获取执行单位列表
|
|
|
getdeptlist() {
|
|
|
- getDeptList().then(res => {
|
|
|
+ getDeptList().then((res) => {
|
|
|
this.ExecutableUnit = res.data;
|
|
|
console.log(this.ExecutableUnit);
|
|
|
});
|
|
|
@@ -1408,8 +1517,8 @@ export default {
|
|
|
// 获取发布单位id
|
|
|
issueunit(id) {
|
|
|
this.form.adminId = id;
|
|
|
- }
|
|
|
- }
|
|
|
+ },
|
|
|
+ },
|
|
|
};
|
|
|
</script>
|
|
|
<style>
|
sunyanqiang