1

src/utils/formBuilder.js

@@ -157,64 +157,12 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
             props: {
               type: "datetime",
               "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],
               clearable: true,
               placeholder: info.help_text,
               "picker-options": {
-                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());
-                    },
-                  },
-                ],
+                shortcuts: this.shortcuts
               },
             },
             style: {

src/views/flow/DesktopForm.vue

@@ -4,6 +4,7 @@ import formBuilder from "@/utils/formBuilder";
 import { PopupManager } from "element-ui/lib/utils/popup";
 import { getToken } from "@/utils/auth";
 import request from '@/utils/request'
+import moment from "moment/moment";
 
 export default {
   props: {
@@ -61,6 +62,7 @@ export default {
   },
   data() {
     return {
+      // 脚本注入控制的modal弹窗
       zIndex: PopupManager.nextZIndex(),
       isShowModal: false,
       modalRender: () => {},
@@ -68,6 +70,114 @@ export default {
       action: process.env.VUE_APP_BASE_API,
       form: {},
       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: {

src/views/flow/create.vue

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

src/views/notice/components/AddNotice.vue

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

src/views/notice/index.vue

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