Browse Source

任务管理 客户现场修改 2022-10-09 sxm

master
[li_she] 4 years ago
parent
commit
f805500419
  1. 10
      src/views/modules/taskmanage/alltasklist.vue
  2. 7
      src/views/modules/taskmanage/chat-history.vue
  3. 1
      src/views/modules/taskmanage/chatting.vue
  4. 44
      src/views/modules/taskmanage/mysendtasklist.vue
  5. 1
      src/views/modules/taskmanage/mytasklist.vue
  6. 20
      src/views/modules/taskmanage/task-file-list.vue
  7. 40
      src/views/modules/taskmanage/task-file-upload-list.vue
  8. 109
      src/views/modules/taskmanage/taskReport.vue
  9. 2
      src/views/modules/taskmanage/tasklist-add-or-update.vue
  10. 27
      src/views/modules/taskmanage/tasklist.vue

10
src/views/modules/taskmanage/alltasklist.vue

@ -99,14 +99,14 @@
fixed="right"
header-align="center"
align="center"
width="160"
width="130"
label="操作">
<template slot-scope="scope">
<el-link type="text" size="small" @click="annex(scope.row.id)">沟通附件 |</el-link>
<el-link type="text" size="small" @click="annex(scope.row.taskId)">任务附件 |</el-link>
<el-link v-if="isAuth('taskmanage:tasklist:delete')" type="text" size="small"
@click="deleteHandle(scope.row.id)">删除
</el-link>
<el-link type="text" size="small" @click="annex(scope.row.taskId)">任务附件 </el-link>
<!-- <el-link v-if="isAuth('taskmanage:tasklist:delete')" type="text" size="small"-->
<!-- @click="deleteHandle(scope.row.id)">|删除-->
<!-- </el-link>-->
</template>
</el-table-column>
</el-table>

7
src/views/modules/taskmanage/chat-history.vue

@ -24,6 +24,7 @@
:header-align="'center'"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
show-overflow-tooltip
:fixed="item.fixed==''?false:item.fixed"
:width="item.columnWidth"
:label="item.columnLabel">
@ -37,7 +38,7 @@
fixed="right"
header-align="center"
align="center"
width="170"
width="100"
label="操作">
<template slot-scope="scope">
<el-link type="text" size="small" @click="annex(scope.row.id)">附件</el-link>
@ -76,7 +77,7 @@
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
columnWidth: 120,
format: null,
sortLv: 0,
status: true,
@ -91,7 +92,7 @@
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
columnWidth: 80,
format: null,
sortLv: 0,
status: true,

1
src/views/modules/taskmanage/chatting.vue

