From d9640b681afbd58ae788af9fbba6e74efcfa671b Mon Sep 17 00:00:00 2001
From: 123 <123@qq.com>
Date: Wed, 14 May 2025 16:35:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workflow/businesstrip/types.ts      |  6 +++---
 src/views/workflow/businesstrip/index.vue   | 12 ++++++------
 src/views/workflow/leave copy/leaveEdit.vue |  4 ++--
 src/views/workflow/leave/leaveEdit.vue      |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/api/workflow/businesstrip/types.ts b/src/api/workflow/businesstrip/types.ts
index 6f9d573..155a1e0 100644
--- a/src/api/workflow/businesstrip/types.ts
+++ b/src/api/workflow/businesstrip/types.ts
@@ -3,17 +3,17 @@ export interface BusinessTripVO {
   leaveType: string;
   startDate: string;
   endDate: string;
-  leaveDays: number;
+  tripDays: number;
   remark: string;
   status?: string;
 }
 
 export interface BusinessTripForm extends BaseEntity {
   id?: string | number;
-  leaveType?: string;
+  tripType?: string;
   startDate?: string;
   endDate?: string;
-  leaveDays?: number;
+  tripDays?: number;
   remark?: string;
   status?: string;
 }
diff --git a/src/views/workflow/businesstrip/index.vue b/src/views/workflow/businesstrip/index.vue
index b9dcd32..0292771 100644
--- a/src/views/workflow/businesstrip/index.vue
+++ b/src/views/workflow/businesstrip/index.vue
@@ -6,9 +6,9 @@
           <el-form-item label="出差天数" prop="startLeaveDays">
             <el-input v-model="queryParams.startLeaveDays" placeholder="请输入出差天数" clearable @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item prop="endLeaveDays"> 至 </el-form-item>
-          <el-form-item prop="endLeaveDays">
-            <el-input v-model="queryParams.endLeaveDays" placeholder="请输入出差天数" clearable @keyup.enter="handleQuery" />
+          <el-form-item prop="endTripDays"> 至 </el-form-item>
+          <el-form-item prop="endTripDays">
+            <el-input v-model="queryParams.endTripDays" placeholder="请输入出差天数" clearable @keyup.enter="handleQuery" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -34,7 +34,7 @@
       <el-table v-loading="loading" border :data="leaveList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column v-if="false" label="主键" align="center" prop="id" />
-        <el-table-column label="请假类型" align="center">
+        <el-table-column label="出差类型" align="center">
           <template #default="scope">
             <el-tag>{{ options.find((e) => e.value === scope.row.leaveType)?.label }}</el-tag>
           </template>
@@ -49,8 +49,8 @@
             <span>{{ proxy.parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="请假天数" align="center" prop="leaveDays" />
-        <el-table-column label="请假原因" align="center" prop="remark" />
+        <el-table-column label="出差天数" align="center" prop="leaveDays" />
+        <el-table-column label="出差原因" align="center" prop="remark" />
         <el-table-column align="center" label="流程状态" min-width="70">
           <template #default="scope">
             <dict-tag :options="wf_business_status" :value="scope.row.status"></dict-tag>
diff --git a/src/views/workflow/leave copy/leaveEdit.vue b/src/views/workflow/leave copy/leaveEdit.vue
index 78d5079..0a0660a 100644
--- a/src/views/workflow/leave copy/leaveEdit.vue	
+++ b/src/views/workflow/leave copy/leaveEdit.vue	
@@ -16,8 +16,8 @@
     <el-card shadow="never" style="height: 78vh; overflow-y: auto">
       <el-form ref="leaveFormRef" v-loading="loading" :disabled="routeParams.type === 'view'" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="请假类型" prop="leaveType">
-          <el-select v-model="form.leaveType" placeholder="请选择请假类型" style="width: 100%" clearable>
-              <el-option v-for="dict in opr_seal_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          <el-select v-model="form.leaveType" placeholder="请选择请假类型" style="width: 100%">
+            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="请假时间">
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index 657e75d..946d089 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -42,7 +42,7 @@
           <el-input v-model="form.reason" type="textarea" :rows="3" placeholder="请输入请假原因" />
         </el-form-item>
         <el-form-item label="附件" prop="attachment">
-          <el-input v-model="form.attachment" type="textarea" :rows="3" placeholder="请输入请假原因" />
+          <imageUpload  v-model="form.attachment" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" />