From bb98d179dd020e0b003446cb35ce422651ab8acd Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 25 九月 2023 09:40:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/wel/index.vue | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index da24de5..b97532d 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -13,7 +13,7 @@
</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,6 +86,7 @@
todoData: [],
// 浠ｅ姙娴佺▼浠诲姟option
todoOption: {
+ height:650,
addBtn: false,
header: false,
align: 'center',
@@ -187,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"]),
@@ -196,8 +201,6 @@
handleChange(val) {
window.console.log(val);
},
- //element缁勪欢鍏抽棴寮圭獥鐨勫欢杩熷洖璋冿紝杩欓噷娌℃湁鐢ㄥ叧闂脊绐楃殑鏂规硶锛屽洜涓哄綋鐢ㄦ埛鐐瑰嚮纭涔熸槸鍏抽棴寮圭獥锛屽鏋滅櫥褰曟垚鍔熷脊绐楀叧闂悗涔熸槸浼氭竻闄oken鍥炲埌鐧诲綍椤�
- //Xdelhandle鏄偣鍑籜鍙峰叧闂脊鍞�,delhandle鏄偣鍑诲彇娑堝叧闂脊绐�,鍦ㄨ繖鍒嗕簡涓や釜浜嬩欢
Xdelhandle() {
removeToken()
this.dialogFormVisible = false
@@ -267,7 +270,7 @@
})
},
cellHandle(row, column, cell, event) {
- if (column.property == 'name') {
+ if (column.property == 'taskName') {
this.gotodo(row)
}
},
--
Gitblit v1.9.3