mirror of
https://github.com/FatttSnake/Pinnacle-OA.git
synced 2026-04-05 23:11:24 +08:00
temp 2023/5/2
This commit is contained in:
GGB
@@ -4,7 +4,7 @@
|
||||
.main {
|
||||
display: flex;
|
||||
height: 100vh;
|
||||
width: 98vw;
|
||||
width: 100vw;
|
||||
min-width: 600px;
|
||||
min-height: 600px;
|
||||
text-align: center;
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
:data="taskData"
|
||||
border
|
||||
>
|
||||
<el-descriptions-item label="创建者ID">{{ taskData.publisher_id }}</el-descriptions-item>
|
||||
<el-descriptions-item label="创建者ID">{{ taskData.publisherId }}</el-descriptions-item>
|
||||
<el-descriptions-item label="创建时间">{{ taskData.createTime }}</el-descriptions-item>
|
||||
<el-descriptions-item label="结束时间">{{ taskData.deadLine }}</el-descriptions-item>
|
||||
<el-descriptions-item label="结束时间">{{ taskData.deadline }}</el-descriptions-item>
|
||||
<el-descriptions-item label="状态">
|
||||
<template #default> {{}} </template>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="负责员工" property="worker" />
|
||||
<el-descriptions-item label="工作信息">{{ taskData.taskContent }}</el-descriptions-item>
|
||||
<el-descriptions-item label="工作信息">{{ taskData.content }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</template>
|
||||
|
||||
@@ -23,12 +23,12 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
taskData: {
|
||||
publisher_id: '1',
|
||||
publisherId: '1',
|
||||
createTime: '1',
|
||||
deadLine: '1',
|
||||
taskStatus: false,
|
||||
deadline: '1',
|
||||
status: false,
|
||||
worker: '',
|
||||
taskContent: '213'
|
||||
content: '213'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,30 +6,29 @@
|
||||
multiple
|
||||
filterable
|
||||
:reserve-keyword="false"
|
||||
value-key="userID"
|
||||
value-key="username"
|
||||
placeholder="选择相对应的工作人员"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in workers"
|
||||
:key="item.userID"
|
||||
:label="item.userName"
|
||||
:key="item.userId"
|
||||
:label="item.username"
|
||||
:value="item"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="终止时间" prop="deadLine">
|
||||
<el-form-item label="终止时间" prop="deadline">
|
||||
<el-col :span="11">
|
||||
<el-date-picker
|
||||
v-model="form.deadLine"
|
||||
v-model="form.deadline"
|
||||
type="datetime"
|
||||
format="YYYY-MM-DD HH:mm"
|
||||
placeholder="请选择时间"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
<el-form-item label="工作内容" prop="taskContent">
|
||||
<el-input v-model="form.taskContent" type="textarea" />
|
||||
<el-form-item label="工作内容" prop="content">
|
||||
<el-input v-model="form.content" type="textarea" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="onSubmit(form)">创建</el-button>
|
||||
@@ -45,16 +44,16 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
form: {
|
||||
publisher_id: '',
|
||||
publisherId: '',
|
||||
createTime: '',
|
||||
deadLine: '',
|
||||
taskContent: '',
|
||||
deadline: '',
|
||||
content: '',
|
||||
worker: []
|
||||
},
|
||||
workers: [
|
||||
{
|
||||
userID: '',
|
||||
userName: ''
|
||||
userId: '',
|
||||
username: ''
|
||||
}
|
||||
],
|
||||
rules: {
|
||||
@@ -64,14 +63,14 @@ export default {
|
||||
message: '请选择相应的工作人员'
|
||||
}
|
||||
],
|
||||
deadLine: [
|
||||
deadline: [
|
||||
{
|
||||
type: 'date',
|
||||
required: true,
|
||||
message: '请输入终止日期'
|
||||
}
|
||||
],
|
||||
taskContent: [
|
||||
content: [
|
||||
{
|
||||
required: true,
|
||||
message: '请输入工作内容'
|
||||
@@ -83,10 +82,10 @@ export default {
|
||||
methods: {
|
||||
getFormData() {
|
||||
axios
|
||||
.get('http://localhost:8080/user')
|
||||
.get('http://localhost:8621/user')
|
||||
.then((response) => {
|
||||
console.log(response.data)
|
||||
this.workers = response.data
|
||||
console.log(response.data.data)
|
||||
this.workers = response.data.data
|
||||
console.log(this.workers)
|
||||
})
|
||||
.catch((reportError) => {
|
||||
@@ -96,7 +95,7 @@ export default {
|
||||
addWork(form) {
|
||||
console.log(form)
|
||||
axios
|
||||
.post('http://localhost:8080/work', form)
|
||||
.post('http://localhost:8621/work', form)
|
||||
.then((response) => {
|
||||
console.log(response.data)
|
||||
})
|
||||
@@ -108,9 +107,9 @@ export default {
|
||||
//表单校验
|
||||
this.$refs.ruleForm.validate((value) => {
|
||||
if (value) {
|
||||
form.createTime = new Date().getTime().toString()
|
||||
console.log(form)
|
||||
form.publisher_id = String(1)
|
||||
console.log(form.deadline)
|
||||
form.createTime = new Date()
|
||||
form.publisherId = String(1)
|
||||
this.addWork(form)
|
||||
this.$emit('setDialogVisible', false)
|
||||
console.log('submit!')
|
||||
|
||||
@@ -2,28 +2,30 @@
|
||||
<div class="main">
|
||||
<div class="main-table">
|
||||
<el-table :data="tableData" style="width: 100%">
|
||||
<el-table-column fixed prop="id" label="工作事项ID" width="150" />
|
||||
<el-table-column prop="publisher_id" label="发布者ID" width="120" />
|
||||
<el-table-column prop="taskContent" label="内容" width="800" />
|
||||
<el-table-column prop="content" label="内容" width="800" />
|
||||
<el-table-column prop="publisherName" label="发布者ID" width="120" />
|
||||
<el-table-column prop="worker" label="工作人员" width="200">
|
||||
<template #default="{ row }">
|
||||
<span v-for="item in row.worker" :key="item.userID">
|
||||
{{ item.userName }},
|
||||
<span v-for="item in row.worker" :key="item.userId">
|
||||
{{ item.username }},
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="deadLine" label="结束时间" width="200">
|
||||
<el-table-column prop="deadline" label="结束时间" width="200">
|
||||
<template #default="scope">
|
||||
{{ formatDate(scope.row.deadLine) }}
|
||||
{{ formatDate(scope.row.deadline) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="taskStatus" label="状态" width="150" />
|
||||
<el-table-column prop="progress" label="进度" width="250">
|
||||
<template #default>
|
||||
<el-progress :text-inside="true" :stroke-width="20" :percentage="70" />
|
||||
<el-table-column fixed="right" prop="progress" label="进度" width="200">
|
||||
<template #default="scope">
|
||||
<el-progress
|
||||
:text-inside="true"
|
||||
:stroke-width="15"
|
||||
:percentage="scope.row.progress"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column fixed="right" label="操作" width="240">
|
||||
<el-table-column fixed="right" label="操作" width="200">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" size="large" @click="handleClick"
|
||||
>编辑</el-button
|
||||
@@ -42,20 +44,20 @@
|
||||
<el-button link type="primary" size="default">删除</el-button>
|
||||
</template>
|
||||
</el-popconfirm>
|
||||
<el-popconfirm
|
||||
width="220"
|
||||
confirm-button-text="是"
|
||||
cancel-button-text="否"
|
||||
:icon="InfoFilled"
|
||||
icon-color="#00d4ff"
|
||||
title="是否确认完成？"
|
||||
@confirm="completeConfirmEvent"
|
||||
@cancel="completeCancelEvent"
|
||||
>
|
||||
<template #reference>
|
||||
<el-button link type="primary" size="default">完成</el-button>
|
||||
</template>
|
||||
</el-popconfirm>
|
||||
<!-- <el-popconfirm-->
|
||||
<!-- width="220"-->
|
||||
<!-- confirm-button-text="是"-->
|
||||
<!-- cancel-button-text="否"-->
|
||||
<!-- :icon="InfoFilled"-->
|
||||
<!-- icon-color="#00d4ff"-->
|
||||
<!-- title="是否确认完成？"-->
|
||||
<!-- @confirm="completeConfirmEvent"-->
|
||||
<!-- @cancel="completeCancelEvent"-->
|
||||
<!-- >-->
|
||||
<!-- <template #reference>-->
|
||||
<!-- <el-button link type="primary" size="default">完成</el-button>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-popconfirm>-->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -84,9 +86,9 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
formatDate(deadLine) {
|
||||
console.log(new Date(deadLine).toLocaleString())
|
||||
return new Date(deadLine).toLocaleString()
|
||||
formatDate(deadline) {
|
||||
console.log(new Date(deadline).toLocaleString())
|
||||
return new Date(deadline).toLocaleString()
|
||||
},
|
||||
handleClick() {
|
||||
console.log('click')
|
||||
@@ -107,10 +109,10 @@ export default {
|
||||
},
|
||||
getTableData() {
|
||||
axios
|
||||
.get('http://localhost:8080/work')
|
||||
.get('http://localhost:8621/work')
|
||||
.then((response) => {
|
||||
console.log(response.data)
|
||||
this.tableData = response.data
|
||||
console.log(response.data.data)
|
||||
this.tableData = response.data.data
|
||||
console.log(this.tableData)
|
||||
})
|
||||
.catch((reportError) => {
|
||||
@@ -119,9 +121,9 @@ export default {
|
||||
},
|
||||
deleteTableData(row) {
|
||||
axios
|
||||
.delete('http://localhost:8080/work/' + row.id)
|
||||
.delete('http://localhost:8621/work/' + row.id)
|
||||
.then((response) => {
|
||||
console.log(response.data)
|
||||
console.log(response.data.data)
|
||||
})
|
||||
.catch((reportError) => {
|
||||
console.log(reportError)
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
<div class="main-table">
|
||||
<el-table :data="tableData" style="width: 100%">
|
||||
<el-table-column fixed prop="id" label="工作事项ID" width="150" />
|
||||
<el-table-column prop="publisher_id" label="发布者ID" width="120" />
|
||||
<el-table-column prop="taskContent" label="内容" width="800" />
|
||||
<el-table-column prop="publisherId" label="发布者ID" width="120" />
|
||||
<el-table-column prop="content" label="内容" width="800" />
|
||||
<el-table-column prop="worker" label="工作人员" width="200">
|
||||
<template #default="{ row }">
|
||||
<span v-for="item in row.worker" :key="item.userID">
|
||||
@@ -12,9 +12,9 @@
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="deadLine" label="结束时间" width="200">
|
||||
<el-table-column prop="deadline" label="结束时间" width="200">
|
||||
<template #default="scope">
|
||||
{{ formatDate(scope.row.deadLine) }}
|
||||
{{ formatDate(scope.row.deadline) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column fixed="right" label="操作" width="240">
|
||||
@@ -52,9 +52,9 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
formatDate(deadLine) {
|
||||
console.log(new Date(deadLine).toLocaleString())
|
||||
return new Date(deadLine).toLocaleString()
|
||||
formatDate(deadline) {
|
||||
console.log(new Date(deadline).toLocaleString())
|
||||
return new Date(deadline).toLocaleString()
|
||||
},
|
||||
todoConfirmEvent(row) {
|
||||
console.log(row)
|
||||
@@ -80,7 +80,7 @@ export default {
|
||||
setTaskTodo(row) {
|
||||
var workDo = new Object()
|
||||
workDo.id = row.id
|
||||
workDo.taskStatus = false
|
||||
workDo.status = false
|
||||
axios
|
||||
.put('http://localhost:8080/work', workDo)
|
||||
.then((response) => {
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
<div class="main-table">
|
||||
<el-table :data="tableData" style="width: 100%">
|
||||
<el-table-column fixed prop="id" label="工作事项ID" width="150" />
|
||||
<el-table-column prop="publisher_id" label="发布者ID" width="120" />
|
||||
<el-table-column prop="taskContent" label="内容" width="800" />
|
||||
<el-table-column prop="publisherId" label="发布者ID" width="120" />
|
||||
<el-table-column prop="content" label="内容" width="800" />
|
||||
<el-table-column prop="worker" label="工作人员" width="200">
|
||||
<template #default="{ row }">
|
||||
<span v-for="item in row.worker" :key="item.userID">
|
||||
@@ -12,9 +12,9 @@
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="deadLine" label="结束时间" width="200">
|
||||
<el-table-column prop="deadline" label="结束时间" width="200">
|
||||
<template #default="scope">
|
||||
{{ formatDate(scope.row.deadLine) }}
|
||||
{{ formatDate(scope.row.deadline) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column fixed="right" label="操作" width="240">
|
||||
@@ -51,9 +51,9 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
formatDate(deadLine) {
|
||||
console.log(new Date(deadLine).toLocaleString())
|
||||
return new Date(deadLine).toLocaleString()
|
||||
formatDate(deadline) {
|
||||
console.log(new Date(deadline).toLocaleString())
|
||||
return new Date(deadline).toLocaleString()
|
||||
},
|
||||
completeConfirmEvent(row) {
|
||||
console.log(row)
|
||||
@@ -79,7 +79,7 @@ export default {
|
||||
setTaskComplete(row) {
|
||||
var workDo = new Object()
|
||||
workDo.id = row.id
|
||||
workDo.taskStatus = true
|
||||
workDo.status = true
|
||||
axios
|
||||
.put('http://localhost:8080/work', workDo)
|
||||
.then((response) => {
|
||||
|
||||
Reference in New Issue
Block a user