From 60c97371be338da5a707b4c6516e7a2dbe8ea2c9 Mon Sep 17 00:00:00 2001
From: wanghong <309858992@qq.com>
Date: 星期五, 05 一月 2024 18:02:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/wel/index.vue | 453 ++++++++++++++++++++++++++++----------------------------
1 files changed, 228 insertions(+), 225 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index bf872e5..cd5bbbe 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -15,41 +15,44 @@
<el-row>
<el-col :span="24">
<basic-container title="寰呭姙娴佺▼浠诲姟">
- <avue-crud ref="crud" :table-loading="loading" :data="todoData" :option="todoOption"
+ <avue-crud ref="crud" :data="todoData" :option="todoOption" :page.sync="page"
+ :table-loading="loading"
@on-load="onLoad"
- @cell-click="cellHandle"
- :page.sync="page">
+ @cell-click="cellHandle">
<template #menu="{size,row,index}">
- <el-button @click="gotodo(row,index)"
+ <el-button :size="size"
icon="el-icon-check"
type="text"
- :size="size">鎵ц</el-button>
+ @click="gotodo(row,index)">鎵ц
+ </el-button>
</template>
</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">
- <el-form-item label="鍘熷瘑鐮�" :label-width="formLabelWidth" prop="oldPassword">
+ <el-dialog :before-close="Xdelhandle" :close-on-press-escape="false" :visible.sync="dialogFormVisible"
+ append-to-body
+ title="淇敼瀵嗙爜">
+ <el-form ref="form" :model="form" :rules="rules">
+ <el-form-item :label-width="formLabelWidth" label="鍘熷瘑鐮�" prop="oldPassword">
<el-input v-model="form.oldPassword" autocomplete="off"></el-input>
</el-form-item>
- <el-form-item label="鏂板瘑鐮�" :label-width="formLabelWidth" prop="newPassword">
+ <el-form-item :label-width="formLabelWidth" label="鏂板瘑鐮�" prop="newPassword">
<el-input v-model="form.newPassword" autocomplete="off"></el-input>
</el-form-item>
- <el-form-item label="纭瀵嗙爜" :label-width="formLabelWidth" prop="newPassword1">
+ <el-form-item :label-width="formLabelWidth" label="纭瀵嗙爜" prop="newPassword1">
<el-input v-model="form.newPassword1" autocomplete="off"></el-input>
</el-form-item>
</el-form>
@@ -62,229 +65,229 @@
</template>
<script>
- import {mapGetters} from "vuex";
- import {check,updatePassword} from "@/api/system/user"
- import md5 from "js-md5";
- import {removeToken} from "@/util/auth";
- import Statistic from './Statistic.vue';
- import {validatenull} from "@/util/validate";
- import {flowCategory,flowRoute} from "@/util/flow";
- import {todoList} from "@/api/work/work";
+import {mapGetters} from "vuex";
+import {check, updatePassword} from "@/api/system/user"
+import md5 from "js-md5";
+import {removeToken} from "@/util/auth";
+import Statistic from './Statistic.vue';
+import {validatenull} from "@/util/validate";
+import {flowCategory, flowRoute} from "@/util/flow";
+import {todoList} from "@/api/work/work";
- export default {
- name: "wel",
- components: {Statistic},
- data() {
- return {
- loading: false,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0
+export default {
+ name: "wel",
+ components: {Statistic},
+ data() {
+ return {
+ loading: false,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ // 浠ｅ姙娴佺▼浠诲姟data
+ todoData: [],
+ // 浠ｅ姙娴佺▼浠诲姟option
+ todoOption: {
+ height: 500,
+ addBtn: false,
+ header: false,
+ align: 'center',
+ index: true,
+ menuWidth: 80,
+ editBtn: false,
+ delBtn: false,
+ border: true,
+ column: [{
+ label: '浠诲姟鍚嶇О',
+ 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.variables.processName + '-' + val.taskName + '</a>'
+ }
},
- // 浠ｅ姙娴佺▼浠诲姟data
- todoData: [],
- // 浠ｅ姙娴佺▼浠诲姟option
- todoOption: {
- height:500,
- addBtn: false,
- header: false,
- align: 'center',
- index: true,
- menuWidth: 80,
- editBtn: false,
- delBtn: false,
- border:true,
- column: [{
- label: '浠诲姟鍚嶇О',
- prop: 'taskName',
- sortable:true,
- headerAlign:'center',
- align:'left',
- html: true,
- width:300,
- overHidden:true,
+ {
+ label: '涓婁竴姝ュ鐞嗘椂闂�',
+ sortable: true,
+ width: 150,
+ prop: 'createTime'
+ },
+ {
+ label: '涓婁竴姝ユ搷浣滀汉',
+ sortable: true,
+ width: 120,
+ prop: 'historyActivityAssigneName'
+ },
+ {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ overHidden: true,
formatter: (val) => {
- return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.variables.processName+'-'+val.taskName + '</a>'
+ return val.variables.processDesc
}
},
- {
- label: '涓婁竴姝ュ鐞嗘椂闂�',
- sortable:true,
- width:150,
- prop: 'createTime'
- },
- {
- label: '涓婁竴姝ユ搷浣滀汉',
- sortable:true,
- width:120,
- prop: 'historyActivityAssigneName'
- },
- {
- label: '娴佺▼鎻忚堪',
- prop: 'processDesc',
- overHidden:true,
- formatter: (val) => {
- return val.variables.processDesc
- }
- },
- {
- label: '鎵�灞炴祦绋嬫ā鏉�',
- sortable:true,
- overHidden:true,
- prop: 'categoryName'
- }
- ]
- },
- noticeData: [{
- img: '/img/bg/vip1.png',
- title: '鍙茶拏澶蜂箶甯冩柉 鍏虫敞浜嗕綘',
- subtitle: '05-08 15:08',
- tag: '宸茬粡寮�濮�',
- status: 0
- }, {
- img: '/img/bg/vip2.png',
- title: '鏂拏澶锋矁鍏瑰凹浜氬厠 鍏虫敞浜嗕綘',
- subtitle: '05-08 15:08',
- tag: '鏈紑濮�',
- status: 1
- }, {
- img: '/img/bg/vip3.png',
- title: '钂傚路搴撳厠 鍏虫敞浜嗕綘',
- subtitle: '05-08 15:08',
- status: 3,
- tag: '鏈夐敊璇�'
- }, {
- img: '/img/bg/vip4.png',
- title: '姣斿皵路璐瑰皵鍗楀痉鏂� 鍏虫敞浜嗕綘',
- subtitle: '05-08 15:08',
- status: 4,
- tag: '宸插畬鎴�'
- }],
- logActiveNames: ['28'],
- userarr: [],
- userid: '',
- updataArr: [],
- dialogFormVisible: false,
- form: {
- oldPassword: '',
- newPassword: '',
- newPassword1: '',
- },
- rules: {
- oldPassword: [
- {required: true, message: '璇疯緭鍏ュ師瀵嗙爜', trigger: 'blur'}
- ],
- newPassword: [
- {required: true, message: '璇疯緭鍏ユ柊瀵嗙爜', trigger: 'blur'}
- ],
- newPassword1: [
- {required: true, message: '璇疯緭纭瀵嗙爜', trigger: 'blur'}
- ]
- },
- };
+ {
+ label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable: true,
+ overHidden: true,
+ prop: 'categoryName'
+ }
+ ]
+ },
+ noticeData: [{
+ img: '/img/bg/vip1.png',
+ title: '鍙茶拏澶蜂箶甯冩柉 鍏虫敞浜嗕綘',
+ subtitle: '05-08 15:08',
+ tag: '宸茬粡寮�濮�',
+ status: 0
+ }, {
+ img: '/img/bg/vip2.png',
+ title: '鏂拏澶锋矁鍏瑰凹浜氬厠 鍏虫敞浜嗕綘',
+ subtitle: '05-08 15:08',
+ tag: '鏈紑濮�',
+ status: 1
+ }, {
+ img: '/img/bg/vip3.png',
+ title: '钂傚路搴撳厠 鍏虫敞浜嗕綘',
+ subtitle: '05-08 15:08',
+ status: 3,
+ tag: '鏈夐敊璇�'
+ }, {
+ img: '/img/bg/vip4.png',
+ title: '姣斿皵路璐瑰皵鍗楀痉鏂� 鍏虫敞浜嗕綘',
+ subtitle: '05-08 15:08',
+ status: 4,
+ tag: '宸插畬鎴�'
+ }],
+ logActiveNames: ['28'],
+ userarr: [],
+ userid: '',
+ updataArr: [],
+ dialogFormVisible: false,
+ form: {
+ oldPassword: '',
+ newPassword: '',
+ newPassword1: '',
+ },
+ rules: {
+ oldPassword: [
+ {required: true, message: '璇疯緭鍏ュ師瀵嗙爜', trigger: 'blur'}
+ ],
+ newPassword: [
+ {required: true, message: '璇疯緭鍏ユ柊瀵嗙爜', trigger: 'blur'}
+ ],
+ newPassword1: [
+ {required: true, message: '璇疯緭纭瀵嗙爜', trigger: 'blur'}
+ ]
+ },
+ };
+ },
+ // 鎷垮埌userid璇锋眰鎺ュ彛
+ created() {
+ this.updataArr = JSON.parse(localStorage.getItem("updataid"))
+ this.userid = this.$store.state.user.upadatastatus.user_id
+ const pageFlag = localStorage.getItem("pageFlag")
+ if (pageFlag === null) {
+ this.checkhandle()
+ localStorage.setItem("pageFlag", true)
+ }
+ },
+ computed: {
+ ...mapGetters(["userInfo", "flowRoutes"]),
+ },
+ methods: {
+ handleChange(val) {
+ window.console.log(val);
},
- // 鎷垮埌userid璇锋眰鎺ュ彛
- created() {
- this.updataArr = JSON.parse(localStorage.getItem("updataid"))
- this.userid = this.$store.state.user.upadatastatus.user_id
- const pageFlag = localStorage.getItem("pageFlag")
- if (pageFlag === null) {
+ Xdelhandle() {
+ removeToken()
+ this.dialogFormVisible = false
+ },
+ // 鍏抽棴寮圭獥鍚庢竻闄oken杩斿洖鍒扮櫥褰曢〉闈�
+ delhandle() {
+ removeToken()
+ this.dialogFormVisible = false
+ },
+ // 淇敼瀵嗙爜鏂规硶
+ addok() {
+ this.dialogFormVisible = false
+ updatePassword(md5(this.form.oldPassword), this.form.newPassword, this.form.newPassword1).then(res => {
+ if (res.data.code == 200) {
+ this.$message({
+ type: "success",
+ message: "淇敼鎴愬姛锛�"
+ })
+ }
+ }).catch(res => {
+ console.log(res)
this.checkhandle()
- localStorage.setItem("pageFlag", true)
- }
+ })
},
- computed: {
- ...mapGetters(["userInfo", "flowRoutes"]),
- },
- methods: {
- handleChange(val) {
- window.console.log(val);
- },
- Xdelhandle() {
- removeToken()
- this.dialogFormVisible = false
- },
- // 鍏抽棴寮圭獥鍚庢竻闄oken杩斿洖鍒扮櫥褰曢〉闈�
- delhandle() {
- removeToken()
- this.dialogFormVisible = false
- },
- // 淇敼瀵嗙爜鏂规硶
- addok() {
- this.dialogFormVisible = false
- updatePassword(md5(this.form.oldPassword), this.form.newPassword, this.form.newPassword1).then(res => {
- if (res.data.code == 200) {
+ // 鎻愰啋鏃堕棿璇锋眰锛屼篃闇�瑕佸垽鏂槸鍚︿负瓒呯韬唤锛岃秴绠¤韩浠戒笉鍒ゆ柇
+ checkhandle() {
+ if (this.updataArr.user_id != '0' && this.updataArr.tenant_id !== '000000') {
+ check(this.userid).then(res => {
+ if (res.data.data > 0) {
this.$message({
- type: "success",
- message: "淇敼鎴愬姛锛�"
+ type: 'warning',
+ message: `浣犺繕鏈�${res.data.data}澶╁氨瑕佷慨鏀瑰瘑鐮佷簡`
})
+ } else if (res.data.data == -1) {
+ this.$message({
+ type: "warning",
+ message: "瀵嗙爜绛栫暐宸茶淇敼锛岃閲嶆柊淇敼瀵嗙爜锛�"
+ })
+ setTimeout(() => {
+ this.dialogFormVisible = true
+ }, 1500)
+ } else if (res.data.data == 0) {
+ // this.$message({
+ // type: 'success',
+ // message: "鎿嶄綔鎴愬姛"
+ // })
}
}).catch(res => {
console.log(res)
- this.checkhandle()
})
- },
- // 鎻愰啋鏃堕棿璇锋眰锛屼篃闇�瑕佸垽鏂槸鍚︿负瓒呯韬唤锛岃秴绠¤韩浠戒笉鍒ゆ柇
- checkhandle() {
- if (this.updataArr.user_id != '0' && this.updataArr.tenant_id !== '000000') {
- check(this.userid).then(res => {
- if (res.data.data > 0) {
- this.$message({
- type: 'warning',
- message: `浣犺繕鏈�${res.data.data}澶╁氨瑕佷慨鏀瑰瘑鐮佷簡`
- })
- } else if (res.data.data == -1) {
- this.$message({
- type: "warning",
- message: "瀵嗙爜绛栫暐宸茶淇敼锛岃閲嶆柊淇敼瀵嗙爜锛�"
- })
- setTimeout(() => {
- this.dialogFormVisible = true
- }, 1500)
- } else if (res.data.data == 0) {
- // this.$message({
- // type: 'success',
- // message: "鎿嶄綔鎴愬姛"
- // })
- }
- }).catch(res => {
- console.log(res)
- })
- }
- },
- onLoad(page, params = {}) {
- this.loading = true;
- const query = {
- ...this.query,
- category: (params.category) ? flowCategory(params.category) : null
- };
- todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.todoData = data.records;
- this.loading = false;
- }).catch(error => {
- this.$message.error(error);
- this.loading = false;
- })
- },
- cellHandle(row, column, cell, event) {
- if (column.property == 'taskName') {
- this.gotodo(row)
- }
- },
- gotodo(row, index) {
- this.$router.push({ path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}` });
}
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ const query = {
+ ...this.query,
+ category: (params.category) ? flowCategory(params.category) : null
+ };
+ todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.todoData = data.records;
+ this.loading = false;
+ }).catch(error => {
+ this.$message.error(error);
+ this.loading = false;
+ })
+ },
+ cellHandle(row, column, cell, event) {
+ if (column.property == 'taskName') {
+ this.gotodo(row)
+ }
+ },
+ gotodo(row, index) {
+ this.$router.push({path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}`});
}
- };
+ }
+};
</script>
<style>
- .el-font-size {
- font-size: 14px;
- }
+.el-font-size {
+ font-size: 14px;
+}
</style>
--
Gitblit v1.9.3