|
@@ -95,7 +95,7 @@
|
|
|
:header-cell-style="{ background: '#003C69', color: 'white' }"
|
|
|
>
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="序号" align="center">
|
|
|
+ <el-table-column label="序号" align="center" width="50">
|
|
|
<template scope="scope">
|
|
|
<span>{{
|
|
|
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
|
@@ -133,12 +133,14 @@
|
|
|
align="center"
|
|
|
prop="taskCount"
|
|
|
v-if="taskCounts"
|
|
|
+ width="100"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
label="当前进度"
|
|
|
align="center"
|
|
|
prop="taskProgress"
|
|
|
v-if="taskProgres"
|
|
|
+ width="100"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ scope.row.taskProgress }}%</span>
|
|
@@ -149,6 +151,7 @@
|
|
|
align="center"
|
|
|
prop="unitCount"
|
|
|
v-if="unitCounts"
|
|
|
+ width="100"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
label="备注"
|
|
@@ -157,6 +160,15 @@
|
|
|
show-overflow-tooltip
|
|
|
/>
|
|
|
|
|
|
+ <el-table-column
|
|
|
+ v-if="aaa == 0"
|
|
|
+ label="任务说明"
|
|
|
+ align="center"
|
|
|
+ prop="planDetail.taskDescription"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+
|
|
|
+
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
align="center"
|
|
@@ -191,11 +203,11 @@
|
|
|
>
|
|
|
<el-button
|
|
|
v-if="aaa != 0"
|
|
|
- size="btk"
|
|
|
+ size="btzx"
|
|
|
type="text"
|
|
|
@click="handleUpdateAdd(scope.row)"
|
|
|
v-hasPermi="['workingArrangements:taskplandetail:add']"
|
|
|
- >添加</el-button
|
|
|
+ >添加分支任务</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
v-if="aaa != 0"
|
|
@@ -789,9 +801,9 @@
|
|
|
:inline="true"
|
|
|
>
|
|
|
<el-form-item label="任务名称" prop="taskName">
|
|
|
- <el-input v-model="form8.taskName" placeholder="" disabled />
|
|
|
+ <el-input v-model="form8.taskName" placeholder="" disabled class="ren_wu1"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="开始时间" prop="startTime">
|
|
|
+ <el-form-item label="开始时间" prop="startTime" style="margin-right: 155px;">
|
|
|
<el-date-picker
|
|
|
clearable
|
|
|
v-model="form8.startTime"
|
|
@@ -816,11 +828,12 @@
|
|
|
<el-form-item label="发布人" prop="createBy">
|
|
|
<el-input v-model="form8.createBy" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <div style="height: 33px; color: #fff; font-size: 15px">附件</div>
|
|
|
+ <div style="height: 33px; color: #fff; font-size: 15px;padding-left: 26px;">附件</div>
|
|
|
<div
|
|
|
v-for="(item, i2) in form8.annexList"
|
|
|
:key="i2 + ' '"
|
|
|
class="box3"
|
|
|
+ style="margin-left: 22px;"
|
|
|
>
|
|
|
<el-input
|
|
|
label="附件名称"
|
|
@@ -836,8 +849,17 @@
|
|
|
>下载附件</a
|
|
|
>
|
|
|
</div>
|
|
|
- <div style="height: 33px; color: #fff; font-size: 15px">备注</div>
|
|
|
- <el-form-item label="" prop="remarkInfo">
|
|
|
+ <div style="height: 33px; color: #fff; font-size: 15px;margin-left: 26px;">任务说明</div>
|
|
|
+ <el-form-item label="" prop="remarkInfo" style="margin-left: 20px;">
|
|
|
+ <el-input
|
|
|
+ v-model="form9.taskDescription"
|
|
|
+ type="textarea"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ disabled
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <div style="height: 33px; color: #fff; font-size: 15px;margin-left: 26px;">备注</div>
|
|
|
+ <el-form-item label="" prop="remarkInfo" style="margin-left: 20px;">
|
|
|
<el-input
|
|
|
v-model="form8.remarkInfo"
|
|
|
type="textarea"
|
|
@@ -845,7 +867,8 @@
|
|
|
disabled
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <div class="jiben">反馈说明</div>
|
|
|
+ <div v-if="form9.feedbackDescription">
|
|
|
+ <div class="jiben">反馈说明</div>
|
|
|
<el-form-item label="" prop="feedbackDescription">
|
|
|
<el-input
|
|
|
v-model="form9.feedbackDescription"
|
|
@@ -854,11 +877,12 @@
|
|
|
disabled
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <!-- <fileUpload v-model="form2.annexLists" class="m-l-20" :limit="5" /> -->
|
|
|
+ </div>
|
|
|
<div
|
|
|
v-for="(item, i3) in form9.annexList"
|
|
|
:key="i3 + ' '"
|
|
|
class="box3"
|
|
|
+ style="margin-left: 26px;"
|
|
|
>
|
|
|
<el-input
|
|
|
label="附件名称"
|
|
@@ -949,6 +973,15 @@
|
|
|
>下载附件</a
|
|
|
>
|
|
|
</div>
|
|
|
+ <div style="height: 33px; color: #fff; ">任务说明</div>
|
|
|
+ <el-form-item label="" prop="remarkInfo" >
|
|
|
+ <el-input
|
|
|
+ v-model="nairong"
|
|
|
+ type="textarea"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ disabled
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
<div style="height: 33px; color: #fff; font-size: 15px">备注</div>
|
|
|
<el-form-item label="" prop="remarkInfo">
|
|
|
<el-input
|
|
@@ -974,95 +1007,6 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <!-- 审批 -->
|
|
|
- <el-dialog
|
|
|
- title="审批"
|
|
|
- :visible.sync="openxShen"
|
|
|
- width="800px"
|
|
|
- append-to-body
|
|
|
- :close-on-click-modal="false"
|
|
|
- custom-class="box4"
|
|
|
- >
|
|
|
- <el-form
|
|
|
- ref="form"
|
|
|
- :model="form4"
|
|
|
- :rules="rules"
|
|
|
- label-width="80px"
|
|
|
- :inline="true"
|
|
|
- >
|
|
|
- <el-form-item label="执行单位" prop="unitId">
|
|
|
- <treeselect
|
|
|
- v-model="form4.unitId"
|
|
|
- :options="deptOptions"
|
|
|
- placeholder="请选择单位"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="执行人员" prop="peopleId">
|
|
|
- <el-select v-model="form4.peopleId" placeholder="请选择执行人员">
|
|
|
- <el-option
|
|
|
- v-for="(item, i1) in executor"
|
|
|
- :key="i1 + ' '"
|
|
|
- :label="item.nickName"
|
|
|
- :value="item.userId"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <div class="jiben">任务说明</div>
|
|
|
- <el-form-item label="" prop="taskDescription">
|
|
|
- <el-input
|
|
|
- v-model="form4.taskDescription"
|
|
|
- type="textarea"
|
|
|
- placeholder="请输入内容"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <div class="jiben">执行反馈</div>
|
|
|
- <el-form-item label="反馈时间" prop="startTime">
|
|
|
- <el-date-picker
|
|
|
- clearable
|
|
|
- v-model="form4.feedbackTime"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <div class="jiben">反馈说明</div>
|
|
|
- <el-input
|
|
|
- v-model="form4.feedbackDescription"
|
|
|
- type="textarea"
|
|
|
- placeholder="请输入内容"
|
|
|
- />
|
|
|
- <div class="jiben">任务附件</div>
|
|
|
- <div
|
|
|
- v-for="(item, i3) in form4.annexList"
|
|
|
- :key="i3 + ' '"
|
|
|
- class="box3"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- label="附件名称"
|
|
|
- v-model="item.name"
|
|
|
- style="width: 820px"
|
|
|
- disabled
|
|
|
- />
|
|
|
- <a
|
|
|
- :href="url + item.url"
|
|
|
- :download="item.name"
|
|
|
- title="下载"
|
|
|
- style="color: white; margin-left: 10px"
|
|
|
- >下载附件</a
|
|
|
- >
|
|
|
- </div>
|
|
|
- <div class="jiben">驳回原因</div>
|
|
|
- <el-input
|
|
|
- v-model="form4.rejectContent"
|
|
|
- type="textarea"
|
|
|
- placeholder=""
|
|
|
- />
|
|
|
- </el-form>
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="submitFormTong">通 过</el-button>
|
|
|
- <el-button @click="cancelBo">驳 回</el-button>
|
|
|
- </div>
|
|
|
- </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -1220,6 +1164,8 @@ export default {
|
|
|
taskProgres: true,
|
|
|
// 执行单位数
|
|
|
unitCounts: true,
|
|
|
+ // 执行按钮任务说明
|
|
|
+ nairong:null
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
@@ -1242,14 +1188,15 @@ export default {
|
|
|
methods: {
|
|
|
// 执行人查看
|
|
|
handleUpdatebZXCK(row) {
|
|
|
- this.usersid = row.bdglWorkTaskPlanDetailList[0].id;
|
|
|
+ // console.log(row);
|
|
|
+ this.usersid = row.planDetail.id;
|
|
|
this.form8.id = row.id;
|
|
|
getWorktaskplan(this.form8.id).then((res) => {
|
|
|
- console.log(res);
|
|
|
this.form8 = res.data;
|
|
|
});
|
|
|
taskplandetailIds(this.usersid).then((res) => {
|
|
|
this.form9 = res.data;
|
|
|
+ console.log(res,2);
|
|
|
});
|
|
|
this.title = "查看";
|
|
|
this.openzxck = true;
|
|
@@ -1349,10 +1296,12 @@ export default {
|
|
|
// 点击执行
|
|
|
handleUpdateb(row) {
|
|
|
console.log(row);
|
|
|
- this.usersid = row.bdglWorkTaskPlanDetailList[0].id;
|
|
|
+ this. nairong=row.planDetail.taskDescription
|
|
|
+ this.usersid = row.planDetail.id;
|
|
|
this.form2.id = row.id;
|
|
|
getWorktaskplan(this.form2.id).then((res) => {
|
|
|
this.form2 = res.data;
|
|
|
+ // console.log(this.form2);
|
|
|
});
|
|
|
this.getChaKan(this.usersid);
|
|
|
this.title = "编辑";
|
|
@@ -1707,6 +1656,9 @@ export default {
|
|
|
.ren_wu {
|
|
|
width: 501px;
|
|
|
}
|
|
|
+.ren_wu1 {
|
|
|
+ width: 636px;
|
|
|
+}
|
|
|
/* 基本信息背景 */
|
|
|
.jiben {
|
|
|
width: 700px;
|
|
@@ -1765,13 +1717,17 @@ export default {
|
|
|
}
|
|
|
|
|
|
::v-deep .box5 .box3 .el-input {
|
|
|
- width: 470px !important;
|
|
|
+ width: 577px !important;
|
|
|
}
|
|
|
::v-deep .box5 .el-dialog__footer {
|
|
|
- margin-right: 158px;
|
|
|
+ margin-right: 88px;
|
|
|
+}
|
|
|
+
|
|
|
+::v-deep .box5 .el-textarea__inner{
|
|
|
+ width: 687px !important;
|
|
|
}
|
|
|
::v-deep .box5 .el-dialog__body {
|
|
|
- margin-left: 123px;
|
|
|
+ margin-left: 69px;
|
|
|
}
|
|
|
|
|
|
::v-deep .box .el-dialog__footer {
|
|
@@ -1797,4 +1753,30 @@ hr {
|
|
|
::v-deep .box4 .el-dialog__footer {
|
|
|
margin-right: 79px;
|
|
|
}
|
|
|
+
|
|
|
+/* 查看 添加分支任务*/
|
|
|
+.el-button--btzx.is-active,
|
|
|
+.el-button--btzx:active {
|
|
|
+ background: #1d96ff;
|
|
|
+ border-color: #1d96ff;
|
|
|
+ color: #FFFFFF;
|
|
|
+}
|
|
|
+
|
|
|
+.el-button--btzx:focus,
|
|
|
+.el-button--btzx:hover {
|
|
|
+ background: #41a4fa;
|
|
|
+ border-color: #41a4fa;
|
|
|
+ color: #FFFFFF;
|
|
|
+}
|
|
|
+
|
|
|
+.el-button--btzx {
|
|
|
+ width: 100px !important;
|
|
|
+ border: 1px solid transparent;
|
|
|
+ padding: 3px 8px;
|
|
|
+ font-size: 14px;
|
|
|
+ line-height: 1.5;
|
|
|
+ border-radius: 3px;
|
|
|
+ color: #fff;
|
|
|
+ background-color: #1d96ff;
|
|
|
+}
|
|
|
</style>
|