Browse Source

0412 新看板

master
ruanqi 1 year ago
parent
commit
52061b9cc5
  1. 101
      src/views/modules/taskmanage/alltasklist.vue
  2. 30
      src/views/modules/taskmanage/chat-history.vue
  3. 85
      src/views/modules/taskmanage/mysendtasklist.vue
  4. 85
      src/views/modules/taskmanage/mytasklist.vue
  5. 248
      src/views/modules/taskmanage/taskType_add.vue
  6. 1
      src/views/modules/taskmanage/tasklist-add-or-update.vue
  7. 44
      src/views/modules/taskmanage/tasklist.vue

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

@ -13,7 +13,7 @@
class="el-button el-button--primary el-button--medium">
{{ '导出' }}
</download-excel>
<el-button @click="taskTypeModel()" type="primary">任务类型</el-button>
</el-col>
</el-row>
<el-row>
@ -45,6 +45,15 @@
format='yyyy-MM-dd'
></el-date-picker>
</el-form-item>
<el-form-item label="任务类型" prop="taskHeader">
<el-select filterable v-model="dataForm.taskType" >
<el-option label="全部" value="">
</el-option>
<el-option :label="item.taskType" :value="item.taskType" v-for="(item,index) in taskTypeList "
:key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -73,6 +82,12 @@
format='yyyy-MM-dd'
></el-date-picker>
</el-form-item>
<el-form-item label="老型号/编码" >
<el-input v-model="dataForm.oldSpec"></el-input>
</el-form-item>
<el-form-item label="新型号/编码" >
<el-input v-model="dataForm.newSpec"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -126,18 +141,21 @@
<!-- 沟通记录 -->
<chat-history v-if="chatHistoryVisible" ref="chatHistory" ></chat-history>
<task-file-list v-if="taskFileVisible" ref="taskFileList"></task-file-list>
<taskType_add ref="taskTypeAdd" v-drag></taskType_add>
</div>
</template>
<script>
import AddOrUpdate from './tasklist-add-or-update'
import ChatHistory from './chat-history.vue'
import {getTaskDetailList} from '@/api/taskmanage/tasklist.js'
import {getTaskDetailList,getTaskTypeList} from '@/api/taskmanage/tasklist.js'
import TaskFileList from './task-file-list.vue'
import taskType_add from './taskType_add.vue'
export default {
data() {
return {
taskTypeList:[],
height: 200,
dataForm: {
site: this.$store.state.user.site,
@ -154,7 +172,11 @@
finishStartDate: '',
finishEndDate: '',
status: '',
taskType:'',
oldSpec:'',
newSpec: '',
},
taskTypeVisible:false,
//
columnList: [
{
@ -266,6 +288,24 @@
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "taskType",
columnLabel: "任务类型",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
@ -356,6 +396,42 @@
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "oldSpec",
columnLabel: "老型号/编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "newSpec",
columnLabel: "新型号/编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
@ -446,10 +522,12 @@
components: {
AddOrUpdate,
ChatHistory,
TaskFileList
TaskFileList,
taskType_add
},
activated() {
// this.getDataList()
this.getTaskTypeList();
},
mounted() {
this.$nextTick(() => {
@ -488,6 +566,15 @@
this.$refs.chatHistory.init(id)
})
},
getTaskTypeList() {
getTaskTypeList({}).then(({data}) => {
if (data && data.code === 0) {
this.taskTypeList = data.rows
} else {
this.taskTypeList = []
}
})
},
//
annex(row) {
this.taskFileVisible = true
@ -520,6 +607,12 @@
})
})
},
taskTypeModel(){
this.taskTypeVisible=true
this.$refs.taskTypeAdd.init()
},
//
fields() {
let json = "{"

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

@ -11,7 +11,24 @@
<el-row>
<el-col :span="24">
<el-form-item label="主题" prop="taskHeader">
<el-input style="width: 750px" v-model="headerData.taskHeader" readonly></el-input>
<el-input style="width: 793px" v-model="headerData.taskHeader" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="任务类型" >
<el-input style="width: 240px" v-model="headerData.taskType" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="老型号/编码" >
<el-input style="width: 240px" v-model="headerData.oldSpec" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="新型号/编码" >
<el-input style="width: 240px" v-model="headerData.newSpec" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
@ -19,7 +36,7 @@
<el-col :span="24">
<div class="redModel">
<el-form-item label="要求完成时间" prop="taskHeader" label-class="red-label" style="font-weight:bold;color:#bd0b06">
<el-input style="width: 750px" v-model="headerData.requiredCompletionDate" readonly></el-input>
<el-input style="width: 793px" v-model="headerData.requiredCompletionDate" readonly></el-input>
</el-form-item>
</div>
</el-col>
@ -27,7 +44,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="任务描述">
<el-input type="textarea" style="width: 750px" v-model="headerData.taskDescription" readonly></el-input>
<el-input type="textarea" style="width: 793px" v-model="headerData.taskDescription" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
@ -161,6 +178,10 @@
headerData:{
taskHeader:'',
taskDescription:'',
requiredCompletionDate:'',
taskType:'',
oldSpec:'',
newSpec: '',
}
}
},
@ -174,6 +195,9 @@
this.headerData.taskHeader = row.taskHeader
this.headerData.taskDescription = row.taskDescription
this.headerData.requiredCompletionDate = row.requiredCompletionDate
this.headerData.taskType = row.taskType
this.headerData.oldSpec = row.oldSpec
this.headerData.newSpec = row.newSpec
this.visible = true
this.getDataList()
},

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

