commit:同步2.2版本

This commit is contained in:
Jerry
2022-01-23 21:00:54 +08:00
parent ff7e52eedb
commit 35ac62e4d2
1201 changed files with 16301 additions and 161770 deletions

View File

@@ -0,0 +1,76 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formModifyPassword" class="full-width-input" style="width: 100%;"
label-width="80px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="用户头像">
<el-upload
class="upload-image-item" name="uploadFile" :headers="getUploadHeaders"
:action="headImageUploadUrl"
:show-file-list="false" accept=".jpg,.png,.jpeg"
:on-success="onHeadImageUploadSuccess"
:on-error="onUploadError" :on-exceed="onUploadLimit"
>
<img v-if="getHeadImageUrl()" class="upload-image-show" :src="getHeadImageUrl()">
<i v-else class="el-icon-plus upload-image-item" />
</el-upload>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</template>
<script>
import { mapGetters, mapMutations } from 'vuex';
import { SystemController } from '@/api';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin } from '@/core/mixins';
export default {
name: 'formModifyHeadImage',
mixins: [uploadMixin, statsDateRangeMixin],
data () {
return {
}
},
methods: {
/**
* 课程图片上传成功
*/
onHeadImageUploadSuccess (response, file, fileList) {
console.log(response, file);
if (response.success) {
this.setHeadImage(response.data);
} else {
this.$message.error(response.message);
}
},
onUploadError (e, file, fileList) {
this.$message.error('文件上传失败');
},
onUploadLimit (files, fileList) {
this.$message.error('已经超出最大上传个数限制');
},
getHeadImageUrl () {
if (this.getUserInfo && this.getUserInfo.headImageUrl != null && this.getUserInfo.headImageUrl !== '') {
let temp = this.getUploadFileUrl(this.getUserInfo.headImageUrl, { filename: this.getUserInfo.headImageUrl.filename });
return temp;
} else {
return null;
}
},
...mapMutations(['setHeadImage'])
},
computed: {
headImageUploadUrl () {
return this.getUploadActionUrl(SystemController.changeHeadImageUrl());
},
...mapGetters(['getUserInfo'])
}
}
</script>
<style>
</style>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formModifyPassword" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="120px" size="mini" label-position="right" @submit.native.prevent>
label-width="120px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="旧密码" prop="oldPassword">
@@ -26,11 +26,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" @click="onSave()">
<el-button type="primary" :size="defaultFormItemSize" @click="onSave()">
保存
</el-button>
</el-row>

View File

