修改系统名称

menu_style
zhangdi 3 months ago
parent 3f5f6ba909
commit d591bd0490
  1. 21
      index.html
  2. 2
      src/config/website.js
  3. 4
      src/lang/en.js
  4. 4
      src/lang/zh.js
  5. 14
      src/page/login/index.vue
  6. 4
      src/page/login/userlogin.vue
  7. 1
      src/router/views/index.js
  8. 1
      src/views/plugin/workflow/mixins/draft.js
  9. 1
      src/views/plugin/workflow/mixins/ex-form.js
  10. 2
      src/views/plugin/workflow/pages/demo/leave/index.vue
  11. 2
      src/views/plugin/workflow/pages/external/Leave/detail.vue
  12. 2
      src/views/plugin/workflow/pages/external/Leave/start.vue
  13. 306
      src/views/plugin/workflow/pages/external/zdtest/start.vue
  14. 12
      src/views/plugin/workflow/pages/process/start.vue

@ -18,21 +18,24 @@
<link rel='stylesheet' href='/iconfont/common/iconfont.css'>
<link rel='stylesheet' href='/css/loading.css'>
<link rel='stylesheet' href='/css/saber.css'>
<title>BladeX微服务开发平台</title>
<title>电镀智能化生产管理系统</title>
</head>
<body>
<div id='app'>
<div id='loader-wrapper'>
<div class='loader-box'>
<span>BladeX</span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
</div>
<div class='loader-title'>系统加载中</div>
</div>

