From 421ee711aa469f00eaff610cfa85ad1d4b755688 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 19 十月 2023 08:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/wel/index.vue | 75 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index 863ede5..bf872e5 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -7,13 +7,13 @@
</el-row>
<el-row>
<el-col :span="24">
- <basic-container title="寰呭姙浜嬮」">
+ <basic-container title="涓绘暟鎹粺璁�">
<Statistic></Statistic>
</basic-container>
</el-col>
</el-row>
<el-row>
- <el-col :span="16">
+ <el-col :span="24">
<basic-container title="寰呭姙娴佺▼浠诲姟">
<avue-crud ref="crud" :table-loading="loading" :data="todoData" :option="todoOption"
@on-load="onLoad"
@@ -28,18 +28,18 @@
</avue-crud>
</basic-container>
</el-col>
- <el-col :span="8">
- <el-row>
- <basic-container title="娑堟伅鍒楄〃">
- <el-collapse v-model="logActiveNames" @change="handleChange">
- <el-collapse-item v-for="item in noticeData" :title="item.title" :name="item.id">
- <div>{{item.subtitle}}</div>
- </el-collapse-item>
- </el-collapse>
- </basic-container>
- </el-row>
+<!-- <el-col :span="8">-->
+<!-- <el-row>-->
+<!-- <basic-container title="娑堟伅鍒楄〃">-->
+<!-- <el-collapse v-model="logActiveNames" @change="handleChange">-->
+<!-- <el-collapse-item v-for="item in noticeData" :title="item.title" :name="item.id">-->
+<!-- <div>{{item.subtitle}}</div>-->
+<!-- </el-collapse-item>-->
+<!-- </el-collapse>-->
+<!-- </basic-container>-->
+<!-- </el-row>-->
- </el-col>
+<!-- </el-col>-->
</el-row>
<el-dialog title="淇敼瀵嗙爜" :visible.sync="dialogFormVisible" append-to-body :close-on-press-escape="false" :before-close="Xdelhandle">
<el-form :model="form" :rules="rules" ref="form">
@@ -86,35 +86,52 @@
todoData: [],
// 浠ｅ姙娴佺▼浠诲姟option
todoOption: {
+ height:500,
addBtn: false,
header: false,
align: 'center',
index: true,
- menuWidth: 100,
+ menuWidth: 80,
editBtn: false,
delBtn: false,
+ border:true,
column: [{
label: '浠诲姟鍚嶇О',
- prop: 'name',
+ prop: 'taskName',
+ sortable:true,
+ headerAlign:'center',
+ align:'left',
html: true,
+ width:300,
+ overHidden:true,
formatter: (val) => {
- return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.taskName + '</a>'
+ return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.variables.processName+'-'+val.taskName + '</a>'
}
},
{
label: '涓婁竴姝ュ鐞嗘椂闂�',
+ sortable:true,
+ width:150,
prop: 'createTime'
},
{
- label: '鎻忚堪',
- prop: 'description'
+ label: '涓婁竴姝ユ搷浣滀汉',
+ sortable:true,
+ width:120,
+ prop: 'historyActivityAssigneName'
},
{
- label: '涓婁竴姝ユ搷浣滀汉',
- prop: 'creator_name'
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ overHidden:true,
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
},
{
label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable:true,
+ overHidden:true,
prop: 'categoryName'
}
]
@@ -171,7 +188,11 @@
created() {
this.updataArr = JSON.parse(localStorage.getItem("updataid"))
this.userid = this.$store.state.user.upadatastatus.user_id
- this.checkhandle()
+ const pageFlag = localStorage.getItem("pageFlag")
+ if (pageFlag === null) {
+ this.checkhandle()
+ localStorage.setItem("pageFlag", true)
+ }
},
computed: {
...mapGetters(["userInfo", "flowRoutes"]),
@@ -180,8 +201,6 @@
handleChange(val) {
window.console.log(val);
},
- //element缁勪欢鍏抽棴寮圭獥鐨勫欢杩熷洖璋冿紝杩欓噷娌℃湁鐢ㄥ叧闂脊绐楃殑鏂规硶锛屽洜涓哄綋鐢ㄦ埛鐐瑰嚮纭涔熸槸鍏抽棴寮圭獥锛屽鏋滅櫥褰曟垚鍔熷脊绐楀叧闂悗涔熸槸浼氭竻闄oken鍥炲埌鐧诲綍椤�
- //Xdelhandle鏄偣鍑籜鍙峰叧闂脊鍞�,delhandle鏄偣鍑诲彇娑堝叧闂脊绐�,鍦ㄨ繖鍒嗕簡涓や釜浜嬩欢
Xdelhandle() {
removeToken()
this.dialogFormVisible = false
@@ -224,10 +243,10 @@
this.dialogFormVisible = true
}, 1500)
} else if (res.data.data == 0) {
- this.$message({
- type: 'success',
- message: "鎿嶄綔鎴愬姛"
- })
+ // this.$message({
+ // type: 'success',
+ // message: "鎿嶄綔鎴愬姛"
+ // })
}
}).catch(res => {
console.log(res)
@@ -251,7 +270,7 @@
})
},
cellHandle(row, column, cell, event) {
- if (column.property == 'name') {
+ if (column.property == 'taskName') {
this.gotodo(row)
}
},
--
Gitblit v1.9.3