From 784b18d6a55e7771a97a11d559cb9fc3e7ab3131 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Fri, 6 Dec 2024 18:14:41 +0800
Subject: [PATCH] 1

---
 src/components/OnlineFile/index.vue           |  9 ++++-
 src/main.js                                   |  3 +-
 src/settings.js                               |  6 +++
 src/utils/formBuilder.js                      | 12 +++++-
 src/views/BeOnDuty/components/AddBeOnDuty.vue | 20 +++++++++-
 .../components/AddDocumentMenu.vue            |  9 ++++-
 .../MeetingRoom/components/AddMeetingRoom.vue | 20 +++++++++-
 .../SpecialDays/components/AddSpecialDays.vue | 20 +++++++++-
 .../components/AddVehicleCertificate.vue      | 20 +++++++++-
 .../attendance/components/MonthStatics.vue    |  9 ++++-
 src/views/attendance/index.vue                | 10 +++--
 src/views/config/components/AddConfig.vue     |  7 +++-
 src/views/dashboard/index.vue                 |  7 +++-
 src/views/document/components/AddDocument.vue | 10 +++--
 src/views/flow/DesktopForm.vue                | 11 ++++--
 src/views/flow/MobileForm.vue                 | 11 +++++-
 src/views/flow/components/assign.vue          |  8 +++-
 src/views/flow/components/forward.vue         |  9 ++++-
 src/views/flow/components/rollback.vue        |  9 +++--
 src/views/flow/components/share.vue           |  8 +++-
 src/views/flow/create.vue                     | 38 +++++++++++++++----
 src/views/flow/list.vue                       |  1 -
 src/views/flow/statistics.vue                 |  4 +-
 src/views/meeting/components/AddMeeting.vue   | 10 +++--
 src/views/notice/components/AddNotice.vue     |  9 ++++-
 src/views/vehicle/components/AddVehicle.vue   |  9 ++++-
 26 files changed, 231 insertions(+), 58 deletions(-)

diff --git a/src/components/OnlineFile/index.vue b/src/components/OnlineFile/index.vue
index 9b37603..5101d92 100644
--- a/src/components/OnlineFile/index.vue
+++ b/src/components/OnlineFile/index.vue
@@ -1,9 +1,12 @@
 <template>
   <div>
     <vxe-modal
-      :width="840"
-      :height="600"
+      :width="defaultModalSize.width"
+      :height="defaultModalSize.height"
       show-zoom
+      resize
+      transfer
+      esc-closable
       :fullscreen="$store.getters.device === 'mobile'"
       :z-index="zIndex"
       v-model="showModal"
@@ -23,10 +26,12 @@
 
 <script>
 import { PopupManager } from "element-ui/lib/utils/popup";