@ -45,6 +45,15 @@
format='yyyy-MM-dd'
></el-date-picker>
</el-form-item>
<el-form-item label="任务类型" prop="taskHeader">
<el-select filterable v-model="dataForm.taskType" >
<el-option label="全部" value="">
</el-option>
<el-option :label="item.taskType" :value="item.taskType" v-for="(item,index) in taskTypeList "
:key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -73,6 +82,12 @@
format='yyyy-MM-dd'
></el-date-picker>
</el-form-item>
<el-form-item label="老型号/编码" >
<el-input v-model="dataForm.oldSpec"></el-input>
</el-form-item>
<el-form-item label="新型号/编码" >
<el-input v-model="dataForm.newSpec"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -158,13 +173,14 @@
<script>
import ChatHistory from './chat-history.vue'
import {getTaskDetailList,updateTaskDetail} from '@/api/taskmanage/tasklist.js'
import {getTaskDetailList,updateTaskDetail,getTaskTypeList} from '@/api/taskmanage/tasklist.js'
import TaskFileList from './task-file-upload-list.vue'
import AddOrUpdate from "./tasklist-add-or-update";
export default {
data() {
return {
taskTypeList:[],
height: 200,
dataForm: {
site: this.$store.state.user.site,
@ -181,6 +197,9 @@
finishStartDate: '',
finishEndDate: '',
status: '',
taskType:'',
oldSpec:'',
newSpec: '',
},
//
columnList: [
@ -293,6 +312,24 @@
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "taskType",
columnLabel: "任务类型",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
@ -383,6 +420,42 @@
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "oldSpec",
columnLabel: "老型号/编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "newSpec",
columnLabel: "新型号/编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
@ -477,6 +550,7 @@
},
activated() {
// this.getDataList()
this.getTaskTypeList();
},
mounted() {
this.$nextTick(() => {
@ -559,6 +633,15 @@
})
})
},
getTaskTypeList() {
getTaskTypeList({}).then(({data}) => {
if (data && data.code === 0) {
this.taskTypeList = data.rows
} else {
this.taskTypeList = []
}
})
},
tableRowClassName({row, rowIndex}) {
// if (row.chatLastType == ''&&row.finalStatus=='') {
// return 'newChat'

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

@ -40,6 +40,15 @@
format='yyyy-MM-dd'
></el-date-picker>
</el-form-item>
<el-form-item label="任务类型" prop="taskHeader">
<el-select filterable v-model="dataForm.taskType" >
<el-option label="全部" value="">
</el-option>
<el-option :label="item.taskType" :value="item.taskType" v-for="(item,index) in taskTypeList "
:key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -66,6 +75,12 @@
format='yyyy-MM-dd'
></el-date-picker>
</el-form-item>
<el-form-item label="老型号/编码" >
<el-input v-model="dataForm.oldSpec"></el-input>
</el-form-item>
<el-form-item label="新型号/编码" >
<el-input v-model="dataForm.newSpec"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -144,13 +159,14 @@
<script>
import AddOrUpdate from './tasklist-add-or-update'
import ChatHistory from './chat-history.vue'
import {getTaskDetailList,updateTask} from '@/api/taskmanage/tasklist.js'
import {getTaskDetailList,updateTask,getTaskTypeList} from '@/api/taskmanage/tasklist.js'
import TaskFileList from './task-file-list.vue'
export default {
data() {
return {
height: 200,
taskTypeList:[],
dataForm: {
site: this.$store.state.user.site,
customer: '',
@ -166,6 +182,9 @@
finishStartDate: '',
finishEndDate: '',
status: '',
taskType:'',
oldSpec:'',
newSpec: '',
},
//
columnList: [
@ -278,6 +297,24 @@
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "taskType",
columnLabel: "任务类型",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
@ -368,6 +405,42 @@
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "oldSpec",
columnLabel: "老型号/编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
columnProp: "newSpec",
columnLabel: "新型号/编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: null,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: null
},
{
tableId: "ProjectInfo",
tableName: this.$route.meta.title,
@ -460,6 +533,7 @@
},
activated() {
// this.getDataList()
this.getTaskTypeList();
},
mounted() {
this.$nextTick(() => {
@ -549,6 +623,15 @@
})
})
},
getTaskTypeList() {
getTaskTypeList({}).then(({data}) => {
if (data && data.code === 0) {
this.taskTypeList = data.rows
} else {
this.taskTypeList = []
}
})
},
//
fields() {
let json = "{"

248
src/views/modules/taskmanage/taskType_add.vue

@ -0,0 +1,248 @@
<template>
<div>
<el-dialog v-drag
title="任务类型清单"
:close-on-click-modal="false"
width="455px"
:visible.sync="visible">
<el-form :inline="false" label-position="top"
label-width="80px" >
<el-button type="primary" @click="addModel()">{{'新增'}}</el-button>
<el-row style="margin-top: 0px">
<el-table
:height="height"
:data="dataList"
border
ref="mainTable"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-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-column
header-align="center"
align="center"
width="120"
fixed="right"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" @click="updateTypeModel(scope.row)">修改</a>
<a type="text" size="small" @click="deleteType(scope.row)">删除</a>
</template>
</el-table-column>
</el-table>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="visible = false">关闭</el-button>
</span>
</el-dialog>
<el-dialog title="类型维护" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="200px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;" @submit.native.prevent>
<el-form-item :label="'任务类型:'">
<el-input v-model="dataForm.taskType" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'排序序号:'">
<el-input v-model="dataForm.order" style="width: 130px" type="number" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 30px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">取消</el-button>
</el-footer>
</el-dialog>
</div>
</template>
<script>
import {getTaskTypeList,saveTaskType, deleteTaskType,updateTaskType} from '@/api/taskmanage/tasklist.js'
export default {
data() {
return {
dataListLoading: false,
visible: false,
height: 300,
modalFlag:false,
//
columnList: [
{
userId: this.$store.state.user.name,
functionId: 103001,
serialNumber: '103001Table1Order',
tableId: '103001Table1',
tableName: '测试信息表',
columnProp: 'order',
headerAlign: 'center',
align: 'center',
columnLabel: '序号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 60
},
{
userId: this.$store.state.user.name,
functionId: 103001,
serialNumber: '103001Table1TaskType',
tableId: '103001Table1',
tableName: '测试信息表',
columnProp: 'taskType',
headerAlign: 'center',
align: 'center',
columnLabel: '任务类型',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
],
userList: [],
dataListSelections: [],
dataForm: {
id: 0,
order: '',
taskType: '',
},
taskTypeList:[],
dataList:[],
}
},
methods: {
getTaskTypeList() {
getTaskTypeList({}).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.rows
} else {
this.dataList = []
}
})
},
addModel(){
this.dataForm={
id: null,
order: null,
taskType: '',
}
this.modalFlag=true
},
updateTypeModel(row){
this.dataForm={
id: row.id,
order: row.order,
taskType: row.taskType,
}
this.modalFlag=true
},
saveData(){
if(this.dataForm.order==null||this.dataForm.order===''){
this.$alert('请填写序号!', '错误', {
confirmButtonText: '确定'
})
return false
}
if(this.dataForm.taskType==null||this.dataForm.taskType===''){
this.$alert('请填写类型!', '错误', {
confirmButtonText: '确定'
})
return false
}
if(this.dataForm.id==null){
this.saveTaskType()
}else {
this.updateTaskType()
}
},
saveTaskType(){
this.$confirm("是否保存信息?", '保存提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
}).then(() => {
saveTaskType(this.dataForm).then(({data}) => {
if (data && data.code === 0) {
this.$message.success( '操作成功')
this.getTaskTypeList()
this.modalFlag=false
} else {
this.$message.error(data.msg)
}
})
}).catch(() => {
return
})
},
updateTaskType(){
this.$confirm("是否保存信息?", '保存提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
}).then(() => {
updateTaskType(this.dataForm).then(({data}) => {
if (data && data.code === 0) {
this.$message.success( '操作成功')
this.getTaskTypeList()
this.modalFlag=false
} else {
this.$message.error(data.msg)
}
})
}).catch(() => {
return
})
},
deleteType(row){
this.$confirm("是否删除信息?", '保存提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
}).then(() => {
deleteTaskType(row).then(({data}) => {
if (data && data.code === 0) {
this.$message.success( '操作成功')
this.getTaskTypeList()
} else {
this.$message.error(data.msg)
}
})
}).catch(() => {
return
})
},
init(){
this.getTaskTypeList();
this.visible=true
},
},
created() {
}
}
</script>
<style scoped>
</style>

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