@@ -12,34 +12,36 @@
</el-menu>
</div>
<div class="header-menu" style="flex-grow: 1;">
<el-popover class="message" style="margin-right: 20px;" width="300" placement="bottom-end" :offset="20" popper-class="message-popover">
<el-badge slot="reference" is-dot :hidden="(getMessageList || {}).dataList == null || (getMessageList || {}).dataList.length <= 0"
<el-dropdown trigger="click" style="margin-right: 10px;" @command="handleMessage">
<el-badge is-dot :hidden="(getMessageCount || {}).totalCount == null || (getMessageCount || {}).totalCount <= 0"
style="height: 180x; line-height: 18px; cursor: pointer;">
<i class="el-icon-bell" style="font-size: 18px;" />
</el-badge>
<el-table :data="(getMessageList || {}).dataList" size="mini" empty-text="暂无消息" :show-header="false">
<el-table-column label="流程名称" prop="processDefinitionName" />
<el-table-column width="80px">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="onSubmit(scope.row)">办理</el-button>
</template>
</el-table-column>
</el-table>
<el-button v-if="getMessageList && (getMessageList.dataList || []).length < getMessageList.totalCount"
size="small" type="text" style="width: 100%;"
@click="onMoreMessageClick">
查看更多
</el-button>
</el-popover>
<el-dropdown-menu slot="dropdown" style="min-width: 130px;">
<el-dropdown-item class="user-dropdown-item" command="remindingMessage">
催办消息
<el-badge :value="(getMessageCount || {}).remindingMessageCount"
:hidden="(getMessageCount || {}).remindingMessageCount == null || (getMessageCount || {}).remindingMessageCount <= 0"
/>
</el-dropdown-item>
<el-dropdown-item class="user-dropdown-item" command="copyMessage">
抄送消息
<el-badge :value="(getMessageCount || {}).copyMessageCount"
:hidden="(getMessageCount || {}).copyMessageCount == null || (getMessageCount || {}).copyMessageCount <= 0"
/>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-dropdown class="user-dropdown" trigger="click" @command="handleCommand">
<span class="el-dropdown-link">{{(getUserInfo || {}).showName}}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item class="user-dropdown-item" command="modifyPassword">修改密码</el-dropdown-item>
<el-dropdown-item class="user-dropdown-item" command="modifyHeadImage">修改头像</el-dropdown-item>
<el-dropdown-item class="user-dropdown-item" command="logout">退出登录</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<img :src="header" class="header-img" />
<img :src="getHeadImageUrl ? getHeadImageUrl : header" class="header-img" />
</div>
</el-header>
<el-main :style="{'padding-bottom': '15px', 'padding-top': (getMultiTags ? '0px' : '15px')}">
@@ -60,11 +62,13 @@
import '@/staticDict/onlineStaticDict.js';
import SideBar from './components/sidebar/sidebar.vue';
import { mapGetters, mapMutations, mapActions } from 'vuex';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin } from '@/core/mixins';
import Breadcrumb from './components/breadcrumb';
import TagPanel from './components/tags/tagPanel.vue';
import formModifyPassword from './components/formModifyPassword/index.vue';
import formModifyHeadImage from './components/formModifyHeadImage/index.vue';
import { SystemController } from '@/api';
import { FlowOperationController } from '@/api/flowController.js';
import { getToken, setToken } from '@/utils';
export default {
@@ -78,6 +82,7 @@ export default {
'breadcrumb': Breadcrumb,
'tag-panel': TagPanel
},
mixins: [uploadMixin, statsDateRangeMixin],
methods: {
toggleSideBar () {
this.setCollapse(!this.getCollapse);
@@ -125,47 +130,22 @@ export default {
this.$dialog.show('修改密码', formModifyPassword, {
area: ['500px']
}, {}).catch(e => {});
} else if (command === 'modifyHeadImage') {
this.$dialog.show('修改头像', formModifyHeadImage, {
area: ['500px']
}, {}).catch(e => {});
}
},
// 办理催办任务
onSubmit (row) {
console.log(row);
let params = {
processInstanceId: row.processInstanceId,
processDefinitionId: row.processDefinitionId,
taskId: row.taskId
}
FlowOperationController.viewRuntimeTaskInfo(this, params).then(res => {
if (res.data) {
this.$router.push({
name: res.data.routerName || 'handlerFlowTask',
query: {
isRuntime: true,
taskId: row.taskId,
processDefinitionKey: row.processDefinitionKey,
processInstanceId: row.processInstanceId,
processDefinitionId: row.processDefinitionId,
formId: res.data.formId,
routerName: res.data.routerName,
readOnly: res.data.readOnly,
taskName: row.taskName,
flowEntryName: row.processDefinitionName,
processInstanceInitiator: row.processInstanceInitiator,
// 过滤掉加签和撤销操作,只有在已完成任务里可以操作
operationList: (res.data.operationList || []).filter(item => {
return item.type !== this.SysFlowTaskOperationType.CO_SIGN && item.type !== this.SysFlowTaskOperationType.REVOKE;
}),
variableList: res.data.variableList
}
});
}
}).catch(e => {});
handleMessage (type) {
this.onMoreMessageClick(type);
},
// 更多催办消息
onMoreMessageClick () {
onMoreMessageClick (type) {
this.$router.push({
name: 'formMessage'
name: 'formMessage',
query: {
type: type
}
});
},
...mapMutations([
@@ -199,6 +179,14 @@ export default {
{'min-height': this.getMainContextHeight + 'px'}
]
},
getHeadImageUrl () {
if (this.getUserInfo && this.getUserInfo.headImageUrl != null && this.getUserInfo.headImageUrl !== '') {
let temp = this.getUploadFileUrl(this.getUserInfo.headImageUrl, { filename: this.getUserInfo.headImageUrl.filename });
return temp;
} else {
return null;
}
},
...mapGetters([
'getMultiTags',
'getClientHeight',
@@ -210,7 +198,7 @@ export default {
'getCurrentColumnId',
'getColumnList',
'getMenuItem',
'getMessageList',
'getMessageCount',
'getMainContextHeight'
])
},

View File

@@ -24,6 +24,13 @@
</el-form>
</div>
</div>
<Verify
ref="verify"
@success="onVerifySuccess"
:mode="'pop'"
captchaType="blockPuzzle"
:imgSize="{ width: '330px', height: '155px' }"
/>
</div>
</template>
@@ -32,8 +39,12 @@ import { SystemController } from '@/api';
import { mapMutations } from 'vuex';
import projectConfig from '@/core/config';
import { encrypt, setToken } from '@/utils';
import Verify from '@/components/Verifition/Verify.vue';
export default {
components: {
Verify
},
data () {
return {
bkImg: require('@/assets/img/login.png'),
@@ -57,23 +68,30 @@ export default {
dataFormSubmit () {
this.$refs['dataForm'].validate(valid => {
if (valid) {
let params = {
loginName: this.dataForm.mobilePhone,
password: encrypt(this.dataForm.password)
};
SystemController.login(this, params, null, {showMask: false}).then(data => {
this.setMenuList(data.data.menuList);
delete data.data.menuList;
this.setUserInfo(data.data);
setToken(data.data.tokenData);
this.setCurrentMenuId(null);
this.$router.replace({ name: 'main' });
}).catch(e => {});
this.$refs.verify.show();
}
});
},
login (verifyParams) {
let params = {
loginName: this.dataForm.mobilePhone,
password: encrypt(this.dataForm.password),
captchaVerification: (verifyParams || {}).captchaVerification
};
SystemController.login(this, params, null, {showMask: false}).then(data => {
this.setMenuList(data.data.menuList);
delete data.data.menuList;
this.setUserInfo(data.data);
setToken(data.data.tokenData);
this.setCurrentMenuId(null);
this.$router.replace({ name: 'main' });
}).catch(e => {});
},
onVerifySuccess (verifyParams) {
this.login(verifyParams);
},
...mapMutations(['setUserInfo', 'setMenuList', 'setCurrentMenuId'])
},
mounted () {

View File

@@ -1,5 +1,5 @@
<template>
<el-form-item :label="widgetConfig.showName + ''" :prop="widgetConfig.variableName">
<el-form-item :label="widgetConfig.showName + ''" :prop="'formFilter.' + widgetConfig.column.columnName">
<el-input v-if="widgetConfig.widgetType === SysCustomWidgetType.Input"
class="filter-item" clearable
:type="widgetConfig.type"

View File

@@ -7,7 +7,7 @@
{{widgetConfig.showName}}
</div>
<div>
<el-button size="mini"
<el-button :size="defaultFormItemSize"
v-for="operation in getTableOperation(false)" :key="operation.id"
:plain="operation.plain"
:type="operation.btnType"
@@ -18,7 +18,7 @@
</el-row>
</el-col>
<el-col :span="24">
<el-table size="mini" header-cell-class-name="table-header-gray" ref="tableImpl"
<el-table :size="defaultFormItemSize" header-cell-class-name="table-header-gray" ref="tableImpl"
:style="{height: (widgetConfig.tableInfo.height != null && widgetConfig.tableInfo.height !== '') ? widgetConfig.tableInfo.height + 'px' : undefined}"
:height="(widgetConfig.tableInfo.height != null && widgetConfig.tableInfo.height !== '') ? widgetConfig.tableInfo.height + 'px' : undefined"
:data="tableWidget.dataList" :row-key="primaryColumnName"
@@ -32,7 +32,7 @@
:sortable="tableColumn.sortable ? 'custom' : false"
>
<template slot-scope="scope">
<el-tag size="mini" :type="scope.row[tableColumn.dataFieldName] ? 'success' : 'danger'">
<el-tag :size="defaultFormItemSize" :type="scope.row[tableColumn.dataFieldName] ? 'success' : 'danger'">
{{scope.row[tableColumn.dataFieldName] ? '是' : '否'}}
</el-tag>
</template>
@@ -84,7 +84,7 @@
</template>
</el-table-column>
</template>
<el-table-column v-if="formType === SysOnlineFormType.WORK_ORDER" label="当前任务" prop="(runtimeTaskInfo || {}).taskName" />
<el-table-column v-if="formType === SysOnlineFormType.WORK_ORDER" label="当前任务" prop="runtimeTaskInfo.taskName" />
<el-table-column v-if="formType === SysOnlineFormType.WORK_ORDER" label="流程创建时间" width="180px" prop="createTime" />
<el-table-column v-if="formType === SysOnlineFormType.WORK_ORDER" label="流程状态" width="100px" prop="flowStatus" />
<el-table-column
@@ -94,27 +94,27 @@
<template slot-scope="scope">
<el-button v-for="operation in getTableOperation(true)" :key="operation.id"
:class="operation.btnClass"
type="text" size="mini"
type="text" :size="defaultFormItemSize"
@click.stop="onOperationClick(operation, scope.row)"
>
{{operation.name}}
</el-button>
<el-button type="text" size="mini"
<el-button type="text" :size="defaultFormItemSize"
v-if="formType === SysOnlineFormType.WORK_ORDER && (scope.row.initTaskInfo || {}).taskKey !== (scope.row.runtimeTaskInfo || {}).taskKey"
@click.stop="onViewWorkOrder(scope.row)">
详情
</el-button>
<el-button type="text" size="mini"
<el-button type="text" :size="defaultFormItemSize"
v-if="formType === SysOnlineFormType.WORK_ORDER && (scope.row.initTaskInfo || {}).taskKey === (scope.row.runtimeTaskInfo || {}).taskKey"
@click.stop="onHandlerWorkOrder(scope.row)">
办理
</el-button>
<el-button type="text" size="mini"
<el-button type="text" :size="defaultFormItemSize"
v-if="formType === SysOnlineFormType.WORK_ORDER"
@click.stop="onHandlerRemindClick(scope.row)">
催办
</el-button>
<el-button type="text" size="mini" class="table-btn error"
<el-button type="text" :size="defaultFormItemSize" class="table-btn error"
v-if="formType === SysOnlineFormType.WORK_ORDER"
@click.stop="onCancelWorkOrder(scope.row)">
撤销

View File

@@ -31,7 +31,7 @@
</template>
<!-- 上传文件 -->
<template v-else-if="!widgetConfig.isImage">
<el-button size="mini" type="primary">点击上传</el-button>
<el-button :size="defaultFormItemSize" type="primary">点击上传</el-button>
</template>
</el-upload>
<template v-else>

View File

@@ -12,7 +12,8 @@
>
{{value}}
</span>
<span v-else-if="widgetConfig.widgetType === SysCustomWidgetType.Select">{{getDictValue(value)}}</span>
<span v-else-if="widgetConfig.widgetType === SysCustomWidgetType.Select">{{dropdownShowName}}</span>
<span v-else-if="widgetConfig.widgetType === SysCustomWidgetType.Cascader">{{dropdownShowName}}</span>
<div v-else-if="widgetConfig.widgetType === SysCustomWidgetType.RichEditor" v-html="value" />
<span v-else-if="widgetConfig.widgetType === SysCustomWidgetType.Switch">{{value ? '是' : '否'}}</span>
</el-form-item>
@@ -107,7 +108,7 @@
<script>
import { DropdownWidget } from '@/utils/widget.js';
import { getDictDataList } from '../utils';
import { findItemFromList, findTreeNodePath } from '@/utils';
import { findItemFromList, findTreeNodePath, findTreeNodeObjectPath } from '@/utils';
import CustomText from './customText.vue';
import CustomImage from './customImage.vue';
@@ -213,12 +214,39 @@ export default {
getDictValue (id) {
if (this.dropdownWidget && Array.isArray(this.dropdownWidget.dropdownList)) {
return (findItemFromList(this.dropdownWidget.dropdownList, id, 'id') || {}).name;
} else {
return '';
}
return id;
},
getTreeDictValue (id) {
console.log(this.dropdownWidget.dropdownList);
if (this.dropdownWidget && Array.isArray(this.dropdownWidget.dropdownList)) {
let nodePath = findTreeNodeObjectPath(this.dropdownWidget.dropdownList, id, 'id');
console.log(nodePath);
if (Array.isArray(nodePath)) {
return nodePath.map(item => item.name).join(' / ');
}
}
return id;
}
},
computed: {
dropdownShowName () {
console.log((this.dropdownWidget || {}).dropdownList, this.value);
if (this.dropdownWidget && Array.isArray(this.dropdownWidget.dropdownList)) {
if (this.widgetConfig.widgetType === this.SysCustomWidgetType.Select) {
return this.getDictValue(this.value);
} else if (this.widgetConfig.widgetType === this.SysCustomWidgetType.Cascader) {
return this.getTreeDictValue(this.value);
}
}
return this.value;
}
},
mounted () {
this.onVisibleChange();
}
}
</script>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="form" :model="formData" class="full-width-input" :rules="rules"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row>
<el-col :span="24">
<el-form-item label="参数名称">
@@ -47,11 +47,11 @@
</el-col>
<el-col :span="24" style="margin-top: 15px;">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
@click="onSubmit()">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="form" :model="formData" class="full-width-input" :rules="rules"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row>
<el-col :span="24">
<el-form-item label="表单参数" prop="objectFieldName">
@@ -14,11 +14,11 @@
</el-col>
<el-col :span="24" style="margin-top: 15px;">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
@click="onSubmit()">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="form" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="120px" size="mini" label-position="right" @submit.native.prevent>
label-width="120px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="过滤数据表" prop="tableId">
@@ -14,7 +14,7 @@
<span>{{table.tableName}}</span>
<el-tag
:type="table.relationType == null ? 'success' : 'parimary'"
style="margin-left: 30px;" size="mini" effect="dark" >
style="margin-left: 30px;" :size="defaultFormItemSize" effect="dark" >
{{(table.relationType == null || index === 0) ? '主表' : '一对一关联'}}
</el-tag>
</el-row>
@@ -72,11 +72,11 @@
</el-col>
<el-col :span="24" style="margin-top: 15px;">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
@click="onSubmit()">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="form" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row>
<el-col :span="24">
<el-form-item label="字段数据表" prop="tableId">
@@ -14,7 +14,7 @@
<span>{{table.tableName}}</span>
<el-tag
:type="table.relationType == null ? 'success' : 'parimary'"
style="margin-left: 30px;" size="mini" effect="dark" >
style="margin-left: 30px;" :size="defaultFormItemSize" effect="dark" >
{{(table.relationType == null || index === 0) ? '主表' : '一对一关联'}}
</el-tag>
</el-row>
@@ -56,11 +56,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
@click="onSubmit()">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="form" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row>
<el-col :span="24">
<el-form-item label="操作名称" prop="name">
@@ -44,11 +44,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
@click="onSubmit()">
保存
</el-button>

View File

@@ -24,7 +24,7 @@
<span :title="table.tag.datasourceName || table.tag.relationName">
{{table.tag.datasourceName || table.tag.relationName}}
</span>
<el-tag v-if="getMasterTable !== table" size="mini" style="margin-left: 5px;" effect="dark" :type="getTableTagType(table.relationType)">{{getTableRelationName(table.relationType)}}</el-tag>
<el-tag v-if="getMasterTable !== table" :size="defaultFormItemSize" style="margin-left: 5px;" effect="dark" :type="getTableTagType(table.relationType)">{{getTableRelationName(table.relationType)}}</el-tag>
</div>
<Draggable class="card-item-box" draggable=".card-item" :list="getTableColumnList(table)"
:group="{ name: 'componentsGroup', pull: 'clone', put: false }"
@@ -67,7 +67,7 @@
<div @click="onFormClick" :style="{'min-height': height - 50 + 'px'}">
<template v-if="formConfig.formType === SysOnlineFormType.QUERY || formConfig.formType === SysOnlineFormType.WORK_ORDER">
<div style="position: relative;">
<el-form :label-width="formConfig.labelWidth + 'px'" size="mini" :label-position="formConfig.labelPosition" @submit.native.prevent>
<el-form :label-width="formConfig.labelWidth + 'px'" :size="defaultFormItemSize" :label-position="formConfig.labelPosition" @submit.native.prevent>
<DraggableFilterBox :list="formWidgetList" :itemWidth="formConfig.labelWidth + 272"
:style="{'min-height': '50px'}" style="padding: 20px 20px 0px 20px; overflow: hidden; display: flex; justify-content: space-between;"
>
@@ -79,10 +79,10 @@
@delete="onWidgetDeleteClick"
/>
<div slot="operator" style="padding: 13px 10px;" v-if="Array.isArray(formWidgetList) && formWidgetList.length > 0">
<el-button type="primary" :plain="true" size="mini">查询</el-button>
<el-button type="primary" :plain="true" :size="defaultFormItemSize">查询</el-button>
</div>
<div slot="operator" style="padding: 13px 10px;" v-for="operation in getTableOperation(false)" :key="operation.id">
<el-button size="mini"
<el-button :size="defaultFormItemSize"
:plain="operation.plain"
:type="operation.btnType"
@click.stop="">
@@ -100,10 +100,10 @@
format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" />
</el-form-item>
<div slot="operator" style="padding: 13px 10px;">
<el-button type="primary" :plain="true" size="mini">查询</el-button>
<el-button type="primary" :plain="true" :size="defaultFormItemSize">查询</el-button>
</div>
<div slot="operator" style="padding: 13px 10px;">
<el-button type="primary" size="mini">新建</el-button>
<el-button type="primary" :size="defaultFormItemSize">新建</el-button>
</div>
</template>
</DraggableFilterBox>
@@ -120,7 +120,7 @@
</div>
</template>
<el-row v-else :gutter="formConfig.gutter">
<el-form class="full-width-input" size="mini" :label-width="formConfig.labelWidth + 'px'" :label-position="formConfig.labelPosition">
<el-form class="full-width-input" :size="defaultFormItemSize" :label-width="formConfig.labelWidth + 'px'" :label-position="formConfig.labelPosition">
<Draggable draggable=".draggable-item" :list="formWidgetList" group="componentsGroup"
:style="{'min-height': height - 50 + 'px'}" style="padding: 20px; overflow: hidden;"
>
@@ -508,7 +508,7 @@
</el-table-column>
<el-table-column label="操作类型" prop="type" width="90px">
<template slot-scope="scope">
<el-tag size="mini" effect="dark" :type="scope.row.rowOperation ? 'success' : 'warning'">
<el-tag :size="defaultFormItemSize" effect="dark" :type="scope.row.rowOperation ? 'success' : 'warning'">
{{scope.row.rowOperation ? '行内操作' : '表格操作'}}
</el-tag>
</template>
@@ -534,7 +534,7 @@
</el-table-column>
<el-table-column label="参数名称" width="120px">
<template slot-scope="scope">
<el-tag size="mini" effect="dark" :type="scope.row.table.relationType == null ? 'success' : 'primary'">
<el-tag :size="defaultFormItemSize" effect="dark" :type="scope.row.table.relationType == null ? 'success' : 'primary'">
{{scope.row.column.columnName}}
</el-tag>
</template>
@@ -583,8 +583,8 @@
<el-table-column label="参数名" prop="columnName" />
<el-table-column label="参数类型" width="100px">
<template slot-scope="scope">
<el-tag v-if="scope.row.primaryKey" size="mini" type="warning">主键</el-tag>
<el-tag v-if="scope.row.slaveColumn" size="mini" type="primary">关联字段</el-tag>
<el-tag v-if="scope.row.primaryKey" :size="defaultFormItemSize" type="warning">主键</el-tag>
<el-tag v-if="scope.row.slaveColumn" :size="defaultFormItemSize" type="primary">关联字段</el-tag>
</template>
</el-table-column>
</el-table>
@@ -698,6 +698,10 @@ export default {
}).catch(e => {});
},
onPreview () {
if (this.formConfig.formType === this.SysOnlineFormType.WORK_ORDER || this.formConfig.formType === this.SysOnlineFormType.FLOW) {
this.$message.warning('流程页面表单不能预览!');
return;
}
this.onSave().then(res => {
let dialogPos = {
area: this.formConfig.formType === this.SysOnlineFormType.QUERY ? ['70vw', '80vh'] : this.formConfig.width + 'px',

View File

@@ -1,7 +1,7 @@
<template>
<el-popover trigger="click" width="300px" @show="onInit" v-model="isShow">
<el-form ref="dictData" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-form-item label="字典键类型">
<el-radio-group v-model="formData.type">
<el-radio-button label="Integer">整数</el-radio-button>
@@ -19,10 +19,10 @@
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button size="mini" type="primary" :plain="true" @click="onCancel">取消</el-button>
<el-button size="mini" type="primary" @click="onSubmit">保存</el-button>
<el-button :size="defaultFormItemSize" type="primary" :plain="true" @click="onCancel">取消</el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="onSubmit">保存</el-button>
</el-row>
<el-button class="table-btn" :class="{'success': value != null}" slot="reference" size="mini" type="text">{{btnText}}</el-button>
<el-button class="table-btn" :class="{'success': value != null}" slot="reference" :size="defaultFormItemSize" type="text">{{btnText}}</el-button>
</el-popover>
</template>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formEditOnlineFormDict" :model="formOnlineDict" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="150px" size="mini" label-position="right" @submit.native.prevent>
label-width="150px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="字典名称" prop="dictName">
@@ -58,7 +58,7 @@
<el-input class="input-item" v-model="formOnlineDict.dictListUrl"
:clearable="true" placeholder="输入字典获取url"
@change="clearDictInfo">
<el-button slot="append" size="mini" @click="onGetDictData(true)">获取数据</el-button>
<el-button slot="append" :size="defaultFormItemSize" @click="onGetDictData(true)">获取数据</el-button>
</el-input>
</el-form-item>
</el-col>
@@ -146,7 +146,7 @@
</el-col>
<!-- 字典数据 -->
<el-col :span="24" v-if="formOnlineDict.dictType === SysOnlineDictType.STATIC || formOnlineDict.dictType === SysOnlineDictType.CUSTOM">
<el-table :data="dictData" size="mini" header-cell-class-name="table-header-gray" height="300px">
<el-table :data="dictData" :size="defaultFormItemSize" header-cell-class-name="table-header-gray" height="300px">
<el-table-column label="字典键数据" prop="id" />
<el-table-column label="字典值数据" prop="name" />
<el-table-column label="操作" width="100px" fixed="right" align="right"
@@ -165,11 +165,11 @@
</el-col>
<el-col :span="24" style="margin-top: 15px;">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
@click="onSaveClick()">
保存
</el-button>

View File

@@ -1,13 +1,14 @@
<template>
<div style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formOnlineDict" :model="formOnlineDict" label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="字典名称">
<el-form-item label="字典名称" prop="formFilter.dictName">
<el-input class="filter-item" v-model="formOnlineDict.formFilter.dictName"
:clearable="true" placeholder="字典名称" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshOnlineDict(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshOnlineDict(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize"
@click="onFormCreateDictClick()">
新建
</el-button>
@@ -15,30 +16,30 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="class" :data="formOnlineDict.dict.impl.dataList" size="mini" @sort-change="formOnlineDict.dict.impl.onSortChange"
<el-table ref="class" :data="formOnlineDict.dict.impl.dataList" :size="defaultFormItemSize" @sort-change="formOnlineDict.dict.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formOnlineDict.dict.impl.getTableIndex" />
<el-table-column label="字典名称" prop="dictName" />
<el-table-column label="字典类型" prop="dictTypeDictMap.name">
<template slot-scope="scope">
<el-tag size="mini" :type="getDictTypeTagType(scope.row.dictType)">
<el-tag :size="defaultFormItemSize" :type="getDictTypeTagType(scope.row.dictType)">
{{scope.row.dictTypeDictMap.name}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="是否树字典">
<template slot-scope="scope">
<el-tag size="mini" :type="scope.row.treeFlag ? 'success' : 'danger'">
<el-tag :size="defaultFormItemSize" :type="scope.row.treeFlag ? 'success' : 'danger'">
{{scope.row.treeFlag ? '是' : '否'}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150px">
<template slot-scope="scope">
<el-button class="table-btn success" @click.stop="onFormEditDictClick(scope.row)" type="text" size="mini">
<el-button class="table-btn success" @click.stop="onFormEditDictClick(scope.row)" type="text" :size="defaultFormItemSize">
编辑
</el-button>
<el-button class="table-btn delete" @click.stop="onFormDeleteDictClick(scope.row)" type="text" size="mini">
<el-button class="table-btn delete" @click.stop="onFormDeleteDictClick(scope.row)" type="text" :size="defaultFormItemSize">
删除
</el-button>
</template>
@@ -92,6 +93,10 @@ export default {
}
},
methods: {
onReset () {
this.$refs.formOnlineDict.resetFields();
this.refreshOnlineDict(true);
},
getDictTypeTagType (type) {
switch (type) {
case this.SysOnlineDictType.TABLE: return 'success';

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="form" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="表单编码" prop="formCode">
@@ -38,7 +38,7 @@
<el-option v-for="item in getValidTableList" :key="item.tableId" :value="item.tableId" :label="item.tableName">
<el-row type="flex" justify="space-between" align="middle">
<span>{{item.tableName}}</span>
<el-tag size="mini" :type="getDatasourceTableTagType(item.relationType)" effect="dark"
<el-tag :size="defaultFormItemSize" :type="getDatasourceTableTagType(item.relationType)" effect="dark"
style="margin-left: 30px;"
>
{{getDatasourceTableTagName(item.relationType)}}
@@ -50,11 +50,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
@click="onSubmit()">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formEditOnlinePageDatasource" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="数据源名称" prop="datasourceName">
@@ -32,11 +32,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
@click="onSubmit()">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formEditOnlinePageDatasourceRelation" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="120px" size="mini" label-position="right" @submit.native.prevent>
label-width="120px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="关联名称" prop="relationName">
@@ -70,11 +70,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
@click="onSubmit()">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="form" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="数据表" prop="tableId">
@@ -47,11 +47,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
@click="onSubmit()">
保存
</el-button>

View File

@@ -1,20 +1,21 @@
<template>
<div style="position: relative;">
<el-form label-width="75px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formOnlinePage" :model="formOnlinePage" label-width="75px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="表单类型">
<el-form-item label="表单类型" prop="formFilter.pageType">
<el-select class="filter-item" v-model="formOnlinePage.formFilter.pageType"
placeholder="表单类型" :clearable="true">
<el-option v-for="item in SysOnlinePageType.getList()"
:key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="表单名称">
<el-form-item label="表单名称" prop="formFilter.pageName">
<el-input class="filter-item" v-model="formOnlinePage.formFilter.pageName"
:clearable="true" placeholder="表单名称" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshOnlinePage(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshOnlinePage(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize"
@click="onCreateOnlinePage()">
新建
</el-button>
@@ -22,21 +23,21 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="class" :data="pageListWidget.dataList" size="mini" @sort-change="pageListWidget.onSortChange"
<el-table ref="class" :data="pageListWidget.dataList" :size="defaultFormItemSize" @sort-change="pageListWidget.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="pageListWidget.getTableIndex" />
<el-table-column label="页面名称" prop="pageName" />
<el-table-column label="页面代码" prop="pageCode" />
<el-table-column label="页面类型">
<template slot-scope="scope">
<el-tag size="mini" :type="scope.row.pageType === SysOnlinePageType.BIZ ? 'success' : 'primary'">
<el-tag :size="defaultFormItemSize" :type="scope.row.pageType === SysOnlinePageType.BIZ ? 'success' : 'primary'">
{{SysOnlinePageType.getValue(scope.row.pageType)}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="页面状态" prop="statusDictMap.name">
<template slot-scope="scope">
<el-tag size="mini" :type="getPageStatusTagType(scope.row.status)">
<el-tag :size="defaultFormItemSize" :type="getPageStatusTagType(scope.row.status)">
{{SysOnlinePageStatus.getValue(scope.row.status)}}
</el-tag>
</template>
@@ -54,6 +55,19 @@
</template>
</el-table-column>
</el-table>
<el-col :span="24">
<el-row type="flex" justify="end" style="margin-top: 10px;">
<el-pagination
:total="pageListWidget.totalCount"
:current-page="pageListWidget.currentPage"
:page-size="pageListWidget.pageSize"
:page-sizes="[10, 20, 50, 100]"
layout="total, prev, pager, next, sizes"
@current-change="pageListWidget.onCurrentPageChange"
@size-change="pageListWidget.onPageSizeChange">
</el-pagination>
</el-row>
</el-col>
</el-col>
</el-row>
<OnlinePageSetting v-if="showPageSetting" :pageId="(currentPage || {}).pageId" @close="onCloseSetting" />
@@ -98,6 +112,10 @@ export default {
}
},
methods: {
onReset () {
this.$refs.formOnlinePage.resetFields();
this.refreshOnlinePage(true);
},
getPageStatusTagType (status) {
switch (status) {
case this.SysOnlinePageStatus.BASIC: return 'warning';

View File

@@ -60,7 +60,7 @@
<el-table-column label="数据表名" prop="tableName" />
<el-table-column label="关联类型" prop="relationType">
<template slot-scope="scope">
<el-tag size="mini" :type="getDatasourceTableTagType(scope.row.relationType)" effect="dark">
<el-tag :size="defaultFormItemSize" :type="getDatasourceTableTagType(scope.row.relationType)" effect="dark">
{{getDatasourceTableTagName(scope.row.relationType)}}
</el-tag>
</template>
@@ -69,7 +69,7 @@
<el-table-column label="从表关联字段" prop="slaveColumnName" />
<el-table-column label="级联删除" prop="cascadeDelete">
<template slot-scope="scope">
<el-tag v-if="scope.row.relationType != null" size="mini"
<el-tag v-if="scope.row.relationType != null" :size="defaultFormItemSize"
:type="scope.row.cascadeDelete ? 'success' : 'danger'" effect="dark">
{{scope.row.cascadeDelete ? '是' : '否'}}
</el-tag>
@@ -77,7 +77,7 @@
</el-table-column>
<el-table-column label="是否左连接" prop="leftJoin">
<template slot-scope="scope">
<el-tag v-if="scope.row.relationType != null" size="mini"
<el-tag v-if="scope.row.relationType != null" :size="defaultFormItemSize"
:type="scope.row.leftJoin ? 'success' : 'danger'" effect="dark">
{{scope.row.leftJoin ? '是' : '否'}}
</el-tag>
@@ -86,22 +86,22 @@
<el-table-column label="操作" width="250px" fixed="right">
<template slot-scope="scope">
<!-- 数据源主表只有当没有任何关联的时候才可以编辑 -->
<el-button class="table-btn success" size="mini" type="text"
<el-button class="table-btn success" :size="defaultFormItemSize" type="text"
@click="onEditDatasourceTable(scope.row)"
:disabled="scope.row.relationType == null && Array.isArray(scope.row.relationList) && scope.row.relationList.length > 0"
>
编辑
</el-button>
<el-button size="mini" type="text"
<el-button :size="defaultFormItemSize" type="text"
@click="onEditTableColumn(scope.row)">
字段管理
</el-button>
<el-button size="mini" type="text"
<el-button :size="defaultFormItemSize" type="text"
:disabled="scope.row.relationType != null"
@click="onEditVirtualColumn(scope.row)">
聚合计算
</el-button>
<el-button class="table-btn delete" size="mini" type="text"
<el-button class="table-btn delete" :size="defaultFormItemSize" type="text"
:disabled="scope.row.relationType == null && (!Array.isArray(scope.row.relationList) || scope.row.relationList.length <= 0)"
@click="onDeleteDatasourceTable(scope.row)"
>
@@ -141,7 +141,7 @@
<el-table-column label="表单名称" prop="formName" />
<el-table-column label="表单类型" prop="formType">
<template slot-scope="scope">
<el-tag size="mini" effect="dark"
<el-tag :size="defaultFormItemSize" effect="dark"
:type="getFormTypeTag(scope.row.formType)"
>
{{SysOnlineFormType.getValue(scope.row.formType)}}
@@ -150,9 +150,9 @@
</el-table-column>
<el-table-column label="操作" width="150px">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="onDesignPageForm(scope.row)">页面布局</el-button>
<el-button class="table-btn success" size="mini" type="text" @click="onEditPageForm(scope.row)">编辑</el-button>
<el-button class="table-btn delete" size="mini" type="text" style="color: #F56C6C;" @click="onDeletePageForm(scope.row)">删除</el-button>
<el-button :size="defaultFormItemSize" type="text" @click="onDesignPageForm(scope.row)">页面布局</el-button>
<el-button class="table-btn success" :size="defaultFormItemSize" type="text" @click="onEditPageForm(scope.row)">编辑</el-button>
<el-button class="table-btn delete" :size="defaultFormItemSize" type="text" style="color: #F56C6C;" @click="onDeletePageForm(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>

View File

@@ -5,7 +5,7 @@
<div class="title">
<span>{{tableName}}</span>
<el-dropdown trigger="click" @command="onAddNewColumn">
<el-button class="table-btn success" size="mini" type="text"
<el-button class="table-btn success" :size="defaultFormItemSize" type="text"
icon="el-icon-circle-plus-outline" :disabled="getNewColumnList.length <= 0"
>
新增
@@ -26,16 +26,16 @@
>
<div>
<span style="margin-right: 10px;">{{column.columnName}}</span>
<el-tag v-if="column.deletedFlag" size="mini" type="danger">已删除</el-tag>
<el-tag v-if="column.deletedFlag" :size="defaultFormItemSize" type="danger">已删除</el-tag>
</div>
<div class="refresh" style="margin-left: 10px;">
<el-button class="table-btn success" size="mini" type="text" v-if="getNewColumnList.length <= 0"
<el-button class="table-btn success" :size="defaultFormItemSize" type="text" v-if="getNewColumnList.length <= 0"
@click.stop="onRefreshOnlineColumn(column, column)"
>
刷新
</el-button>
<el-dropdown v-else trigger="click" @command="onRefreshNewColumn">
<el-button class="table-btn success" size="mini" type="text" @click.stop="() => {}">
<el-button class="table-btn success" :size="defaultFormItemSize" type="text" @click.stop="() => {}">
刷新
</el-button>
<el-dropdown-menu slot="dropdown">
@@ -45,7 +45,7 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button v-if="column.deletedFlag" class="table-btn delete" size="mini" type="text" style="margin-left: 10px;"
<el-button v-if="column.deletedFlag" class="table-btn delete" :size="defaultFormItemSize" type="text" style="margin-left: 10px;"
@click.stop="onDeleteColumn(column)"
>
删除
@@ -69,13 +69,13 @@
<el-col class="attribute-item">
<el-form-item label="字段名:">
<span :title="currentColumn.columnComment">{{currentColumn.columnName}}</span>
<el-tag size="mini" type="warning" v-if="currentColumn.primaryKey" style="margin-left: 20px;">主键</el-tag>
<el-tag :size="defaultFormItemSize" type="warning" v-if="currentColumn.primaryKey" style="margin-left: 20px;">主键</el-tag>
</el-form-item>
</el-col>
<el-col class="attribute-item">
<el-form-item label="字段类型:">
<span>{{currentColumn.fullColumnType}}</span>
<el-tag size="mini" type="success" effect="dark" style="margin-left: 10px;">{{currentColumn.tag.objectFieldType}}</el-tag>
<el-tag :size="defaultFormItemSize" type="success" effect="dark" style="margin-left: 10px;">{{currentColumn.tag.objectFieldType}}</el-tag>
</el-form-item>
</el-col>
<el-col class="attribute-item">
@@ -140,7 +140,7 @@
</el-row>
<el-row style="margin-top: 15px;">
<el-col :span="24" style="border-top: 1px solid #EBEEF5;">
<el-table size="mini" :data="columnRuleList" :show-header="false" empty-text="请添加验证规则">
<el-table :size="defaultFormItemSize" :data="columnRuleList" :show-header="false" empty-text="请添加验证规则">
<el-table-column type="index" width="45px" />
<el-table-column label="规则名称" prop="ruleName" width="150px" />
<el-table-column label="校验错误信息" prop="columnRuleInfo.message" />

View File

@@ -4,7 +4,7 @@
<div class="table-column-list">
<div class="title">
<span>虚拟字段列表</span>
<el-button class="table-btn success" size="mini" type="text"
<el-button class="table-btn success" :size="defaultFormItemSize" type="text"
icon="el-icon-circle-plus-outline"
@click.stop="onAddNewVirtualColumn">
新增
@@ -17,7 +17,7 @@
@click.stop="onActiveColumnClick(column)"
>
<span style="margin-right: 10px;">{{column.columnPrompt}}</span>
<el-button class="table-btn delete" size="mini" type="text" style="margin-left: 10px;"
<el-button class="table-btn delete" :size="defaultFormItemSize" type="text" style="margin-left: 10px;"
@click.stop="onDeleteColumn(column)"
>
删除
@@ -57,7 +57,7 @@
:value="item.relationId" :label="item.relationName">
<div style="display: flex; justify-content: space-between; align-items: center">
<span>{{item.relationName}}</span>
<el-tag style="margin-left: 30px;" size="mini"
<el-tag style="margin-left: 30px;" :size="defaultFormItemSize"
:type="getDatasourceTableTagType(item.relationType)">
{{SysOnlineRelationType.getValue(item.relationType)}}
</el-tag>
@@ -110,7 +110,7 @@
</el-row>
<el-row style="margin-top: 15px;">
<el-col :span="24" style="border-top: 1px solid #EBEEF5;">
<el-table size="mini" :data="virtualColumnFilterList" :show-header="false" empty-text="请添加过滤条件">
<el-table :size="defaultFormItemSize" :data="virtualColumnFilterList" :show-header="false" empty-text="请添加过滤条件">
<el-table-column label="操作" width="45px">
<template slot-scope="scope">
<el-button class="table-btn delete" type="text" icon="el-icon-remove-outline"
@@ -125,7 +125,7 @@
</el-table-column>
<el-table-column label="所属表" width="100px">
<template>
<el-tag size="mini" type="success">关联从表</el-tag>
<el-tag :size="defaultFormItemSize" type="success">关联从表</el-tag>
</template>
</el-table-column>
<el-table-column label="过滤类型" width="100px">

View File

@@ -2,7 +2,7 @@
<div class="form-single-fragment" style="position: relative;">
<!-- 设置字段验证规则 -->
<el-form v-if="!isCreateRule" class="full-width-input" ref="form" :rules="rules" :model="formData"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="验证规则" prop="ruleId" key="ruleId">
@@ -49,7 +49,7 @@
</el-form>
<!-- 新建验证规则 -->
<el-form v-if="isCreateRule" class="full-width-input" ref="ruleData" :rules="rules" :model="ruleData"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="规则类型" prop="ruleType">
@@ -69,8 +69,8 @@
</el-row>
</el-form>
<el-row type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true" @click="onCancelClick">取消</el-button>
<el-button type="primary" size="mini" @click="onSubmit">保存</el-button>
<el-button type="primary" :size="defaultFormItemSize" :plain="true" @click="onCancelClick">取消</el-button>
<el-button type="primary" :size="defaultFormItemSize" @click="onSubmit">保存</el-button>
</el-row>
</div>
</template>

View File

@@ -2,7 +2,7 @@
<div class="form-single-fragment" style="position: relative;">
<el-scrollbar class="custom-scroll" :style="{height: formConfig.height + 'px', 'min-height': '100px'}">
<el-form ref="form" :model="formData" class="full-width-input" :rules="rules"
:label-width="formConfig.labelWidth + 'px'" size="mini"
:label-width="formConfig.labelWidth + 'px'" :size="defaultFormItemSize"
:label-position="formConfig.labelPosition"
@submit.native.prevent>
<el-row :gutter="formConfig.gutter">
@@ -62,12 +62,12 @@
</el-form>
</el-scrollbar>
<el-row v-if="formConfig.formType === SysOnlineFormType.FORM" type="flex" justify="end" style="margin-top: 15px;">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
v-if="formConfig.formKind === SysOnlineFormKind.DIALOG"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
@click="onSave()">
保存
</el-button>

View File

@@ -1,6 +1,6 @@
<template>
<div style="position: relative;">
<el-form :label-width="formConfig.labelWidth + 'px'" size="mini" :label-position="formConfig.labelPosition" @submit.native.prevent>
<el-form ref="filterForm" :model="formData" :label-width="formConfig.labelWidth + 'px'" :size="defaultFormItemSize" :label-position="formConfig.labelPosition" @submit.native.prevent>
<filter-box :item-width="formConfig.labelWidth + 250" v-if="!isLoading">
<CustomFilterWidget v-for="widget in formConfig.formWidgetList" :key="widget.id"
:ref="widget.variableName"
@@ -9,11 +9,15 @@
v-model="formData.formFilter[widget.column.columnName]"
/>
<el-button v-if="Array.isArray(formConfig.formWidgetList) && formConfig.formWidgetList.length > 0"
slot="operator" type="primary" :plain="true" size="mini" @click="onSearch">
slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">
重置
</el-button>
<el-button v-if="Array.isArray(formConfig.formWidgetList) && formConfig.formWidgetList.length > 0"
slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="onSearch">
查询
</el-button>
<el-button v-for="operation in getTableOperation(false)" :key="operation.id"
slot="operator" size="mini"
slot="operator" :size="defaultFormItemSize"
:plain="operation.plain"
:type="operation.btnType"
:disabled="!checkPermCodeExist(getPermCode(formConfig.formQueryTable, operation))"
@@ -93,6 +97,14 @@ export default {
}
this.$refs[this.formConfig.formQueryTable.variableName].refresh();
},
onReset () {
if (this.$refs.filterForm) {
this.$refs.filterForm.resetFields();
this.$nextTick(() => {
this.onSearch();
});
}
},
getDropdownParams (widget) {
if (Array.isArray(widget.dictParamList)) {
let params = {};

View File

@@ -1,26 +1,27 @@
<template>
<div style="position: relative;">
<el-form label-width="80px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="onlineWorkOrder" :model="formFilter" label-width="80px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="330">
<el-form-item label="工单状态">
<el-select class="filter-item" v-model="flowStatus" :clearable="true"
<el-form-item label="工单状态" prop="flowStatus">
<el-select class="filter-item" v-model="formFilter.flowStatus" :clearable="true"
placeholder="工单状态">
<el-option v-for="item in SysFlowWorkOrderStatus.getList()" :key="item.id"
:label="item.name" :value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="创建日期">
<date-range class="filter-item" v-model="createTime" :clearable="true" :allowTypes="['day']" align="left"
<el-form-item label="创建日期" prop="createTime">
<date-range class="filter-item" v-model="formFilter.createTime" :clearable="true" :allowTypes="['day']" align="left"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize"
:disabled="processDefinitionKey == null"
@click="onSearch()">
查询
</el-button>
<el-button slot="operator" type="primary" size="mini"
<el-button slot="operator" type="primary" :size="defaultFormItemSize"
:disabled="processDefinitionKey == null"
@click="onStartFlow()">
新建
@@ -74,11 +75,17 @@ export default {
return {
processDefinitionKey: undefined,
processDefinitionName: undefined,
createTime: [],
flowStatus: undefined
formFilter: {
createTime: [],
flowStatus: undefined
}
}
},
methods: {
onReset () {
this.$refs.onlineWorkOrder.resetFields();
this.onSearch();
},
getTableQueryParams (widget) {
let queryParams = [];
if (Array.isArray(widget.queryParamList)) {
@@ -109,7 +116,7 @@ export default {
params = {
...params,
flowWorkOrderDtoFilter: {
flowStatus: this.flowStatus,
flowStatus: this.formFilter.flowStatus,
createTimeStart: Array.isArray(this.createTime) ? this.createTime[0] : undefined,
createTimeEnd: Array.isArray(this.createTime) ? this.createTime[1] : undefined
}
@@ -119,12 +126,12 @@ export default {
processDefinitionKey: this.processDefinitionKey
}).then(res => {
res.data.dataList = res.data.dataList.map(item => {
let initTaskInfo = JSON.parse(item.initTaskInfo);
let initTaskInfo = item.initTaskInfo == null ? {} : JSON.parse(item.initTaskInfo);
let runtimeTaskInfo = (Array.isArray(item.runtimeTaskInfoList) && item.runtimeTaskInfoList.length > 0) ? item.runtimeTaskInfoList[0] : {};
return {
...item,
flowStatus: this.SysFlowWorkOrderStatus.getValue(item.flowStatus),
...Object.keys(item.masterData).reduce((retObj, key) => {
...Object.keys(item.masterData || {}).reduce((retObj, key) => {
retObj['masterTable__' + key] = item.masterData[key];
return retObj;
}, {}),

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment">
<el-form ref="form" :model="formData" class="full-width-input" :rules="rules"
:label-width="formConfig.labelWidth + 'px'" size="mini"
:label-width="formConfig.labelWidth + 'px'" :size="defaultFormItemSize"
:label-position="formConfig.labelPosition"
@submit.native.prevent>
<el-row :gutter="formConfig.gutter">
@@ -182,8 +182,12 @@ export default {
tempObj.slaveData[widget.relation.relationId] = tableData;
}
} else {
tempObj.slaveData[widget.relation.relationId][widget.column.columnName] = that.formData[that.getWidgetFieldName(widget)];
if (tempObj.slaveData[widget.relation.relationId]['__slaveWidget__'] == null) tempObj.slaveData[widget.relation.relationId]['__slaveWidget__'] = widget;
let value = that.formData[that.getWidgetFieldName(widget)];
if (value != null && widget.column != null) {
if (tempObj.slaveData[widget.relation.relationId] == null) tempObj.slaveData[widget.relation.relationId] = {};
tempObj.slaveData[widget.relation.relationId][widget.column.columnName] = value;
if (tempObj.slaveData[widget.relation.relationId]['__slaveWidget__'] == null) tempObj.slaveData[widget.relation.relationId]['__slaveWidget__'] = widget;
}
}
}

View File

@@ -16,17 +16,17 @@
</el-card>
</el-aside>
<el-main style="margin-left: 15px; background-color: white; padding: 20px;">
<el-form label-width="120px" size="mini" label-position="left" @submit.native.prevent>
<el-form label-width="120px" :size="defaultFormItemSize" label-position="left" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item v-if="dirtyCount > 0" label="失效缓存数量:">
<span style="color: #F56C6C;">{{dirtyCount}}</span>
</el-form-item>
<el-button slot="operator" type="primary" size="mini" :plain="true"
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :plain="true"
:disabled="!checkPermCodeExist('formSysDict:fragmentSysDict:reloadCache') || currentDict == null"
@click="onRefreshCacheData">
同步缓存
</el-button>
<el-button slot="operator" type="primary" size="mini"
<el-button slot="operator" type="primary" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysDict:fragmentSysDict:add') || currentDict == null"
@click="onAddDictData">
添加数据
@@ -35,14 +35,14 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="getCurrentDictData" size="mini" header-cell-class-name="table-header-gray"
<el-table :data="getCurrentDictData" :size="defaultFormItemSize" header-cell-class-name="table-header-gray"
:row-style="tableRowStyle"
:height="(getMainContextHeight - 90) + 'px'" row-key="id">
<el-table-column label="ID" prop="id" />
<el-table-column label="字典名称" prop="name">
<template slot-scope="scope">
<span>{{scope.row.name}}</span>
<el-tag v-if="scope.row.dirty" size="mini" effect="dark" type="warning"
<el-tag v-if="scope.row.dirty" :size="defaultFormItemSize" effect="dark" type="warning"
style="margin-left: 15px;">
缓存失效
</el-tag>
@@ -50,8 +50,8 @@
</el-table-column>
<el-table-column label="操作" width="150px">
<template slot-scope="scope">
<el-button type="text" size="mini" :disabled="!checkPermCodeExist('formSysDict:fragmentSysDict:update')" @click="onUpdateDictDataClick(scope.row)">编辑</el-button>
<el-button type="text" size="mini" :disabled="!checkPermCodeExist('formSysDict:fragmentSysDict:delete')" @click="onDeleteDictDataClick(scope.row)">删除</el-button>
<el-button type="text" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formSysDict:fragmentSysDict:update')" @click="onUpdateDictDataClick(scope.row)">编辑</el-button>
<el-button type="text" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formSysDict:fragmentSysDict:delete')" @click="onDeleteDictDataClick(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>

View File

@@ -1,5 +1,5 @@
<template>
<el-form ref="form" :model="formData" :rules="rules" label-width="80px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="form" :model="formData" :rules="rules" label-width="80px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-form-item v-if="dictInfo.treeFlag" label="父字典">
<el-cascader style="width: 100%;"
@@ -14,8 +14,8 @@
</el-form-item>
</el-row>
<el-row type="flex" justify="end" class="dialog-btn-layer">
<el-button size="mini" @click="onCancel(false)" >取消</el-button>
<el-button type="primary" size="mini" @click="onSubmit">确定</el-button>
<el-button :size="defaultFormItemSize" @click="onCancel(false)" >取消</el-button>
<el-button type="primary" :size="defaultFormItemSize" @click="onSubmit">确定</el-button>
</el-row>
</el-form>
</template>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formEditSysDataPerm" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="120px" size="mini" label-position="right" @submit.native.prevent>
label-width="120px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="数据权限名称" prop="SysDataPerm.dataPermName">
@@ -23,7 +23,7 @@
<el-card shadow="never">
<div slot="header" class="card-header">
<span>部门列表</span>
<el-input size="mini" v-model="deptNameFilter" placeholder="输入部门名称过滤" style="width: 250px;" clearable suffix-icon="el-icon-search" />
<el-input :size="defaultFormItemSize" v-model="deptNameFilter" placeholder="输入部门名称过滤" style="width: 250px;" clearable suffix-icon="el-icon-search" />
</div>
<el-scrollbar style="height: 250px;" wrap-class="scrollbar_dropdown__wrap">
<el-tree ref="deptTree" :data="deptTree" show-checkbox node-key="id" default-expand-all
@@ -34,10 +34,10 @@
</el-row>
<el-col :span="24" style="margin-top: 20px;">
<el-row type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true" @click="onCancel(false)">
<el-button type="primary" :size="defaultFormItemSize" :plain="true" @click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" @click="onUpdateClick()"
<el-button type="primary" :size="defaultFormItemSize" @click="onUpdateClick()"
:disabled="!(checkPermCodeExist('formSysDataPerm:fragmentSysDataPerm:add') || checkPermCodeExist('formSysDataPerm:fragmentSysDataPerm:update'))">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formEditSysDept" :model="formData" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="所属部门" prop="SysDept.parentId">
@@ -26,11 +26,11 @@
</el-col>
<el-col :span="24">
<el-row type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" @click="onUpdateClick()"
<el-button type="primary" :size="defaultFormItemSize" @click="onUpdateClick()"
:disabled="!(checkPermCodeExist('formSysDept:fragmentSysDept:update') || checkPermCodeExist('formSysDept:fragmentSysDept:add'))">
保存
</el-button>

View File

@@ -1,5 +1,5 @@
<template>
<el-form ref="form" :model="formData" :rules="rules" label-width="110px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="form" :model="formData" :rules="rules" label-width="110px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20" class="full-width-input">
<el-col :span="24" >
<el-form-item label="菜单名称" prop="menuName">
@@ -15,8 +15,8 @@
</el-row>
<!-- 弹窗按钮 -->
<el-row type="flex" justify="end" class="dialog-btn-layer mt20">
<el-button size="mini" @click="onCancel(false)" >取消</el-button>
<el-button type="primary" size="mini" @click="onSubmit">确定</el-button>
<el-button :size="defaultFormItemSize" @click="onCancel(false)" >取消</el-button>
<el-button type="primary" :size="defaultFormItemSize" @click="onSubmit">确定</el-button>
</el-row>
</el-form>
</template>

View File

@@ -1,10 +1,10 @@
<template>
<el-form ref="form" :model="formData" :rules="rules" label-width="110px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="form" :model="formData" :rules="rules" label-width="110px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20" class="full-width-input">
<el-col :span="12">
<el-form-item label="上级菜单">
<el-cascader :options="menuTree" v-model="parentMenuPath" :props="menuProps" placeholder="选择父菜单"
:disabled="!canEditParent || isEdit" :clearable="true" :change-on-select="true" size="mini"
:disabled="!canEditParent || isEdit" :clearable="true" :change-on-select="true" :size="defaultFormItemSize"
@change="onParentMenuChange" />
</el-form-item>
</el-col>
@@ -67,7 +67,7 @@
<el-card shadow="never">
<div slot="header" class="card-header">
<span>权限字列表</span>
<el-input size="mini" v-model="permCodeNameFilter" placeholder="输入权限字名称过滤" style="width: 250px;" clearable suffix-icon="el-icon-search" />
<el-input :size="defaultFormItemSize" v-model="permCodeNameFilter" placeholder="输入权限字名称过滤" style="width: 250px;" clearable suffix-icon="el-icon-search" />
</div>
<el-scrollbar style="height: 210px;" wrap-class="scrollbar_dropdown__wrap">
<el-tree ref="permCodeTree" :check-strictly="true"
@@ -80,8 +80,8 @@
</el-row>
<!-- 弹窗按钮 -->
<el-row type="flex" justify="end" class="dialog-btn-layer mt20">
<el-button size="mini" @click="onCancel(false)" >取消</el-button>
<el-button type="primary" size="mini" @click="onSubmit"
<el-button :size="defaultFormItemSize" @click="onCancel(false)" >取消</el-button>
<el-button type="primary" :size="defaultFormItemSize" @click="onSubmit"
:disabled="!(checkPermCodeExist('formSysMenu:fragmentSysMenu:add') || checkPermCodeExist('formSysMenu:fragmentSysMenu:update'))">
确定
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formCreatePerm" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="权限名称" prop="SysPerm.permName">
@@ -12,7 +12,7 @@
<el-col :span="24">
<el-form-item label="所属模块" prop="SysPerm.moduleId">
<el-cascader class="input-item" :options="permModuleList" v-model="formData.SysPerm.moduleId"
placeholder="选择所属模块" :clearable="true" size="mini" :props="{value: 'moduleId', label: 'moduleName'}" />
placeholder="选择所属模块" :clearable="true" :size="defaultFormItemSize" :props="{value: 'moduleId', label: 'moduleName'}" />
</el-form-item>
</el-col>
<el-col :span="24">
@@ -29,11 +29,11 @@
</el-col>
<el-col :span="24">
<el-row type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" @click="onAddClick()"
<el-button type="primary" :size="defaultFormItemSize" @click="onAddClick()"
:disabled="!(checkPermCodeExist('formSysPerm:fragmentSysPerm:updatePerm') || checkPermCodeExist('formSysPerm:fragmentSysPerm:addPerm'))">
保存
</el-button>

View File

@@ -1,10 +1,10 @@
<template>
<el-form ref="form" :model="formData" :rules="rules" label-width="110px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="form" :model="formData" :rules="rules" label-width="110px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20" class="full-width-input">
<el-col :span="24">
<el-form-item label="所属权限字">
<el-cascader :options="permCodeTree" v-model="parentPermCodePath" :props="permCodeProps" filterable
:disabled="formData.permCodeId != null || formData.parenId == null" placeholder="选择父权限字" :clearable="true" :change-on-select="true" size="mini" />
:disabled="formData.permCodeId != null || formData.parenId == null" placeholder="选择父权限字" :clearable="true" :change-on-select="true" :size="defaultFormItemSize" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -34,7 +34,7 @@
<el-card shadow="never">
<div slot="header" class="card-header">
<span>权限列表</span>
<el-input size="mini" v-model="permNameFilter" placeholder="输入权限名称过滤" style="width: 250px;" clearable suffix-icon="el-icon-search" />
<el-input :size="defaultFormItemSize" v-model="permNameFilter" placeholder="输入权限名称过滤" style="width: 250px;" clearable suffix-icon="el-icon-search" />
</div>
<el-scrollbar style="height: 215px;" wrap-class="scrollbar_dropdown__wrap">
<el-tree ref="permTree" :data="formData.permCodeType === SysPermCodeType.FORM ? [] : getPermTree" :props="treeProps" show-checkbox
@@ -51,8 +51,8 @@
</el-row>
<!-- 弹窗按钮 -->
<el-row type="flex" justify="end" class="dialog-btn-layer mt20">
<el-button size="mini" @click="onCancel(false)" >取消</el-button>
<el-button type="primary" size="mini" @click="onSubmit"
<el-button :size="defaultFormItemSize" @click="onCancel(false)" >取消</el-button>
<el-button type="primary" :size="defaultFormItemSize" @click="onSubmit"
:disabled="!(checkPermCodeExist('formSysPermCode:fragmentSysPermCode:add') || checkPermCodeExist('formSysPermCode:fragmentSysPermCode:update'))">
确定
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formCreatePermModule" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="120px" size="mini" label-position="right" @submit.native.prevent>
label-width="120px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="模块名称" prop="SysPermModule.moduleName">
@@ -12,7 +12,7 @@
<el-col :span="24">
<el-form-item label="模块类型">
<el-select class="input-item" v-model="formData.SysPermModule.moduleType"
placeholder="模块类型" :clearable="true" size="mini" :disabled="isEdit">
placeholder="模块类型" :clearable="true" :size="defaultFormItemSize" :disabled="isEdit">
<el-option v-for="item in SysPermModuleType.getList()" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
@@ -20,7 +20,7 @@
<el-col :span="24">
<el-form-item label="所属模块">
<el-cascader class="input-item" :options="getPermGroupTree" v-model="formData.SysPermModule.parentId"
placeholder="选择所属模块" :clearable="true" size="mini"
placeholder="选择所属模块" :clearable="true" :size="defaultFormItemSize"
:props="{value: 'moduleId', label: 'moduleName', checkStrictly: true}" />
</el-form-item>
</el-col>
@@ -32,10 +32,10 @@
</el-col>
<el-col :span="24">
<el-row type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true" @click="onCancel(false)">
<el-button type="primary" :size="defaultFormItemSize" :plain="true" @click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" @click="onAddClick()"
<el-button type="primary" :size="defaultFormItemSize" @click="onAddClick()"
:disabled="!(checkPermCodeExist('formSysPerm:fragmentSysPerm:addPermModule') || checkPermCodeExist('formSysPerm:fragmentSysPerm:updatePermModule'))">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="fragmentEditPost" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="岗位名称" prop="SysPost.postName">
@@ -22,11 +22,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
:disabled="!(checkPermCodeExist('formSysPost:fragmentSysPost:add') || checkPermCodeExist('formSysPost:fragmentSysPost:update'))"
@click="onSaveClick()">
保存

View File

@@ -1,5 +1,5 @@
<template>
<el-form ref="form" :model="formData" :rules="rules" label-width="80px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="form" :model="formData" :rules="rules" label-width="80px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="角色名称" prop="roleName">
@@ -14,7 +14,7 @@
<el-card shadow="never">
<div slot="header" class="card-header">
<span>菜单权限</span>
<el-input size="mini" v-model="menuNameFilter" placeholder="输入菜单名称过滤" style="width: 250px;" clearable suffix-icon="el-icon-search" />
<el-input :size="defaultFormItemSize" v-model="menuNameFilter" placeholder="输入菜单名称过滤" style="width: 250px;" clearable suffix-icon="el-icon-search" />
</div>
<el-scrollbar style="height: 230px;" wrap-class="scrollbar_dropdown__wrap">
<el-tree ref="authTree" :data="authData" :props="treeProps" :check-strictly="false"
@@ -26,8 +26,8 @@
</el-row>
<!-- 弹窗下发按钮栏必须设置class为dialog-btn-layer -->
<el-row type="flex" justify="end" class="dialog-btn-layer" style="margin-top: 20px;">
<el-button size="mini" @click="onCancel(false)" >取消</el-button>
<el-button type="primary" size="mini" @click="onSubmit"
<el-button :size="defaultFormItemSize" @click="onCancel(false)" >取消</el-button>
<el-button type="primary" :size="defaultFormItemSize" @click="onSubmit"
:disabled="!(checkPermCodeExist('formSysRole:fragmentSysRole:update') || checkPermCodeExist('formSysRole:fragmentSysRole:add'))">
确定
</el-button>

View File

@@ -1,5 +1,5 @@
<template>
<el-form ref="form" :model="formData" :rules="rules" label-width="110px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="form" :model="formData" :rules="rules" label-width="110px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20" class="full-width-input">
<el-col :span="24">
<el-form-item label="登录名称" prop="loginName">
@@ -56,8 +56,8 @@
</el-row>
<!-- 弹窗下发按钮栏必须设置class为dialog-btn-layer -->
<el-row type="flex" justify="end" class="dialog-btn-layer">
<el-button size="mini" type="primary" :plain="true" @click="onCancel(false)" >取消</el-button>
<el-button type="primary" size="mini" @click="onSubmit"
<el-button :size="defaultFormItemSize" type="primary" :plain="true" @click="onCancel(false)" >取消</el-button>
<el-button type="primary" :size="defaultFormItemSize" @click="onSubmit"
:disabled="!(checkPermCodeExist('formSysUser:fragmentSysUser:update') || checkPermCodeExist('formSysUser:fragmentSysUser:add'))">
确定
</el-button>

View File

@@ -1,19 +1,19 @@
<template>
<div>
<el-form label-width="75px" size="mini" label-position="right" @submit.native.prevent>
<el-form label-width="75px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="关联URL">
<el-input class="filter-item" v-model="formMenuPerm.formFilter.url"
:clearable="true" placeholder="权限字名称" />
</el-form-item>
<el-button slot="operator" type="primary" size="mini" :plain="true" @click="refreshFormMenuPerm(true)">
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :plain="true" @click="refreshFormMenuPerm(true)">
查询
</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="getPermList" size="mini" height="459px"
<el-table :data="getPermList" :size="defaultFormItemSize" height="459px"
@sort-change="formMenuPerm.SysPerm.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="50px" :index="formMenuPerm.SysPerm.impl.getTableIndex" />
@@ -21,7 +21,7 @@
</el-table-column>
<el-table-column label="权限字类型" width="100px">
<template slot-scope="scope">
<el-tag size="mini" :type="getPermCodeType(scope.row.permCodeType)">
<el-tag :size="defaultFormItemSize" :type="getPermCodeType(scope.row.permCodeType)">
{{SysPermCodeType.getValue(scope.row.permCodeType)}}
</el-tag>
</template>

View File

@@ -1,26 +1,27 @@
<template>
<div>
<el-form label-width="75px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formSetRoleUsers" :model="formSysUser" label-width="75px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="325">
<el-form-item label="用户状态">
<el-form-item label="用户状态" prop="formFilter.sysUserStatus">
<el-select class="filter-item" v-model="formSysUser.formFilter.sysUserStatus" :clearable="true"
placeholder="用户状态" :loading="formSysUser.sysUserStatus.impl.loading"
@visible-change="onSysUserStatusVisibleChange">
<el-option v-for="item in formSysUser.sysUserStatus.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="用户名">
<el-form-item label="用户名" prop="formFilter.sysUserLoginName">
<el-input class="filter-item" v-model="formSysUser.formFilter.sysUserLoginName"
:clearable="true" placeholder="用户名" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormSysUser(true)">查询</el-button>
<el-button slot="operator" size="mini" type="primary" :plain="false" @click="onSetUser"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormSysUser(true)">查询</el-button>
<el-button slot="operator" :size="defaultFormItemSize" type="primary" :plain="false" @click="onSetUser"
:disabled="selectUsers == null || selectUsers.length <= 0">授权人员</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="formSysUser.SysUser.impl.dataList" size="mini" row-key="userId" ref="userTable"
<el-table :data="formSysUser.SysUser.impl.dataList" :size="defaultFormItemSize" row-key="userId" ref="userTable"
header-cell-class-name="table-header-gray" height="395px" @selection-change="onTableSelectionChange">
<el-table-column label="序号" header-align="center" align="center" type="index" width="50px" :index="formSysUser.SysUser.impl.getTableIndex" />
<el-table-column header-align="center" align="center" type="selection" width="50px" :reserve-selection="true" />
@@ -35,7 +36,7 @@
</el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<el-tag :type="getUserStatusType(scope.row.userStatus)" size="mini">{{SysUserStatus.getValue(scope.row.userStatus)}}</el-tag>
<el-tag :type="getUserStatusType(scope.row.userStatus)" :size="defaultFormItemSize">{{SysUserStatus.getValue(scope.row.userStatus)}}</el-tag>
</template>
</el-table-column>
</el-table>
@@ -146,6 +147,10 @@ export default {
onCancel () {
this.$router.go(-1);
},
onReset () {
this.$refs.formSetRoleUsers.resetFields();
this.refreshFormSysUser(true);
},
loadSysUserData (params) {
params.roleId = this.roleId;
params.sysUserDtoFilter = {

View File

@@ -1,26 +1,27 @@
<template>
<div>
<el-form label-width="75px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formSysUser" :model="formSysUser" label-width="75px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="325">
<el-form-item label="用户状态">
<el-form-item label="用户状态" prop="formFilter.sysUserStatus">
<el-select class="filter-item" v-model="formSysUser.formFilter.sysUserStatus" :clearable="true"
placeholder="用户状态" :loading="formSysUser.sysUserStatus.impl.loading"
@visible-change="onSysUserStatusVisibleChange">
<el-option v-for="item in formSysUser.sysUserStatus.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="用户名">
<el-form-item label="用户名" prop="formFilter.sysUserLoginName">
<el-input class="filter-item" v-model="formSysUser.formFilter.sysUserLoginName"
:clearable="true" placeholder="用户名" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormSysUser(true)">查询</el-button>
<el-button slot="operator" size="mini" type="primary" :plain="false" @click="onSetUser"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormSysUser(true)">查询</el-button>
<el-button slot="operator" :size="defaultFormItemSize" type="primary" :plain="false" @click="onSetUser"
:disabled="selectUsers == null || selectUsers.length <= 0">授权人员</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="formSysUser.SysUser.impl.dataList" size="mini" row-key="userId" ref="userTable"
<el-table :data="formSysUser.SysUser.impl.dataList" :size="defaultFormItemSize" row-key="userId" ref="userTable"
header-cell-class-name="table-header-gray" height="395px" @selection-change="onTableSelectionChange">
<el-table-column label="序号" header-align="center" align="center" type="index" width="50px" :index="formSysUser.SysUser.impl.getTableIndex" />
<el-table-column header-align="center" align="center" type="selection" width="50px" :reserve-selection="true" />
@@ -35,7 +36,7 @@
</el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<el-tag :type="getUserStatusType(scope.row.userStatus)" size="mini">{{SysUserStatus.getValue(scope.row.userStatus)}}</el-tag>
<el-tag :type="getUserStatusType(scope.row.userStatus)" :size="defaultFormItemSize">{{SysUserStatus.getValue(scope.row.userStatus)}}</el-tag>
</template>
</el-table-column>
</el-table>
@@ -97,6 +98,10 @@ export default {
}
},
methods: {
onReset () {
this.$refs.formSysUser.resetFields();
this.refreshFormSysUser(true);
},
/**
* 用户状态下拉数据获取函数
*/

View File

@@ -3,9 +3,9 @@
<el-tabs v-model="activeFragmentId" :before-leave="onFragmentChange">
<el-tab-pane label="数据权限管理" name="fragmentSysDataPerm" style="width: 100%;"
v-if="checkPermCodeExist('formSysDataPerm:fragmentSysDataPerm')">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="fragmentSysDataPerm" :model="fragmentSysDataPerm" label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="过滤规则">
<el-form-item label="过滤规则" prop="formFilter.sysDatapermType">
<el-select class="filter-item" v-model="fragmentSysDataPerm.formFilter.sysDatapermType" :clearable="true"
placeholder="过滤规则" :loading="fragmentSysDataPerm.sysDatapermType.impl.loading"
@visible-change="onSysDatapermTypeVisibleChange"
@@ -13,12 +13,13 @@
<el-option v-for="item in fragmentSysDataPerm.sysDatapermType.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="数据权限名称">
<el-form-item label="数据权限名称" prop="formFilter.sysDataPermName">
<el-input class="filter-item" v-model="fragmentSysDataPerm.formFilter.sysDataPermName"
:clearable="true" placeholder="数据权限名称" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFragmentSysDataPerm(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formSysDataPerm:fragmentSysDataPerm:add')"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetDataPerm">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFragmentSysDataPerm(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formSysDataPerm:fragmentSysDataPerm:add')"
@click="onAddDataPermClick()">
新建
</el-button>
@@ -26,7 +27,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysDataPerm.SysDataPerm.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysDataPerm.SysDataPerm.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysDataPerm.SysDataPerm.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"
@@ -42,11 +43,11 @@
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button @click="onEditDataPermClick(scope.row)" type="text" size="mini"
<el-button @click="onEditDataPermClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysDataPerm:fragmentSysDataPerm:update')">
编辑
</el-button>
<el-button @click="onDeleteClick(scope.row)" type="text" size="mini"
<el-button @click="onDeleteClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysDataPerm:fragmentSysDataPerm:delete')">
删除
</el-button>
@@ -71,9 +72,9 @@
</el-tab-pane>
<el-tab-pane label="用户授权" name="fragmentSysDataPermUser" style="width: 100%;"
v-if="checkPermCodeExist('formSysDataPerm:fragmentSysDataPermUser')">
<el-form label-width="75px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="fragmentSysDataPermUser" :model="fragmentSysDataPermUser" label-width="75px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="数据权限">
<el-form-item label="数据权限" prop="formFilter.dataPermId">
<el-select class="filter-item" v-model="fragmentSysDataPermUser.formFilter.dataPermId" clearable
placeholder="数据权限" :loading="fragmentSysDataPermUser.dataPermId.impl.loading"
@visible-change="fragmentSysDataPermUser.dataPermId.impl.onVisibleChange"
@@ -82,14 +83,15 @@
:value="item.dataPermId" :label="item.dataPermName" />
</el-select>
</el-form-item>
<el-form-item label="用户名">
<el-form-item label="用户名" prop="formFilter.searchString">
<el-input class="filter-item" v-model="fragmentSysDataPermUser.formFilter.searchString"
:clearable="true" placeholder="输入用户名 / 昵称查询" @change="refreshFragmentSysDataPermUser(true)" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFragmentSysDataPermUser(true)">
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetDataPermUser">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFragmentSysDataPermUser(true)">
查询
</el-button>
<el-button slot="operator" type="primary" size="mini" @click="onAddDataPermUserClick()"
<el-button slot="operator" type="primary" :size="defaultFormItemSize" @click="onAddDataPermUserClick()"
:disabled="!checkPermCodeExist('formSysDataPerm:fragmentSysDataPermUser:addDataPermUser') ||
fragmentSysDataPermUser.formFilter.dataPermId == null || fragmentSysDataPermUser.formFilter.dataPermId === ''">
添加用户
@@ -98,7 +100,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysDataPermUser.SysDataPermUserList.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysDataPermUser.SysDataPermUserList.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysDataPermUser.SysDataPermUserList.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"
@@ -114,12 +116,12 @@
</el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<el-tag :type="getUserStatusType(scope.row.userStatus)" size="mini">{{SysUserStatus.getValue(scope.row.userStatus)}}</el-tag>
<el-tag :type="getUserStatusType(scope.row.userStatus)" :size="defaultFormItemSize">{{SysUserStatus.getValue(scope.row.userStatus)}}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="80px">
<template slot-scope="scope">
<el-button class="btn-table-delete" type="text" size="mini"
<el-button class="btn-table-delete" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysDataPerm:fragmentSysDataPermUser:deleteDataPermUser')"
@click="onDeleteRow(scope.row)">移除</el-button>
</template>
@@ -197,6 +199,14 @@ export default {
}
},
methods: {
onResetDataPerm () {
this.$refs.fragmentSysDataPerm.resetFields();
this.refreshFragmentSysDataPerm(true);
},
onResetDataPermUser () {
this.$refs.fragmentSysDataPermUser.resetFields();
this.refreshFragmentSysDataPermUser(true);
},
/**
* 数据权限数据获取函数返回Primise
*/

View File

@@ -1,13 +1,14 @@
<template>
<div>
<el-form label-width="75px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formSysDept" :model="formSysDept" label-width="75px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="部门名称">
<el-form-item label="部门名称" prop="formFilter.deptName">
<el-input class="filter-item" v-model="formSysDept.formFilter.deptName"
:clearable="true" placeholder="部门名称" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormSysDept(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formSysDept:fragmentSysDept:add')"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormSysDept(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formSysDept:fragmentSysDept:add')"
@click="onCreateSysDeptClick()">
新建
</el-button>
@@ -15,7 +16,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="formSysDept.SysDeptList.impl.dataList" size="mini" row-key="deptId"
<el-table :data="formSysDept.SysDeptList.impl.dataList" :size="defaultFormItemSize" row-key="deptId"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="50px">
</el-table-column>
@@ -23,15 +24,15 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="150px">
<template slot-scope="scope">
<el-button @click="onEditSysDeptClick(scope.row)" type="text" size="mini"
<el-button @click="onEditSysDeptClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysDept:fragmentSysDept:update')">
编辑
</el-button>
<el-button @click="onEditSysDeptPostClick(scope.row)" type="text" size="mini"
<el-button @click="onEditSysDeptPostClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!(checkPermCodeExist('formSysDept:fragmentSysDept:editPost') || checkPermCodeExist('formSysDept:fragmentSysDept:viewPost'))">
岗位
</el-button>
<el-button @click="onDeleteClick(scope.row)" type="text" size="mini"
<el-button @click="onDeleteClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysDept:fragmentSysDept:delete')">
删除
</el-button>
@@ -75,6 +76,10 @@ export default {
}
},
methods: {
onReset () {
this.$refs.formSysDept.resetFields();
this.refreshFormSysDept(true);
},
/**
* 部门列表数据获取函数返回Primise
*/

View File

@@ -1,13 +1,14 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formSetDeptPost" :model="formSetDeptPost" label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="岗位名称">
<el-form-item label="岗位名称" prop="formFilter.postName">
<el-input class="filter-item" v-model="formSetDeptPost.formFilter.postName"
:clearable="true" placeholder="岗位名称" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormSetDeptPost(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormSetDeptPost(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize"
:disabled="tableSelectRowList.length <= 0 || !checkPermCodeExist('formSysDept:fragmentSysDept:editPost')"
@click="onAddSysDeptPostClick()">
添加岗位
@@ -16,7 +17,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="formSetDeptPost.SysPost.impl.dataList" size="mini" @sort-change="formSetDeptPost.SysPost.impl.onSortChange"
<el-table :data="formSetDeptPost.SysPost.impl.dataList" :size="defaultFormItemSize" @sort-change="formSetDeptPost.SysPost.impl.onSortChange"
@selection-change="onSysPostSelectionChange" header-cell-class-name="table-header-gray">
<el-table-column label="序号" type="index" header-align="center" align="center" width="55px" :index="formSetDeptPost.SysPost.impl.getTableIndex" />
<el-table-column type="selection" header-align="center" align="center" width="55px" />
@@ -26,7 +27,7 @@
</el-table-column>
<el-table-column label="领导岗位" prop="leaderPost" sortable="custom">
<template slot-scope="scope">
<el-tag size="mini" :type="scope.row.leaderPost ? 'success' : 'danger'">
<el-tag :size="defaultFormItemSize" :type="scope.row.leaderPost ? 'success' : 'danger'">
{{scope.row.leaderPost ? '是' : '否'}}
</el-tag>
</template>
@@ -86,6 +87,10 @@ export default {
}
},
methods: {
onReset () {
this.$refs.formSetDeptPost.resetFields();
this.refreshFormSetDeptPost(true);
},
onCancel (isSuccess) {
if (this.observer != null) {
this.observer.cancel(isSuccess);

View File

@@ -1,13 +1,14 @@
<template>
<div style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formSysDeptPost" :model="formSysDeptPost" label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="岗位名称">
<el-form-item label="岗位名称" prop="formFilter.postName">
<el-input class="filter-item" v-model="formSysDeptPost.formFilter.postName"
:clearable="true" placeholder="岗位名称" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormSysDeptPost(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formSysDept:fragmentSysDept:editPost')"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormSysDeptPost(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formSysDept:fragmentSysDept:editPost')"
@click="onFormSetDeptPostClick()">
岗位设置
</el-button>
@@ -15,7 +16,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="sysPost" :data="formSysDeptPost.SysPost.impl.dataList" size="mini" @sort-change="formSysDeptPost.SysPost.impl.onSortChange"
<el-table ref="sysPost" :data="formSysDeptPost.SysPost.impl.dataList" :size="defaultFormItemSize" @sort-change="formSysDeptPost.SysPost.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formSysDeptPost.SysPost.impl.getTableIndex" />
<el-table-column label="岗位名称" prop="postName">
@@ -23,14 +24,14 @@
<el-table-column label="岗位别名" prop="sysDeptPost.postShowName">
<template slot-scope="scope">
<span v-if="formSysDeptPost.SysPost.currentRow == null || formSysDeptPost.SysPost.currentRow.postId !== scope.row.postId">{{(scope.row.sysDeptPost || {}).postShowName}}</span>
<el-input v-else size="mini" v-model="formSysDeptPost.SysPost.currentRow.sysDeptPost.postShowName" />
<el-input v-else :size="defaultFormItemSize" v-model="formSysDeptPost.SysPost.currentRow.sysDeptPost.postShowName" />
</template>
</el-table-column>
<el-table-column label="岗位层级" prop="level" sortable="custom">
</el-table-column>
<el-table-column label="领导岗位" prop="leaderPost" sortable="custom">
<template slot-scope="scope">
<el-tag size="mini" :type="scope.row.leaderPost ? 'success' : 'danger'">
<el-tag :size="defaultFormItemSize" :type="scope.row.leaderPost ? 'success' : 'danger'">
{{scope.row.leaderPost ? '是' : '否'}}
</el-tag>
</template>
@@ -38,21 +39,21 @@
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button v-if="formSysDeptPost.SysPost.currentRow == null"
@click.stop="onEditPostName(scope.row)" type="text" size="mini"
@click.stop="onEditPostName(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysDept:fragmentSysDept:editPost')">
修改别名
</el-button>
<el-button class="table-btn delete" v-if="formSysDeptPost.SysPost.currentRow == null"
@click.stop="onDeleteSysDeptPostClick(scope.row)" type="text" size="mini"
@click.stop="onDeleteSysDeptPostClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysDept:fragmentSysDept:editPost')">
移除
</el-button>
<el-button v-if="formSysDeptPost.SysPost.currentRow != null && formSysDeptPost.SysPost.currentRow.postId === scope.row.postId"
@click.stop="onSavePostName(scope.row)" type="text" size="mini">
@click.stop="onSavePostName(scope.row)" type="text" :size="defaultFormItemSize">
保存
</el-button>
<el-button v-if="formSysDeptPost.SysPost.currentRow != null && formSysDeptPost.SysPost.currentRow.postId === scope.row.postId"
@click.stop="onCancelSavePostName(scope.row)" type="text" size="mini">
@click.stop="onCancelSavePostName(scope.row)" type="text" :size="defaultFormItemSize">
取消
</el-button>
</template>
@@ -123,6 +124,10 @@ export default {
this.refreshParentCachedPage = isSuccess;
this.$router.go(-1);
},
onReset () {
this.$refs.formSysDeptPost.resetFields();
this.refreshFormSysDeptPost(true);
},
/**
* 部门岗位数据获取函数返回Promise
*/

View File

@@ -1,16 +1,17 @@
<template>
<div style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formSysLoginUser" :model="formSysLoginUser" label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="登录名称">
<el-form-item label="登录名称" prop="formFilter.loginName">
<el-input class="filter-item" v-model="formSysLoginUser.formFilter.loginName" :clearable="true" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormOperationType(true)">查询</el-button>
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormOperationType(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="teacher" :data="formSysLoginUser.loginUser.impl.dataList" size="mini" @sort-change="formSysLoginUser.loginUser.impl.onSortChange"
<el-table ref="teacher" :data="formSysLoginUser.loginUser.impl.dataList" :size="defaultFormItemSize" @sort-change="formSysLoginUser.loginUser.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formSysLoginUser.loginUser.impl.getTableIndex" />
<el-table-column label="登录名称" prop="loginName" />
@@ -19,7 +20,7 @@
<el-table-column label="登录时间" prop="loginTime" />
<el-table-column label="操作" fixed="right" width="150px" >
<template slot-scope="scope">
<el-button @click.stop="onDeleteLoginUserClick(scope.row)" type="text" size="mini">
<el-button @click.stop="onDeleteLoginUserClick(scope.row)" type="text" :size="defaultFormItemSize">
强退
</el-button>
</template>
@@ -69,6 +70,10 @@ export default {
}
},
methods: {
onReset () {
this.$refs.formSysLoginUser.resetFields();
this.refreshFormOperationType(true);
},
/**
* 登录用户数据数据获取函数返回Promise
*/

View File

@@ -2,13 +2,13 @@
<div class="tab-dialog-box" style="position: relative;">
<el-tabs v-model="activeFragment">
<el-tab-pane label="栏目管理" name="fragmentSysColumn" style="width: 100%;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row type="flex" justify="end" style="margin-bottom: 18px;">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="initFormData()">
刷新
</el-button>
<el-button type="primary" size="mini" :disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:add')"
<el-button type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:add')"
@click="onCreateSysColumnClick()">
新建
</el-button>
@@ -16,18 +16,18 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="columnList" size="mini" :height="getTabPaneHeight + 'px'"
<el-table :data="columnList" :size="defaultFormItemSize" :height="getTabPaneHeight + 'px'"
header-cell-class-name="table-header-gray" row-key="menuId">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
<el-table-column label="栏目名称" prop="columnName" />
<el-table-column label="显示顺序" prop="showOrder" />
<el-table-column label="操作" width="200px">
<template slot-scope="scope">
<el-button @click="onEditSysColumnClick(scope.row)" type="text" size="mini"
<el-button @click="onEditSysColumnClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:update')">
编辑
</el-button>
<el-button @click="onDeleteClick(scope.row)" type="text" size="mini"
<el-button @click="onDeleteClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:delete')">
删除
</el-button>
@@ -38,7 +38,7 @@
</el-row>
</el-tab-pane>
<el-tab-pane label="菜单管理" name="fragmentSysMenu" style="width: 100%;">
<el-form label-width="80px" size="mini" label-position="right" @submit.native.prevent>
<el-form label-width="80px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row>
<el-col :span="12">
<el-form-item label="所属栏目" style="flex-grow: 1">
@@ -50,11 +50,11 @@
</el-col>
<el-col :span="12">
<el-row type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="initFormData(true)">
刷新
</el-button>
<el-button type="primary" size="mini" :disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:add')"
<el-button type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:add')"
@click="onCreateSysMenuClick()">
新建
</el-button>
@@ -64,7 +64,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="currentMenuTree" size="mini" :height="getTabPaneHeight + 'px'"
<el-table :data="currentMenuTree" :size="defaultFormItemSize" :height="getTabPaneHeight + 'px'"
header-cell-class-name="table-header-gray" row-key="menuId">
<el-table-column label="菜单名称" prop="menuName" width="300px">
</el-table-column>
@@ -77,26 +77,26 @@
</el-table-column>
<el-table-column label="菜单类型" prop="menuType" width="100px">
<template slot-scope="scope">
<el-tag size="mini" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
<el-tag :size="defaultFormItemSize" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
</template>
</el-table-column>
<el-table-column label="菜单路由" prop="formRouterName" min-width="250px">
</el-table-column>
<el-table-column label="操作" width="200px">
<template slot-scope="scope">
<el-button @click="onEditSysMenuClick(scope.row)" type="text" size="mini"
<el-button @click="onEditSysMenuClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:update')">
编辑
</el-button>
<el-button @click="onAddChildSysMenuClick(scope.row)" type="text" size="mini"
<el-button @click="onAddChildSysMenuClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:add') || scope.row.menuType === SysMenuType.BUTTON">
添加
</el-button>
<el-button @click="onDeleteClick(scope.row)" type="text" size="mini"
<el-button @click="onDeleteClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:delete')">
删除
</el-button>
<el-button @click="onShowPermList(scope.row)" type="text" size="mini"
<el-button @click="onShowPermList(scope.row)" type="text" :size="defaultFormItemSize"
v-if="checkPermCodeExist('formSysMenu:fragmentSysMenu:listSysMenuPermDetail')"
:disabled="scope.row.menuType === SysMenuType.DIRECTORY">
权限详情

View File

@@ -2,18 +2,18 @@
<div class="tab-dialog-box" style="position: relative; margin-top: -15px;">
<el-tabs v-model="activeFragmentId">
<el-tab-pane label="权限资源" name="fragmentSysMenuPerm" style="width: 100%;">
<el-form label-width="100px" size="mini" label-position="left" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="left" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="URL">
<el-input class="filter-item" v-model="fragmentSysMenuPerm.formFilter.url" clearable
placeholder="" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshfragmentSysMenuPerm(true)">查询</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshfragmentSysMenuPerm(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysMenuPerm.SysMenuPerm.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysMenuPerm.SysMenuPerm.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysMenuPerm.SysMenuPerm.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"
@@ -22,7 +22,7 @@
</el-table-column>
<el-table-column label="权限字类型" width="100px">
<template slot-scope="scope">
<el-tag size="mini" :type="getPermCodeType(scope.row.permCodeType)">
<el-tag :size="defaultFormItemSize" :type="getPermCodeType(scope.row.permCodeType)">
{{SysPermCodeType.getValue(scope.row.permCodeType)}}
</el-tag>
</template>
@@ -36,18 +36,18 @@
</el-row>
</el-tab-pane>
<el-tab-pane label="用户查询" name="fragmentSysMenuUser" style="width: 100%;">
<el-form label-width="100px" size="mini" label-position="left" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="left" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="用户名">
<el-input class="filter-item" v-model="fragmentSysMenuUser.formFilter.loginName" clearable
placeholder="" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFragmentSysMenuUser(true)">查询</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFragmentSysMenuUser(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysMenuUser.SysMenuUser.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysMenuUser.SysMenuUser.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysMenuUser.SysMenuUser.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"

View File

@@ -1,12 +1,12 @@
<template>
<div>
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-button slot="operator" type="primary" size="mini" :plain="true"
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :plain="true"
@click="refreshFormSysMenu(true)">
刷新
</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:add')"
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:add')"
@click="onCreateSysMenuClick()">
新建
</el-button>
@@ -14,7 +14,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="formSysMenu.SysMenu.impl.dataList" size="mini"
<el-table :data="formSysMenu.SysMenu.impl.dataList" :size="defaultFormItemSize"
header-cell-class-name="table-header-gray" row-key="menuId">
<el-table-column label="菜单名称" prop="menuName" width="300px">
</el-table-column>
@@ -27,26 +27,26 @@
</el-table-column>
<el-table-column label="菜单类型" prop="menuType" width="100px">
<template slot-scope="scope">
<el-tag size="mini" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
<el-tag :size="defaultFormItemSize" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
</template>
</el-table-column>
<el-table-column label="菜单路由" prop="formRouterName" min-width="250px">
</el-table-column>
<el-table-column label="操作" fixed="right" width="200px">
<template slot-scope="scope">
<el-button @click="onEditSysMenuClick(scope.row)" type="text" size="mini"
<el-button @click="onEditSysMenuClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:update') || (scope.row.onlineFormId != null && scope.row.menuType === SysMenuType.BUTTON)">
编辑
</el-button>
<el-button @click="onAddChildSysMenuClick(scope.row)" type="text" size="mini"
<el-button @click="onAddChildSysMenuClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:add') || scope.row.menuType === SysMenuType.BUTTON">
添加
</el-button>
<el-button @click="onDeleteClick(scope.row)" type="text" size="mini"
<el-button @click="onDeleteClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysMenu:fragmentSysMenu:delete') || (scope.row.onlineFormId != null && scope.row.menuType === SysMenuType.BUTTON)">
删除
</el-button>
<el-button @click="onShowPermList(scope.row)" type="text" size="mini"
<el-button @click="onShowPermList(scope.row)" type="text" :size="defaultFormItemSize"
v-if="checkPermCodeExist('formSysMenu:fragmentSysMenu:listSysMenuPermDetail')"
:disabled="scope.row.menuType === SysMenuType.DIRECTORY">
权限详情

View File

@@ -2,18 +2,18 @@
<div class="tab-dialog-box" style="position: relative; margin-top: -15px;">
<el-tabs v-model="activeFragmentId">
<el-tab-pane label="用户查询" name="fragmentSysPermUser" style="width: 100%;">
<el-form label-width="100px" size="mini" label-position="left" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="left" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="用户名">
<el-input class="filter-item" v-model="fragmentSysPermUser.formFilter.loginName" clearable
placeholder="" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFragmentSysPermUser(true)">查询</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFragmentSysPermUser(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysPermUser.SysUser.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysPermUser.SysUser.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysPermUser.SysUser.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"
@@ -27,18 +27,18 @@
</el-row>
</el-tab-pane>
<el-tab-pane label="角色查询" name="fragmentSysPermRole" style="width: 100%;">
<el-form label-width="100px" size="mini" label-position="left" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="left" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="角色名称">
<el-input class="filter-item" v-model="fragmentSysPermRole.formFilter.roleName" clearable
placeholder="" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFragmentSysPermRole(true)">查询</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFragmentSysPermRole(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysPermRole.SysRole.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysPermRole.SysRole.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysPermRole.SysRole.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"
@@ -50,7 +50,7 @@
</el-table-column>
<el-table-column label="菜单类型" prop="permCodeType">
<template slot-scope="scope">
<el-tag size="mini" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
<el-tag :size="defaultFormItemSize" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
</template>
</el-table-column>
<el-table-column label="角色名称" prop="roleName" />
@@ -60,18 +60,18 @@
</el-row>
</el-tab-pane>
<el-tab-pane label="菜单查询" name="fragmentSysPermMenu" style="width: 100%;">
<el-form label-width="100px" size="mini" label-position="left" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="left" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="菜单名称">
<el-input class="filter-item" v-model="fragmentSysPermMenu.formFilter.menuName" clearable
placeholder="" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFragmentSysPermMenu(true)">查询</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFragmentSysPermMenu(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysPermMenu.SysMenu.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysPermMenu.SysMenu.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysPermMenu.SysMenu.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"
@@ -83,7 +83,7 @@
</el-table-column>
<el-table-column label="菜单类型" prop="menuType">
<template slot-scope="scope">
<el-tag size="mini" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
<el-tag :size="defaultFormItemSize" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
</template>
</el-table-column>
<el-table-column label="权限字" prop="permCode" />

View File

@@ -16,12 +16,12 @@
:highlight-current="true" @node-expand="onModuleNodeExpand" @node-collapse="onModuleNodeCollapse">
<div class="module-node-item" slot-scope="{ data }">
<div class="module-node-menu" :class="{group: data.moduleType === SysPermModuleType.GROUP}" v-if="!data.isAll">
<el-button type="text" size="mini" @click.stop="onEditpermModuleClick(data)" icon="el-icon-edit-outline"
<el-button type="text" :size="defaultFormItemSize" @click.stop="onEditpermModuleClick(data)" icon="el-icon-edit-outline"
:disabled="!checkPermCodeExist('formSysPerm:fragmentSysPerm:updatePermModule')"></el-button>
<el-button type="text" size="mini" v-show="data.moduleType === SysPermModuleType.GROUP"
<el-button type="text" :size="defaultFormItemSize" v-show="data.moduleType === SysPermModuleType.GROUP"
:disabled="!checkPermCodeExist('formSysPerm:fragmentSysPerm:addPermModule')" icon="el-icon-circle-plus-outline"
@click.stop="onAddChildPermModuleClick(data)"></el-button>
<el-button type="text" size="mini" @click.stop="onDeleteModuleClick(data)" icon="el-icon-delete"
<el-button type="text" :size="defaultFormItemSize" @click.stop="onDeleteModuleClick(data)" icon="el-icon-delete"
:disabled="!checkPermCodeExist('formSysPerm:fragmentSysPerm:deletePermModule')"></el-button>
</div>
<div class="module-node-text" :class="{group: data.moduleType === SysPermModuleType.GROUP}">
@@ -33,14 +33,15 @@
</el-card>
</el-aside>
<el-main style="margin-left: 15px; background-color: white; padding: 20px;">
<el-form label-width="75px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formPerm" :model="formPerm" label-width="75px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="关联URL">
<el-form-item label="关联URL" prop="formFilter.url">
<el-input class="filter-item" placeholder="URL模糊搜索" v-model="formPerm.formFilter.url"
size="mini" clearable />
:size="defaultFormItemSize" clearable />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormPerm(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formSysPerm:fragmentSysPerm:addPerm')"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormPerm(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formSysPerm:fragmentSysPerm:addPerm')"
@click="onCreatePermClick()">
新建
</el-button>
@@ -48,7 +49,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="formPerm.SysPerm.impl.dataList" size="mini" @sort-change="formPerm.SysPerm.impl.onSortChange"
<el-table :data="formPerm.SysPerm.impl.dataList" :size="defaultFormItemSize" @sort-change="formPerm.SysPerm.impl.onSortChange"
header-cell-class-name="table-header-gray" :height="(getMainContextHeight - 132) + 'px'">
<el-table-column label="序号" header-align="center" align="center" type="index" width="50px" :index="formPerm.SysPerm.impl.getTableIndex" />
<el-table-column label="权限名称" prop="permName" width="150px">
@@ -59,15 +60,15 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="150px">
<template slot-scope="scope">
<el-button @click="onEditPermModuleClick(scope.row)" type="text" size="mini"
<el-button @click="onEditPermModuleClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysPerm:fragmentSysPerm:updatePerm')">
编辑
</el-button>
<el-button @click="onDeleteClick(scope.row)" type="text" size="mini"
<el-button @click="onDeleteClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysPerm:fragmentSysPerm:deletePerm')">
删除
</el-button>
<el-button class="btn-table-primary" type="text" size="mini"
<el-button class="btn-table-primary" type="text" :size="defaultFormItemSize"
v-if="checkPermCodeExist('formSysPerm:fragmentSysPerm:listSysPermPermDetail')"
@click="onSysPermDetailClick(scope.row)">
权限详情
@@ -135,6 +136,10 @@ export default {
}
},
methods: {
onReset () {
this.$refs.formPerm.resetFields();
this.refreshFormPerm(true);
},
/**
* 权限数据获取函数返回Primise
*/

View File

@@ -2,18 +2,18 @@
<div class="tab-dialog-box" style="position: relative; margin-top: -15px;">
<el-tabs v-model="activeFragmentId">
<el-tab-pane label="用户查询" name="fragmentSysPermCodeUser" style="width: 100%;">
<el-form label-width="100px" size="mini" label-position="left" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="left" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="用户名">
<el-input class="filter-item" v-model="fragmentSysPermCodeUser.formFilter.loginName" clearable
placeholder="" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFragmentSysPermCodeUser(true)">查询</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFragmentSysPermCodeUser(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysPermCodeUser.SysUser.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysPermCodeUser.SysUser.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysPermCodeUser.SysUser.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"
@@ -28,7 +28,7 @@
</el-table-column>
<el-table-column label="菜单类型" prop="permCodeType">
<template slot-scope="scope">
<el-tag size="mini" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
<el-tag :size="defaultFormItemSize" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
</template>
</el-table-column>
</el-table>
@@ -36,18 +36,18 @@
</el-row>
</el-tab-pane>
<el-tab-pane label="角色查询" name="fragmentSysPermCodeRole" style="width: 100%;">
<el-form label-width="100px" size="mini" label-position="left" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="left" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="角色名称">
<el-input class="filter-item" v-model="fragmentSysPermCodeRole.formFilter.roleName" clearable
placeholder="" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFragmentSysPermCodeRole(true)">查询</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFragmentSysPermCodeRole(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysPermCodeRole.SysRole.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysPermCodeRole.SysRole.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysPermCodeRole.SysRole.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"
@@ -59,7 +59,7 @@
</el-table-column>
<el-table-column label="菜单类型" prop="permCodeType">
<template slot-scope="scope">
<el-tag size="mini" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
<el-tag :size="defaultFormItemSize" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
</template>
</el-table-column>
<el-table-column label="角色名称" prop="roleName" />

View File

@@ -1,15 +1,16 @@
<template>
<div>
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formPermCode" :model="formPermCode" label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="权限字名称">
<el-form-item label="权限字名称" prop="formFilter.showName">
<el-input class="filter-item" v-model="formPermCode.formFilter.showName"
:clearable="true" placeholder="权限字名称" />
</el-form-item>
<el-button slot="operator" type="primary" size="mini" :plain="true" @click="refreshFormPermCode(true)">
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :plain="true" @click="refreshFormPermCode(true)">
查询
</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formSysPermCode:fragmentSysPermCode:add')"
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formSysPermCode:fragmentSysPermCode:add')"
@click="onCreatePermCodeClick()">
新建
</el-button>
@@ -17,13 +18,13 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="getPermCodeList" size="mini" @sort-change="formPermCode.SysPermCode.impl.onSortChange"
<el-table :data="getPermCodeList" :size="defaultFormItemSize" @sort-change="formPermCode.SysPermCode.impl.onSortChange"
row-key="permCodeId" header-cell-class-name="table-header-gray">
<el-table-column label="权限字名称" prop="showName" width="250px">
</el-table-column>
<el-table-column label="权限字类型" prop="permCodeType" width="150px">
<template slot-scope="scope">
<el-tag size="mini" :type="getPermCodeType(scope.row.permCodeType)">{{SysPermCodeType.getValue(scope.row.permCodeType)}}</el-tag>
<el-tag :size="defaultFormItemSize" :type="getPermCodeType(scope.row.permCodeType)">{{SysPermCodeType.getValue(scope.row.permCodeType)}}</el-tag>
</template>
</el-table-column>
<el-table-column label="显示顺序" prop="showOrder" width="100px">
@@ -32,19 +33,19 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="200px">
<template slot-scope="scope">
<el-button @click="onEditPermCodeClick(scope.row)" type="text" size="mini"
<el-button @click="onEditPermCodeClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysPermCode:fragmentSysPermCode:update')">
编辑
</el-button>
<el-button @click="onAddChildPermCodeClick(scope.row)" type="text" size="mini"
<el-button @click="onAddChildPermCodeClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="scope.row.permCodeType === 2 || !checkPermCodeExist('formSysPermCode:fragmentSysPermCode:add')">
添加
</el-button>
<el-button @click="onDeleteClick(scope.row)" type="text" size="mini"
<el-button @click="onDeleteClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysPermCode:fragmentSysPermCode:delete')">
删除
</el-button>
<el-button class="btn-table-primary" type="text" size="mini"
<el-button class="btn-table-primary" type="text" :size="defaultFormItemSize"
v-if="checkPermCodeExist('formSysPermCode:fragmentSysPermCode:listSysPermCodePermDetail')"
@click="onSysPermCodeDetailClick(scope.row)">
权限详情
@@ -96,6 +97,10 @@ export default {
}
},
methods: {
onReset () {
this.$refs.formPermCode.resetFields();
this.refreshFormPermCode(true);
},
getPermCodeType (permCodeType) {
switch (permCodeType) {
case this.SysPermCodeType.FORM: return 'primary';

View File

@@ -1,13 +1,14 @@
<template>
<div style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formSysPost" :model="formSysPost" label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="岗位名称">
<el-form-item label="岗位名称" prop="formFilter.postName">
<el-input class="filter-item" v-model="formSysPost.formFilter.postName"
:clearable="true" placeholder="岗位名称" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormSysPost(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formSysPost:fragmentSysPost:add')"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormSysPost(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formSysPost:fragmentSysPost:add')"
@click="onFormAddPostClick()">
新建
</el-button>
@@ -15,7 +16,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="sysPost" :data="formSysPost.sysPost.impl.dataList" size="mini" @sort-change="formSysPost.sysPost.impl.onSortChange"
<el-table ref="sysPost" :data="formSysPost.sysPost.impl.dataList" :size="defaultFormItemSize" @sort-change="formSysPost.sysPost.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formSysPost.sysPost.impl.getTableIndex" />
<el-table-column label="岗位名称" prop="postName">
@@ -24,18 +25,18 @@
</el-table-column>
<el-table-column label="领导岗位" prop="leaderPost" sortable="custom">
<template slot-scope="scope">
<el-tag size="mini" :type="scope.row.leaderPost ? 'success' : 'danger'">
<el-tag :size="defaultFormItemSize" :type="scope.row.leaderPost ? 'success' : 'danger'">
{{scope.row.leaderPost ? '是' : '否'}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button @click.stop="onFormEditPostClick(scope.row)" type="text" size="mini"
<el-button @click.stop="onFormEditPostClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysPost:fragmentSysPost:update')">
编辑
</el-button>
<el-button class="table-btn delete" @click.stop="onDeleteClick(scope.row)" type="text" size="mini"
<el-button class="table-btn delete" @click.stop="onDeleteClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysPost:fragmentSysPost:delete')">
删除
</el-button>
@@ -91,6 +92,10 @@ export default {
}
},
methods: {
onReset () {
this.$refs.formSysPost.resetFields();
this.refreshFormSysPost(true);
},
/**
* 岗位管理数据获取函数返回Promise
*/

View File

@@ -1,19 +1,20 @@
<template>
<div class="tab-dialog-box" style="position: relative; margin-top: -15px;">
<el-tabs v-model="activeFragmentId">
<el-tab-pane label="权限资源" name="fragmentSysRolePerm" style="width: 100%;">
<el-form label-width="100px" size="mini" label-position="left" @submit.native.prevent>
<el-tab-pane ref="fragmentSysRolePerm" :model="fragmentSysRolePerm" label="权限资源" name="fragmentSysRolePerm" style="width: 100%;">
<el-form label-width="100px" :size="defaultFormItemSize" label-position="left" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="URL">
<el-input class="filter-item" v-model="fragmentSysRolePerm.formFilter.url" clearable
placeholder="" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshfragmentSysRolePerm(true)">查询</el-button>
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetPerm">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshfragmentSysRolePerm(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysRolePerm.SysRolePerm.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysRolePerm.SysRolePerm.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysRolePerm.SysRolePerm.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"
@@ -30,18 +31,19 @@
</el-row>
</el-tab-pane>
<el-tab-pane label="权限字" name="fragmentSysRolePermCode" style="width: 100%;">
<el-form label-width="100px" size="mini" label-position="left" @submit.native.prevent>
<el-form ref="fragmentSysRolePermCode" :model="fragmentSysRolePermCode" label-width="100px" :size="defaultFormItemSize" label-position="left" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="权限字">
<el-form-item label="权限字" prop="formFilter.permCode">
<el-input class="filter-item" v-model="fragmentSysRolePermCode.formFilter.permCode" clearable
placeholder="" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshfragmentSysRolePermCode(true)">查询</el-button>
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetPermCode">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshfragmentSysRolePermCode(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysRolePermCode.SysRolePermCode.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysRolePermCode.SysRolePermCode.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysRolePermCode.SysRolePermCode.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"
@@ -54,7 +56,7 @@
<el-table-column label="权限字" prop="permCode" />
<el-table-column label="权限字类型" prop="permCodeType">
<template slot-scope="scope">
<el-tag size="mini" :type="getPermCodeType(scope.row.permCodeType)">{{SysPermCodeType.getValue(scope.row.permCodeType)}}</el-tag>
<el-tag :size="defaultFormItemSize" :type="getPermCodeType(scope.row.permCodeType)">{{SysPermCodeType.getValue(scope.row.permCodeType)}}</el-tag>
</template>
</el-table-column>
</el-table>
@@ -109,6 +111,14 @@ export default {
}
},
methods: {
onResetPerm () {
this.$refs.fragmentSysRolePerm.resetFields();
this.refreshfragmentSysRolePerm(true);
},
onResetPermCode () {
this.$refs.fragmentSysRolePermCode.resetFields();
this.refreshfragmentSysRolePermCode(true);
},
getMenuType (row) {
if (row.menuType === 0) {
return 'primary'

View File

@@ -3,14 +3,15 @@
<el-tabs v-model="activeFragmentId" :before-leave="onFragmentChange">
<el-tab-pane label="角色管理" name="fragmentSysRole" style="width: 100%;"
v-if="checkPermCodeExist('formSysRole:fragmentSysRole')">
<el-form label-width="75px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="fragmentSysRole" :model="fragmentSysRole" label-width="75px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="角色名称">
<el-form-item label="角色名称" prop="formFilter.sysRoleName">
<el-input class="filter-item" v-model="fragmentSysRole.formFilter.sysRoleName"
:clearable="true" placeholder="角色名称" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFragmentSysRole(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formSysRole:fragmentSysRole:add')"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetRole">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFragmentSysRole(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formSysRole:fragmentSysRole:add')"
@click="onAddSysRoleClick()">
新建
</el-button>
@@ -18,7 +19,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysRole.SysRole.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysRole.SysRole.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysRole.SysRole.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="50px"
@@ -27,15 +28,15 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="150px">
<template slot-scope="scope">
<el-button @click="onEditSysRoleClick(scope.row)" type="text" size="mini"
<el-button @click="onEditSysRoleClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysRole:fragmentSysRole:update')">
编辑
</el-button>
<el-button @click="onDeleteClick(scope.row)" type="text" size="mini"
<el-button @click="onDeleteClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysRole:fragmentSysRole:delete')">
删除
</el-button>
<el-button class="btn-table-primary" type="text" size="mini"
<el-button class="btn-table-primary" type="text" :size="defaultFormItemSize"
v-if="checkPermCodeExist('formSysRole:fragmentSysRole:listSysRolePermDetail')"
@click="onSysRolePermClick(scope.row)">
权限详情
@@ -61,7 +62,7 @@
</el-tab-pane>
<el-tab-pane label="用户授权" name="fragmentSysRoleUser" style="width: 100%;"
v-if="checkPermCodeExist('formSysRole:fragmentSysRoleUser')">
<el-form label-width="75px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="fragmentSysRoleUser" :model="fragmentSysRoleUser" label-width="75px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="用户角色">
<el-select class="filter-item" v-model="fragmentSysRoleUser.formFilter.sysRoleId" clearable
@@ -71,14 +72,15 @@
<el-option v-for="item in fragmentSysRoleUser.sysRole.impl.dropdownList" :key="item.roleId" :value="item.roleId" :label="item.roleName" />
</el-select>
</el-form-item>
<el-form-item label="用户名">
<el-form-item label="用户名" prop="formFilter.sysUserLoginName">
<el-input class="filter-item" v-model="fragmentSysRoleUser.formFilter.sysUserLoginName"
:clearable="true" placeholder="输入用户名 / 昵称查询" @change="refreshFragmentSysRoleUser(true)" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFragmentSysRoleUser(true)">
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetRoleUser">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFragmentSysRoleUser(true)">
查询
</el-button>
<el-button slot="operator" type="primary" size="mini" @click="onAddRow()"
<el-button slot="operator" type="primary" :size="defaultFormItemSize" @click="onAddRow()"
:disabled="!checkPermCodeExist('formSysRole:fragmentSysRoleUser:addUserRole') ||
fragmentSysRoleUser.formFilter.sysRoleId == null || fragmentSysRoleUser.formFilter.sysRoleId === ''">
添加用户
@@ -87,7 +89,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysRoleUser.SysUser.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysRoleUser.SysUser.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysRoleUser.SysUser.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="50px" :index="fragmentSysRoleUser.SysUser.impl.getTableIndex" />
@@ -102,12 +104,12 @@
</el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<el-tag :type="getUserStatusType(scope.row.userStatus)" size="mini">{{SysUserStatus.getValue(scope.row.userStatus)}}</el-tag>
<el-tag :type="getUserStatusType(scope.row.userStatus)" :size="defaultFormItemSize">{{SysUserStatus.getValue(scope.row.userStatus)}}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="80px">
<template slot-scope="scope">
<el-button class="btn-table-delete" type="text" size="mini"
<el-button class="btn-table-delete" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formSysRole:fragmentSysRoleUser:deleteUserRole')"
@click="onDeleteRow(scope.row)">
移除
@@ -183,6 +185,14 @@ export default {
}
},
methods: {
onResetRole () {
this.$refs.fragmentSysRole.resetFields();
this.refreshFragmentSysRole(true);
},
onResetRoleUser () {
this.$refs.fragmentSysRoleUser.resetFields();
this.refreshFragmentSysRoleUser(true);
},
/**
* 用户角色数据获取函数返回Primise
*/

View File

@@ -2,18 +2,18 @@
<div class="tab-dialog-box" style="position: relative; margin-top: -15px;">
<el-tabs v-model="activeFragmentId">
<el-tab-pane label="权限资源" name="fragmentSysUserPerm" style="width: 100%;">
<el-form label-width="100px" size="mini" label-position="left" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="left" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="URL">
<el-input class="filter-item" v-model="fragmentSysUserPerm.formFilter.url" clearable
placeholder="" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFragmentSysUserPerm(true)">查询</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFragmentSysUserPerm(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysUserPerm.SysUserPerm.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysUserPerm.SysUserPerm.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysUserPerm.SysUserPerm.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"
@@ -31,18 +31,18 @@
</el-row>
</el-tab-pane>
<el-tab-pane label="权限字" name="fragmentSysUserPermCode" style="width: 100%;">
<el-form label-width="100px" size="mini" label-position="left" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="left" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="权限字">
<el-input class="filter-item" v-model="fragmentSysUserPermCode.formFilter.permCode" clearable
placeholder="" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFragmentSysUserPermCode(true)">查询</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFragmentSysUserPermCode(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysUserPermCode.SysUserPermCode.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysUserPermCode.SysUserPermCode.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysUserPermCode.SysUserPermCode.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"
@@ -56,7 +56,7 @@
<el-table-column label="权限字" prop="permCode" />
<el-table-column label="权限字类型" prop="permCodeType">
<template slot-scope="scope">
<el-tag size="mini" :type="getPermCodeType(scope.row.permCodeType)">{{SysPermCodeType.getValue(scope.row.permCodeType)}}</el-tag>
<el-tag :size="defaultFormItemSize" :type="getPermCodeType(scope.row.permCodeType)">{{SysPermCodeType.getValue(scope.row.permCodeType)}}</el-tag>
</template>
</el-table-column>
</el-table>
@@ -64,18 +64,18 @@
</el-row>
</el-tab-pane>
<el-tab-pane label="菜单权限" name="fragmentSysUserMenu" style="width: 100%;">
<el-form label-width="100px" size="mini" label-position="left" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="left" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="菜单名称">
<el-input class="filter-item" v-model="fragmentSysUserMenu.formFilter.menuName" clearable
placeholder="" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFragmentSysUserMenu(true)">查询</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFragmentSysUserMenu(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="fragmentSysUserMenu.SysUserMenu.impl.dataList" size="mini" :height="getTableHeight + 'px'"
<el-table :data="fragmentSysUserMenu.SysUserMenu.impl.dataList" :size="defaultFormItemSize" :height="getTableHeight + 'px'"
@sort-change="fragmentSysUserMenu.SysUserMenu.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px"
@@ -88,7 +88,7 @@
</el-table-column>
<el-table-column label="菜单类型" prop="menuType">
<template slot-scope="scope">
<el-tag size="mini" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
<el-tag :size="defaultFormItemSize" :type="getMenuType(scope.row)">{{SysMenuType.getValue(scope.row.menuType)}}</el-tag>
</template>
</el-table-column>
</el-table>

View File

@@ -1,8 +1,8 @@
<template>
<div>
<el-form label-width="75px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formSysUser" :model="formSysUser" label-width="75px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="用户状态">
<el-form-item label="用户状态" prop="formFilter.sysUserStatus">
<el-select class="filter-item" v-model="formSysUser.formFilter.sysUserStatus" :clearable="true"
placeholder="用户状态" :loading="formSysUser.sysUserStatus.impl.loading"
@visible-change="formSysUser.sysUserStatus.impl.onVisibleChange"
@@ -10,12 +10,13 @@
<el-option v-for="item in formSysUser.sysUserStatus.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="登录名称">
<el-form-item label="登录名称" prop="formFilter.sysUserLoginName">
<el-input class="filter-item" v-model="formSysUser.formFilter.sysUserLoginName"
:clearable="true" placeholder="登录名称" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormSysUser(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formSysUser:fragmentSysUser:add')"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormSysUser(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formSysUser:fragmentSysUser:add')"
@click="onAddRow()">
新建
</el-button>
@@ -23,7 +24,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="formSysUser.SysUser.impl.dataList" size="mini" @sort-change="formSysUser.SysUser.impl.onSortChange"
<el-table :data="formSysUser.SysUser.impl.dataList" :size="defaultFormItemSize" @sort-change="formSysUser.SysUser.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="50px" :index="formSysUser.SysUser.impl.getTableIndex" />
<el-table-column label="用户名" prop="loginName" sortable="custom">
@@ -33,7 +34,7 @@
<el-table-column label="账号类型" prop="userTypeDictMap.name" />
<el-table-column label="状态">
<template slot-scope="scope">
<el-tag :type="getUserStatusType(scope.row.userStatus)" size="mini">{{SysUserStatus.getValue(scope.row.userStatus)}}</el-tag>
<el-tag :type="getUserStatusType(scope.row.userStatus)" :size="defaultFormItemSize">{{SysUserStatus.getValue(scope.row.userStatus)}}</el-tag>
</template>
</el-table-column>
<el-table-column label="创建时间">
@@ -43,22 +44,22 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="220px">
<template slot-scope="scope">
<el-button class="btn-table-edit" type="text" size="mini" @click="onEditRow(scope.row)"
<el-button class="btn-table-edit" type="text" :size="defaultFormItemSize" @click="onEditRow(scope.row)"
:disabled="isAdmin(scope.row) || !checkPermCodeExist('formSysUser:fragmentSysUser:update')"
>
编辑
</el-button>
<el-button class="btn-table-delete" type="text" size="mini" @click="onDeleteRow(scope.row)"
<el-button class="btn-table-delete" type="text" :size="defaultFormItemSize" @click="onDeleteRow(scope.row)"
:disabled="isAdmin(scope.row) || !checkPermCodeExist('formSysUser:fragmentSysUser:delete')"
>
删除
</el-button>
<el-button class="btn-table-delete" type="text" size="mini" @click="onResetPassword(scope.row)"
<el-button class="btn-table-delete" type="text" :size="defaultFormItemSize" @click="onResetPassword(scope.row)"
:disabled="!checkPermCodeExist('formSysUser:fragmentSysUser:resetPassword')"
>
重置密码
</el-button>
<el-button class="btn-table-primary" type="text" size="mini"
<el-button class="btn-table-primary" type="text" :size="defaultFormItemSize"
v-if="checkPermCodeExist('formSysUser:fragmentSysUser:listSysUserPermDetail')"
@click="onSysUserPermClick(scope.row)">
权限详情
@@ -121,6 +122,10 @@ export default {
}
},
methods: {
onReset () {
this.$refs.formSysUser.resetFields();
this.refreshFormSysUser(true);
},
isAdmin (row) {
return (row.userType === this.SysUserType.ADMIN);
},

View File

@@ -1,7 +1,7 @@
<template>
<div>
<div class="title">
<p>浏览完每个功能过后自然会发现些与众不同然而这一切都<span> 橙单 </span>生成</p>
<p>无论是专业版还是企业版的脚手架我们全部开源免费这一切都<span> 橙单 </span>为您生成</p>
</div>
<el-row type="flex">
<div style="width: 100%;">
@@ -10,37 +10,37 @@
<el-collapse-item title="选择我们的 5 个理由" name="1">
<ul class="item-list">
<li>是真正的生成器而非脚手架</li>
<li>技术选型包名作者署名都由您钦定</li>
<li>手把手教的操作指南和教学视频</li>
<li>可生成卓越的架构和高质量的代码</li>
<li>生成后工程代码完全可读包名和作者署名都由您钦定</li>
<li>授权极为宽松生成后代码版权完全归属于您</li>
<li>详尽完善免费护眼的开发文档</li>
<li>全网超合理超低价商业授权就是撸顿串的价格</li>
</ul>
</el-collapse-item>
<el-collapse-item title="我们的技术选型" name="2">
<ul class="item-list">
<li>Element (Vue) / Ant Design (React) / ECharts / AntV / Axios / Webpack</li>
<li>Spring Boot / Spring Cloud / Spring Cloud Alibaba + Mybatis + Jwt</li>
<li>Hutool + Guava + Caffeine + Lombok + MapStruct + 通用 Mapper</li>
<li>Redis + Zookeeper + Nacos + Consul + Apollo + XXL-Job + Kafka + Seata</li>
<li>Hutool + Guava + Caffeine + Lombok + MapStruct + Flowable + Activiti</li>
<li>Redis + Zookeeper + Nacos + Consul + XXL-Job + Quartz + Kafka + RocketMQ + Seata</li>
<li>ELK + PinPoint / SkyWalking + Grafana + Prometheus</li>
</ul>
</el-collapse-item>
<el-collapse-item title="可快速上手的高质量代码" name="3">
<ul class="item-list">
<li>无任何二次封装只生成您最懂的代码</li>
<li>遵循阿里巴巴标准的代码规范</li>
<li>主流技术栈恣意组合对面试大有裨益</li>
<li>产品级代码强度层次清晰滴水不漏</li>
<li>15年架构师优化的每一处细节</li>
<li>完整的工作流支持</li>
<li>完整的在线表单支持</li>
<li>完整的静态表单支持</li>
<li>完整的多关联数据组装支持</li>
<li>完整的中台化核心组件支持</li>
</ul>
</el-collapse-item>
<el-collapse-item title="设计理念和未来目标" name="4">
<ul class="item-list">
<li>全面实用的日志跟踪和服务监控体系</li>
<li>全面且实用的日志跟踪链路跟踪和服务监控体系</li>
<li>前沿的单表组合式设计使系统拆分SO EASY</li>
<li>先代码后SQL的原则让服务扩充更具弹性</li>
<li>统一的数据组装接口更高效的满足微服务的拆分与再合并</li>
<li>拥抱云原生架构更多可落地的实用功能正在开发之中</li>
<li>支持实时与离线的数据同步更好的拥抱云原生架构</li>
</ul>
</el-collapse-item>
</el-collapse>
@@ -62,6 +62,11 @@
<a href="https://www.bilibili.com/video/BV1Wg4y1i7vP" target="_blank">https://www.bilibili.com/video/BV1Wg4y1i7vP</a>
</div>
<el-divider></el-divider>
<div class="item">
<span style="width: 120px;">更多演示</span>
<a href="http://demo.orangeforms.com/" target="_blank">http://demo.orangeforms.com/</a>
</div>
<el-divider></el-divider>
<div class="item">
<span style="width: 120px;">操作指南</span>
<a href="http://www.orangeforms.com/orange-doc/" target="_blank">http://www.orangeforms.com/orange-doc/</a>
@@ -82,14 +87,14 @@
<span>
QQ群
<a target="_blank" style="margin-left: 5px;"
href="//shang.qq.com/wpa/qunwpa?idkey=590857a1b4c587e2be3d66b9a7e2015109772e777c6451c897dee393489b1661">
788581363
href="https://qm.qq.com/cgi-bin/qm/qr?k=cMMom9SdX1j57T_58WihLZ4TBrBpokrv&jump_from=webapi">
883176267
</a>
</span>
</div>
<el-divider></el-divider>
<div style="width: 100%; text-align: center; padding: 10px;">
<img src="../../assets/img/orange-group1.png" />
<img src="../../assets/img/orange-group2.png" />
</div>
</el-card>
</el-row>

View File

@@ -0,0 +1,223 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="form" :model="formData" class="full-width-input" style="width: 100%;"
label-width="130px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="抄送类型" prop="type">
<el-select class="input-item" v-model="formData.type"
placeholder="抄送类型" @change="onCopyForTypeChange">
<el-option v-for="item in SysFlowCopyForType.getList()"
:key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item v-if="formData.type === SysFlowCopyForType.USER" label="抄送人" prop="id">
<TagSelect v-model="formData.id">
<el-button slot="append" class="append-add" type="default" icon="el-icon-plus" @click="onSelectUser" />
</TagSelect>
</el-form-item>
<el-form-item v-if="formData.type === SysFlowCopyForType.ROLE" label="抄送角色" prop="id">
<el-select v-model="formData.id" placeholder="" :multiple="true">
<el-option v-for="role in roleList" :key="role.id" :label="role.name" :value="role.id" />
</el-select>
</el-form-item>
<el-form-item v-if="formData.type === SysFlowCopyForType.DEPT" label="抄送部门" prop="id">
<TagSelect v-model="selectDeptList">
<el-button slot="append" class="append-add" type="default" icon="el-icon-plus" @click="onSelectDept" />
</TagSelect>
</el-form-item>
<el-form-item v-if="[SysFlowCopyForType.POST, SysFlowCopyForType.SELF_DEPT_POST, SysFlowCopyForType.UP_DEPT_POST].indexOf(formData.type) !== -1"
:label="SysFlowCopyForType.getValue(formData.type)" prop="id">
<el-select v-model="formData.id" placeholder="" :multiple="true">
<el-option v-for="post in postList" :key="post.postId" :label="post.postName" :value="post.postId" />
</el-select>
</el-form-item>
<el-form-item v-if="formData.type === SysFlowCopyForType.DEPT_POST" label="抄送部门" prop="deptId">
<el-cascader v-model="deptId" :clearable="true"
:size="defaultFormItemSize" placeholder=""
:props="{value: 'id', label: 'name', checkStrictly: true}"
:options="deptList" @change="onDeptChange"
>
</el-cascader>
</el-form-item>
<el-form-item v-if="formData.type === SysFlowCopyForType.DEPT_POST" label="抄送岗位" prop="id">
<el-select v-model="formData.id" placeholder="" :multiple="true">
<el-option v-for="post in validDeptPostList" :key="post.deptPostId" :label="post.postShowName" :value="post.deptPostId" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-row type="flex" justify="end">
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" :size="defaultFormItemSize" @click="onSubmit()">
保存
</el-button>
</el-row>
</el-col>
</el-row>
</el-form>
</div>
</template>
<script>
import { findItemFromList } from '@/utils';
import TagSelect from '@/views/workflow/components/TagSelect.vue';
import TaskUserSelect from '@/views/workflow/components/TaskUserSelect.vue';
import TaskGroupSelect from '@/views/workflow/components/TaskGroupSelect.vue';
export default {
props: {
deptList: {
type: Array,
required: true
},
postList: {
type: Array,
required: true
},
deptPostList: {
type: Array,
required: true
},
roleList: {
type: Array,
required: true
}
},
components: {
TagSelect
},
data () {
return {
deptId: undefined,
selectDeptList: [],
formData: {
type: this.SysFlowCopyForType.USER,
id: undefined
}
}
},
methods: {
onCancel (isSuccess, data) {
if (this.observer != null) {
this.observer.cancel(isSuccess, data);
}
},
onSubmit () {
if (this.formData.type === this.SysFlowCopyForType.DEPT_POST && (this.deptId == null || this.deptId === '')) {
this.$message.warning('请选择抄送部门');
return;
}
if ((this.formData.id == null || this.formData.id === '') &&
this.formData.type !== this.SysFlowCopyForType.SELF_DEPT_LEADER &&
this.formData.type !== this.SysFlowCopyForType.UP_DEPT_LEADER) {
this.$message.warning('请选择' + this.SysFlowCopyForType.getValue(this.formData.type));
return;
}
let tempId = null;
switch (this.formData.type) {
case this.SysFlowCopyForType.ROLE:
tempId = this.formData.id.join(',');
break;
case this.SysFlowCopyForType.USER:
case this.SysFlowCopyForType.DEPT:
tempId = this.formData.id;
break;
case this.SysFlowCopyForType.POST:
case this.SysFlowCopyForType.SELF_DEPT_POST:
case this.SysFlowCopyForType.UP_DEPT_POST:
case this.SysFlowCopyForType.DEPT_POST:
tempId = this.formData.id.join(',');
break;
default:
tempId = '';
break;
}
this.onCancel(true, {
type: this.formData.type,
id: tempId
});
},
onDeptChange (val) {
this.formData.id = undefined;
},
onCopyForTypeChange (val) {
this.formData.id = undefined;
this.deptId = undefined;
this.selectDeptList = [];
},
onSelectUser () {
let usedUserIdList = (this.formData.id == null || this.formData.id === '') ? [] : this.formData.id.split(',');
this.$dialog.show('添加抄送人', TaskUserSelect, {
area: ['1000px', '600px']
}, {
multiple: true,
usedUserIdList: usedUserIdList
}).then(res => {
let userList = [];
if (Array.isArray(res)) {
userList = res.map(item => item.loginName);
} else {
if (res && res.loginName !== '') {
userList = [res.loginName];
}
}
// 跟老的候选人合并
if (Array.isArray(usedUserIdList) && usedUserIdList.length > 0) {
userList.forEach(item => {
if (usedUserIdList.indexOf(item) === -1) {
usedUserIdList.push(item);
}
});
} else {
usedUserIdList = userList;
}
this.formData.id = usedUserIdList.join(',');
}).catch(e => {});
},
onSelectDept () {
let usedIdList = (this.formData.id == null || this.formData.id === '') ? [] : this.formData.id.split(',');
this.$dialog.show('选择部门', TaskGroupSelect, {
area: ['600px', '600px']
}, {
allGroupList: this.deptList,
usedIdList: usedIdList
}).then(res => {
if (Array.isArray(res)) {
if (!Array.isArray(this.selectDeptList)) this.selectDeptList = [];
res.forEach(item => {
if (findItemFromList(this.selectDeptList, item.id, 'id') == null) {
this.selectDeptList.push(item);
}
});
}
this.formData.id = Array.isArray(this.selectDeptList) ? this.selectDeptList.map(item => item.id).join(',') : '';
}).catch(e => {});
}
},
computed: {
validDeptPostList () {
let id = Array.isArray(this.deptId) ? this.deptId[this.deptId.length - 1] : undefined;
if (id == null) return [];
return this.deptPostList.filter(item => {
return item.deptId === id;
});
}
}
}
</script>
<style scoped>
.append-add {
border: none;
border-left: 1px solid #DCDFE6;
border-radius: 0px;
background: #F5F7FA;
}
</style>

View File

@@ -0,0 +1,280 @@
<template>
<el-col class="copy-select" :span="24">
<el-table :data="tableDataList" :show-header="false">
<el-table-column label="操作" width="45px">
<template slot-scope="scope">
<el-button class="table-btn delete" type="text" icon="el-icon-remove-outline"
@click="onDeleteCopyItem(scope.row)"
/>
</template>
</el-table-column>
<el-table-column label="抄送类型" width="150px">
<template slot-scope="scope">
<span>{{SysFlowCopyForType.getValue(scope.row.type)}}</span>
</template>
</el-table-column>
<el-table-column label="抄送对象">
<template slot-scope="scope">
<el-tag :size="defaultFormItemSize" type="primary" effect="dark"
v-for="item in scope.row.showNameList" :key="item.id"
closable @close="onCloseSubItem(scope.row, item)"
>
{{item.name}}
</el-tag>
</template>
</el-table-column>
</el-table>
<el-button class="full-line-btn" icon="el-icon-plus" @click="onEditCopyForItem()">添加抄送人</el-button>
</el-col>
</template>
<script>
import { treeDataTranslate } from '@/utils';
import { SysPostController, DictionaryController } from '@/api';
import addCopyForItem from './addCopyForItem.vue';
export default {
name: 'copyForSelect',
props: {
value: {
type: Array,
default: () => []
}
},
data () {
return {
isInit: false,
roleList: [],
roleMap: new Map(),
deptList: [],
deptMap: new Map(),
postList: [],
postMap: new Map(),
deptPostList: [],
deptPostMap: new Map()
}
},
methods: {
onDeleteCopyItem (row) {
this.$confirm('是否删除此抄送人?').then(res => {
let temp = (this.value || []).filter(item => {
return row.type !== item.type;
});
this.$emit('input', temp);
}).catch(e => {});
},
onCloseSubItem (row, item) {
this.$confirm('是否移除此抄送人?').then(res => {
let temp = (this.value || []).filter(copyItem => {
if (row.type === copyItem.type) {
if (copyItem.id == null || copyItem.id === '') return false;
let tempIdList = (copyItem.id || '').split(',');
tempIdList = tempIdList.filter(subItemId => {
return subItemId !== item.id;
});
if (tempIdList.length <= 0) {
return false;
} else {
copyItem.id = tempIdList.join(',');
return true;
}
} else {
return true;
}
});
this.$emit('input', temp);
}).catch(e => {});
},
onEditCopyForItem () {
this.$dialog.show('添加抄送人', addCopyForItem, {
area: '600px'
}, {
roleList: this.roleList,
deptList: this.deptList,
postList: this.postList,
deptPostList: this.deptPostList
}).then(res => {
let copyForType = res.type;
let bFind = false;
// 按照抄送类型更新
let temp = (this.value || []).map(copyItem => {
if (copyItem.type === copyForType) {
bFind = true;
let oldIdList = (copyItem.id || '').split(',');
let newIdList = (res.id || '').split(',');
// 合并新旧选项
let idList = oldIdList;
newIdList.forEach(id => {
if (idList.indexOf(id) === -1) idList.push(id);
});
return {
...copyItem,
id: idList.join(',')
};
} else {
return {
...copyItem
}
}
});
if (!bFind) {
temp.push({
...res
});
}
this.$emit('input', temp);
}).catch(e => {});
},
loadSysDeptList () {
return new Promise((resolve, reject) => {
DictionaryController.dictSysDept(this, {}).then(res => {
res.getList().forEach(item => {
this.deptMap.set(item.id, item);
});
this.deptList = treeDataTranslate(res.getList());
resolve();
}).catch(e => {
reject(e);
});
});
},
loadDeptPostList () {
return new Promise((resolve, reject) => {
DictionaryController.dictDeptPost(this, {}).then(res => {
res.forEach(item => {
this.deptPostMap.set(item.deptPostId, item);
});
this.deptPostList = res.sort((value1, value2) => {
return value1.level - value2.level;
});
resolve();
}).catch(e => {
reject(e);
});
});
},
loadSysPostList () {
this.postMap = new Map();
return new Promise((resolve, reject) => {
SysPostController.list(this, {}).then(res => {
this.postList = res.data.dataList;
this.postList.forEach(item => {
this.postMap.set(item.postId, item);
});
resolve();
}).catch(e => {
reject(e);
});
});
},
loadSysRoleList () {
return new Promise((resolve, reject) => {
DictionaryController.dictSysRole(this, {}).then(res => {
this.roleList = res.getList();
this.roleList.forEach(item => {
this.roleMap.set(item.id, item);
});
resolve();
}).catch(e => {
reject(e);
});
});
}
},
computed: {
tableDataList () {
if (this.isInit && Array.isArray(this.value)) {
return this.value.map(item => {
let showNameList = (item.id || '').split(',');
switch (item.type) {
case this.SysFlowCopyForType.USER:
showNameList = showNameList.map(id => {
return (id && id !== '') ? {
id: id,
name: id
} : undefined
}).filter(item => item != null);
break;
case this.SysFlowCopyForType.ROLE:
showNameList = showNameList.map(id => {
let role = this.roleMap.get(id);
return role ? {
id: id,
name: role.name
} : undefined
}).filter(item => item != null);
break;
case this.SysFlowCopyForType.DEPT:
showNameList = showNameList.map(id => {
let dept = this.deptMap.get(id);
return dept ? {
id: id,
name: dept.name
} : undefined
}).filter(item => item != null);
break;
case this.SysFlowCopyForType.SELF_DEPT_LEADER:
case this.SysFlowCopyForType.UP_DEPT_LEADER:
showNameList = [];
break;
case this.SysFlowCopyForType.POST:
case this.SysFlowCopyForType.SELF_DEPT_POST:
case this.SysFlowCopyForType.UP_DEPT_POST:
showNameList = showNameList.map(id => {
let post = this.postMap.get(id);
return post ? {
id: id,
name: post.postName
} : undefined
}).filter(item => item != null);
break;
case this.SysFlowCopyForType.DEPT_POST:
showNameList = showNameList.map(id => {
let deptPost = this.deptPostMap.get(id);
return deptPost ? {
id: id,
name: deptPost.deptName + ' / ' + deptPost.postShowName
} : undefined
}).filter(item => item != null);
break;
}
return {
...item,
showNameList
}
});
}
return [];
}
},
mounted () {
let httpCalls = [
this.loadSysDeptList(),
this.loadSysPostList(),
this.loadDeptPostList(),
this.loadSysRoleList()
];
Promise.all(httpCalls).then(res => {
this.isInit = true;
}).catch(e => {});
},
beforeDestroy () {
this.roleMap = null;
this.deptMap = null;
this.postMap = null;
this.deptPostMap = null;
}
}
</script>
<style scoped>
.full-line-btn {
width: 100%;
margin: 10px 0px;
border: 1px dashed #EBEEF5;
}
.copy-select >>> .el-tag {
margin-right: 10px;
}
</style>

View File

@@ -3,13 +3,14 @@
<div class="task-title">
<div>
<span class="text">{{flowInfo.flowEntryName}}</span>
<el-tag v-if="flowInfo.taskName" effect="dark" size="mini" type="success">{{'当前节点' + flowInfo.taskName}}</el-tag>
<el-tag v-if="flowInfo.processInstanceInitiator" effect="dark" size="mini" type="info">{{'发起人' + flowInfo.processInstanceInitiator}}</el-tag>
<el-tag v-if="flowInfo.taskName" effect="dark" :size="defaultFormItemSize" type="success">{{'当前节点' + flowInfo.taskName}}</el-tag>
<el-tag v-if="flowInfo.processInstanceInitiator" effect="dark" :size="defaultFormItemSize" type="info">{{'发起人' + flowInfo.processInstanceInitiator}}</el-tag>
</div>
</div>
<el-row type="flex" justify="space-between" style="margin-bottom: 15px;">
<el-radio-group size="small" v-model="currentPage" v-if="processInstanceId != null" style="min-width: 300px;">
<el-radio-group size="small" v-model="currentPage" style="min-width: 350px;">
<el-radio-button label="formInfo">表单信息</el-radio-button>
<el-radio-button v-if="processInstanceId == null || isRuntime || isRuntime === 'true'" label="copyInfo">抄送设置</el-radio-button>
<el-radio-button v-if="processInstanceId != null" label="flowProcess">流程图</el-radio-button>
<el-radio-button v-if="processInstanceId != null" label="approveInfo">审批记录</el-radio-button>
</el-radio-group>
@@ -28,7 +29,7 @@
</el-row>
<el-scrollbar class="custom-scroll" :style="{height: (getMainContextHeight - 140) + 'px'}">
<el-form ref="form" class="full-width-input" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<!-- 表单信息 -->
<el-row v-show="currentPage === 'formInfo'" type="flex" :key="formKey">
<slot />
@@ -36,14 +37,14 @@
<!-- 审批记录 -->
<el-row v-if="currentPage === 'approveInfo'" :gutter="20">
<el-col :span="24">
<el-table :data="flowTaskCommentList" size="mini" border header-cell-class-name="table-header-gray" :height="(getMainContextHeight - 150) + 'px'">
<el-table :data="flowTaskCommentList" :size="defaultFormItemSize" border header-cell-class-name="table-header-gray" :height="(getMainContextHeight - 150) + 'px'">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
<el-table-column label="流程环节" prop="taskName" width="200px" />
<el-table-column label="执行人" prop="createUsername" width="200px" />
<el-table-column label="操作" width="150px">
<template slot-scope="scope">
<el-tag size="mini" :type="getOperationTagType(scope.row.approvalType)" effect="dark">{{SysFlowTaskOperationType.getValue(scope.row.approvalType)}}</el-tag>
<el-tag v-if="scope.row.delegateAssginee != null" size="mini" type="success" effect="plain" style="margin-left: 10px;">{{scope.row.delegateAssginee}}</el-tag>
<el-tag :size="defaultFormItemSize" :type="getOperationTagType(scope.row.approvalType)" effect="dark">{{SysFlowTaskOperationType.getValue(scope.row.approvalType)}}</el-tag>
<el-tag v-if="scope.row.delegateAssginee != null" :size="defaultFormItemSize" type="success" effect="plain" style="margin-left: 10px;">{{scope.row.delegateAssginee}}</el-tag>
</template>
</el-table-column>
<el-table-column label="审批意见">
@@ -63,6 +64,12 @@
:allCommentList="flowTaskCommentList"
/>
</el-row>
<!-- 抄送设置 -->
<el-row v-show="currentPage === 'copyInfo'">
<el-col :span="24" style="border-top: 1px solid #EBEEF5">
<CopyForSelect v-model="copyItemList" />
</el-col>
</el-row>
</el-form>
</el-scrollbar>
<label class="page-close-box">
@@ -78,6 +85,7 @@ import { mapGetters } from 'vuex';
import { cachedPageChildMixin } from '@/core/mixins';
import { FlowOperationController } from '@/api/flowController.js';
import ProcessViewer from '@/views/workflow/components/ProcessViewer.vue';
import CopyForSelect from '@/views/workflow/components/CopyForSelect/index.vue';
export default {
name: 'handlerFowTask',
@@ -90,6 +98,9 @@ export default {
processDefinitionId: {
type: String
},
isRuntime: {
type: [Boolean, String]
},
// 流程名称
flowEntryName: {
type: String
@@ -108,7 +119,8 @@ export default {
}
},
components: {
ProcessViewer
ProcessViewer,
CopyForSelect
},
mixins: [cachedPageChildMixin],
data () {
@@ -122,7 +134,8 @@ export default {
flowEntryName: this.flowEntryName,
processInstanceInitiator: this.processInstanceInitiator
},
flowTaskCommentList: []
flowTaskCommentList: [],
copyItemList: []
}
},
methods: {
@@ -145,6 +158,7 @@ export default {
case this.SysFlowTaskOperationType.MULTI_REFUSE:
return 'default';
case this.SysFlowTaskOperationType.REJECT:
case this.SysFlowTaskOperationType.REJECT_TO_START:
case this.SysFlowTaskOperationType.REVOKE:
return 'danger';
default: return 'default';
@@ -162,20 +176,18 @@ export default {
return 'warning';
case this.SysFlowTaskOperationType.STOP:
case this.SysFlowTaskOperationType.REJECT:
case this.SysFlowTaskOperationType.REJECT_TO_START:
case this.SysFlowTaskOperationType.REVOKE:
return 'danger';
default:
return 'primary';
}
},
onStartFlow (operation) {
this.$emit('start', operation);
},
handlerOperation (operation) {
if (this.processInstanceId == null) {
this.onStartFlow(operation);
this.$emit('start', operation, this.copyItemList);
} else {
this.$emit('submit', operation);
this.$emit('submit', operation, this.copyItemList);
}
},
getTaskHighlightData () {

View File

@@ -11,15 +11,15 @@
</marker>
</defs>
<!-- 已完成节点悬浮弹窗 -->
<el-dialog class="comment-dialog" :title="dlgTitle || '审批记录'" :visible.sync="dialogVisible">
<el-dialog class="comment-dialog" :title="dlgTitle || '审批记录'" :visible.sync="dialogVisible" :append-to-body="true">
<el-row>
<el-table :data="taskCommentList" size="mini" border header-cell-class-name="table-header-gray" height="500px">
<el-table :data="taskCommentList" :size="defaultFormItemSize" border header-cell-class-name="table-header-gray" height="500px">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
<el-table-column label="执行人" prop="createUsername" width="150px" />
<el-table-column label="操作" width="150px">
<template slot-scope="scope">
<el-tag size="mini" :type="getOperationTagType(scope.row.approvalType)" effect="dark">{{SysFlowTaskOperationType.getValue(scope.row.approvalType)}}</el-tag>
<el-tag v-if="scope.row.delegateAssginee != null" size="mini" type="success" effect="plain" style="margin-left: 10px;">{{scope.row.delegateAssginee}}</el-tag>
<el-tag :size="defaultFormItemSize" :type="getOperationTagType(scope.row.approvalType)" effect="dark">{{SysFlowTaskOperationType.getValue(scope.row.approvalType)}}</el-tag>
<el-tag v-if="scope.row.delegateAssginee != null" :size="defaultFormItemSize" type="success" effect="plain" style="margin-left: 10px;">{{scope.row.delegateAssginee}}</el-tag>
</template>
</el-table-column>
<el-table-column label="审批意见">

View File

@@ -2,7 +2,7 @@
<div class="tag-select">
<div class="tag-box">
<el-tag v-for="item in selectValues" :key="item.id" effect="dark"
style="margin-right: 5px;" type="primary" size="mini" closable
style="margin-right: 5px;" type="primary" :size="defaultFormItemSize" closable
@close="onDeleteTag(item)"
>
{{item.name}}

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formTaskCommit" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24"
v-if="operation.type !== SysFlowTaskOperationType.CO_SIGN && operation.type !== SysFlowTaskOperationType.MULTI_SIGN">
@@ -18,11 +18,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" @click="onSubmitClick()">
<el-button type="primary" :size="defaultFormItemSize" @click="onSubmitClick()">
提交
</el-button>
</el-row>

View File

@@ -1,15 +1,15 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row type="flex" justify="end">
<el-button type="primary" size="mini" @click="onSubmit" :disabled="!canCommit">
<el-button type="primary" :size="defaultFormItemSize" @click="onSubmit" :disabled="!canCommit">
添加分组
</el-button>
</el-row>
</el-form>
<el-row style="margin-top: 18px;">
<el-col :span="24">
<el-table :data="allGroupList" size="mini" height="452px"
<el-table :data="allGroupList" :size="defaultFormItemSize" height="452px"
header-cell-class-name="table-header-gray"
row-key="id" :default-expand-all="true"
@selection-change="handleSelectionChange"

View File

@@ -4,19 +4,19 @@
<el-card class="base-card" shadow="never" :body-style="{ padding: '0px' }" style="border: none;">
<div slot="header" class="base-card-header">
<el-row type="flex" align="middle">
<el-radio-group v-model="formData.deptType" size="mini" @change="formData.deptId = undefined">
<el-radio-group v-model="formData.deptType" :size="defaultFormItemSize" @change="formData.deptId = undefined">
<el-radio-button label="allDeptPost">全部</el-radio-button>
<el-radio-button label="selfDeptPost">本部门</el-radio-button>
<el-radio-button label="upDeptPost">上级部门</el-radio-button>
<el-radio-button label="deptPost">指定部门</el-radio-button>
</el-radio-group>
<el-cascader v-model="formData.deptId" :clearable="true"
size="mini" placeholder="选择部门" v-show="formData.deptType === 'deptPost'"
:size="defaultFormItemSize" placeholder="选择部门" v-show="formData.deptType === 'deptPost'"
:props="{value: 'id', label: 'name', checkStrictly: true}"
:options="deptList">
</el-cascader>
<!--
<el-select v-model="formData.deptId" size="mini" placeholder="选择部门" v-show="formData.deptType === 'deptPost'" style="margin-left: 10px;">
<el-select v-model="formData.deptId" :size="defaultFormItemSize" placeholder="选择部门" v-show="formData.deptType === 'deptPost'" style="margin-left: 10px;">
<el-option v-for="item in deptList" :key="item.id"
:label="item.name" :value="item.id"
/>
@@ -24,7 +24,7 @@
-->
</el-row>
<div class="base-card-operation">
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
:disabled="selectPost.length <= 0"
@click="onAddPostClick()"
>
@@ -32,7 +32,7 @@
</el-button>
</div>
</div>
<el-table :data="getValidDeptPostList" size="mini" height="500px"
<el-table :data="getValidDeptPostList" :size="defaultFormItemSize" height="500px"
header-cell-class-name="table-header-gray"
row-key="deptPostId"
@selection-change="handleSelectionChange"
@@ -45,7 +45,7 @@
</el-table-column>
<el-table-column label="领导岗位">
<template slot-scope="scope">
<el-tag size="mini" :type="scope.row.leaderPost ? 'success' : 'danger'">
<el-tag :size="defaultFormItemSize" :type="scope.row.leaderPost ? 'success' : 'danger'">
{{scope.row.leaderPost ? '是' : '否'}}
</el-tag>
</template>

View File

@@ -1,6 +1,6 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row type="flex" justify="space-between">
<el-form-item label="登录名称">
<el-input class="filter-item" v-model="formSysUser.formFilter.sysUserLoginName"
@@ -8,15 +8,15 @@
:clearable="true" placeholder="登录名称" />
</el-form-item>
<div>
<el-input v-if="!multiple" size="mini" v-model="assignee" placeholder="自定义用户" style="width: 200px; margin: 0px 10px;">
<el-input v-if="!multiple" :size="defaultFormItemSize" v-model="assignee" placeholder="自定义用户" style="width: 200px; margin: 0px 10px;">
</el-input>
<el-button type="primary" size="mini" @click="setStartUser">
<el-button type="primary" :size="defaultFormItemSize" @click="setStartUser">
流程发起人
</el-button>
<el-button v-if="showAssignee" type="primary" size="mini" @click="useAppointedAssignee">
<el-button v-if="showAssignee" type="primary" :size="defaultFormItemSize" @click="useAppointedAssignee">
使用指定审批人
</el-button>
<el-button type="primary" size="mini" @click="onSubmit" :disabled="!canCommit">
<el-button type="primary" :size="defaultFormItemSize" @click="onSubmit" :disabled="!canCommit">
添加用户
</el-button>
</div>
@@ -25,7 +25,7 @@
<el-row>
<el-col :span="24">
<el-radio-group class="radio-table" v-model="selectUserId" style="width: 100%;">
<el-table :data="formSysUser.sysUserWidget.dataList" size="mini" height="410px"
<el-table :data="formSysUser.sysUserWidget.dataList" :size="defaultFormItemSize" height="410px"
header-cell-class-name="table-header-gray"
row-key="userId"
@sort-change="formSysUser.sysUserWidget.onSortChange"

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formEditFlowCategory" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="分类名称" prop="FlowCategory.name">
@@ -23,11 +23,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" @click="onSubmitClick()">
<el-button type="primary" :size="defaultFormItemSize" @click="onSubmitClick()">
保存
</el-button>
</el-row>

View File

@@ -1,17 +1,18 @@
<template>
<div style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formFlowCategory" :model="formFlowCategory" label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="分类名称">
<el-form-item label="分类名称" prop="formFilter.name">
<el-input class="filter-item" v-model="formFlowCategory.formFilter.name"
:clearable="true" placeholder="流程分类名称" />
</el-form-item>
<el-form-item label="分类编码">
<el-form-item label="分类编码" prop="formFilter.code">
<el-input class="filter-item" v-model="formFlowCategory.formFilter.code"
:clearable="true" placeholder="分类编码" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormFlowCategory(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formFlowCategory:formFlowCategory:add')"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormFlowCategory(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formFlowCategory:formFlowCategory:add')"
@click="onAddFlowCategoryClick()">
新建
</el-button>
@@ -19,7 +20,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="flowCategory" :data="flowCategoryWidget.dataList" size="mini" @sort-change="flowCategoryWidget.onSortChange"
<el-table ref="flowCategory" :data="flowCategoryWidget.dataList" :size="defaultFormItemSize" @sort-change="flowCategoryWidget.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="flowCategoryWidget.getTableIndex" />
<el-table-column label="流程分类名称" prop="name">
@@ -35,11 +36,11 @@
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button class="table-btn success" @click.stop="onEditFlowCategoryClick(scope.row)" type="text" size="mini"
<el-button class="table-btn success" @click.stop="onEditFlowCategoryClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formFlowCategory:formFlowCategory:update')">
编辑
</el-button>
<el-button class="table-btn delete" @click.stop="onDeleteFlowCategoryClick(scope.row)" type="text" size="mini"
<el-button class="table-btn delete" @click.stop="onDeleteFlowCategoryClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formFlowCategory:formFlowCategory:delete')">
删除
</el-button>
@@ -95,6 +96,10 @@ export default {
}
},
methods: {
onReset () {
this.$refs.formFlowCategory.resetFields();
this.refreshFormFlowCategory(true);
},
/**
* FlowCategory数据获取函数返回Promise
*/

View File

@@ -100,7 +100,7 @@
<el-table-column label="变量标识" prop="variableName" />
<el-table-column label="变量类型">
<template slot-scope="scope">
<el-tag size="mini" effect="dark"
<el-tag :size="defaultFormItemSize" effect="dark"
:type="scope.row.variableType === SysFlowVariableType.TASK ? 'primary' : 'success'">
{{SysFlowVariableType.getValue(scope.row.variableType)}}
</el-tag>
@@ -108,15 +108,15 @@
</el-table-column>
<el-table-column label="内置变量">
<template slot-scope="scope">
<el-tag size="mini" effect="dark" :type="scope.row.builtIn ? 'success' : 'danger'">
<el-tag :size="defaultFormItemSize" effect="dark" :type="scope.row.builtIn ? 'success' : 'danger'">
{{scope.row.builtIn ? '是' : '否'}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="100px">
<template slot-scope="scope">
<el-button class="table-btn success" size="mini" type="text" :disabled="scope.row.builtin" @click="editEntryVariable(scope.row)">编辑</el-button>
<el-button class="table-btn delete" size="mini" type="text" :disabled="scope.row.builtin" @click="deleteEntryVariable(scope.row)">删除</el-button>
<el-button class="table-btn success" :size="defaultFormItemSize" type="text" :disabled="scope.row.builtin" @click="editEntryVariable(scope.row)">编辑</el-button>
<el-button class="table-btn delete" :size="defaultFormItemSize" type="text" :disabled="scope.row.builtin" @click="deleteEntryVariable(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="form" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24" v-if="datasource != null">
<el-form-item label="绑定字段">
@@ -28,11 +28,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
@click="onSubmit()">
保存
</el-button>

View File

@@ -1,8 +1,8 @@
<template>
<div style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formFlowEntry" :model="formFlowEntry" label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="流程分类">
<el-form-item label="流程分类" prop="formFilter.categoryId">
<el-select class="filter-item" v-model="formFlowEntry.formFilter.categoryId"
:clearable="true" filterable placeholder="流程分类"
:loading="formFlowEntry.categoryIdWidget.loading"
@@ -11,22 +11,23 @@
<el-option v-for="item in formFlowEntry.categoryIdWidget.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="流程名称">
<el-form-item label="流程名称" prop="formFilter.processDefinitionName">
<el-input class="filter-item" v-model="formFlowEntry.formFilter.processDefinitionName"
:clearable="true" placeholder="流程名称" />
</el-form-item>
<el-form-item label="流程标识">
<el-form-item label="流程标识" prop="formFilter.processDefinitionKey">
<el-input class="filter-item" v-model="formFlowEntry.formFilter.processDefinitionKey"
:clearable="true" placeholder="流程标识" />
</el-form-item>
<el-form-item label="发布状态">
<el-form-item label="发布状态" prop="formFilter.status">
<el-select class="filter-item" v-model="formFlowEntry.formFilter.status" :clearable="true" filterable
placeholder="发布状态">
<el-option v-for="item in SysFlowEntryPublishedStatus.getList()" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormFlowEntry(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formFlowEntry:formFlowEntry:update')"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onReset">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormFlowEntry(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formFlowEntry:formFlowEntry:update')"
@click="onAddFlowEntryClick()">
新建
</el-button>
@@ -34,7 +35,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="flowEntry" :data="formFlowEntry.flowEntryWidget.dataList" size="mini" @sort-change="formFlowEntry.flowEntryWidget.onSortChange"
<el-table ref="flowEntry" :data="formFlowEntry.flowEntryWidget.dataList" :size="defaultFormItemSize" @sort-change="formFlowEntry.flowEntryWidget.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formFlowEntry.flowEntryWidget.getTableIndex" />
<el-table-column label="流程名称" prop="processDefinitionName">
@@ -45,45 +46,45 @@
</el-table-column>
<el-table-column label="发布状态" prop="status">
<template slot-scope="scope">
<el-tag size="mini" :type="scope.row.status === SysFlowEntryPublishedStatus.PUBLISHED ? 'success' : 'warning'">
<el-tag :size="defaultFormItemSize" :type="scope.row.status === SysFlowEntryPublishedStatus.PUBLISHED ? 'success' : 'warning'">
{{SysFlowEntryPublishedStatus.getValue(scope.row.status)}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="流程主版本" prop="mainFlowEntryPublish" header-align="center" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.mainFlowEntryPublish" size="mini" type="primary" effect="dark">
<el-tag v-if="scope.row.mainFlowEntryPublish" :size="defaultFormItemSize" type="primary" effect="dark">
{{'V:' + scope.row.mainFlowEntryPublish.publishVersion}}
</el-tag>
<el-tag v-if="scope.row.mainFlowEntryPublish" size="mini" effect="dark" style="margin-left: 10px"
<el-tag v-if="scope.row.mainFlowEntryPublish" :size="defaultFormItemSize" effect="dark" style="margin-left: 10px"
:type="scope.row.mainFlowEntryPublish.activeStatus ? 'success' : 'danger'"
>
{{scope.row.mainFlowEntryPublish.activeStatus ? '激活' : '挂起'}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="最近发布时间" prop="lastestPublishTime" sortable="custom" />
<el-table-column label="最近发布时间" prop="latestPublishTime" sortable="custom" />
<el-table-column label="创建时间" prop="createTime" sortable="custom" />
<el-table-column label="操作" fixed="right" width="250px">
<template slot-scope="scope">
<el-button class="table-btn success" @click.stop="onStartFlowEntryClick(scope.row)" type="text" size="mini"
<el-button class="table-btn success" @click.stop="onStartFlowEntryClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formFlowEntry:formFlowEntry:start') ||
!(scope.row.mainFlowEntryPublish && scope.row.mainFlowEntryPublish.activeStatus)">
启动
</el-button>
<el-button class="table-btn success" @click.stop="onEditFlowEntryClick(scope.row)" type="text" size="mini"
<el-button class="table-btn success" @click.stop="onEditFlowEntryClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formFlowEntry:formFlowEntry:update')">
编辑
</el-button>
<el-button @click.stop="onPublishedClick(scope.row)" type="text" size="mini"
<el-button @click.stop="onPublishedClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formFlowEntry:formFlowEntry:update')">
发布
</el-button>
<el-button @click.stop="onPublishedEntryListClick(scope.row)" type="text" size="mini"
<el-button @click.stop="onPublishedEntryListClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formFlowEntry:formFlowEntry:update')">
版本管理
</el-button>
<el-button class="table-btn delete" @click.stop="onDeleteFlowEntryClick(scope.row)" type="text" size="mini"
<el-button class="table-btn delete" @click.stop="onDeleteFlowEntryClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formFlowEntry:formFlowEntry:update')">
删除
</el-button>
@@ -150,6 +151,10 @@ export default {
}
},
methods: {
onReset () {
this.$refs.formFlowEntry.resetFields();
this.refreshFormFlowEntry(true);
},
onEditFlowEntryClose () {
this.showFlowEntryDesign = false;
this.currentFlowEntry = null;

View File

@@ -3,7 +3,7 @@
<div class="form-single-fragment" style="position: relative;">
<el-row>
<el-col :span="24" v-if="entryXml == null">
<el-table ref="flowEntry" :data="publishedFlowEntryWidget.dataList" size="mini" height="655px"
<el-table ref="flowEntry" :data="publishedFlowEntryWidget.dataList" :size="defaultFormItemSize" height="655px"
@sort-change="publishedFlowEntryWidget.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="publishedFlowEntryWidget.getTableIndex" />
@@ -19,19 +19,19 @@
</el-table-column>
<el-table-column label="流程版本" prop="publishVersion">
<template slot-scope="scope">
<el-tag size="mini" type="primary" effect="dark">{{'V:' + scope.row.publishVersion}}</el-tag>
<el-tag :size="defaultFormItemSize" type="primary" effect="dark">{{'V:' + scope.row.publishVersion}}</el-tag>
</template>
</el-table-column>
<el-table-column label="激活状态" prop="activeStatus">
<template slot-scope="scope">
<el-tag size="mini" effect="dark" :type="scope.row.activeStatus ? 'success' : 'danger'">
<el-tag :size="defaultFormItemSize" effect="dark" :type="scope.row.activeStatus ? 'success' : 'danger'">
{{scope.row.activeStatus ? '激活' : '挂起'}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="主版本" prop="mainVersion">
<template slot-scope="scope">
<el-tag size="mini" effect="dark" :type="scope.row.mainVersion ? 'success' : 'danger'">
<el-tag :size="defaultFormItemSize" effect="dark" :type="scope.row.mainVersion ? 'success' : 'danger'">
{{scope.row.mainVersion ? '是' : '否'}}
</el-tag>
</template>
@@ -40,14 +40,14 @@
<el-table-column label="操作" fixed="right" width="200px">
<template slot-scope="scope">
<el-button class="table-btn" :class="scope.row.activeStatus ? 'delete' : 'success'"
@click.stop="onSetActiveStatus(scope.row)" type="text" size="mini">
@click.stop="onSetActiveStatus(scope.row)" type="text" :size="defaultFormItemSize">
{{scope.row.activeStatus ? '挂起' : '激活'}}
</el-button>
<el-button class="table-btn primary" type="text" size="mini" @click="getTaskProcessXml(scope.row)">
<el-button class="table-btn primary" type="text" :size="defaultFormItemSize" @click="getTaskProcessXml(scope.row)">
流程图
</el-button>
<el-button class="table-btn primary" :disabled="scope.row.mainVersion"
@click.stop="onSetMainVersion(scope.row)" type="text" size="mini">
@click.stop="onSetMainVersion(scope.row)" type="text" :size="defaultFormItemSize">
设置为主版本
</el-button>
</template>

View File

@@ -1,39 +1,85 @@
<template>
<div style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormMessage(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="flowCategory" :data="messageListWidget.dataList" size="mini" @sort-change="messageListWidget.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="messageListWidget.getTableIndex" />
<el-table-column label="流程名称" prop="processDefinitionName" />
<el-table-column label="任务名称" prop="taskName" />
<el-table-column label="催办人" prop="createUsername" />
<el-table-column label="任务创建时间" prop="taskStartTime" />
<el-table-column label="催办时间" prop="createTime" />
<el-table-column label="操作" width="100px">
<template slot-scope="scope">
<el-button type="text" size="mini" @click="onSubmit(scope.row)">办理</el-button>
</template>
</el-table-column>
</el-table>
<el-row type="flex" justify="end" style="margin-top: 10px;">
<el-pagination
:total="messageListWidget.totalCount"
:current-page="messageListWidget.currentPage"
:page-size="messageListWidget.pageSize"
:page-sizes="[10, 20, 50, 100]"
layout="total, prev, pager, next, sizes"
@current-change="messageListWidget.onCurrentPageChange"
@size-change="messageListWidget.onPageSizeChange">
</el-pagination>
<div class="tab-dialog-box" style="position: relative;">
<el-tabs v-model="activeFragmentId">
<el-tab-pane label="催办消息" name="remindingMessage" style="width: 100%;">
<el-form label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshRemindingMessage(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="flowCategory" :data="remindingMessageWidget.dataList" :size="defaultFormItemSize" @sort-change="remindingMessageWidget.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="remindingMessageWidget.getTableIndex" />
<el-table-column label="流程名称" prop="processDefinitionName" />
<el-table-column label="任务名称" prop="taskName" />
<el-table-column label="催办" prop="createUsername" />
<el-table-column label="任务创建时间" prop="taskStartTime" />
<el-table-column label="催办时间" prop="createTime" />
<el-table-column label="操作" width="100px">
<template slot-scope="scope">
<el-button type="text" :size="defaultFormItemSize" @click="onSubmit(scope.row)">办理</el-button>
</template>
</el-table-column>
</el-table>
<el-row type="flex" justify="end" style="margin-top: 10px;">
<el-pagination
:total="remindingMessageWidget.totalCount"
:current-page="remindingMessageWidget.currentPage"
:page-size="remindingMessageWidget.pageSize"
:page-sizes="[10, 20, 50, 100]"
layout="total, prev, pager, next, sizes"
@current-change="remindingMessageWidget.onCurrentPageChange"
@size-change="remindingMessageWidget.onPageSizeChange">
</el-pagination>
</el-row>
</el-col>
</el-row>
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane label="抄送消息" name="copyMessage" style="width: 100%;">
<el-form label-width="0px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<filter-box :item-width="350">
<el-form-item label="">
<el-radio-group v-model="messageStatus" @change="refreshCopyMessage(true)">
<el-radio-button :label="1">已读消息</el-radio-button>
<el-radio-button :label="0">未读消息</el-radio-button>
</el-radio-group>
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshCopyMessage(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="flowCategory" :data="copyMessageWidget.dataList" :size="defaultFormItemSize" @sort-change="copyMessageWidget.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="copyMessageWidget.getTableIndex" />
<el-table-column label="流程名称" prop="processDefinitionName" />
<el-table-column label="任务名称" prop="taskName" />
<el-table-column label="抄送人" prop="createUsername" />
<el-table-column label="任务创建时间" prop="taskStartTime" />
<el-table-column label="抄送时间" prop="createTime" />
<el-table-column label="操作" width="100px">
<template slot-scope="scope">
<el-button type="text" :size="defaultFormItemSize" @click="onSubmit(scope.row, scope.row.messageId)">查看详情</el-button>
</template>
</el-table-column>
</el-table>
<el-row type="flex" justify="end" style="margin-top: 10px;">
<el-pagination
:total="copyMessageWidget.totalCount"
:current-page="copyMessageWidget.currentPage"
:page-size="copyMessageWidget.pageSize"
:page-sizes="[10, 20, 50, 100]"
layout="total, prev, pager, next, sizes"
@current-change="copyMessageWidget.onCurrentPageChange"
@size-change="copyMessageWidget.onPageSizeChange">
</el-pagination>
</el-row>
</el-col>
</el-row>
</el-tab-pane>
</el-tabs>
</div>
</template>
@@ -46,13 +92,22 @@ import { FlowOperationController } from '@/api/flowController.js';
export default {
name: 'formMessage',
mixins: [uploadMixin, statsDateRangeMixin, cachePageMixin],
props: {
type: {
type: String,
default: 'remindingMessage'
}
},
data () {
return {
messageListWidget: new TableWidget(this.loadMessageData, this.loadMessageVerify, true, false, 'createTime', 1)
activeFragmentId: 'remindingMessage',
messageStatus: 1,
remindingMessageWidget: new TableWidget(this.loadRemindingMessageData, this.loadRemindingMessageVerify, true, false, 'createTime', 1),
copyMessageWidget: new TableWidget(this.loadCopyMessageData, this.loadCopyMessageVerify, true, false, 'createTime', 1)
}
},
methods: {
loadMessageData (params) {
loadRemindingMessageData (params) {
if (params == null) params = {};
return new Promise((resolve, reject) => {
FlowOperationController.listRemindingTask(this, params).then(res => {
@@ -65,36 +120,72 @@ export default {
});
});
},
loadMessageVerify () {
loadRemindingMessageVerify () {
return true;
},
loadCopyMessageData (params) {
if (params == null) params = {};
params.read = this.messageStatus === 1;
return new Promise((resolve, reject) => {
FlowOperationController.listCopyMessage(this, params).then(res => {
resolve({
dataList: res.data.dataList,
totalCount: res.data.totalCount
});
}).catch(e => {
reject(e);
});
});
},
loadCopyMessageVerify () {
return true;
},
refreshRemindingMessage (reloadData = false) {
if (reloadData) {
this.remindingMessageWidget.refreshTable(true, 1);
} else {
this.remindingMessageWidget.refreshTable();
}
},
refreshCopyMessage (reloadData = false) {
if (reloadData) {
this.copyMessageWidget.refreshTable(true, 1);
} else {
this.copyMessageWidget.refreshTable();
}
},
refreshFormMessage (reloadData = false) {
if (reloadData) {
this.messageListWidget.refreshTable(true, 1);
this.remindingMessageWidget.refreshTable(true, 1);
this.copyMessageWidget.refreshTable(true, 1);
} else {
this.messageListWidget.refreshTable();
this.remindingMessageWidget.refreshTable();
this.copyMessageWidget.refreshTable();
}
},
onSubmit (row) {
onSubmit (row, messageId) {
// 是否抄送消息
let isCopy = messageId != null;
let params = {
processInstanceId: row.processInstanceId,
processDefinitionId: row.processDefinitionId,
taskId: row.taskId
}
FlowOperationController.viewRuntimeTaskInfo(this, params).then(res => {
let httpCall = isCopy ? FlowOperationController.viewInitialHistoricTaskInfo(this, params) : FlowOperationController.viewRuntimeTaskInfo(this, params);
httpCall.then(res => {
if (res.data) {
this.$router.push({
name: res.data.routerName || 'handlerFlowTask',
query: {
isRuntime: true,
isRuntime: !isCopy,
taskId: row.taskId,
messageId: messageId,
processDefinitionKey: row.processDefinitionKey,
processInstanceId: row.processInstanceId,
processDefinitionId: row.processDefinitionId,
formId: res.data.formId,
routerName: res.data.routerName,
readOnly: res.data.readOnly,
readOnly: isCopy ? true : res.data.readOnly,
taskName: row.taskName,
flowEntryName: row.processDefinitionName,
processInstanceInitiator: row.processInstanceInitiator,
@@ -120,6 +211,15 @@ export default {
mounted () {
// 初始化页面数据
this.formInit();
},
watch: {
type: {
handler (val) {
this.activeFragmentId = val;
this.messageStatus = 0;
},
immediate: true
}
}
}
</script>

View File

@@ -6,6 +6,7 @@
:processInstanceInitiator="processInstanceInitiator"
:taskName="taskName"
:operationList="operationList"
:isRuntime="isRuntime"
@close="handlerClose(false)"
@start="handlerStart"
@submit="handlerOperation"
@@ -59,6 +60,10 @@ export default {
type: [String, Boolean],
default: true
},
// 消息id用于抄送消息回显
messageId: {
type: String
},
// 流程实例id
processInstanceId: {
type: String
@@ -144,7 +149,7 @@ export default {
} else if (operationType === this.SysFlowTaskOperationType.SET_ASSIGNEE) {
// 设置下一个任务节点处理人
if (formData.taskVariableData == null) formData.taskVariableData = {};
formData.taskVariableData.appointedAssignee = assignee;
formData.taskVariableData.appointedAssignee = Array.isArray(assignee) ? assignee[0] : undefined;
}
resolve(formData);
}).catch(e => {
@@ -160,11 +165,11 @@ export default {
/**
* 启动流程
*/
handlerStart (operation) {
handlerStart (operation, copyItemList) {
if (!this.isOnlineForm) {
let funHandlerStart = this.getRouterCompomentFunction('handlerStart');
if (funHandlerStart != null) {
funHandlerStart(operation).then(res => {
funHandlerStart(operation, copyItemList).then(res => {
this.handlerClose();
}).catch(e => {});
} else {
@@ -180,7 +185,11 @@ export default {
taskVariableData: formData.taskVariableData,
flowTaskCommentDto: {
approvalType: operation.type
}
},
copyData: (copyItemList || []).reduce((retObj, item) => {
retObj[item.type] = item.id;
return retObj;
}, {})
}, {
processDefinitionKey: this.processDefinitionKey
}).then(res => {
@@ -195,7 +204,7 @@ export default {
* 流程操作
* @param {Object} operation 流程操作
*/
handlerOperation (operation) {
handlerOperation (operation, copyItemList) {
if (this.isOnlineForm) {
this.preHandlerOperation(operation, this.isStart).then(res => {
// 加签操作
@@ -216,6 +225,17 @@ export default {
}).catch(e => {});
return;
}
// 驳回到起点
if (operation.type === this.SysFlowTaskOperationType.REJECT_TO_START) {
FlowOperationController.rejectToStartUserTask(this, {
processInstanceId: this.processInstanceId,
taskId: this.taskId,
comment: (res || {}).message
}).then(res => {
this.handlerClose();
}).catch(e => {});
return;
}
// 撤销操作
if (operation.type === this.SysFlowTaskOperationType.REVOKE) {
this.$confirm('是否撤销此任务?').then(res => {
@@ -240,7 +260,11 @@ export default {
approvalType: operation.type,
delegateAssginee: operation.type === this.SysFlowTaskOperationType.TRANSFER ? (res || {}).assignee : undefined
},
taskVariableData: formData.taskVariableData
taskVariableData: formData.taskVariableData,
copyData: (copyItemList || []).reduce((retObj, item) => {
retObj[item.type] = item.id;
return retObj;
}, {})
}
FlowOperationController.submitUserTask(this, params).then(res => {
@@ -253,7 +277,7 @@ export default {
} else {
let funHandlerOperation = this.getRouterCompomentFunction('handlerOperation');
if (funHandlerOperation) {
funHandlerOperation(operation).then(res => {
funHandlerOperation(operation, copyItemList).then(res => {
this.handlerClose();
}).catch(e => {});
} else {
@@ -275,7 +299,15 @@ export default {
taskId: this.taskId
}
// 判断是展示历史流程的数据还是待办流程的数据
let httpCall = (this.taskId != null && this.isRuntime) ? FlowOperationController.viewUserTask(this, params) : FlowOperationController.viewHistoricProcessInstance(this, params);
let httpCall = null;
if (this.messageId != null) {
// 抄送消息
httpCall = FlowOperationController.viewOnlineCopyBusinessData(this, {
messageId: this.messageId
});
} else {
httpCall = (this.taskId != null && this.isRuntime) ? FlowOperationController.viewUserTask(this, params) : FlowOperationController.viewHistoricProcessInstance(this, params);
}
httpCall.then(res => {
this.isStart = (res.data == null);
// 一对多数据

View File

@@ -1131,6 +1131,38 @@
}
]
},
{
"name": "CopyItemList",
"superClass": [ "Element" ],
"meta": {
"allowedIn": [
"bpmn:UserTask"
]
},
"properties": [
{
"name": "copyItemList",
"type": "CopyItem",
"isMany": true
}
]
},
{
"name": "CopyItem",
"superClass": [ "Element" ],
"properties": [
{
"name": "id",
"type": "String",
"isAttr": true
},
{
"name": "type",
"type": "String",
"isAttr": true
}
]
},
{
"name": "DeptPostList",
"superClass": [ "Element" ],

View File

@@ -1127,6 +1127,38 @@
}
]
},
{
"name": "CopyItemList",
"superClass": [ "Element" ],
"meta": {
"allowedIn": [
"bpmn:UserTask"
]
},
"properties": [
{
"name": "copyItemList",
"type": "CopyItem",
"isMany": true
}
]
},
{
"name": "CopyItem",
"superClass": [ "Element" ],
"properties": [
{
"name": "id",
"type": "String",
"isAttr": true
},
{
"name": "type",
"type": "String",
"isAttr": true
}
]
},
{
"name": "DeptPostList",
"superClass": [ "Element" ],

View File

@@ -21,11 +21,15 @@
<div slot="title" class="panel-tab__title"><i class="el-icon-s-data"></i>任务变量</div>
<form-variable :id="elementId" :type="elementType" />
</el-collapse-item>
<el-collapse-item name="task" v-if="elementType && elementType.indexOf('Task') !== -1" key="task">
<el-collapse-item name="task" v-if="elementType && (elementType.indexOf('Task') !== -1 || elementType === 'SubProcess')" key="task">
<div slot="title" class="panel-tab__title"><i class="el-icon-s-claim"></i>任务设置</div>
<element-task :id="elementId" :type="elementType" />
</el-collapse-item>
<el-collapse-item name="multiInstance" v-if="elementType && elementType.indexOf('Task') !== -1" key="multiInstance">
<el-collapse-item name="copyFor" v-if="formVisible" key="copyFor">
<div slot="title" class="panel-tab__title"><i class="el-icon-s-custom"></i>抄送设置</div>
<CopyForSelect :id="elementId" :type="elementType" />
</el-collapse-item>
<el-collapse-item name="multiInstance" v-if="elementType && (elementType.indexOf('Task') !== -1 || elementType === 'SubProcess')" key="multiInstance">
<div slot="title" class="panel-tab__title"><i class="el-icon-s-help"></i>多实例</div>
<element-multi-instance :business-object="elementBusinessObject" :type="elementType" />
</el-collapse-item>
@@ -66,6 +70,7 @@ import ElementProperties from "./properties/ElementProperties";
// import ElementForm from "./form/ElementForm";
import ElementForm from "./form/flowFormConfig";
import FormVariable from "./form-variable/index.vue";
import CopyForSelect from "./copy-for/index.vue";
import UserTaskListeners from "./listeners/UserTaskListeners";
// import ElementMultiInstanceAssignee from './multi-instance/ElementMultiInstanceAssignee.vue';
@@ -88,7 +93,8 @@ export default {
ElementMultiInstance,
ElementTask,
ElementOtherConfig,
ElementBaseInfo
ElementBaseInfo,
CopyForSelect
// ElementMultiInstanceAssignee
},
componentName: "MyPropertiesPanel",

View File

@@ -1,6 +1,6 @@
<template>
<div class="panel-tab__content">
<el-form size="mini" label-width="90px" @submit.native.prevent>
<el-form :size="defaultFormItemSize" label-width="90px" @submit.native.prevent>
<el-form-item label="ID">
<el-input
v-model="elementBaseInfo.id"

View File

@@ -0,0 +1,74 @@
<template>
<div class="panel-tab__content">
<ConyForSelect v-model="copyForItemList" />
</div>
</template>
<script>
import ConyForSelect from '@/views/workflow/components/CopyForSelect/index.vue';
export default {
props: {
id: String,
type: String
},
components: {
ConyForSelect
},
inject: ['prefix'],
data () {
return {
copyForItemList: [],
copyItemElementList: undefined
}
},
methods: {
resetFormVariable () {
this.bpmnELement = window.bpmnInstances.bpmnElement;
let elExtensionElements = this.bpmnELement.businessObject.get("extensionElements") || window.bpmnInstances.moddle.create("bpmn:ExtensionElements", { values: [] });
this.copyItemElementList = elExtensionElements.values.filter(ex => ex.$type === `${this.prefix}:CopyItemList`)?.[0] ||
window.bpmnInstances.moddle.create(`${this.prefix}:CopyItemList`, { copyItemList: [] });
this.copyForItemList = this.copyItemElementList.copyItemList;
this.updateElementExtensions();
},
updateElementExtensions () {
// 更新回扩展元素
let elExtensionElements = this.bpmnELement.businessObject.get("extensionElements") || window.bpmnInstances.moddle.create("bpmn:ExtensionElements", { values: [] });
let otherExtensions = elExtensionElements.values.filter(ex => ex.$type !== `${this.prefix}:CopyItemList`);
this.copyItemElementList.copyItemList = (this.copyForItemList || []).map(item => {
return window.bpmnInstances.moddle.create(`${this.prefix}:CopyItem`, {
id: item.id,
type: item.type
});
});
const newElExtensionElements = window.bpmnInstances.moddle.create(`bpmn:ExtensionElements`, {
values: otherExtensions.concat(this.copyItemElementList)
});
// 更新到元素上
window.bpmnInstances.modeling.updateProperties(this.bpmnELement, {
extensionElements: newElExtensionElements
});
}
},
watch: {
'copyForItemList': {
handler (newValue) {
this.updateElementExtensions();
}
},
id: {
immediate: true,
handler (val) {
if (val && val.length) {
this.$nextTick(() => {
this.resetFormVariable();
});
}
}
}
}
}
</script>
<style>
</style>

View File

@@ -1,6 +1,6 @@
<template>
<div class="panel-tab__content">
<el-form :model="flowConditionForm" label-width="90px" size="mini" @submit.native.prevent>
<el-form :model="flowConditionForm" label-width="90px" :size="defaultFormItemSize" @submit.native.prevent>
<el-form-item label="流转类型">
<el-select v-model="flowConditionForm.type" @change="updateFlowType">
<el-option label="普通流转路径" value="normal" />

View File

@@ -1,6 +1,6 @@
<template>
<div class="panel-tab__content">
<el-form size="mini" label-width="90px" @submit.native.prevent>
<el-form :size="defaultFormItemSize" label-width="90px" @submit.native.prevent>
<el-form-item label="任务变量">
<el-select v-model="taskVariableList" clearable multiple collapse-tags
placeholder="选择任务节点使用的变量" filterable default-first-option

View File

@@ -1,6 +1,6 @@
<template>
<div class="panel-tab__content">
<el-form size="mini" label-width="80px" @submit.native.prevent>
<el-form :size="defaultFormItemSize" label-width="80px" @submit.native.prevent>
<el-form-item label="表单标识">
<el-input v-model="formKey" clearable @change="updateElementFormKey" />
</el-form-item>
@@ -15,27 +15,27 @@
<!--字段列表-->
<div class="element-property list-property">
<el-divider><i class="el-icon-coin"></i> 表单字段</el-divider>
<el-table :data="fieldList" size="mini" max-height="240" border fit>
<el-table :data="fieldList" :size="defaultFormItemSize" max-height="240" border fit>
<el-table-column label="序号" type="index" width="50px" />
<el-table-column label="字段名称" prop="label" min-width="80px" show-overflow-tooltip />
<el-table-column label="字段类型" prop="type" min-width="80px" :formatter="row => fieldType[row.type] || row.type" show-overflow-tooltip />
<el-table-column label="默认值" prop="defaultValue" min-width="80px" show-overflow-tooltip />
<el-table-column label="操作" width="90px">
<template slot-scope="{ row, $index }">
<el-button size="mini" type="text" @click="openFieldForm(row, $index)">编辑</el-button>
<el-button :size="defaultFormItemSize" type="text" @click="openFieldForm(row, $index)">编辑</el-button>
<el-divider direction="vertical" />
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeField(row, $index)">移除</el-button>
<el-button :size="defaultFormItemSize" type="text" style="color: #ff4d4f" @click="removeField(row, $index)">移除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="element-drawer__button">
<el-button size="mini" type="primary" icon="el-icon-plus" @click="openFieldForm(null, -1)">添加字段</el-button>
<el-button :size="defaultFormItemSize" type="primary" icon="el-icon-plus" @click="openFieldForm(null, -1)">添加字段</el-button>
</div>
<!--字段配置侧边栏-->
<el-drawer :visible.sync="fieldModelVisible" title="字段配置" :size="`${width}px`" custom-class="process-drawer" append-to-body destroy-on-close>
<el-form :model="formFieldForm" label-width="90px" size="mini" @submit.native.prevent>
<el-form :model="formFieldForm" label-width="90px" :size="defaultFormItemSize" @submit.native.prevent>
<el-form-item label="字段ID">
<el-input v-model="formFieldForm.id" clearable />
</el-form-item>
@@ -63,17 +63,17 @@
<el-divider key="enum-divider" />
<p class="listener-filed__title" key="enum-title">
<span><i class="el-icon-menu"></i>枚举值列表</span>
<el-button size="mini" type="primary" @click="openFieldOptionForm(null, -1, 'enum')">添加枚举值</el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="openFieldOptionForm(null, -1, 'enum')">添加枚举值</el-button>
</p>
<el-table :data="fieldEnumList" size="mini" key="enum-table" max-height="240" border fit>
<el-table :data="fieldEnumList" :size="defaultFormItemSize" key="enum-table" max-height="240" border fit>
<el-table-column label="序号" width="50px" type="index" />
<el-table-column label="枚举值编号" prop="id" min-width="100px" show-overflow-tooltip />
<el-table-column label="枚举值名称" prop="name" min-width="100px" show-overflow-tooltip />
<el-table-column label="操作" width="90px">
<template slot-scope="{ row, $index }">
<el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'enum')">编辑</el-button>
<el-button :size="defaultFormItemSize" type="text" @click="openFieldOptionForm(row, $index, 'enum')">编辑</el-button>
<el-divider direction="vertical" />
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'enum')">移除</el-button>
<el-button :size="defaultFormItemSize" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'enum')">移除</el-button>
</template>
</el-table-column>
</el-table>
@@ -83,17 +83,17 @@
<el-divider key="validation-divider" />
<p class="listener-filed__title" key="validation-title">
<span><i class="el-icon-menu"></i>约束条件列表</span>
<el-button size="mini" type="primary" @click="openFieldOptionForm(null, -1, 'constraint')">添加约束</el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="openFieldOptionForm(null, -1, 'constraint')">添加约束</el-button>
</p>
<el-table :data="fieldConstraintsList" size="mini" key="validation-table" max-height="240" border fit>
<el-table :data="fieldConstraintsList" :size="defaultFormItemSize" key="validation-table" max-height="240" border fit>
<el-table-column label="序号" width="50px" type="index" />
<el-table-column label="约束名称" prop="name" min-width="100px" show-overflow-tooltip />
<el-table-column label="约束配置" prop="config" min-width="100px" show-overflow-tooltip />
<el-table-column label="操作" width="90px">
<template slot-scope="{ row, $index }">
<el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'constraint')">编辑</el-button>
<el-button :size="defaultFormItemSize" type="text" @click="openFieldOptionForm(row, $index, 'constraint')">编辑</el-button>
<el-divider direction="vertical" />
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'constraint')">移除</el-button>
<el-button :size="defaultFormItemSize" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'constraint')">移除</el-button>
</template>
</el-table-column>
</el-table>
@@ -102,30 +102,30 @@
<el-divider key="property-divider" />
<p class="listener-filed__title" key="property-title">
<span><i class="el-icon-menu"></i>字段属性列表</span>
<el-button size="mini" type="primary" @click="openFieldOptionForm(null, -1, 'property')">添加属性</el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="openFieldOptionForm(null, -1, 'property')">添加属性</el-button>
</p>
<el-table :data="fieldPropertiesList" size="mini" key="property-table" max-height="240" border fit>
<el-table :data="fieldPropertiesList" :size="defaultFormItemSize" key="property-table" max-height="240" border fit>
<el-table-column label="序号" width="50px" type="index" />
<el-table-column label="属性编号" prop="id" min-width="100px" show-overflow-tooltip />
<el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />
<el-table-column label="操作" width="90px">
<template slot-scope="{ row, $index }">
<el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'property')">编辑</el-button>
<el-button :size="defaultFormItemSize" type="text" @click="openFieldOptionForm(row, $index, 'property')">编辑</el-button>
<el-divider direction="vertical" />
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'property')">移除</el-button>
<el-button :size="defaultFormItemSize" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'property')">移除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 底部按钮 -->
<div class="element-drawer__button">
<el-button size="mini"> </el-button>
<el-button size="mini" type="primary" @click="saveField"> </el-button>
<el-button :size="defaultFormItemSize"> </el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="saveField"> </el-button>
</div>
</el-drawer>
<el-dialog :visible.sync="fieldOptionModelVisible" :title="optionModelTitle" width="600px" append-to-body destroy-on-close>
<el-form :model="fieldOptionForm" size="mini" label-width="96px" @submit.native.prevent>
<el-form :model="fieldOptionForm" :size="defaultFormItemSize" label-width="96px" @submit.native.prevent>
<el-form-item label="编号/ID" v-if="fieldOptionType !== 'constraint'" key="option-id">
<el-input v-model="fieldOptionForm.id" clearable />
</el-form-item>
@@ -140,8 +140,8 @@
</el-form-item>
</el-form>
<template slot="footer">
<el-button size="mini" @click="fieldOptionModelVisible = false"> </el-button>
<el-button size="mini" type="primary" @click="saveFieldOption"> </el-button>
<el-button :size="defaultFormItemSize" @click="fieldOptionModelVisible = false"> </el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="saveFieldOption"> </el-button>
</template>
</el-dialog>
</div>

View File

@@ -1,6 +1,6 @@
<template>
<div class="panel-tab__content">
<el-form ref="form" size="mini" label-width="80px" :model="formData" :rules="rules" @submit.native.prevent>
<el-form ref="form" :size="defaultFormItemSize" label-width="80px" :model="formData" :rules="rules" @submit.native.prevent>
<el-form-item label="表单路由" prop="routerName"
v-if="flowEntry().bindFormType === SysFlowEntryBindFormType.ROUTER_FORM">
<el-input v-model="formData.routerName" clearable @change="updateElementFormKey" />
@@ -37,7 +37,7 @@
</el-table-column>
<el-table-column label="按钮类型" min-width="100px">
<template slot-scope="scope">
<el-tag size="mini" effect="dark">{{SysFlowTaskOperationType.getValue(scope.row.type)}}</el-tag>
<el-tag :size="defaultFormItemSize" effect="dark">{{SysFlowTaskOperationType.getValue(scope.row.type)}}</el-tag>
</template>
</el-table-column>
<el-table-column label="显示顺序" prop="showOrder" width="60px" />
@@ -109,7 +109,7 @@ export default {
formId: this.flowEntry().bindFormType === this.SysFlowEntryBindFormType.ONLINE_FORM ? this.formData.formId : undefined,
routerName: this.flowEntry().bindFormType === this.SysFlowEntryBindFormType.ONLINE_FORM ? undefined : this.formData.routerName,
readOnly: !this.formData.editable,
groupType: this.formData.groupType || 'ROLE'
groupType: this.formData.groupType || 'ASSIGNEE'
});
window.bpmnInstances.modeling.updateProperties(this.bpmnELement, { formKey: formKeyString });
});

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="form" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="按钮类型" prop="type">
@@ -67,11 +67,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini"
<el-button type="primary" :size="defaultFormItemSize"
@click="onSubmit()">
保存
</el-button>

View File

@@ -1,24 +1,24 @@
<template>
<div class="panel-tab__content">
<el-table :data="elementListenersList" size="mini" border>
<el-table :data="elementListenersList" :size="defaultFormItemSize" border>
<el-table-column label="序号" width="50px" type="index" />
<el-table-column label="事件类型" min-width="100px" prop="event" />
<el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
<el-table-column label="操作" width="90px">
<template slot-scope="{ row, $index }">
<el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
<el-button :size="defaultFormItemSize" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
<el-divider direction="vertical" />
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
<el-button :size="defaultFormItemSize" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
</template>
</el-table-column>
</el-table>
<div class="element-drawer__button">
<el-button size="mini" type="primary" icon="el-icon-plus" @click="openListenerForm(null)">添加监听器</el-button>
<el-button :size="defaultFormItemSize" type="primary" icon="el-icon-plus" @click="openListenerForm(null)">添加监听器</el-button>
</div>
<!-- 监听器 编辑/创建 部分 -->
<el-drawer :visible.sync="listenerFormModelVisible" title="执行监听器" :size="`${width}px`" custom-class="process-drawer" append-to-body destroy-on-close>
<el-form size="mini" :model="listenerForm" label-width="96px" ref="listenerFormRef" @submit.native.prevent>
<el-form :size="defaultFormItemSize" :model="listenerForm" label-width="96px" ref="listenerFormRef" @submit.native.prevent>
<el-form-item label="事件类型" prop="event" :rules="{ required: true, message: '请选择事件类型', trigger: ['blur', 'change'] }">
<el-select v-model="listenerForm.event">
<el-option label="start" value="start" />
@@ -100,31 +100,31 @@
<el-divider />
<p class="listener-filed__title">
<span><i class="el-icon-menu"></i>注入字段</span>
<el-button size="mini" type="primary" @click="openListenerFieldForm(null)">添加字段</el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="openListenerFieldForm(null)">添加字段</el-button>
</p>
<el-table :data="fieldsListOfListener" size="mini" max-height="240" border fit style="flex: none">
<el-table :data="fieldsListOfListener" :size="defaultFormItemSize" max-height="240" border fit style="flex: none">
<el-table-column label="序号" width="50px" type="index" />
<el-table-column label="字段名称" min-width="100px" prop="name" />
<el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" />
<el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
<el-table-column label="操作" width="100px">
<template slot-scope="{ row, $index }">
<el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
<el-button :size="defaultFormItemSize" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
<el-divider direction="vertical" />
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>
<el-button :size="defaultFormItemSize" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>
</template>
</el-table-column>
</el-table>
<div class="element-drawer__button" style="margin-top: 8px;">
<el-button size="mini" @click="listenerFormModelVisible = false"> </el-button>
<el-button size="mini" type="primary" @click="saveListenerConfig"> </el-button>
<el-button :size="defaultFormItemSize" @click="listenerFormModelVisible = false"> </el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="saveListenerConfig"> </el-button>
</div>
</el-drawer>
<!-- 注入字段 编辑/创建 部分 -->
<el-dialog title="字段配置" :visible.sync="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close>
<el-form :model="listenerFieldForm" size="mini" label-width="96px" ref="listenerFieldFormRef" @submit.native.prevent>
<el-form :model="listenerFieldForm" :size="defaultFormItemSize" label-width="96px" ref="listenerFieldFormRef" @submit.native.prevent>
<el-form-item label="字段名称:" prop="name" :rules="{ required: true, message: '请填写字段名称', trigger: ['blur', 'change'] }">
<el-input v-model="listenerFieldForm.name" clearable />
</el-form-item>
@@ -153,8 +153,8 @@
</el-form-item>
</el-form>
<template slot="footer">
<el-button size="mini" @click="listenerFieldFormModelVisible = false"> </el-button>
<el-button size="mini" type="primary" @click="saveListenerFiled"> </el-button>
<el-button :size="defaultFormItemSize" @click="listenerFieldFormModelVisible = false"> </el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="saveListenerFiled"> </el-button>
</template>
</el-dialog>
</div>

View File

@@ -1,25 +1,25 @@
<template>
<div class="panel-tab__content">
<el-table :data="elementListenersList" size="mini" border>
<el-table :data="elementListenersList" :size="defaultFormItemSize" border>
<el-table-column label="序号" width="50px" type="index" />
<el-table-column label="事件类型" min-width="80px" show-overflow-tooltip :formatter="row => listenerEventTypeObject[row.event]" />
<el-table-column label="事件id" min-width="80px" prop="id" show-overflow-tooltip />
<el-table-column label="监听器类型" min-width="80px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
<el-table-column label="操作" width="90px">
<template slot-scope="{ row, $index }">
<el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
<el-button :size="defaultFormItemSize" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
<el-divider direction="vertical" />
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
<el-button :size="defaultFormItemSize" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
</template>
</el-table-column>
</el-table>
<div class="element-drawer__button">
<el-button size="mini" type="primary" icon="el-icon-plus" @click="openListenerForm(null)">添加监听器</el-button>
<el-button :size="defaultFormItemSize" type="primary" icon="el-icon-plus" @click="openListenerForm(null)">添加监听器</el-button>
</div>
<!-- 监听器 编辑/创建 部分 -->
<el-drawer :visible.sync="listenerFormModelVisible" title="任务监听器" :size="`${width}px`" custom-class="process-drawer" append-to-body destroy-on-close>
<el-form size="mini" :model="listenerForm" label-width="96px" ref="listenerFormRef" @submit.native.prevent>
<el-form :size="defaultFormItemSize" :model="listenerForm" label-width="96px" ref="listenerFormRef" @submit.native.prevent>
<el-form-item label="事件类型" prop="event" :rules="{ required: true, message: '请选择事件类型', trigger: ['blur', 'change'] }">
<el-select v-model="listenerForm.event">
<el-option v-for="i in Object.keys(listenerEventTypeObject)" :key="i" :label="listenerEventTypeObject[i]" :value="i" />
@@ -124,31 +124,31 @@
<el-divider />
<p class="listener-filed__title">
<span><i class="el-icon-menu"></i>注入字段</span>
<el-button size="mini" type="primary" @click="openListenerFieldForm(null)">添加字段</el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="openListenerFieldForm(null)">添加字段</el-button>
</p>
<el-table :data="fieldsListOfListener" size="mini" max-height="240" border fit style="flex: none">
<el-table :data="fieldsListOfListener" :size="defaultFormItemSize" max-height="240" border fit style="flex: none">
<el-table-column label="序号" width="50px" type="index" />
<el-table-column label="字段名称" min-width="100px" prop="name" />
<el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" />
<el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
<el-table-column label="操作" width="100px">
<template slot-scope="{ row, $index }">
<el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
<el-button :size="defaultFormItemSize" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
<el-divider direction="vertical" />
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>
<el-button :size="defaultFormItemSize" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>
</template>
</el-table-column>
</el-table>
<div class="element-drawer__button" style="margin-top: 8px;">
<el-button size="mini" @click="listenerFormModelVisible = false"> </el-button>
<el-button size="mini" type="primary" @click="saveListenerConfig"> </el-button>
<el-button :size="defaultFormItemSize" @click="listenerFormModelVisible = false"> </el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="saveListenerConfig"> </el-button>
</div>
</el-drawer>
<!-- 注入西段 编辑/创建 部分 -->
<el-dialog title="字段配置" :visible.sync="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close>
<el-form :model="listenerFieldForm" size="mini" label-width="96px" ref="listenerFieldFormRef" @submit.native.prevent>
<el-form :model="listenerFieldForm" :size="defaultFormItemSize" label-width="96px" ref="listenerFieldFormRef" @submit.native.prevent>
<el-form-item label="字段名称:" prop="name" :rules="{ required: true, message: '请填写字段名称', trigger: ['blur', 'change'] }">
<el-input v-model="listenerFieldForm.name" clearable />
</el-form-item>
@@ -177,8 +177,8 @@
</el-form-item>
</el-form>
<template slot="footer">
<el-button size="mini" @click="listenerFieldFormModelVisible = false"> </el-button>
<el-button size="mini" type="primary" @click="saveListenerFiled"> </el-button>
<el-button :size="defaultFormItemSize" @click="listenerFieldFormModelVisible = false"> </el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="saveListenerFiled"> </el-button>
</template>
</el-dialog>
</div>

View File

@@ -1,25 +1,25 @@
export const template = isTaskListener => {
return `
<div class="panel-tab__content">
<el-table :data="elementListenersList" size="mini" border>
<el-table :data="elementListenersList" :size="defaultFormItemSize" border>
<el-table-column label="序号" width="50px" type="index" />
<el-table-column label="事件类型" min-width="100px" prop="event" />
<el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
<el-table-column label="操作" width="90px">
<template slot-scope="{ row, $index }">
<el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
<el-button :size="defaultFormItemSize" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
<el-divider direction="vertical" />
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
<el-button :size="defaultFormItemSize" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
</template>
</el-table-column>
</el-table>
<div class="element-drawer__button">
<el-button size="mini" type="primary" icon="el-icon-plus" @click="openListenerForm(null)">添加监听器</el-button>
<el-button :size="defaultFormItemSize" type="primary" icon="el-icon-plus" @click="openListenerForm(null)">添加监听器</el-button>
</div>
<!-- 监听器 编辑/创建 部分 -->
<el-drawer :visible.sync="listenerFormModelVisible" title="执行监听器" :size="width + 'px'" custom-class="process-drawer" append-to-body destroy-on-close>
<el-form size="mini" :model="listenerForm" label-width="96px" ref="listenerFormRef" @submit.native.prevent>
<el-form :size="defaultFormItemSize" :model="listenerForm" label-width="96px" ref="listenerFormRef" @submit.native.prevent>
<el-form-item label="事件类型" prop="event" :rules="{ required: true, trigger: ['blur', 'change'] }">
<el-select v-model="listenerForm.event">
<el-option label="start" value="start" />
@@ -116,31 +116,31 @@ export const template = isTaskListener => {
<el-divider />
<p class="listener-filed__title">
<span><i class="el-icon-menu"></i>注入字段:</span>
<el-button size="mini" type="primary" @click="openListenerFieldForm(null)">添加字段</el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="openListenerFieldForm(null)">添加字段</el-button>
</p>
<el-table :data="fieldsListOfListener" size="mini" max-height="240" border fit style="flex: none">
<el-table :data="fieldsListOfListener" :size="defaultFormItemSize" max-height="240" border fit style="flex: none">
<el-table-column label="序号" width="50px" type="index" />
<el-table-column label="字段名称" min-width="100px" prop="name" />
<el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" />
<el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
<el-table-column label="操作" width="100px">
<template slot-scope="{ row, $index }">
<el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
<el-button :size="defaultFormItemSize" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
<el-divider direction="vertical" />
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>
<el-button :size="defaultFormItemSize" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>
</template>
</el-table-column>
</el-table>
<div class="element-drawer__button">
<el-button size="mini" @click="listenerFormModelVisible = false">取 消</el-button>
<el-button size="mini" type="primary" @click="saveListenerConfig">保 存</el-button>
<el-button :size="defaultFormItemSize" @click="listenerFormModelVisible = false">取 消</el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="saveListenerConfig">保 存</el-button>
</div>
</el-drawer>
<!-- 注入西段 编辑/创建 部分 -->
<el-dialog title="字段配置" :visible.sync="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close>
<el-form :model="listenerFieldForm" size="mini" label-width="96px" ref="listenerFieldFormRef" style="height: 136px" @submit.native.prevent>
<el-form :model="listenerFieldForm" :size="defaultFormItemSize" label-width="96px" ref="listenerFieldFormRef" style="height: 136px" @submit.native.prevent>
<el-form-item label="字段名称:" prop="name" :rules="{ required: true, trigger: ['blur', 'change'] }">
<el-input v-model="listenerFieldForm.name" clearable />
</el-form-item>
@@ -169,8 +169,8 @@ export const template = isTaskListener => {
</el-form-item>
</el-form>
<template slot="footer">
<el-button size="mini" @click="listenerFieldFormModelVisible = false">取 消</el-button>
<el-button size="mini" type="primary" @click="saveListenerFiled">确 定</el-button>
<el-button :size="defaultFormItemSize" @click="listenerFieldFormModelVisible = false">取 消</el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="saveListenerFiled">确 定</el-button>
</template>
</el-dialog>
</div>

View File

@@ -1,6 +1,6 @@
<template>
<div class="panel-tab__content">
<el-form size="mini" label-width="90px" @submit.native.prevent>
<el-form :size="defaultFormItemSize" label-width="90px" @submit.native.prevent>
<el-form-item label="内置变量">
<el-button type="primary" @click="showVariableDlg = true">查看</el-button>
</el-form-item>

View File

@@ -1,6 +1,6 @@
<template>
<div class="panel-tab__content">
<el-form size="mini" label-width="90px" @submit.native.prevent>
<el-form :size="defaultFormItemSize" label-width="90px" @submit.native.prevent>
<el-form-item label="集合类型">
<el-select v-model="collectionType" key="collectionType" placeholder="">
<el-option label="候选用户" value="assignee" />

View File

@@ -6,7 +6,7 @@
<el-input
type="textarea"
v-model="documentation"
size="mini"
:size="defaultFormItemSize"
resize="vertical"
:autosize="{ minRows: 2, maxRows: 4 }"
@input="updateDocumentation"

View File

@@ -1,23 +1,23 @@
<template>
<div class="panel-tab__content">
<el-table :data="elementPropertyList" size="mini" max-height="240" border fit>
<el-table :data="elementPropertyList" :size="defaultFormItemSize" max-height="240" border fit>
<el-table-column label="序号" width="50px" type="index" />
<el-table-column label="属性名" prop="name" min-width="100px" show-overflow-tooltip />
<el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />
<el-table-column label="操作" width="90px">
<template slot-scope="{ row, $index }">
<el-button size="mini" type="text" @click="openAttributesForm(row, $index)">编辑</el-button>
<el-button :size="defaultFormItemSize" type="text" @click="openAttributesForm(row, $index)">编辑</el-button>
<el-divider direction="vertical" />
<el-button size="mini" type="text" style="color: #ff4d4f" @click="removeAttributes(row, $index)">移除</el-button>
<el-button :size="defaultFormItemSize" type="text" style="color: #ff4d4f" @click="removeAttributes(row, $index)">移除</el-button>
</template>
</el-table-column>
</el-table>
<div class="element-drawer__button">
<el-button size="mini" type="primary" icon="el-icon-plus" @click="openAttributesForm(null, -1)">添加属性</el-button>
<el-button :size="defaultFormItemSize" type="primary" icon="el-icon-plus" @click="openAttributesForm(null, -1)">添加属性</el-button>
</div>
<el-dialog :visible.sync="propertyFormModelVisible" title="属性配置" width="600px" append-to-body destroy-on-close>
<el-form :model="propertyForm" label-width="80px" size="mini" ref="attributeFormRef" @submit.native.prevent>
<el-form :model="propertyForm" label-width="80px" :size="defaultFormItemSize" ref="attributeFormRef" @submit.native.prevent>
<el-form-item label="属性名:" prop="name">
<el-input v-model="propertyForm.name" clearable />
</el-form-item>
@@ -26,8 +26,8 @@
</el-form-item>
</el-form>
<template slot="footer">
<el-button size="mini" @click="propertyFormModelVisible = false"> </el-button>
<el-button size="mini" type="primary" @click="saveAttribute"> </el-button>
<el-button :size="defaultFormItemSize" @click="propertyFormModelVisible = false"> </el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="saveAttribute"> </el-button>
</template>
</el-dialog>
</div>

View File

@@ -2,25 +2,25 @@
<div class="panel-tab__content">
<div class="panel-tab__content--title">
<span><i class="el-icon-menu" style="margin-right: 8px; color: #555555"></i>消息列表</span>
<el-button size="mini" type="primary" icon="el-icon-plus" @click="openModel('message')">创建新消息</el-button>
<el-button :size="defaultFormItemSize" type="primary" icon="el-icon-plus" @click="openModel('message')">创建新消息</el-button>
</div>
<el-table :data="messageList" size="mini" border>
<el-table :data="messageList" :size="defaultFormItemSize" border>
<el-table-column type="index" label="序号" width="60px" />
<el-table-column label="消息ID" prop="id" max-width="300px" show-overflow-tooltip />
<el-table-column label="消息名称" prop="name" max-width="300px" show-overflow-tooltip />
</el-table>
<div class="panel-tab__content--title" style="padding-top: 8px; margin-top: 8px; border-top: 1px solid #eeeeee">
<span><i class="el-icon-menu" style="margin-right: 8px; color: #555555"></i>信号列表</span>
<el-button size="mini" type="primary" icon="el-icon-plus" @click="openModel('signal')">创建新信号</el-button>
<el-button :size="defaultFormItemSize" type="primary" icon="el-icon-plus" @click="openModel('signal')">创建新信号</el-button>
</div>
<el-table :data="signalList" size="mini" border>
<el-table :data="signalList" :size="defaultFormItemSize" border>
<el-table-column type="index" label="序号" width="60px" />
<el-table-column label="信号ID" prop="id" max-width="300px" show-overflow-tooltip />
<el-table-column label="信号名称" prop="name" max-width="300px" show-overflow-tooltip />
</el-table>
<el-dialog :visible.sync="modelVisible" :title="modelConfig.title" :close-on-click-modal="false" width="400px" append-to-body destroy-on-close>
<el-form :model="modelObjectForm" size="mini" label-width="90px" @submit.native.prevent>
<el-form :model="modelObjectForm" :size="defaultFormItemSize" label-width="90px" @submit.native.prevent>
<el-form-item :label="modelConfig.idLabel">
<el-input v-model="modelObjectForm.id" clearable />
</el-form-item>
@@ -29,8 +29,8 @@
</el-form-item>
</el-form>
<template slot="footer">
<el-button size="mini" @click="modelVisible = false"> </el-button>
<el-button size="mini" type="primary" @click="addNewObject"> </el-button>
<el-button :size="defaultFormItemSize" @click="modelVisible = false"> </el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="addNewObject"> </el-button>
</template>
</el-dialog>
</div>

View File

@@ -1,6 +1,6 @@
<template>
<div class="panel-tab__content">
<el-form size="mini" label-width="90px" @submit.native.prevent>
<el-form :size="defaultFormItemSize" label-width="90px" @submit.native.prevent>
<el-form-item label="异步延续">
<el-checkbox v-model="taskConfigForm.asyncBefore" label="异步前" @change="changeTaskAsync" />
<el-checkbox v-model="taskConfigForm.asyncAfter" label="异步后" @change="changeTaskAsync" />
@@ -35,6 +35,7 @@ export default {
// 手工任务与普通任务一致,不需要其他配置
// 接收消息任务,需要在全局下插入新的消息实例,并在该节点下的 messageRef 属性绑定该实例
// 发送任务、服务任务、业务规则任务共用一个相同配置
SubProcess: "UserTask",
UserTask: "UserTask", // 用户任务配置
ScriptTask: "ScriptTask", // 脚本任务配置
ReceiveTask: "ReceiveTask" // 消息接收任务

View File

@@ -5,11 +5,11 @@
<el-select v-model="bindMessageId" @change="updateTaskMessage">
<el-option v-for="id in Object.keys(messageMap)" :value="id" :label="messageMap[id]" :key="id" />
</el-select>
<el-button size="mini" type="primary" icon="el-icon-plus" style="margin-left: 8px" @click="openMessageModel" />
<el-button :size="defaultFormItemSize" type="primary" icon="el-icon-plus" style="margin-left: 8px" @click="openMessageModel" />
</div>
</el-form-item>
<el-dialog :visible.sync="messageModelVisible" :close-on-click-modal="false" title="创建新消息" width="400px" append-to-body destroy-on-close>
<el-form :model="newMessageForm" size="mini" label-width="90px" @submit.native.prevent>
<el-form :model="newMessageForm" :size="defaultFormItemSize" label-width="90px" @submit.native.prevent>
<el-form-item label="消息ID">
<el-input v-model="newMessageForm.id" clearable />
</el-form-item>
@@ -18,7 +18,7 @@
</el-form-item>
</el-form>
<template slot="footer">
<el-button size="mini" type="primary" @click="createNewMessage"> </el-button>
<el-button :size="defaultFormItemSize" type="primary" @click="createNewMessage"> </el-button>
</template>
</el-dialog>
</div>

Some files were not shown because too many files have changed in this diff Show More