xiaoy
/
cz-hjjc-oa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
rollback
xy 1 year ago
parent 6de809beba
commit 13a4d3117c
5 changed files with 120 additions and 61 deletions
Show Stats Download Patch File Download Diff File

56
src/utils/formBuilder.js
Unescape View File

@ -157,64 +157,12 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
props: { props: {
type: "datetime", type: "datetime",
"value-format": "yyyy-MM-dd HH:mm:ss", "value-format": "yyyy-MM-dd HH:mm:ss",
format: "yyyy-MM-dd HH:mm", format: this.datetimeFormat,
value: row ? row[info.name] : this.form[info.name], value: row ? row[info.name] : this.form[info.name],
clearable: true, clearable: true,
placeholder: info.help_text, placeholder: info.help_text,
"picker-options": { "picker-options": {
shortcuts: [ shortcuts: this.shortcuts
{
text: "一年前",
onClick(picker) {
picker.$emit(
"pick",
moment().subtract(1, "years").toDate()
);
},
},
{
text: "一月前",
onClick(picker) {
picker.$emit(
"pick",
moment().subtract(1, "months").toDate()
);
},
},
{
text: "一周前",
onClick(picker) {
picker.$emit(
"pick",
moment().subtract(1, "weeks").toDate()
);
},
},
{
text: "今天",
onClick(picker) {
picker.$emit("pick", new Date());
},
},
{
text: "一周后",
onClick(picker) {
picker.$emit("pick", moment().add(1, "weeks").toDate());
},
},
{
text: "一月后",
onClick(picker) {
picker.$emit("pick", moment().add(1, "months").toDate());
},
},
{
text: "一年后",
onClick(picker) {
picker.$emit("pick", moment().add(1, "years").toDate());
},
},
],
}, },
}, },
style: { style: {

110
src/views/flow/DesktopForm.vue
Unescape View File

@ -4,6 +4,7 @@ import formBuilder from "@/utils/formBuilder";
import { PopupManager } from "element-ui/lib/utils/popup"; import { PopupManager } from "element-ui/lib/utils/popup";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import request from '@/utils/request' import request from '@/utils/request'
import moment from "moment/moment";
export default { export default {
props: { props: {
@ -61,6 +62,7 @@ export default {
}, },
data() { data() {
return { return {
// 脚本注入控制的modal弹窗
zIndex: PopupManager.nextZIndex(), zIndex: PopupManager.nextZIndex(),
isShowModal: false, isShowModal: false,
modalRender: () => {}, modalRender: () => {},
@ -68,6 +70,114 @@ export default {
action: process.env.VUE_APP_BASE_API, action: process.env.VUE_APP_BASE_API,
form: {}, form: {},
file: {}, file: {},
datetimeFormat: 'yyyy-MM-dd HH:mm',
copyShortcuts: [
{
text: "一年前",
onClick(picker) {
picker.$emit(
"pick",
moment().subtract(1, "years").toDate()
);
},
},
{
text: "一月前",
onClick(picker) {
picker.$emit(
"pick",
moment().subtract(1, "months").toDate()
);
},
},
{
text: "一周前",
onClick(picker) {
picker.$emit(
"pick",
moment().subtract(1, "weeks").toDate()
);
},
},
{
text: "今天",
onClick(picker) {
picker.$emit("pick", new Date());
},
},
{
text: "一周后",
onClick(picker) {
picker.$emit("pick", moment().add(1, "weeks").toDate());
},
},
{
text: "一月后",
onClick(picker) {
picker.$emit("pick", moment().add(1, "months").toDate());
},
},
{
text: "一年后",
onClick(picker) {
picker.$emit("pick", moment().add(1, "years").toDate());
},
},
],
shortcuts: [
{
text: "一年前",
onClick(picker) {
picker.$emit(
"pick",
moment().subtract(1, "years").toDate()
);
},
},
{
text: "一月前",
onClick(picker) {
picker.$emit(
"pick",
moment().subtract(1, "months").toDate()
);
},
},
{
text: "一周前",
onClick(picker) {
picker.$emit(
"pick",
moment().subtract(1, "weeks").toDate()
);
},
},
{
text: "今天",
onClick(picker) {
picker.$emit("pick", new Date());
},
},
{
text: "一周后",
onClick(picker) {
picker.$emit("pick", moment().add(1, "weeks").toDate());
},
},
{
text: "一月后",
onClick(picker) {
picker.$emit("pick", moment().add(1, "months").toDate());
},
},
{
text: "一年后",
onClick(picker) {
picker.$emit("pick", moment().add(1, "years").toDate());
},
},
]
}; };
}, },
methods: { methods: {

1
src/views/flow/create.vue
Unescape View File

@ -300,6 +300,7 @@ export default {
form: {}, form: {},
result: {}, result: {},
fileList: {}, fileList: {},
subFileList: {},
rules: {}, rules: {},
subRules: {}, subRules: {},
flows: [], flows: [],

6
src/views/notice/components/AddNotice.vue
Unescape View File

@ -4,10 +4,10 @@
:value="isShow" :value="isShow"
show-footer show-footer
:z-index="zIndex" :z-index="zIndex"
title="会议使用审核" title="发布通知或提醒"
show-confirm-button show-confirm-button
:width="640" :width="740"
:height="580" :height="620"
esc-closable esc-closable
:fullscreen="$store.getters.device === 'mobile'" :fullscreen="$store.getters.device === 'mobile'"
@input="(e) => $emit('update:isShow', e)" @input="(e) => $emit('update:isShow', e)"

8
src/views/notice/index.vue
Unescape View File

@ -21,10 +21,10 @@
:data="tableData" :data="tableData"
> >
<vxe-column type="seq" width="58" align="center" /> <vxe-column type="seq" width="58" align="center" />
<vxe-column field="name" width="170" title="名字" :edit-render="{ name: 'input', attrs: { type: 'text' } }" /> <vxe-column field="title" width="170" title="通知提醒" :edit-render="{ name: 'input', attrs: { type: 'text' } }" />
<vxe-column field="key" width="150" title="标识" :edit-render="{ name: 'input', attrs: { type: 'text' } }" /> <vxe-column field="admin.name" width="150" title="发布人" align="center" />
<vxe-column field="value" width="150" title="值" :edit-render="{ name: 'input', attrs: { type: 'text' } }" /> <vxe-column field="created_at" width="140" title="发出时间" align="center" />
<vxe-column field="mysort" width="80" title="排序" align="center" :edit-render="{ name: 'input', attrs: { type: 'number' } }" /> <vxe-column field="deadline" width="140" title="截止时间" align="center" :edit-render="{ name: 'input', attrs: { type: 'number' } }" />
<vxe-column field="operate" title="操作" min-width="220"> <vxe-column field="operate" title="操作" min-width="220">
<template #default="{ row }"> <template #default="{ row }">
<template v-if="isActiveStatus(row)"> <template v-if="isActiveStatus(row)">

Write Preview
Loading…
Cancel
Save