@ -156,6 +156,7 @@
//
downFtpFile(row){
//'/proxyApi/ftp/file/downFtpFile/'
// '/api/ftp/file/downFtpFile/'
axios.get( '/api/ftp/file/downFtpFile/' + row.id, {
responseType: 'blob',
headers: {

44
src/views/modules/taskmanage/mysendtasklist.vue

@ -12,6 +12,8 @@
class="el-button el-button--primary el-button--medium">
{{ '导出' }}
</download-excel>
<el-button v-if="isAuth('taskmanage:tasklist:save')" @click="addOrUpdateHandle()" type="primary">发起任务
</el-button>
</el-col>
</el-row>
<el-row>
@ -93,13 +95,17 @@
fixed="right"
header-align="center"
align="center"
width="220"
width="300"
label="操作">
<template slot-scope="scope">
<el-link type="text" size="small" @click="updateStatusDialog(scope.row)">更改状态 |</el-link>
<el-link type="text" size="small" @click="addOrUpdateHandle(scope.row.taskId)">修改 |</el-link>
<el-link type="text" size="small" @click="updateStatusDialog(scope.row)">更改最终状态 |</el-link>
<el-link type="text" size="small" @click="chatHistoryDialog(scope.row.id)">沟通 |</el-link>
<el-link type="text" size="small" @click="annex(scope.row.taskId)">任务附件 |</el-link>
<el-link type="text" size="small" @click="annex(scope.row.id)"> 沟通附件</el-link>
<el-link type="text" size="small"
@click="deleteHandle(scope.row.id)">删除
</el-link>
</template>
</el-table-column>
</el-table>
@ -115,10 +121,9 @@
<el-form :model="dataForm" :inline="true" label-position="top"
label-width="80px">
<el-form-item label="状态">
<el-select v-model="selectRow.status" style="width: 120px">
<el-option label="未受理" value="未受理"></el-option>
<el-option label="已受理" value="已受理"></el-option>
<el-option label="已结束" value="已结束"></el-option>
<el-select v-model="selectRow.finalStatus" style="width: 120px">
<el-option label="未完成" value="未完成"></el-option>
<el-option label="已完成" value="已完成"></el-option>
</el-select>
</el-form-item>
</el-form>
@ -129,7 +134,10 @@
</el-dialog>
<!-- 沟通记录 -->
<chat-history v-if="chatHistoryVisible" ref="chatHistory" ></chat-history>
<!-- 文件列表 -->
<task-file-list v-if="taskFileVisible" ref="taskFileList"></task-file-list>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</template>
@ -137,7 +145,8 @@
import ChatHistory from './chat-history.vue'
import {getTaskDetailList,updateTask} from '@/api/taskmanage/tasklist.js'
import TaskFileList from './task-file-list.vue'
import TaskFileList from './task-file-upload-list.vue'
import AddOrUpdate from "./tasklist-add-or-update";
export default {
data() {
@ -435,19 +444,21 @@
dataList: [],
selectRow: {
id: 0,
status: '',
finalStatus: '',
},
dataListLoading: false,
dataListSelections: [],
chatHistoryVisible: false,
statusVisible: false,
taskFileVisible: false,
addOrUpdateVisible: false,
exportName: this.$route.meta.title + this.dayjs().format('YYYYMMDDHHmmss')
}
},
components: {
ChatHistory,
TaskFileList
TaskFileList,
AddOrUpdate,
},
activated() {
// this.getDataList()
@ -476,8 +487,8 @@
},
//
updateStatusDialog(row) {
this.selectRow.status = row.status
this.selectRow.id = row.id
this.selectRow.finalStatus = row.finalStatus
this.selectRow.id = row.taskId
this.statusVisible = true;
},
//
@ -515,13 +526,13 @@
var ids = id ? [id] : this.dataListSelections.map(item => {
return item.id
})
this.$confirm(`确定进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
this.$confirm(`确定进行删除操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http({
url: this.$http.adornUrl('/taskmanage/tasklist/delete'),
url: this.$http.adornUrl('/taskmanage/taskDetail/delete'),
method: 'post',
data: this.$http.adornData(ids, false)
}).then(({data}) => {
@ -534,6 +545,13 @@
})
})
},
// /
addOrUpdateHandle(id) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(id)
})
},
//
fields() {
let json = "{"

1
src/views/modules/taskmanage/mytasklist.vue

@ -93,7 +93,6 @@
width="220"
label="操作">
<template slot-scope="scope">
<el-link type="text" size="small" @click="updateStatusDialog(scope.row)">更改状态 |</el-link>
<el-link type="text" size="small" @click="chatHistoryDialog(scope.row.id)">沟通 |</el-link>
<el-link type="text" size="small" @click="annex(scope.row.taskId)">任务附件 |</el-link>
<el-link type="text" size="small" @click="annex(scope.row.id)"> 沟通附件</el-link>

20
src/views/modules/taskmanage/task-file-list.vue

@ -88,7 +88,22 @@
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
columnWidth: 80,
format: null,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: null
},
{
columnProp: "createdBy",
columnLabel: "上传人",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 100,
format: null,
sortLv: 0,
status: true,
@ -103,7 +118,7 @@
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
columnWidth: 130,
format: null,
sortLv: 0,
status: true,
@ -112,6 +127,7 @@
columnType: null,
align: null
}
],
dataListSelections: [],
dataForm: {},

40
src/views/modules/taskmanage/task-file-upload-list.vue

