1

src/api/flow/index.js

@@ -220,3 +220,13 @@ export function updateFlowTime(params,isLoading=true) {
     isLoading
   })
 }
+
+
+export function getOvertimeHoliday(params,isLoading=false) {
+  return request({
+    method: 'get',
+    url: '/api/oa/flow/get-overtime-holiday',
+    params,
+    isLoading
+  })
+}

src/layout/components/AppMain.vue

@@ -13,7 +13,7 @@ export default {
   name: 'AppMain',
   computed: {
     key() {
-      return this.$route.path
+      return this.$route.fullPath
     }
   }
 }

src/utils/formBuilder.js

@@ -305,7 +305,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                   "application/msword,image/jpeg,application/pdf,image/png,application/vnd.ms-powerpoint,text/plain,application/x-zip-compressed,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document",
                 multiple: !!info.multiple,
                 limit: info.multiple ? 20 : 1,
-                fileList: this.form[info.name].map(i => {
+                fileList: this.form[info.name]?.map(i => {
                   if (i.hasOwnProperty('original_name')) {
                     i.name = i.original_name
                   }
@@ -569,7 +569,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                 "min-height": "200px",
                 border: true,
                 stripe: true,
-                data: this.form[info.name],
+                data: (this.form[info.name] && typeof this.form[info.name] !== 'string') ? this.form[info.name] : [],
                 "keep-source": true,
                 "column-config": { resizable: true },
                 "show-overflow": true,
@@ -800,11 +800,42 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                 color: "#333",
               },
             },
-            this.form[info.name]?.toString()?.split(',').map(j => {
-              return this.flows[info.name]?.find((i) =>
+            this.form[info.name]?.toString()?.split(',')?.map(j => {
+              let flow = this.flows[info.name]?.find((i) =>
                 i.id == j
-              )?.title;
-            })?.toString()
+              )
+              return flow ? h('el-link', {
+                props: {
+                  type: 'primary'
+                },
+                style: {
+                  'line-height': '1.5'
+                },
+                on: {
+                  click: _ => {
+                    let target = this.$router.resolve({
+                      path: '/flow/detail',
+                      query: {
+                        module_id: flow.custom_model_id,
+                        flow_id: flow.id,
+                        isSinglePage: 1
+                      }
+                    });
+                    this.modalRender = h => h('iframe',{
+                      attrs: {
+                        src: target.href,
+                      },
+                      style: {
+                        border: 'none',
+                        width: '100%',
+                        height: '100%'
+                      }
+                    })
+                    this.isShowModal = true
+                  }
+                }
+              },flow.title) : ''
+            })
           );
           break;
         case "file":
@@ -836,7 +867,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                 accept:
                   "application/msword,image/jpeg,application/pdf,image/png,application/vnd.ms-powerpoint,text/plain,application/x-zip-compressed,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document",
                 multiple: true,
-                fileList: (this.form[info.name] instanceof Array) ? this.form[info.name].map(i => {
+                fileList: (this.form[info.name] instanceof Array) ? this.form[info.name]?.map(i => {
                   if (i.hasOwnProperty('original_name')) {
                     i.name = i.original_name
                   }
@@ -1215,12 +1246,12 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                   accept:
                     "application/msword,image/jpeg,application/pdf,image/png,application/vnd.ms-powerpoint,text/plain,application/x-zip-compressed,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document",
                   multiple: !!info.multiple,
-                  fileList: row ? row[info.name].map(i => {
+                  fileList: row ? row[info.name]?.map(i => {
                     if (i.hasOwnProperty('original_name')) {
                       i.name = i.original_name
                     }
                     return i
-                  }) : this.form[info.name].map(i => {
+                  }) : this.form[info.name]?.map(i => {
                     if (i.hasOwnProperty('original_name')) {
                       i.name = i.original_name
                     }
@@ -1408,7 +1439,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
             ]),
             h(
               "div",
-              this.form[info.name].map((sForm, sIndex) =>
+              this.form[info.name] instanceof Array ? this.form[info.name]?.map((sForm, sIndex) =>
                 h(
                   "van-cell-group",
                   {
@@ -1463,7 +1494,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                     ),
                   ]
                 )
-              )
+              ) : ''
             ),
           ]);
           break;
@@ -1579,7 +1610,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
             }),
             h(
               "div",
-              this.form[info.name]?.map((sForm, sIndex) =>
+              this.form[info.name] instanceof Array ? this.form[info.name]?.map((sForm, sIndex) =>
                 h(
                   "van-cell-group",
                   {
@@ -1620,7 +1651,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                     ),
                   ]
                 )
-              )
+              ) : ''
             ),
           ]);
           break;
