From a4e0b8f640d739b17724b2e648196741b42631b8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 十二月 2023 14:40:10 +0800
Subject: [PATCH] 流程管理更改状态
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 11 ++++-
Source/UBCS-WEB/src/views/flow/manager.vue | 20 +++++-----
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 36 ++++++-----------
Source/UBCS-WEB/src/components/file/main.vue | 2
Source/UBCS-WEB/src/views/MasterData/items.vue | 2
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 4 +
6 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 1cb14bf..9f9a378 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -3,7 +3,9 @@
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
:option="Treeoption" style="width: fit-content;" @node-click="nodeClick">
<template slot-scope="{ node }">
- <span id="labelSize" v-html="node.label" ></span>
+ <el-tooltip class="item" effect="dark" open-delay="350" :content="$createElement('div', { domProps: { innerHTML: node.label } })" placement="right-start">
+ <span id="labelSize" v-html="node.label" ></span>
+ </el-tooltip>
</template>
</avue-tree>
<div style="position: absolute; right: 3px; top: -1px;">
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 01e02df..a30dac6 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -77,17 +77,6 @@
:width="item.width"
align="center">
</el-table-column>
- <!-- 鍙傜収鏁版嵁-->
-<!-- <el-table-column v-for="(item,index) in referArray"-->
-<!-- v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"-->
-<!-- :key="index"-->
-<!-- :label="item.title" :show-overflow-tooltip="true"-->
-<!-- :sortable="item.sortable" :width="item.width" align="center"-->
-<!-- :prop="item.prop">-->
-<!-- <template slot-scope="scope">-->
-<!-- <span>{{ scope.row[item.showField] }}</span>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
</el-table>
</div>
</el-row>
@@ -342,7 +331,7 @@
datetime: "datetime",
},
tableData: [],
- tableHeight: 'calc(100vh - 350px)',
+ tableHeight: 'calc(100vh - 300px)',
DataVisible: false,
tableHeadData: [],
items: {},
@@ -356,15 +345,7 @@
},
// 涓绘暟鎹寜閽�
masterVrBtnList: [],
- fileOptions: {
- ownbizOid: "0",
- ownbizBtm: "0",
- fileDocClassify: '!=processAuditSuggest',
- fileDocClassifyName: '',
- hasDownload: true,
- hasUpload: true,
- height: 110
- },
+ fileOptions:{},
result: '',
elapsedTime: '',
};
@@ -416,6 +397,15 @@
this.tableData = newval;
this.searchResults = newval
this.doLayout();
+ this.fileOptions= {
+ ownbizOid: "0",
+ ownbizBtm: "0",
+ fileDocClassify: '!=processAuditSuggest',
+ fileDocClassifyName: '',
+ hasDownload: true,
+ hasUpload: true,
+ height: 'auto'
+ }
},
},
tableHeadFindData: {
@@ -523,7 +513,7 @@
this.tableHeight = 'calc(100vh - 630px)';
this.$refs.dataTable.doLayout()
} else {
- this.tableHeight = 'calc(100vh - 350px)';
+ this.tableHeight = 'calc(100vh - 310px)';
this.$refs.dataTable.doLayout()
}
},
@@ -1139,7 +1129,7 @@
.top {
overflow-y: scroll;
- min-height: 55%;
+ min-height: 40%;
}
.bottom {
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index e576ea9..eb130ce 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -2069,16 +2069,23 @@
const regex = new RegExp(this.rulesData.ruleRowBds);
if (regex.test(this.RulesForm.TestContent)) {
this.$message.success('鏍￠獙鎴愬姛')
+ }else {
+ this.$message.error('鏍￠獙澶辫触')
}
},
//鐐瑰嚮鍒嗙被娉ㄥ叆鎸夐挳
injectBtn() {
if (this.attrSelectList.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉挎暟鎹�')
- } else if (this.attrSelectList.length < 1) {
+ return;
+ }
+ if (this.attrSelectList.length < 1) {
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉挎暟鎹�')
- } else if (this.attrSelectList.length === 1) {
+ return;;
+ }
+ if (this.attrSelectList.length === 1) {
this.injectVisible = true;
+ return;
}
},
//鍒嗙被娉ㄥ叆淇濆瓨
diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index 8444c92..fd673bf 100644
--- a/Source/UBCS-WEB/src/components/file/main.vue
+++ b/Source/UBCS-WEB/src/components/file/main.vue
@@ -88,7 +88,7 @@
hasDel:validatenull(this.options.hasDel) ? true :this.options.hasDel,
hasDownload:validatenull(this.options.hasDownload) ? true :this.options.hasDownload,
option: {
- height:(this.options.tableHeight?this.options.tableHeight:'400'),
+ height:(this.options.tableHeight?this.options.tableHeight:'300'),
calcHeight: 30,
tip: false,
searchShow: false,
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index f095049..2ee09cf 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -55,7 +55,7 @@
page: {
total: 0,
currentPage: 1,
- pageSize: 100,
+ pageSize: 10,
pageSizes: [10, 30, 50, 100, 200],
},
pageSize: "100",
diff --git a/Source/UBCS-WEB/src/views/flow/manager.vue b/Source/UBCS-WEB/src/views/flow/manager.vue
index de3a9e9..e228670 100644
--- a/Source/UBCS-WEB/src/views/flow/manager.vue
+++ b/Source/UBCS-WEB/src/views/flow/manager.vue
@@ -26,7 +26,7 @@
size="small"
icon="el-icon-refresh"
v-if="permissionList.state"
- @click.stop="handleState(scope.row,scope.index)">鍙樻洿鐘舵��
+ @click.stop="handleDoState(scope.row,scope.index)">{{scope.row.suspensionState===1?'婵�娲�':'鎸傝捣'}}
</el-button>
<el-button type="text"
size="small"
@@ -292,15 +292,15 @@
this.stateBox = true;
this.selectionId = row.id;
},
- handleDoState() {
- if (!this.flowState) {
- this.$message({
- type: "warn",
- message: "璇峰厛閫夋嫨娴佺▼鐘舵��!"
- });
- return;
- }
- changeState({processId: this.selectionId, state: this.flowState}).then(res => {
+ handleDoState(row) {
+ // if (!this.flowState) {
+ // this.$message({
+ // type: "warn",
+ // message: "璇峰厛閫夋嫨娴佺▼鐘舵��!"
+ // });
+ // return;
+ // }
+ changeState({processId: row.id, state: (row.suspensionState === 1 ? 'suspend' : 'active')}).then(res => {
const data = res.data;
if (data.success) {
this.$message({
--
Gitblit v1.9.3