+import {defaultModalSize} from "@/settings";
 
 export default {
   data() {
     return {
+      defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
       showModal:false,
       codeUri: "",
diff --git a/src/main.js b/src/main.js
index a740d59..d302e45 100644
--- a/src/main.js
+++ b/src/main.js
@@ -34,9 +34,10 @@ if (process.env.NODE_ENV === 'production') {
 Vue.use(ElementUI)
 
 // vxe-table
-import { VxeUI, VxeUpload } from 'vxe-pc-ui'
+import { VxeUI, VxeUpload, VxeDatePicker } from 'vxe-pc-ui'
 import 'vxe-pc-ui/lib/style.css'
 Vue.use(VxeUpload)
+Vue.use(VxeDatePicker)
 import VxeTable from 'vxe-table'
 import "vxe-table/styles/index.scss"
 import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'
diff --git a/src/settings.js b/src/settings.js
index 11afd79..2b0698d 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -14,4 +14,10 @@ module.exports = {
    */
   sidebarLogo: false,
   uploadSize: 1024 * 1024 * 20,
+  defaultModalSize: {
+    width: '76vw',
+    height: '80vh',
+    sWidth: '64vw',
+    sHeight: '72vh',
+  }
 }
diff --git a/src/utils/formBuilder.js b/src/utils/formBuilder.js
index af72d9d..591eb1e 100644
--- a/src/utils/formBuilder.js
+++ b/src/utils/formBuilder.js
@@ -7,7 +7,7 @@ import { uploadSize } from "@/settings";
 import axios from 'axios';
 import { flowList } from "@/api/flow";
 /**
- * @param {String} device 'desktop' or 'mobile'
+ * @param {String} device 'desktop' | 'mobile'
  * @param {Object} info field参数
  * @param {CreateElement} h
  * @param {Object} row 子表单的row
@@ -949,6 +949,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
               value: row ? row[info.name] : this.form[info.name],
               clearable: true,
               placeholder: info.help_text,
+              rules: this.rules[info.name]
             },
             attrs: {
               placeholder: info.help_text,
@@ -971,6 +972,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
               value: row ? row[info.name] : this.form[info.name],
               clearable: true,
               placeholder: info.help_text,
+              rules: this.rules[info.name]
             },
             attrs: {
               placeholder: info.help_text,
@@ -994,6 +996,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
               value: row ? row[info.name] : this.form[info.name],
               clearable: true,
               placeholder: info.help_text,
+              rules: this.rules[info.name]
             },
             attrs: {
               placeholder: info.help_text,
@@ -1017,6 +1020,8 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
               value: row ? row[info.name] : this.form[info.name],
               clearable: true,
               placeholder: info.help_text,
+              rules: this.rules[info.name],
+              required: !!this.rules[info.name]?.find(j => j.required)
             },
             on: {
               click: (_) => {
@@ -1042,6 +1047,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
               value: typeof findSelect === "object" ? findSelect.name : findSelect,
               clearable: true,
               placeholder: info.help_text,
+              rules: this.rules[info.name]
             },
             on: {
               click: (_) => {
@@ -1072,6 +1078,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
               value: (findChoice instanceof Array) ? (findChoice.map(i => typeof i === "object" ? i.name : i).toString()) : (typeof findChoice === "object" ? findChoice.name : findChoice),
               clearable: true,
               placeholder: info.help_text,
+              rules: this.rules[info.name]
             },
             on: {
               click: (_) => {
@@ -1092,6 +1099,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
           formItem = h('van-cell',{
             props: {
               title: info.label,
+              rules: this.rules[info.name]
             }
           },[
             h(
@@ -1236,6 +1244,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
               value: typeof findFlow === "object" ? (findFlow.name || findFlow.title) : findFlow,
               clearable: true,
               placeholder: info.help_text,
+              rules: this.rules[info.name]
             },
             on: {
               click: (_) => {
@@ -1306,6 +1315,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                     h(
                       "van-form",
                       {
+                        ref: "vanForm",
                         props: {
                           "scroll-to-error": true,
                         },
diff --git a/src/views/BeOnDuty/components/AddBeOnDuty.vue b/src/views/BeOnDuty/components/AddBeOnDuty.vue
index 4fe3a6d..5e5c007 100644
--- a/src/views/BeOnDuty/components/AddBeOnDuty.vue
+++ b/src/views/BeOnDuty/components/AddBeOnDuty.vue
@@ -5,9 +5,13 @@
       show-footer
       title="值班管理"
       show-confirm-button
-      :width="600"
-      :height="400"
+      :width="defaultModalSize.width"
+      :height="defaultModalSize.height"
       esc-closable
+      transfer
+      show-zoom
+      resize
+      :z-index="zIndex"
       :fullscreen="$store.getters.device === 'mobile'"
       @input="e => $emit('update:isShow',e)"
     >
@@ -48,6 +52,9 @@
 <script>
 import UserPicker from "@/components/UserPicker/index.vue";
 import { save } from '@/api/onDutySchedules'
+import {defaultModalSize} from "@/settings";
+import { PopupManager } from "element-ui/lib/utils/popup";
+
 export default {
   components: {
     UserPicker
@@ -61,6 +68,8 @@ export default {
   },
   data() {
     return {
+      zIndex: PopupManager.nextZIndex(),
+      defaultModalSize,
       loading: false,
       form: {
         date: '',
@@ -99,6 +108,13 @@ export default {
         }
       })
     }
+  },
+  watch: {
+    isShow(newVal) {
+      if(newVal) {
+        this.zIndex = PopupManager.nextZIndex()
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/DocumentMenu/components/AddDocumentMenu.vue b/src/views/DocumentMenu/components/AddDocumentMenu.vue
index 5f96497..5be3bf0 100644
--- a/src/views/DocumentMenu/components/AddDocumentMenu.vue
+++ b/src/views/DocumentMenu/components/AddDocumentMenu.vue
@@ -6,8 +6,11 @@
       show-footer
       title="公共文件柜栏目"
       show-confirm-button
-      :width="600"
-      :height="400"
+      resize
+      show-zoom
+      transfer
+      :width="defaultModalSize.sWidth"
+      :height="defaultModalSize.sHeight"
       :fullscreen="$store.getters.device === 'mobile'"
       esc-closable
       @input="e => $emit('update:isShow',e)"
@@ -53,6 +56,7 @@
 import UserPicker from "@/components/UserPicker/index.vue";
 import { menuSave } from '@/api/document'
 import { PopupManager } from "element-ui/lib/utils/popup";
+import {defaultModalSize} from "@/settings";
 export default {
   components: {
     UserPicker
@@ -70,6 +74,7 @@ export default {
   },
   data() {
     return {
+      defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
       loading: false,
       form: {
diff --git a/src/views/MeetingRoom/components/AddMeetingRoom.vue b/src/views/MeetingRoom/components/AddMeetingRoom.vue
index 35c37c5..69c40fc 100644
--- a/src/views/MeetingRoom/components/AddMeetingRoom.vue
+++ b/src/views/MeetingRoom/components/AddMeetingRoom.vue
@@ -3,10 +3,14 @@
     <vxe-modal
       :value="isShow"
       show-footer
+      transfer
+      :z-index="zIndex"
+      resize
+      show-zoom
       title="会议室"
       show-confirm-button
-      :width="600"
-      :height="400"
+      :width="defaultModalSize.sWidth"
+      :height="defaultModalSize.sHeight"
       esc-closable
       :fullscreen="$store.getters.device === 'mobile'"
       @input="e => $emit('update:isShow',e)"
@@ -29,6 +33,9 @@
 
 <script>
 import { save } from '@/api/meetingRoom'
+import { defaultModalSize } from "@/settings";
+import { PopupManager } from 'element-ui/lib/utils/popup'
+
 export default {
   props: {
     isShow: {
@@ -39,7 +46,9 @@ export default {
   },
   data() {
     return {
+      defaultModalSize,
       loading: false,
+      zIndex: PopupManager.nextZIndex(),
       form: {
         name: '',
         myindex: 0
@@ -66,6 +75,13 @@ export default {
         }
       })
     }
+  },
+  watch: {
+    isShow(newVal) {
+      if (newVal) {
+        this.zIndex = PopupManager.nextZIndex()
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/SpecialDays/components/AddSpecialDays.vue b/src/views/SpecialDays/components/AddSpecialDays.vue
index 6a4f6da..a5ece60 100644
--- a/src/views/SpecialDays/components/AddSpecialDays.vue
+++ b/src/views/SpecialDays/components/AddSpecialDays.vue
@@ -5,8 +5,12 @@
       show-footer
       title="特殊日期"
       show-confirm-button
-      :width="600"
-      :height="400"
+      transfer
+      show-zoom
+      resize
+      :z-index="zIndex"
+      :width="defaultModalSize.sWidth"
+      :height="defaultModalSize.sHeight"
       esc-closable
       :fullscreen="$store.getters.device === 'mobile'"
       @input="e => $emit('update:isShow',e)"
@@ -35,6 +39,9 @@
 
 <script>
 import { save } from '@/api/specialDays'
+import {defaultModalSize} from "@/settings";
+import { PopupManager } from 'element-ui/lib/utils/popup'
+
 export default {
   props: {
     isShow: {
@@ -45,6 +52,8 @@ export default {
   },
   data() {
     return {
+      defaultModalSize,
+      zIndex: PopupManager.nextZIndex(),
       loading: false,
       form: {
         date: '',
@@ -80,6 +89,13 @@ export default {
         }
       })
     }
+  },
+  watch: {
+    isShow(newVal) {
+      if (newVal) {
+        this.zIndex = PopupManager.nextZIndex()
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/VehicleCertificate/components/AddVehicleCertificate.vue b/src/views/VehicleCertificate/components/AddVehicleCertificate.vue
index fabae8c..71713df 100644
--- a/src/views/VehicleCertificate/components/AddVehicleCertificate.vue
+++ b/src/views/VehicleCertificate/components/AddVehicleCertificate.vue
@@ -1,13 +1,17 @@
 <template>
   <div>
     <vxe-modal
+      :z-index="zIndex"
       :value="isShow"
       show-footer
       title="车辆证照管理"
       show-confirm-button
-      :width="840"
-      :height="660"
+      :width="defaultModalSize.width"
+      :height="defaultModalSize.height"
       esc-closable
+      transfer
+      show-zoom
+      resize
       :fullscreen="$store.getters.device === 'mobile'"
       @input="e => $emit('update:isShow',e)"
     >
@@ -67,6 +71,9 @@
 <script>
 import { getToken } from '@/utils/auth'
 import { save } from '@/api/vehicleCertificate'
+import {defaultModalSize} from "@/settings";
+import { PopupManager } from "element-ui/lib/utils/popup";
+
 export default {
   props: {
     isShow: {
@@ -83,6 +90,8 @@ export default {
     return {
       fileList: [],
       action: process.env.VUE_APP_UPLOAD_API,
+      defaultModalSize,
+      zIndex: PopupManager.nextZIndex(),
 
       loading: false,
       form: {
@@ -138,6 +147,13 @@ export default {
         }
       })
     }
+  },
+  watch: {
+    isShow(newVal) {
+      if(newVal) {
+        this.zIndex = PopupManager.nextZIndex()
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/attendance/components/MonthStatics.vue b/src/views/attendance/components/MonthStatics.vue
index 9ce4c76..413c8b1 100644
--- a/src/views/attendance/components/MonthStatics.vue
+++ b/src/views/attendance/components/MonthStatics.vue
@@ -29,8 +29,11 @@
       :z-index="zIndex"
       title="打卡详情"
       show-confirm-button
-      :width="680"
-      :height="540"
+      transfer
+      show-zoom
+      resize
+      :width="defaultModalSize.sWidth"
+      :height="defaultModalSize.sHeight"
       esc-closable
       :fullscreen="$store.getters.device === 'mobile'"
     >
@@ -116,11 +119,13 @@
 <script>
 import { index } from '@/api/attendance'
 import { PopupManager } from "element-ui/lib/utils/popup";
+import {defaultModalSize} from "@/settings";
 
 export default {
   data() {
     return {
       isShow: false,
+      defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
 
       day: new Date(),
diff --git a/src/views/attendance/index.vue b/src/views/attendance/index.vue
index 075a729..a8901c7 100644
--- a/src/views/attendance/index.vue
+++ b/src/views/attendance/index.vue
@@ -42,9 +42,12 @@
       :z-index="zIndex"
       title="外勤打卡"
       show-confirm-button
-      :width="560"
-      :height="440"
+      :width="defaultModalSize.sWidth"
+      :height="defaultModalSize.sHeight"
       esc-closable
+      transfer
+      show-zoom
+      resize
       :fullscreen="$store.getters.device === 'mobile'"
     >
       <div style="line-height: 3;color: #333;font-weight: 600;">打卡照片</div>
@@ -72,7 +75,7 @@ import MonthStatics from './components/MonthStatics'
 import axios from "axios";
 import * as uni from "@/assets/uni.webview.1.5.6";
 import { PopupManager } from "element-ui/lib/utils/popup";
-import { uploadSize } from "@/settings"
+import {defaultModalSize, uploadSize} from "@/settings"
 export default {
   components: {
     MonthStatics
@@ -86,6 +89,7 @@ export default {
       action: process.env.VUE_APP_UPLOAD_API,
       fileList: [],
       isShow: false,
+      defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
       imageId: '',
       remark: '',
diff --git a/src/views/config/components/AddConfig.vue b/src/views/config/components/AddConfig.vue
index f4862b5..bcf051a 100644
--- a/src/views/config/components/AddConfig.vue
+++ b/src/views/config/components/AddConfig.vue
@@ -5,9 +5,10 @@
       show-footer
       title="特殊日期"
       show-confirm-button
-      :width="600"
-      :height="400"
+      :width="defaultModalSize.sWidth"
+      :height="defaultModalSize.sHeight"
       esc-closable
+      transfer
       :fullscreen="$store.getters.device === 'mobile'"
       @input="e => $emit('update:isShow',e)"
     >
@@ -35,6 +36,7 @@
 
 <script>
 import { save } from '@/api/config'
+import {defaultModalSize} from "@/settings";
 export default {
   props: {
     isShow: {
@@ -45,6 +47,7 @@ export default {
   },
   data() {
     return {
+      defaultModalSize,
       loading: false,
       form: {
         name: '',
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 8b8613d..73d7d82 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -259,10 +259,11 @@
       :z-index="zIndex"
       transfer
       show-zoom
+      resize
       :fullscreen="$store.getters.device === 'mobile'"
       title="办理"
-      width="86vw"
-      height="80vh"
+      :width="defaultModalSize.width"
+      :height="defaultModalSize.height"
       esc-closable
     >
       <iframe
@@ -284,6 +285,7 @@ import { flow } from "@/api/flow";
 import { index as configIndex } from "@/api/config";
 import { index } from "@/api/attendance";
 import {isExternal} from "@/utils/validate";
+import {defaultModalSize} from "@/settings";
 export default {
   name: "Dashboard",
   components: {
@@ -291,6 +293,7 @@ export default {
   },
   data() {
     return {
+      defaultModalSize,
       modalUrl: "",
       zIndex: PopupManager.nextZIndex(),
       isShowModal: false,
diff --git a/src/views/document/components/AddDocument.vue b/src/views/document/components/AddDocument.vue
index bbd3831..8e8ede2 100644
--- a/src/views/document/components/AddDocument.vue
+++ b/src/views/document/components/AddDocument.vue
@@ -6,8 +6,11 @@
       show-footer
       title="公共文件柜"
       show-confirm-button
-      :width="600"
-      :height="400"
+      transfer
+      show-zoom
+      resize
+      :width="defaultModalSize.width"
+      :height="defaultModalSize.height"
       :fullscreen="$store.getters.device === 'mobile'"
       esc-closable
       @input="e => $emit('update:isShow',e)"
@@ -62,7 +65,7 @@
 import { getToken } from '@/utils/auth'
 import { save } from '@/api/document'
 import { PopupManager } from "element-ui/lib/utils/popup";
-import { uploadSize } from "@/settings"
+import {defaultModalSize, uploadSize} from "@/settings"
 import { formatFileSize } from "@/utils"
 export default {
   props: {
@@ -86,6 +89,7 @@ export default {
       action: process.env.VUE_APP_UPLOAD_API,
       fileList: [],
 
+      defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
       loading: false,
       form: {
diff --git a/src/views/flow/DesktopForm.vue b/src/views/flow/DesktopForm.vue
index 55a624e..fec86be 100644
--- a/src/views/flow/DesktopForm.vue
+++ b/src/views/flow/DesktopForm.vue
@@ -4,6 +4,7 @@ import formBuilder from "@/utils/formBuilder";
 import {PopupManager} from "element-ui/lib/utils/popup";
 import request from '@/utils/request'
 import moment from "moment/moment";
+import {defaultModalSize} from "@/settings";
 
 export default {
   props: {
@@ -57,6 +58,7 @@ export default {
   data() {
     return {
       // 脚本注入控制的modal弹窗
+      defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
       isShowModal: false,
       modalRender: () => {},
@@ -187,7 +189,7 @@ export default {
       for (let i = 0;i < subFormName.length;i++) {
         let $subForm = this.$refs[`subForm-${subFormName[i]}`]
         if ($subForm) {
-          const errMap = await this.$refs[`subForm-${subFormName[i]}`].validate()
+          const errMap = await this.$refs[`subForm-${subFormName[i]}`].validate(true)
           if (errMap) {
             throw new Error(errMap)
           }
@@ -263,8 +265,11 @@ export default {
           props: {
             zIndex: this.zIndex,
             value: this.isShowModal,
-            height: 640,
-            width: 860,
+            height: defaultModalSize.height,
+            width: defaultModalSize.width,
+            resize: true,
+            transfer: true,
+            "show-zoom": true,
             "esc-closable": true,
           },
           on: {
diff --git a/src/views/flow/MobileForm.vue b/src/views/flow/MobileForm.vue
index 102ac79..8be4227 100644
--- a/src/views/flow/MobileForm.vue
+++ b/src/views/flow/MobileForm.vue
@@ -102,7 +102,13 @@ export default {
     }
   },
   methods: {
-    request
+    request,
+    async validate() {
+      const $vanForm = this.$refs['vanForm']
+      if ($vanForm) {
+        await $vanForm.validate()
+      }
+    },
   },
   computed: {},
   watch: {
@@ -276,7 +282,8 @@ export default {
         props: {
           zIndex: this.zIndex,
           value: this.isShowModal,
-          fullscreen: true
+          fullscreen: true,
+          transfer: true
         },
         on: {
           input: e => {
diff --git a/src/views/flow/components/assign.vue b/src/views/flow/components/assign.vue
index e8dd95d..45dfbb3 100644
--- a/src/views/flow/components/assign.vue
+++ b/src/views/flow/components/assign.vue
@@ -8,8 +8,10 @@
       show-zoom
       :fullscreen="$store.getters.device === 'mobile'"
       show-confirm-button
-      :width="640"
-      :height="540"
+      transfer
+      resize
+      :width="defaultModalSize.sWidth"
+      :height="defaultModalSize.sHeight"
       @input="e => $emit('update:visible',e)"
     >
       <div>
@@ -108,6 +110,7 @@
 <script>
 import { getNextNode, getNextNodeUsers, assign, preShare } from "@/api/flow";
 import { PopupManager } from 'element-ui/lib/utils/popup'
+import {defaultModalSize} from "@/settings";
 
 export default {
   props: {
@@ -127,6 +130,7 @@ export default {
       isIndeterminate: false,
       checkAll: false,
 
+      defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
       form: {
         cc_users: [],
diff --git a/src/views/flow/components/forward.vue b/src/views/flow/components/forward.vue
index 9d09268..d3b35f1 100644
--- a/src/views/flow/components/forward.vue
+++ b/src/views/flow/components/forward.vue
@@ -5,10 +5,13 @@
                :z-index="zIndex"
                title="转办"
                show-zoom
+               transfer
+               resize
+               esc-closable
                :fullscreen="$store.getters.device === 'mobile'"
                show-confirm-button
-               :width="760"
-               :height="540"
+               :width="defaultModalSize.width"
+               :height="defaultModalSize.height"
                @input="e => $emit('update:isShow',e)">
       <div>
         <div>
@@ -45,6 +48,7 @@
 <script>
 import { preForward, forward } from '@/api/flow'
 import { PopupManager } from 'element-ui/lib/utils/popup'
+import {defaultModalSize} from "@/settings";
 
 export default {
   props: {
@@ -57,6 +61,7 @@ export default {
   },
   data() {
     return {
+      defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
       form: {
         id: "",
diff --git a/src/views/flow/components/rollback.vue b/src/views/flow/components/rollback.vue
index ae99d93..93e8914 100644
--- a/src/views/flow/components/rollback.vue
+++ b/src/views/flow/components/rollback.vue
@@ -5,10 +5,12 @@
                :z-index="zIndex"
                title="退回"
                show-zoom
+               resize
+               transfer
                :fullscreen="$store.getters.device === 'mobile'"
                show-confirm-button
-               :width="760"
-               :height="540"
+               :width="defaultModalSize.sWidth"
+               :height="defaultModalSize.sHeight"
                @input="e => $emit('update:isShow',e)">
       <div>
 
@@ -41,7 +43,7 @@
 <script>
 import { flowLogs, rollback } from '@/api/flow'
 import { PopupManager } from 'element-ui/lib/utils/popup'
-
+import { defaultModalSize } from '@/settings'
 export default {
   props: {
     isShow: {
@@ -53,6 +55,7 @@ export default {
   },
   data() {
     return {
+      defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
       form: {
         id: "",
diff --git a/src/views/flow/components/share.vue b/src/views/flow/components/share.vue
index c937f39..d4152fa 100644
--- a/src/views/flow/components/share.vue
+++ b/src/views/flow/components/share.vue
@@ -6,8 +6,10 @@
                title="抄送"
                show-zoom
                show-confirm-button
-               :width="800"
-               :height="600"
+               transfer
+               resize
+               :width="defaultModalSize.width"
+               :height="defaultModalSize.height"
                @input="e => $emit('update:isShow',e)">
       <div>
         <el-tag effect="dark">{{ flow.custom_model ? flow.custom_model.name : ''}}（流水号：{{ flow.id }}）抄送</el-tag>
@@ -38,6 +40,7 @@
 <script>
 import { preShare, share } from '@/api/flow'
 import { PopupManager } from 'element-ui/lib/utils/popup'
+import {defaultModalSize} from "@/settings";
 
 export default {
   props: {
@@ -50,6 +53,7 @@ export default {
   },
   data() {
     return {
+      defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
       config: {
         cc_users: []
diff --git a/src/views/flow/create.vue b/src/views/flow/create.vue
index fd52ed1..c3a8e8f 100644
--- a/src/views/flow/create.vue
+++ b/src/views/flow/create.vue
@@ -21,6 +21,7 @@
                 v-for="step in config.logs"
                 :title="step.node.name"
                 :status="step.status !== -1 ? 'success' : 'error'"
+                icon="el-icon-circle-check"
               ></el-step>
             </template>
             <el-step
@@ -29,12 +30,16 @@
               icon="el-icon-edit"
             ></el-step>
             <el-step
-              v-for="nextNode in node.nextNodes"
-              :key="nextNode.id"
-              :title="nextNode.name"
               icon="el-icon-right"
               status="wait"
-            ></el-step>
+            >
+              <template #title>
+                <div style="max-width: 180px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+                  <span v-for="(nextNode, index) in ((node.nextNodes && node.nextNodes instanceof Array) ? node.nextNodes : [])">{{ index === 0 ? '' : ',' }}{{ nextNode.name }}</span>
+                </div>
+                <div v-if="node.nextNodes">（{{ node.nextNodes.length }}种流程）</div>
+              </template>
+            </el-step>
           </el-steps>
 
           <el-divider></el-divider>
@@ -445,6 +450,8 @@ export default {
                     }
                   },
                   trigger: "blur",
+                  pattern: validation.get(rule),
+                  message: `${field.label}必须为${validationName.get(rule)}`,
                 };
             }
           });
@@ -473,6 +480,8 @@ export default {
                     })
                   },
                   trigger: "blur",
+                  pattern: validation.get(rule),
+                  message: `${field.label}必须为${validationName.get(rule)}`,
                 };
             }
           });
@@ -700,6 +709,13 @@ export default {
         }
         copyForm = deepCopy(this.$refs["desktopForm"].form);
       } else {
+        try {
+          await this.$refs['mobileForm'].validate()
+        } catch (err) {
+          console.warn(err)
+          this.$message.warning('数据校验失败')
+          return
+        }
         copyForm = deepCopy(this.$refs["mobileForm"].form);
       }
       const uploadHandler = (form) => {
@@ -811,9 +827,9 @@ export default {
       return this.config?.currentNode || {};
     },
     scriptContent() {
-      if (this.config?.customModel?.view_js && this.$route.query.flow_id) {
+      if (this.config?.customModel?.view_js && this.$route.query.flow_id && /\/detail/.test(this.$route.path)) {
         return this.config?.customModel?.view_js;
-      } else if (this.config?.customModel?.js && !this.$route.query.flow_id) {
+      } else if (this.config?.customModel?.js) {
         return this.config?.customModel?.js;
       }
     },
@@ -853,8 +869,9 @@ export default {
 ::v-deep .el-step__icon.is-icon {
   border-radius: 100%;
   box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
-  width: 40px;
-  height: 40px;
+  width: 36px;
+  height: 36px;
+  border: solid 2px;
 }
 ::v-deep .el-step.is-center .el-step__line {
   top: 50%;
@@ -886,6 +903,11 @@ export default {
       margin: 4px 6px;
     }
   }
+
+  ::v-deep .el-steps--horizontal {
+    display: flex;
+    flex-wrap: wrap;
+  }
 }
 </style>
 <style lang="scss">
diff --git a/src/views/flow/list.vue b/src/views/flow/list.vue
index 50fc814..79fc1fc 100644
--- a/src/views/flow/list.vue
+++ b/src/views/flow/list.vue
@@ -109,7 +109,6 @@
               title="流水号"
             ></vxe-column>
             <vxe-column
-              v-if="$route.params.type === 'all'"
               width="80"
               title="发起人"
               align="center"
diff --git a/src/views/flow/statistics.vue b/src/views/flow/statistics.vue
index 55a22ed..5fb75c8 100644
--- a/src/views/flow/statistics.vue
+++ b/src/views/flow/statistics.vue
@@ -50,7 +50,7 @@
 <script>
 import * as echarts from 'echarts'
 import { statistics } from '@/api/flow'
-import { index } from '@/api/department'
+import { departmentListNoAuth } from '@/api/common'
 import { debounce } from '@/utils'
 
 export default {
@@ -305,7 +305,7 @@ export default {
     },
     async getDepartments() {
       try {
-        this.departments = await index()
+        this.departments = await departmentListNoAuth()
       } catch (e) {
         console.error(e)
       }
diff --git a/src/views/meeting/components/AddMeeting.vue b/src/views/meeting/components/AddMeeting.vue
index 28e1c7d..37e0524 100644
--- a/src/views/meeting/components/AddMeeting.vue
+++ b/src/views/meeting/components/AddMeeting.vue
@@ -6,9 +6,12 @@
       :z-index="zIndex"
       title="会议使用审核"
       show-confirm-button
-      :width="640"
-      :height="580"
+      :width="defaultModalSize.width"
+      :height="defaultModalSize.height"
       esc-closable
+      transfer
+      show-zoom
+      resize
       :fullscreen="$store.getters.device === 'mobile'"
       @input="(e) => $emit('update:isShow', e)"
     >
@@ -121,7 +124,7 @@ import { getToken } from "@/utils/auth";
 import { save } from "@/api/meeting";
 import { PopupManager } from "element-ui/lib/utils/popup";
 import { userListNoAuth as index } from '@/api/common';
-import { uploadSize } from "@/settings";
+import {defaultModalSize, uploadSize} from "@/settings";
 import { formatFileSize } from "@/utils"
 export default {
   props: {
@@ -144,6 +147,7 @@ export default {
     return {
       uploadSize,
       users: [],
+      defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
       loading: false,
       form: {
diff --git a/src/views/notice/components/AddNotice.vue b/src/views/notice/components/AddNotice.vue
index ed50275..ca9853f 100644
--- a/src/views/notice/components/AddNotice.vue
+++ b/src/views/notice/components/AddNotice.vue
@@ -6,9 +6,12 @@
       :z-index="zIndex"
       title="发布通知或提醒"
       show-confirm-button
-      :width="740"
-      :height="620"
+      :width="defaultModalSize.width"
+      :height="defaultModalSize.height"
       esc-closable
+      transfer
+      show-zoom
+      resize
       :fullscreen="$store.getters.device === 'mobile'"
       @input="(e) => $emit('update:isShow', e)"
     >
@@ -111,6 +114,7 @@ import { getToken } from "@/utils/auth";
 import { save, show } from "@/api/notice";
 import { PopupManager } from "element-ui/lib/utils/popup";
 import { userListNoAuth as index } from "@/api/common";
+import {defaultModalSize} from "@/settings";
 export default {
   props: {
     isShow: {
@@ -124,6 +128,7 @@ export default {
       type: 'add',
       id: '',
       users: [],
+      defaultModalSize,
       zIndex: PopupManager.nextZIndex(),
       loading: false,
       form: {
diff --git a/src/views/vehicle/components/AddVehicle.vue b/src/views/vehicle/components/AddVehicle.vue
index c29107d..689f029 100644
--- a/src/views/vehicle/components/AddVehicle.vue
+++ b/src/views/vehicle/components/AddVehicle.vue
@@ -5,9 +5,12 @@
       show-footer
       title="车船管理"
       show-confirm-button
-      :width="840"
-      :height="620"
+      :width="defaultModalSize.width"
+      :height="defaultModalSize.height"
       esc-closable
+      transfer
+      show-zoom
+      resize
       @input="e => $emit('update:isShow',e)"
     >
       <el-form ref="elForm" :model="form" :rules="rules" label-position="top" label-width="100">
@@ -84,6 +87,7 @@
 <script>
 import { getToken } from '@/utils/auth'
 import { save } from '@/api/vehicle'
+import {defaultModalSize} from "@/settings";
 export default {
   props: {
     departments: {
@@ -98,6 +102,7 @@ export default {
   },
   data() {
     return {
+      defaultModalSize,
       action: process.env.VUE_APP_UPLOAD_API,
       fileList: [],
       loading: false,