From 6301e8cf4a1ef42829e596c27fa3bb384ff0e3de Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 14 May 2025 17:59:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B5=84=E9=87=91=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/formBuilder.js              |  5 +++++
 src/views/attendance/WorkOvertime.vue | 12 ++++++++----
 src/views/flow/list.vue               | 13 ++++++++-----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/utils/formBuilder.js b/src/utils/formBuilder.js
index 54473c7..ddc830b 100644
--- a/src/utils/formBuilder.js
+++ b/src/utils/formBuilder.js
@@ -448,6 +448,7 @@ export default function formBuilder(
               is_simple: 1,
               custom_model_id: isJSON(info.stub) ? '' : info.stub,
               is_auth: 1,
+              ids:target[info.name]?target[info.name]:'',
               ...extraParam
             }).then((res) => {
               this.$set(this.flows, info.name, res.data.data);
@@ -772,6 +773,7 @@ export default function formBuilder(
           );
           break;
         case "relation-flow":
+        console.log("info",info,target)
           if (!this.flows[info.name]) {
             let extraParam = {}
             if (isJSON(info.stub)) {
@@ -783,6 +785,7 @@ export default function formBuilder(
               is_simple: 1,
               custom_model_id: isJSON(info.stub) ? '' : info.stub,
               is_auth: 1,
+              ids:target[info.name]?target[info.name]:'',
               ...extraParam
             }).then((res) => {
               this.$set(this.flows, info.name, res.data.data);
@@ -1416,6 +1419,7 @@ export default function formBuilder(
               is_simple: 1,
               custom_model_id: isJSON(info.stub) ? '' : info.stub,
               is_auth: 1,
+              ids:target[info.name]?target[info.name]:'',
               ...extraParam
             }).then((res) => {
               this.$set(this.flows, info.name, res.data.data);
@@ -1735,6 +1739,7 @@ export default function formBuilder(
               is_simple: 1,
               custom_model_id: isJSON(info.stub) ? '' : info.stub,
               is_auth: 1,
+              ids:target[info.name]?target[info.name]:'',
               ...extraParam
             }).then((res) => {
               this.$set(this.flows, info.name, res.data.data);
diff --git a/src/views/attendance/WorkOvertime.vue b/src/views/attendance/WorkOvertime.vue
index 4c5a22b..e1619e6 100644
--- a/src/views/attendance/WorkOvertime.vue
+++ b/src/views/attendance/WorkOvertime.vue
@@ -3,7 +3,7 @@
     <card-container>
       <vxe-toolbar print custom export>
         <template #buttons>
-          <el-date-picker
+          <!-- <el-date-picker
             :value="(select.start_date && select.end_date) ? [select.start_date,select.end_date] : []"
             type="daterange"
             size="small"
@@ -15,6 +15,7 @@
             @input="e => (e && e.length === 2) ? (select.start_date = e[0],select.end_date = e[1]) : (select.start_date = '',select.end_date = '')">
           </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
@@ -75,13 +76,16 @@
         </vxe-column>
         <vxe-column type="seq" width="58" align="center" />
         <vxe-column
-          min-width="180"
+          width="80"
           header-align="center"
           field="jiabanleixing"
           title="加班类型"
+          align="center"
         ></vxe-column>
         <vxe-column width="190" align="center" title="开始时间" field="kaishiriqi" />
         <vxe-column width="190" align="center" title="结束时间" field="jieshushijian" />
+        <vxe-column width="80" align="center" title="加班时长(h)" field="jiabanshichang" />
+
         <vxe-column min-width="140" align="center" title="原因说明" field="yuanyinshuoming" />
 <!--        <vxe-column-->
 <!--          width="80"-->
@@ -175,8 +179,8 @@ export default {
       select: {
         page: 1,
         page_size: 10,
-        start_date: this.$moment().subtract(1, 'months').format('YYYY-MM-DD'),
-        end_date: this.$moment().add(1, 'months').format('YYYY-MM-DD')
+        // start_date: this.$moment().subtract(1, 'months').format('YYYY-MM-DD'),
+        // end_date: this.$moment().add(1, 'months').format('YYYY-MM-DD')
       },
       total: 0,
     }
diff --git a/src/views/flow/list.vue b/src/views/flow/list.vue
index 3ab4e1f..4ac3fcf 100644
--- a/src/views/flow/list.vue
+++ b/src/views/flow/list.vue
@@ -749,13 +749,16 @@ export default {
       let text = ''
       fields.forEach((field, index) => {
         let options = []
-        if (field.show_in_list && field.type !== 'relation' && data[field.name]) {
-          if (field?.selection_model) {
-            options = field.selection_model_items || [];
+        if(data){
+          if (field.show_in_list && field.type !== 'relation' && data[field.name]) {
+            if (field?.selection_model) {
+              options = field.selection_model_items || [];
+            }
+            text += `${field.label}:${(field?.selection_model ? options.find(j => j.id === data[field.name])?.name : data[field.name]) ?? '-'}。\n`
           }
-          text += `${field.label}:${(field?.selection_model ? options.find(j => j.id === data[field.name])?.name : data[field.name]) ?? '-'}。\n`
+          row._simple = text
         }
-        row._simple = text
+
       })
     },
     cellClickEvent(e) {