@ -9,9 +9,9 @@
label-width="80px">
<el-row style="margin-top: -5px">
<el-col :span="24">
<!-- <el-form-item label="附件">-->
<!-- <el-input style="width: 305px; color: red" readonly v-model="dataForm.fileName"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="附件">-->
<!-- <el-input style="width: 305px; color: red" readonly v-model="dataForm.fileName"></el-input>-->
<!-- </el-form-item>-->
<el-form-item style="margin-top: 10px">
<ftp-upload @childByValue="childByValue"></ftp-upload>
</el-form-item>
@ -49,8 +49,8 @@
width="80"
label="操作">
<template slot-scope="scope">
<el-link type="text" size="small" @click="downFtpFile(scope.row)"> 下载</el-link>
<el-link type="text" size="small" @click="deleteHandle(scope.row.id)"> 删除</el-link>
<el-link type="text" size="small" @click="downFtpFile(scope.row)"> 下载 </el-link>
<el-link type="text" size="small" @click="deleteHandle(scope.row.id)">| 删除</el-link>
</template>
</el-table-column>
</el-table>
@ -101,7 +101,22 @@
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
columnWidth: 80,
format: null,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: null
},
{
columnProp: "createdBy",
columnLabel: "上传人",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 100,
format: null,
sortLv: 0,
status: true,
@ -116,7 +131,7 @@
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
columnWidth: 130,
format: null,
sortLv: 0,
status: true,
@ -125,6 +140,7 @@
columnType: null,
align: null
}
],
dataListSelections: [],
dataForm: {},
@ -146,10 +162,10 @@
this.fileList.push(childValue)
//
let dto = {
id:childValue.id,
orderRef1:this.dataForm.orderRef2,
orderRef2:this.dataForm.orderRef2,
fileTypeCode:this.dataForm.fileTypeCode,
id: childValue.id,
orderRef1: this.dataForm.orderRef2,
orderRef2: this.dataForm.orderRef2,
fileTypeCode: this.dataForm.fileTypeCode,
}
this.updateOrderRef(dto)
},
@ -164,7 +180,7 @@
})
},
//
updateOrderRef(val){
updateOrderRef(val) {
this.$http({
url: this.$http.adornUrl('/sys/oss/uploadSysOss'),
method: 'post',

109
src/views/modules/taskmanage/taskReport.vue

@ -1,37 +1,52 @@
<template>
<div class="mod-config">
<el-row>
<el-col :span="24" style="display:flex">
<div style=" margin: auto; width: 300px;height: 50px;display:flex">
<img src="src/assets/img/avatar.png" height="55">
<h2>赫艾内部MES沟通系统</h2>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-table
:data="dataList"
border
ref="task_table"
:height="height"
:row-class-name="tableRowClassName"
@mouseenter.native="mouseEnter"
@mouseleave.native="mouseLeave"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="'center'"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<el-table
:data="dataList"
border
ref="task_table"
:height="height"
:row-class-name="tableRowClassName"
@mouseenter.native="mouseEnter"
@mouseleave.native="mouseLeave"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="'center'"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
import {getTaskListReport} from '@/api/taskmanage/tasklist.js'
import {getTaskDetailList} from '@/api/taskmanage/tasklist.js'
let domTimer = '' //
let dataTimer = '' //
@ -40,7 +55,7 @@
return {
height: 200,
dataForm: {
site: this.$store.state.user.site,
site: this.$store.state.user.site?this.$store.state.user.site:1,
customer: '',
taskHeader: '',
project: '',
@ -57,7 +72,6 @@
},
//
columnList: [
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
@ -66,7 +80,7 @@
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
columnWidth: 100,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -79,12 +93,12 @@
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "taskStartDate",
columnLabel: "发起日期",
columnProp: "project",
columnLabel: "项目",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
columnWidth: 100,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -97,8 +111,8 @@
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "requiredCompletionDate",
columnLabel: "要求完成日期",
columnProp: "taskHeader",
columnLabel: "任务主题",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -115,12 +129,12 @@
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "taskHeader",
columnLabel: "任务主题",
columnProp: "taskStartDate",
columnLabel: "发起日期",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
columnWidth: 100,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -133,12 +147,12 @@
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "project",
columnLabel: "项目",
columnProp: "requiredCompletionDate",
columnLabel: "要求完成日期",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
columnWidth: 100,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -148,6 +162,7 @@
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
@ -156,7 +171,7 @@
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
columnWidth: 80,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -174,7 +189,7 @@
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
columnWidth: 80,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -192,7 +207,7 @@
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
columnWidth: 80,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -222,7 +237,7 @@
methods: {
//
getDataList() {
getTaskListReport(this.dataForm).then(({data}) => {
getTaskDetailList(this.dataForm).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.data
} else {
@ -292,11 +307,11 @@
</script>
<style>
.mod-config .not-processing {
background-color: rgba(255, 0, 0, 0.93);
background-color: #ffff00;
}
.mod-config .processing {
background-color: #ffff00;
background-color: #ffffff;
}
.mod-config .finish{

2
src/views/modules/taskmanage/tasklist-add-or-update.vue

@ -163,7 +163,7 @@
department: '',
requiredCompletionDate: '',
status: '未受理',
finalStatus: '未受理',
finalStatus: '未完成',
taskStartDate: '',
createdDate: '',
createdBy: '',

27
src/views/modules/taskmanage/tasklist.vue

@ -3,8 +3,8 @@
<el-row>
<el-col :span="24">
<el-button @click="getDataList()" type="primary">查询</el-button>
<el-button v-if="isAuth('taskmanage:tasklist:save')" @click="addOrUpdateHandle()" type="primary">发起任务
</el-button>
<!-- <el-button v-if="isAuth('taskmanage:tasklist:save')" @click="addOrUpdateHandle()" type="primary">发起任务-->
<!-- </el-button>-->
<download-excel
:fields="fields()"
type="xls"
@ -109,16 +109,16 @@
fixed="right"
header-align="center"
align="center"
width="230"
width="80"
label="操作">
<template slot-scope="scope">
<el-link type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改 |</el-link>
<el-link type="text" size="small" @click="updateStatusDialog(scope.row)">更改最终状态 |</el-link>
<el-link type="text" size="small" @click="chatHistoryDialog(scope.row.id)">沟通 |</el-link>
<el-link type="text" size="small" @click="annex(scope.row.id)">附件 |</el-link>
<el-link v-if="isAuth('taskmanage:tasklist:delete')" type="text" size="small"
@click="deleteHandle(scope.row.id)">删除
</el-link>
<!-- <el-link type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改 |</el-link>-->
<!-- <el-link type="text" size="small" @click="updateStatusDialog(scope.row)">更改最终状态 |</el-link>-->
<!-- <el-link type="text" size="small" @click="chatHistoryDialog(scope.row.id)">沟通 |</el-link>-->
<el-link type="text" size="small" @click="annex(scope.row.id)">附件</el-link>
<!-- <el-link v-if="isAuth('taskmanage:tasklist:delete')" type="text" size="small"-->
<!-- @click="deleteHandle(scope.row.id)">删除-->
<!-- </el-link>-->
</template>
</el-table-column>
</el-table>
@ -135,9 +135,8 @@
label-width="80px">
<el-form-item label="最终状态">
<el-select v-model="selectRow.finalStatus" style="width: 120px">
<el-option label="未受理" value="未受理"></el-option>
<el-option label="已受理" value="已受理"></el-option>
<el-option label="已结束" value="已结束"></el-option>
<el-option label="未完成" value="未完成"></el-option>
<el-option label="已完成" value="已完成"></el-option>
</el-select>
</el-form-item>
</el-form>
@ -158,7 +157,7 @@
import AddOrUpdate from './tasklist-add-or-update'
import ChatHistory from './chat-history.vue'
import {getTaskList, updateTask} from '@/api/taskmanage/tasklist.js'
import TaskFileList from './task-file-upload-list.vue'
import TaskFileList from './task-file-list.vue'
export default {
data() {

Loading…
Cancel
Save