@ -53,7 +53,7 @@ export default {
//水印配置
watermark: {
mode: false,
text: 'BladeX',
text: '电镀智能化生产管理系统',
},
//oauth2配置
oauth2: {

@ -1,5 +1,5 @@
export default {
title: 'BladeX Admin',
title: 'jonhon Admin',
logoutTip: 'Exit the system, do you want to continue?',
submitText: 'submit',
cancelText: 'cancel',
@ -78,7 +78,7 @@ export default {
},
login: {
title: 'Login ',
info: 'BladeX Development Platform',
info: 'jonhon Development Platform',
tenantId: 'Please input tenantId',
name: 'Please input name',
username: 'Please input account',

@ -1,5 +1,5 @@
export default {
title: 'BladeX微服务平台',
title: '电镀智能化生产管理系统',
confirmTip: '提示',
logoutTip: '退出系统, 是否继续?',
submitText: '确定',
@ -79,7 +79,7 @@ export default {
},
login: {
title: '登录 ',
info: 'BladeX 微服务平台',
info: '电镀智能化生产管理系统',
tenantId: '请输入租户ID',
name: '请输入姓名',
username: '请输入账号',

@ -11,14 +11,14 @@
<div class="login-border animate__animated animate__fadeInRight">
<div class="login-main">
<p class="login-title">
{{ $t('login.title') }}{{ website.title }}
<top-lang></top-lang>
{{ $t('login.title') }}
<!-- <top-lang></top-lang> -->
</p>
<userLogin v-if="activeName === 'user'"></userLogin>
<codeLogin v-else-if="activeName === 'code'"></codeLogin>
<thirdLogin v-else-if="activeName === 'third'"></thirdLogin>
<registerLogin v-else-if="activeName === 'register'"></registerLogin>
<div class="login-menu">
<!-- <codeLogin v-else-if="activeName === 'code'"></codeLogin> -->
<!-- <thirdLogin v-else-if="activeName === 'third'"></thirdLogin> -->
<!-- <registerLogin v-else-if="activeName === 'register'"></registerLogin> -->
<!-- <div class="login-menu">
<el-link href="#" @click.stop="activeName = 'user'">{{
$t('login.userLogin')
}}</el-link>
@ -34,7 +34,7 @@
"
>{{ $t('login.ssoLogin') }}</el-link
>
</div>
</div> -->
</div>
</div>
</div>

@ -66,13 +66,13 @@
<el-button type="primary" @click.prevent="handleLogin" class="login-submit"
>{{ $t('login.submit') }}
</el-button>
<el-button
<!-- <el-button
v-if="this.registerMode"
type="danger"
@click.prevent="handleRegister"
class="register-submit"
>{{ $t('login.register') }}
</el-button>
</el-button> -->
</el-form-item>
<el-dialog title="请选择身份信息后登录" append-to-body v-model="userBox" width="400px">
<avue-form :option="userOption" v-model="userForm" @submit="submitLogin" />

@ -159,4 +159,5 @@ export default [
}
]
},
];

@ -14,6 +14,7 @@ export default {
})
},
handleDraft({ processDefId, taskId, formKey, variables }) {
if (!this.$refs.form) {
this.$message.error("找不到可用的表单,请检查表单配置");
return;

@ -60,6 +60,7 @@ export default {
return new Promise(resolve => {
if (formKey && formKey.startsWith('wf_ex_')) {
if (formUrl) {
// 配置了自定义路由
this.$router.push(formUrl + `?p=${param}`);

@ -138,7 +138,7 @@ export default {
menuWidth: 260,
column: [
{
label: '创建人',
label: '创建人2',
prop: 'creator',
search: true,
type: 'tree',

@ -125,7 +125,7 @@ export default {
column: [
{
type: 'input',
label: '创建人',
label: '创建人6',
span: 12,
display: true,
prop: 'creator',

@ -102,7 +102,7 @@ export default {
column: [
{
type: 'input',
label: '创建人',
label: '创建人3',
span: 12,
display: true,
prop: 'creator',

@ -0,0 +1,306 @@
<template>
<nf-container v-if="moduleLoadInit">
<el-skeleton :loading="waiting" avatar :rows="8">
<h3 style="margin-bottom: 20px">{{ process.name }}</h3>
<el-card shadow="never" style="margin-top: 20px">
<!-- 自定义表单区域 -->
<nf-form
v-if="
option &&
((option.column && option.column.length > 0) ||
(option.group && option.group.length > 0))
"
v-model="form"
ref="form"
:option="option"
@submit="handleSubmit"
@error="loading = false"
:upload-preview="handleUploadPreview"
>
</nf-form>
<!-- 自定义表单区域 -->
</el-card>
<el-card shadow="never" style="margin-top: 20px" v-if="showExamForm">
<nf-examine-form
ref="examineForm"
:process="process"
@user-select="handleUserSelect"
></nf-examine-form>
</el-card>
<div style="height: 80px"></div>
<el-affix position="bottom" :offset="20">
<el-row
class="foot-item"
:style="{ width: isCollapse ? 'calc(100% - 71px)' : 'calc(100% - 241px)' }"
>
<el-button type="primary" size="default" v-loading="loading" @click="handleSubmit">
发起
</el-button>
<el-button
v-if="permission.wf_process_draft"
type="success"
size="default"
v-loading="loading"
@click="
handleDraft({ processDefId: process.id, formKey: process.formKey, variables: form })
"
>
存为草稿
</el-button>
</el-row>
</el-affix>
</el-skeleton>
<!-- 人员选择弹窗 -->
<nf-user-select
ref="user-select"
:check-type="checkType"
:default-checked="defaultChecked"
@onConfirm="handleUserSelectConfirm"
></nf-user-select>
</nf-container>
</template>
<script>
import { submit } from '../../../api/demo/leave.js';
import NfExamineForm from '../../../components/nf-exam-form/index.vue';
import NfUserSelect from '../../../components/nf-user-select/index.vue';
import exForm from '../../../mixins/ex-form';
import draft from '../../../mixins/draft';
export default {
components: {
NfUserSelect,
NfExamineForm,
},
mixins: [exForm, draft],
watch: {
'$route.query.p': {
handler(val) {
if (val) {
const param = JSON.parse(window.atob(val));
const { processId, processDefKey, params } = param;
if (processId || processDefKey) this.getForm(processId, processDefKey);
if (params) this.params = params;
}
},
immediate: true,
},
},
computed: {
showExamForm() {
const { hideComment, hideCopy, hideExamine } = this.process;
return !hideComment || !hideCopy || !hideExamine;
},
},
data() {
return {
form: {},
option: {
menuBtn: false,
column: [
{
type: 'input',
label: '创建人55555777',
span: 12,
display: true,
prop: 'creator',
value: '${this.$store.getters.userInfo.nick_name}',
readonly: true,
},
{
type: 'input',
label: '创建部门',
span: 12,
display: true,
prop: 'creatorDept',
value: '${this.$store.getters.userInfo.dept_name}',
readonly: true,
},
{
type: 'datetimerange',
label: '请假时间',
span: 12,
display: true,
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
prop: 'datetime',
dataType: 'string',
required: true,
rules: [
{
required: true,
message: '开始时间必须填写',
},
],
change: ({ value }) => {
if (!value || value.length == 0) {
this.form.day = undefined;
} else {
const d1 = Date.parse(value.split(',')[0]);
const d2 = Date.parse(value.split(',')[1]);
const day = (d2 - d1) / (1 * 24 * 60 * 60 * 1000);
this.form.days = Number(day.toFixed(2));
}
},
},
{
type: 'number',
label: '请假天数',
span: 12,
display: true,
prop: 'days',
required: true,
rules: [
{
required: true,
message: '请假天数必须填写',
},
],
controls: true,
controlsPosition: 'right',
change: ({ value }) => {
if (value) this.form.reason = '请假' + value + '天';
else this.form.reason = '';
},
},
{
type: 'textarea',
label: '请假理由',
span: 24,
display: true,
prop: 'reason',
required: true,
rules: [
{
required: true,
message: '请假理由必须填写',
},
],
},
{
label: '附件',
type: 'upload',
propsHttp: {
res: 'data',
url: 'link',
name: 'originalName',
},
action: '/blade-resource/oss/endpoint/put-file',
display: true,
span: 24,
showFileList: true,
multiple: true,
limit: 10,
prop: 'attachment',
dataType: 'string',
},
],
},
process: {},
loading: false,
params: null,
};
},
methods: {
getForm(processId, processDefKey) {
let param;
let method;
if (processId) {
param = processId;
method = 'getStartForm';
} else if (processDefKey) {
param = processDefKey;
method = 'getStartFormByProcessDefKey';
}
this[method](param).then(res => {
let { process, startForm } = res;
this.form.processId = process.id;
const option = this.option;
const { column, group } = option;
const groupArr = [];
const columnArr = this.filterAvueColumn(column, startForm, true).column;
if (group && group.length > 0) {
// group
group.forEach(gro => {
gro.column = this.filterAvueColumn(gro.column, startForm, true).column;
if (gro.column.length > 0) groupArr.push(gro);
});
}
if (option.initFunction) {
option.initFunction = eval((option.initFunction + '').replace(/this/g, '_this'));
}
option.column = columnArr;
option.group = groupArr;
this.option = option;
setTimeout(() => {
if (!this.validatenull(this.params)) {
this.form = { ...this.form, ...this.params };
console.log('外部参数赋值', this.params);
}
}, 500);
if (this.permission.wf_process_draft) {
// 稿
this.initDraft({ processDefId: process.id }).then(data => {
this.$confirm('是否恢复之前保存的草稿?', '提示', {})
.then(() => {
this.form = JSON.parse(data);
})
.catch(() => {});
});
}
this.waiting = false;
});
},
handleSubmit() {
let form = this.deepClone(this.form);
form = {
...form,
processDefId: form.processId,
formKey: this.process.formKey,
formUrl: this.process.formUrl,
};
submit(form).then(res => {
const data = res.data.data;
this.form.processDefKey = this.process.key;
this.form.businessKey = data.id;
this.handleStartProcessByKey(true)
.then((res, done) => {
const processInsId = res.data.data;
submit({ id: data.id, processInsId }).then(() => {
this.$message.success('发起成功');
this.handleCloseTag('/plugin/workflow/pages/process/send');
if (typeof done == 'function') done();
});
})
.catch(() => {
this.loading = false;
});
});
},
},
};
</script>
<style lang="scss" scoped>
.foot-item {
position: fixed;
bottom: 5px;
margin-left: -20px;
// right: 0;
z-index: 101;
height: 66px;
background-color: #fff;
display: flex;
justify-content: center;
align-items: center;
-webkit-transition: 0.3s;
transition: 0.3s;
-webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
}
</style>

@ -46,7 +46,16 @@
</el-button>
</template>
</nf-crud>
<!-- 发起弹框 -->
<el-dialog
v-model="sendvisble"
append-to-body
destroy-on-close
title="发起"
width="70%"
class="nf-dialog"
>
</el-dialog>
<el-dialog
v-model="bpmnVisible"
append-to-body
@ -154,6 +163,7 @@ export default {
data: [],
bpmnVisible: false,
bpmnOption: {},
sendvisble:false,//
};
},
computed: {

Loading…
Cancel
Save