@ -354,7 +354,6 @@
getTaskTypeList() {
getTaskTypeList({}).then(({data}) => {
if (data && data.code === 0) {
console.log(data.rows)
this.taskTypeList = data.rows
} else {
this.taskTypeList = []

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

@ -17,6 +17,7 @@
<!-- <el-button v-if="isAuth('taskmanage:tasklist:delete')" type="danger" @click="deleteHandle()"-->
<!-- :disabled="dataListSelections.length <= 0">批量删除-->
<!-- </el-button>-->
<el-button @click="taskTypeModel()" type="primary">任务类型</el-button>
</el-col>
</el-row>
<el-row>
@ -41,6 +42,15 @@
format='yyyy-MM-dd'
></el-date-picker>
</el-form-item>
<el-form-item label="任务类型" prop="taskHeader">
<el-select filterable v-model="dataForm.taskType" >
<el-option label="全部" value="">
</el-option>
<el-option :label="item.taskType" :value="item.taskType" v-for="(item,index) in taskTypeList "
:key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -62,6 +72,12 @@
format='yyyy-MM-dd'
></el-date-picker>
</el-form-item>
<el-form-item label="老型号/编码" >
<el-input v-model="dataForm.oldSpec"></el-input>
</el-form-item>
<el-form-item label="新型号/编码" >
<el-input v-model="dataForm.newSpec"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -145,19 +161,21 @@
<!-- 沟通记录 -->
<chat-history v-if="chatHistoryVisible" ref="chatHistory"></chat-history>
<task-file-list v-if="taskFileVisible" ref="taskFileList"></task-file-list>
<taskType_add ref="taskTypeAdd" v-drag></taskType_add>
</div>
</template>
<script>
import AddOrUpdate from './tasklist-add-or-update'
import ChatHistory from './chat-history.vue'
import {getTaskList, updateTask} from '@/api/taskmanage/tasklist.js'
import {getTaskList, updateTask,getTaskTypeList} from '@/api/taskmanage/tasklist.js'
import TaskFileList from './task-file-list.vue'
import taskType_add from './taskType_add.vue'
export default {
data() {
return {
height: 200,
taskTypeList:[],
dataForm: {
site: this.$store.state.user.site,
customer: '',
@ -173,6 +191,9 @@
finishStartDate: '',
finishEndDate: '',
status: '',
taskType:'',
oldSpec:'',
newSpec: '',
},
//
columnList: [
@ -446,10 +467,12 @@
components: {
AddOrUpdate,
ChatHistory,
TaskFileList
TaskFileList,
taskType_add
},
activated() {
// this.getDataList()
this.getTaskTypeList();
},
mounted() {
this.$nextTick(() => {
@ -540,6 +563,21 @@
})
})
},
taskTypeModel(){
this.taskTypeVisible=true
this.$refs.taskTypeAdd.init()
},
getTaskTypeList() {
getTaskTypeList({}).then(({data}) => {
if (data && data.code === 0) {
this.taskTypeList = data.rows
} else {
this.taskTypeList = []
}
})
},
//
fields() {
let json = "{"

Loading…
Cancel
Save