@@ -1642,18 +1673,45 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                 for: info.name
               },
               props: {
-                title: info.label,
-                value: row ? row[info.name]?.toString()?.split(',').map(j => {
-                  return this.flows[info.name]?.find((i) =>
-                    i.id == j
-                  )?.title;
-                })?.toString() : this.form[info.name]?.toString()?.split(',').map(j => {
-                  return this.flows[info.name]?.find((i) =>
+                title: info.label
+              }
+            },
+            this.form[info.name]?.toString()?.split(',')?.map(j => {
+              let flow = this.flows[info.name]?.find((i) =>
                 i.id == j
-                  )?.title;
-                })?.toString()
+              )
+              return flow ? h('el-link', {
+                props: {
+                  type: 'primary'
+                },
+                style: {
+                  'line-height': '1.5'
+                },
+                on: {
+                  click: _ => {
+                    let target = this.$router.resolve({
+                      path: '/flow/detail',
+                      query: {
+                        module_id: flow.custom_model_id,
+                        flow_id: flow.id,
+                        isSinglePage: 1
                       }
+                    });
+                    this.modalRender = h => h('iframe',{
+                      attrs: {
+                        src: target.href,
                       },
+                      style: {
+                        border: 'none',
+                        width: '100%',
+                        height: '100%'
+                      }
+                    })
+                    this.isShowModal = true
+                  }
+                }
+              },flow.title) : ''
+            })
           );
           break;
         default:

src/utils/validate.js

@@ -20,12 +20,12 @@ export function validUsername(str) {
 }
 
 export const validation = new Map([
-  ['integer',/^-?\d+$/],//整数
-  ['date',/(^\d{10})|(^\d{13})|(^((\d\d\d\d(.+)|\d\d(.+))?(0?[1-9](.+)|1[012](.+))?((0?[1-9]|[12]\d|3[01])(.+))?\s?)((0?[0-9]|1[0-9]|2[0-3])(.+))?((0?[0-9]|[1-5][0-9])(.+))?((0?[0-9]|[1-5][0-9])(.+))?)$/],
-  ['email',/^[^\s@]+@[^\s@]+\.[^\s@]+$/],
-  ['isIdCard',/(^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3})|(^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx])$/],
-  ['isMobile',/(^1[3456789]\d{9})|(^(0\d{2,3}(-)*)?\d{7})$/],
-  ['numeric',/^-?\d+(.\d+)?$/],
+  ['integer',/(^$)|^-?\d+$/],//整数
+  ['date',/(^$)|(^\d{10})|(^\d{13})|(^((\d\d\d\d(.+)|\d\d(.+))?(0?[1-9](.+)|1[012](.+))?((0?[1-9]|[12]\d|3[01])(.+))?\s?)((0?[0-9]|1[0-9]|2[0-3])(.+))?((0?[0-9]|[1-5][0-9])(.+))?((0?[0-9]|[1-5][0-9])(.+))?)$/],
+  ['email',/(^$)|^[^\s@]+@[^\s@]+\.[^\s@]+$/],
+  ['isIdCard',/(^$)|(^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3})|(^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx])$/],
+  ['isMobile',/(^$)|(^1[3456789]\d{9})|(^(0\d{2,3}(-)*)?\d{7})$/],
+  ['numeric',/(^$)|^-?\d+(.\d+)?$/],
 ])
 export const validationName = new Map([
   ['integer','整数'],//整数

src/views/attendance/WorkOvertime.vue

@@ -3,7 +3,18 @@
     <card-container>
       <vxe-toolbar print custom export>
         <template #buttons>
-          <el-button icon="el-icon-search" type="primary" plain size="small" @click="getList">搜索</el-button>
+          <el-date-picker
+            :value="(select.start_date && select.end_date) ? [select.start_date,select.end_date] : []"
+            type="daterange"
+            size="small"
+            value-format="yyyy-MM-dd"
+            clearable
+            style="width: 260px;"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+          <el-button icon="el-icon-search" type="primary" plain size="small" style="margin-left: 6px;" @click="getList">搜索</el-button>
         </template>
       </vxe-toolbar>
       <vxe-table
@@ -84,7 +95,7 @@
 </template>
 
 <script>
-import { flowList } from "@/api/flow"
+import { getOvertimeHoliday } from "@/api/flow"
 export default {
   data() {
     return {
@@ -103,30 +114,25 @@ export default {
       select: {
         page: 1,
         page_size: 9999,
-        sort_name: "",
-        sort_type: "",
-        keyword: "",
-        department_id: "",
-        is_fav: "",
-        custom_model_id: "69",
-        date_range: "",
-        date_type: "create_date",
+        start_date: this.$moment().subtract(1, 'months').format('YYYY-MM-DD'),
+        end_date: this.$moment().add(1, 'months').format('YYYY-MM-DD')
       },
+      total: 0,
     }
   },
   methods: {
     detail(row) {
       this.$router.push(
-        `/flow/detail?module_id=${row.custom_model.id}&flow_id=${row.id}`
+        `/flow/detail?module_id=${row.custom_model_id}&flow_id=${row.id}`
       );
     },
     async getList() {
       this.loading = true;
       try {
-        const res = await flowList('my', this.select, false);
+        const res = await getOvertimeHoliday(this.select, false);
         console.log(res);
-        this.tableData = res?.data?.data || [];
-        this.total = res?.data?.total ?? 0;
+        this.tableData = res?.flows?.data || [];
+        this.total = res?.flows?.total ?? 0;
         this.loading = false;
       } catch (err) {
         console.error(err);

src/views/flow/DesktopForm.vue

@@ -223,6 +223,8 @@ export default {
     isShowModal(newVal) {
       if (newVal) {
         this.zIndex = PopupManager.nextZIndex();
+      } else {
+        this.modalRender = () => {}
       }
     },
     logs: {