From e11e683ee8b772619b66efe25e93a72110bf6cfe Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 7 Nov 2025 17:01:16 +0800
Subject: [PATCH 1/9] =?UTF-8?q?feat:=20base=20=E6=88=91=E7=9A=84=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wf/myticket.vue | 49 ++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/views/wf/myticket.vue b/src/views/wf/myticket.vue
index c0f481ce..5e09884e 100644
--- a/src/views/wf/myticket.vue
+++ b/src/views/wf/myticket.vue
@@ -2,6 +2,7 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
+				<el-button type="primary" style="margin-right:4px" @click="()=>{dialogVisible=true;}">发起流程</el-button>
 				<el-segmented
 					v-model="tvalue"
 					:options="Object.keys(toptions)"
@@ -81,19 +82,16 @@
 						{{ scope.row.workflow_.name }}
 					</template>
 				</el-table-column>
-				<el-table-column label="所在节点" width="160">
+				<el-table-column label="节点状态">
 					<template #default="scope">
-						{{ scope.row.state_.name }}
+											<el-tag :type="actStateEnum[scope.row.act_state]?.type">
+									{{ actStateEnum[scope.row.act_state]?.text }}
+								</el-tag>
+						<el-tag type="info" effect="plain">{{ scope.row.state_.name }}</el-tag>
+
 					</template>
-				</el-table-column>
-				<el-table-column label="进行状态" prop="sort" width="120">
-					<template #default="scope">
-						<el-tag :type="actStateEnum[scope.row.act_state]?.type">
-                        {{ actStateEnum[scope.row.act_state]?.text }}
-                    </el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column label="可处理人" :show-overflow-tooltip="true" min-width="160">
+        		</el-table-column>
+				<el-table-column label="可处理人" :show-overflow-tooltip="true" width="200">
 					<template #default="scope">
 						<span
 							v-if="
@@ -130,13 +128,23 @@
 		</el-main>
 		<el-drawer v-model="drawer" size="90%" :show-close="false">
 			<template #header="{ close, titleId, titleClass }">
-				<h4 :id="titleId" :class="titleClass">工单详情</h4>
+				<h4 :id="titleId" :class="titleClass">工单信息</h4>
 				<el-button type="danger" @click="close">关闭</el-button>
 			</template>
-			<component :is="currentComponent" :ticketId="ticketId" :t_id="t_id" @closed="drawer = false"
+			<component :is="currentComponent" :ticketId="ticketId" :t_id="t_id" @closed="drawer = false" :mode="mode"
 			@success="()=>{drawer = false; $refs.table.refresh()}"></component>
 		</el-drawer>
 	</el-container>
+	<el-dialog v-model="dialogVisible" title="选择流程">
+			<el-card
+				v-for="item in wfOptions"
+				:key="item.id"
+				:body-style="{ padding: '10px', cursor: 'pointer' }"
+				style="width: 200px; display: inline-block; margin: 4px; background-color: #f5f7fa;"
+				shadow="hover"
+				@click="startTicket(item)"
+				>{{ item.name }}</el-card>
+	</el-dialog>
 </template>
 
 <script>
@@ -180,7 +188,9 @@ export default {
 			wfOptions: [],
 			currentComponent: null,
 			ticketId: null,
-			t_id: "",
+			t_id: null,
+			dialogVisible: false,
+			mode: "show"
 		};
 	},
 	mounted() {
@@ -228,6 +238,17 @@ export default {
 			defineAsyncComponent(() => import(`@/views${viewPath}.vue`))
 			);
 		},
+		startTicket(item) {
+			this.dialogVisible = false;
+			this.drawer = true;
+			this.t_id = null;
+			this.mode = "add"
+			const viewPath = item.view_path;
+			// 动态 import
+			this.currentComponent = markRaw(
+				defineAsyncComponent(() => import(`@/views${viewPath}.vue`))
+			);
+		}
 	},
 };
 </script>

From 7db573871d40c4f34db6592c2a923944e2882a51 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 7 Nov 2025 17:05:47 +0800
Subject: [PATCH 2/9] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=A6=BB?=
 =?UTF-8?q?=E8=81=8C=E7=94=B3=E8=AF=B7=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/hrm.js               | 29 +++++++++++-
 src/views/hrm/resignation.vue      | 42 +++++++++++++++++
 src/views/hrm/resignation_form.vue | 75 ++++++++++++++++++++++++++++++
 3 files changed, 145 insertions(+), 1 deletion(-)
 create mode 100644 src/views/hrm/resignation.vue
 create mode 100644 src/views/hrm/resignation_form.vue

diff --git a/src/api/model/hrm.js b/src/api/model/hrm.js
index 5f55e757..9f5b3ba2 100644
--- a/src/api/model/hrm.js
+++ b/src/api/model/hrm.js
@@ -159,6 +159,33 @@ export default {
 					`${config.API_URL}/hrm/attendance/${id}/`
 				);
 			}
-		}
+		},
+	},
+	resignation: {
+	  list: {
+			name: "离职申请",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/hrm/resignation/`,
+					data
+				);
+			}
+		},
+	  item: {
+			name: "离职申请",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/hrm/resignation/${id}/`,
+				);
+			}
+		},
+	  create: {
+			name: "新增",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/hrm/resignation/`,
+					data);
+			}
+		},
 	}
 }
diff --git a/src/views/hrm/resignation.vue b/src/views/hrm/resignation.vue
new file mode 100644
index 00000000..9ec9c79d
--- /dev/null
+++ b/src/views/hrm/resignation.vue
@@ -0,0 +1,42 @@
+<template>
+    <el-container>
+        <el-header>
+            <div class="left-panel">
+                <el-button type="primary" @click="handleAdd">新增</el-button>
+            </div>
+
+        </el-header>
+        <el-main class="nopadding">
+            <scTable
+            ref="table"
+            :apiObj="API.hrm.resignation.list"
+            row-key="id"
+            stripe
+            :query="query"
+            >
+            <el-table-column label="姓名" prop="name" width="200"></el-table-column>
+            <el-table-column label="审批状态" width="200"></el-table-column>
+            <el-table-column label="部门" width="200"></el-table-column>
+            <el-table-column label="岗位" width="200"></el-table-column>
+            <el-table-column label="身份证号" width="300"></el-table-column>
+            <el-table-column label="离职日期" width="200"></el-table-column>
+            <el-table-column label="原因" ></el-table-column>
+            </scTable>
+        </el-main>
+    </el-container>
+    <el-drawer title="离职申请" v-model="drawerVisible" :size="'80%'" destroy-on-close>
+        <resignation-form :mode="mode"></resignation-form>
+    </el-drawer>
+</template>
+<script setup>
+import { ref } from 'vue'
+import API from '@/api'
+import resignationForm from './resignation_form.vue'
+const query = ref({});
+const drawerVisible = ref(false);
+const mode = ref('add');
+const handleAdd = () => {
+    mode.value = 'add';
+    drawerVisible.value = true;
+}
+</script>
\ No newline at end of file
diff --git a/src/views/hrm/resignation_form.vue b/src/views/hrm/resignation_form.vue
new file mode 100644
index 00000000..a6eadc3f
--- /dev/null
+++ b/src/views/hrm/resignation_form.vue
@@ -0,0 +1,75 @@
+<template>
+    <el-form label-width="80px" :model="formData" style="padding: 20px;">
+        <el-form-item label="员工信息" required>
+            {{ formData.employee_name }}（{{ formData.belong_dept_name }} - {{ formData.post_name }}）
+        </el-form-item>
+        <el-form-item label="离职日期" required>
+            <el-date-picker
+                v-model="formData.resign_date"
+                type="date"
+                placeholder="预计离职日期"
+                style="width: 100%;"
+                :readonly="mode === 'show'"
+            ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="离职原因" required>
+            <el-input
+                type="textarea"
+                :rows="4"
+                v-model="formData.reason"
+                placeholder="请输入离职原因"
+                :readonly="mode === 'show'"
+            ></el-input>
+        </el-form-item>
+        <el-form-item>
+            <ticketd_b 
+            :workflow_key="'resignation'" 
+            :title="formData.employee_name + '的离职申请'" 
+            :t_id="formData.id" 
+            :ticket_="formData.ticket_"
+            @success="()=>{$emit('success')}" 
+            :submit_b_func="submit_b_func" 
+            ref="ticketd_b"
+          ></ticketd_b>
+        </el-form-item>
+    </el-form>
+</template>
+<script setup>
+import { ref, onMounted, defineProps } from 'vue'
+import ticketd_b from "@/views/wf/ticketd_b.vue";
+import ticketd from '@/views/wf/ticketd.vue'
+import API from '@/api'
+import TOOL from "@/utils/tool.js";
+
+const props = defineProps({
+    mode: { type: String, default: 'show' },
+    t_id: { type: String, default: "" },
+});
+const formData = ref({});
+const mode = ref(props.mode);
+onMounted(async () =>{
+    if(props.t_id){
+       getTid();
+    }else{
+        let res = await API.hrm.employee.read.req();
+        formData.value.employee_name = res.name;
+        formData.value.belong_dept_name = res.belong_dept_name;
+        formData.value.post_name = res.post_name;
+        formData.value.employee = res.id;
+    }
+})
+const getTid = async () => {
+    let res = await API.hrm.resignation.item.req(props.t_id);
+    formData.value = res;
+    if(res.ticket_.state_.type == 1 && res.create_by == TOOL.data.get("USER_INFO").id ) {
+        mode.value = "edit";
+    }else{
+        mode.value = "show";
+    }
+};
+const submit_b_func = async ()=>{
+    if (mode.value == "add") {
+        await API.hrm.resignation.create.req(formData.value);
+    }
+}
+</script>
\ No newline at end of file

From def8713e8ecf389da94d4e2db9577d73e578001b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 7 Nov 2025 23:24:11 +0800
Subject: [PATCH 3/9] =?UTF-8?q?feat:=20myticket=E4=B8=8D=E4=BC=A0=E5=85=A5?=
 =?UTF-8?q?mode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wf/myticket.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/wf/myticket.vue b/src/views/wf/myticket.vue
index 5e09884e..adec72c9 100644
--- a/src/views/wf/myticket.vue
+++ b/src/views/wf/myticket.vue
@@ -131,7 +131,7 @@
 				<h4 :id="titleId" :class="titleClass">工单信息</h4>
 				<el-button type="danger" @click="close">关闭</el-button>
 			</template>
-			<component :is="currentComponent" :ticketId="ticketId" :t_id="t_id" @closed="drawer = false" :mode="mode"
+			<component :is="currentComponent" :ticketId="ticketId" :t_id="t_id" @closed="drawer = false"
 			@success="()=>{drawer = false; $refs.table.refresh()}"></component>
 		</el-drawer>
 	</el-container>
@@ -189,8 +189,7 @@ export default {
 			currentComponent: null,
 			ticketId: null,
 			t_id: null,
-			dialogVisible: false,
-			mode: "show"
+			dialogVisible: false
 		};
 	},
 	mounted() {
@@ -242,7 +241,6 @@ export default {
 			this.dialogVisible = false;
 			this.drawer = true;
 			this.t_id = null;
-			this.mode = "add"
 			const viewPath = item.view_path;
 			// 动态 import
 			this.currentComponent = markRaw(

From 84f0cef58139818cc1802ea02a796dd12bbfcf8e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 9 Nov 2025 12:33:34 +0800
Subject: [PATCH 4/9] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E5=AE=A4=E9=A2=84=E5=AE=9A=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ofm/booking_form.vue | 35 ++++++++++++++--------------------
 src/views/ofm/mroombooking.vue | 13 ++++---------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/views/ofm/booking_form.vue b/src/views/ofm/booking_form.vue
index 890dd552..6035a403 100644
--- a/src/views/ofm/booking_form.vue
+++ b/src/views/ofm/booking_form.vue
@@ -10,12 +10,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="会议名称" prop="title">
-              <el-input v-model="form.title" clearable placeholder="请输入会议名称" :readonly="mode === 'show'"></el-input>
+              <el-input v-model="form.title" clearable placeholder="请输入会议名称" :readonly="localMode === 'show'"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="会议室" prop="mroom">
-              <el-select v-model="form.mroom" placeholder="请选择会议室" @change="mRoomChange" style="width: 100%;" :readonly="mode === 'show'">
+              <el-select v-model="form.mroom" placeholder="请选择会议室" @change="mRoomChange" style="width: 100%;" :readonly="localMode === 'show'">
                 <el-option 
                   v-for="item in mRoomList"
                   :key="item.id"
@@ -27,17 +27,17 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="参会领导" prop="key_participants">
-              <el-input v-model="form.key_participants" clearable placeholder="请输入参会领导" :readonly="mode === 'show'"></el-input>
+              <el-input v-model="form.key_participants" clearable placeholder="请输入参会领导" :readonly="localMode === 'show'"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="会议人数" prop="participant_count">
-              <el-input-number v-model="form.participant_count" clearable style="width: 100%;" :precision="0" :step="1" :min="1" :readonly="mode === 'show'"></el-input-number>
+              <el-input-number v-model="form.participant_count" clearable style="width: 100%;" :precision="0" :step="1" :min="1" :readonly="localMode === 'show'"></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="会议日期" prop="mdate">
-              <el-date-picker v-model="form.mdate" type="date" value-format="YYYY-MM-DD" style="width: 100%;" placeholder="请选择会议日期" :readonly="mode === 'show'" @change="mdateChange"></el-date-picker>
+              <el-date-picker v-model="form.mdate" type="date" value-format="YYYY-MM-DD" style="width: 100%;" placeholder="请选择会议日期" :readonly="localMode === 'show'" @change="mdateChange"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -46,7 +46,7 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="24">
-            <el-form-item label="会议时间段" prop="slots" required v-if="mode != 'show'">
+            <el-form-item label="会议时间段" prop="slots" required v-if="localMode != 'show'">
               <div v-for="(item,$index) in timesList" :key="item.value">
                 <div v-if="item.isSelect" class="timeBlock selectedTimeBlock" @click="selectTime($index)">{{ item.label }}</div>
                 <div v-else class="timeBlock" @click="selectTime($index)">{{ item.label }}</div>
@@ -68,7 +68,7 @@
       <el-footer>
          <el-button @click="$emit('closed')" style="margin-right: 4px">取消</el-button>
 					<ticketd_b 
-            :workflow_key="'booking'" 
+            :workflow_key="'mroombooking.create'" 
             :title="form.title+'-会议室预定'" 
             :t_id="form.id" 
             :ticket_="form.ticket_"
@@ -97,10 +97,6 @@ export default {
     mode: {
       type: String,
       default: "show",
-    },
-    bookingIitem: {
-      type: Object,
-      default: null,
     },
 		t_id: {
 		    type: String,
@@ -181,6 +177,7 @@ export default {
       ],
       mRoomList: [],
       timeselectList: [],
+      localMode: this.mode,
     };
   },
   mounted() {
@@ -190,12 +187,8 @@ export default {
       that.getTid();
     }
     else {
-      if(that.mode=='add'){
-        that.form.belong_dept = that.$TOOL.data.get("USER_INFO").belong_dept;
-      }
-      else if (that.mode=='edit'||that.mode=='show'){
-          that.form = that.bookingIitem;
-      }
+      that.localMode = "add";
+      that.form.belong_dept = that.$TOOL.data.get("USER_INFO").belong_dept;
     }
 
   },
@@ -212,9 +205,9 @@ export default {
         that.form = res;
         that.handleEidt(that.t_id);
         if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) {
-          that.$emit("changeMode", "edit");
+          that.localMode = "edit";
         }else{
-          that.$emit("changeMode", "show");
+          that.localMode = "show";
         }
       })
 		},
@@ -263,11 +256,11 @@ export default {
     },
     async submit_b_func() {
       let that = this;
-			if(that.mode == "add") {
+			if(that.localMode == "add") {
         that.form.belong_dept = that.$TOOL.data.get("USER_INFO").belong_dept;
 				let res = await that.$API.ofm.mroombooking.create.req(that.form);
 				that.form.id = res.id;
-			} else if (that.mode == "edit") {
+			} else if (that.localMode == "edit") {
         await that.$API.ofm.mroombooking.update.req(that.form.id, that.form);
 			}
 		},
diff --git a/src/views/ofm/mroombooking.vue b/src/views/ofm/mroombooking.vue
index f616c94a..ca948861 100644
--- a/src/views/ofm/mroombooking.vue
+++ b/src/views/ofm/mroombooking.vue
@@ -71,8 +71,6 @@
       v-if="limitedVisible"
       :mode="mode" 
       :t_id="t_id"
-      :bookingIitem="bookingIitem"
-      @changeMode="(mode)=>{this.mode=mode;}"
       @success="handleSuccess" 
       @closed="handleCancel"
     ></bookingDialog>
@@ -116,7 +114,6 @@ export default {
     handleAdd() {
       this.mode = "add";
       this.t_id = null;
-      this.bookingIitem = {};
       this.limitedVisible = true;
     },
     handleCancel() {
@@ -130,17 +127,15 @@ export default {
       let that = this;
       that.mode = "show";
       that.t_id = row.id;
-      that.bookingIitem = row;
       that.limitedVisible = true;
     },
     async handleDel(row) {
       var id = row.id;
-      var res = await this.$API.ofm.mroombooking.delete.req(id);
-      if (res.err_msg) {
-        this.$message.error(res.err_msg);
-      } else {
-        this.$refs.table.refresh();
+      try {
+        await this.$API.ofm.mroombooking.checkDelete.req(id);
         this.$message.success("删除成功");
+        this.$refs.table.refresh();
+      } catch (error) {
       }
     },
     //搜索

From 714ab23cd60ba5acff2d96b14aee29336acea97a Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 9 Nov 2025 22:36:58 +0800
Subject: [PATCH 5/9] =?UTF-8?q?feat:=20base=20myticket=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E8=BF=94=E5=9B=9E=E6=88=91=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wf/myticket.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/views/wf/myticket.vue b/src/views/wf/myticket.vue
index adec72c9..fbb6f00d 100644
--- a/src/views/wf/myticket.vue
+++ b/src/views/wf/myticket.vue
@@ -82,7 +82,7 @@
 						{{ scope.row.workflow_.name }}
 					</template>
 				</el-table-column>
-				<el-table-column label="节点状态">
+				<el-table-column label="节点状态"  width="300">
 					<template #default="scope">
 											<el-tag :type="actStateEnum[scope.row.act_state]?.type">
 									{{ actStateEnum[scope.row.act_state]?.text }}
@@ -132,7 +132,7 @@
 				<el-button type="danger" @click="close">关闭</el-button>
 			</template>
 			<component :is="currentComponent" :ticketId="ticketId" :t_id="t_id" @closed="drawer = false"
-			@success="()=>{drawer = false; $refs.table.refresh()}"></component>
+			@success="handleSuccess"></component>
 		</el-drawer>
 	</el-container>
 	<el-dialog v-model="dialogVisible" title="选择流程">
@@ -246,6 +246,15 @@ export default {
 			this.currentComponent = markRaw(
 				defineAsyncComponent(() => import(`@/views${viewPath}.vue`))
 			);
+		},
+		handleSuccess(mode) {
+		    this.drawer = false; 
+			if (mode == "add") {
+				this.tvalue = "我的";
+				this.params.category = "owner";
+				this.query = {};
+			}
+			this.$refs.table.refresh()
 		}
 	},
 };

From 84e447527af5494be36bed36bf783689c1b46b27 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 9 Nov 2025 22:37:18 +0800
Subject: [PATCH 6/9] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=A6=BB?=
 =?UTF-8?q?=E8=81=8C=E7=94=B3=E8=AF=B7=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hrm/resignation_form.vue | 188 +++++++++++++++++++----------
 src/views/ofm/booking_form.vue     |   2 +-
 2 files changed, 122 insertions(+), 68 deletions(-)

diff --git a/src/views/hrm/resignation_form.vue b/src/views/hrm/resignation_form.vue
index a6eadc3f..05abea57 100644
--- a/src/views/hrm/resignation_form.vue
+++ b/src/views/hrm/resignation_form.vue
@@ -1,75 +1,129 @@
 <template>
-    <el-form label-width="80px" :model="formData" style="padding: 20px;">
-        <el-form-item label="员工信息" required>
-            {{ formData.employee_name }}（{{ formData.belong_dept_name }} - {{ formData.post_name }}）
-        </el-form-item>
-        <el-form-item label="离职日期" required>
-            <el-date-picker
-                v-model="formData.resign_date"
-                type="date"
-                placeholder="预计离职日期"
-                style="width: 100%;"
-                :readonly="mode === 'show'"
-            ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="离职原因" required>
-            <el-input
-                type="textarea"
-                :rows="4"
-                v-model="formData.reason"
-                placeholder="请输入离职原因"
-                :readonly="mode === 'show'"
-            ></el-input>
-        </el-form-item>
-        <el-form-item>
-            <ticketd_b 
-            :workflow_key="'resignation'" 
-            :title="formData.employee_name + '的离职申请'" 
-            :t_id="formData.id" 
-            :ticket_="formData.ticket_"
-            @success="()=>{$emit('success')}" 
-            :submit_b_func="submit_b_func" 
-            ref="ticketd_b"
-          ></ticketd_b>
-        </el-form-item>
-    </el-form>
+    <el-container>
+        <el-main class="nopadding">
+            <el-form label-width="80px" :model="formData" style="padding: 20px;">
+                <el-form-item label="员工信息" required>
+                    {{ formData.employee_name }}（{{ formData.belong_dept_name }} - {{ formData.post_name }}）
+                </el-form-item>
+                <el-form-item label="离职日期" required>
+                    <el-date-picker
+                        v-model="formData.end_date"
+                        type="date"
+                        placeholder="预计离职日期"
+                        style="width: 100%;"
+                        value-format="YYYY-MM-DD"
+                        :readonly="localMode === 'show'"
+                    ></el-date-picker>
+                </el-form-item>
+                <el-form-item label="离职原因" required>
+                    <el-input
+                        type="textarea"
+                        :rows="4"
+                        v-model="formData.reason"
+                        placeholder="请输入离职原因"
+                        :readonly="localMode === 'show'"
+                    ></el-input>
+                </el-form-item>
+            </el-form>
+            <el-footer>
+                <ticketd_b 
+                        :workflow_key="'wf_resignation'" 
+                        :title="ticketTitle"
+                        :t_id="formData.id" 
+                        :ticket_="formData.ticket_"
+                        @success="$emit('success', localMode)" 
+                        :submit_b_func="submit_b_func" 
+                        ref="ticketd_b"
+                    ></ticketd_b>
+            </el-footer>
+        </el-main>
+        <el-aside width="20%" v-if="formData.ticket_">
+            <ticketd :ticket_="formData.ticket_" @success="$emit('success')"></ticketd>
+        </el-aside>
+    </el-container>
 </template>
-<script setup>
-import { ref, onMounted, defineProps } from 'vue'
+
+<script>
 import ticketd_b from "@/views/wf/ticketd_b.vue";
 import ticketd from '@/views/wf/ticketd.vue'
-import API from '@/api'
-import TOOL from "@/utils/tool.js";
 
-const props = defineProps({
-    mode: { type: String, default: 'show' },
-    t_id: { type: String, default: "" },
-});
-const formData = ref({});
-const mode = ref(props.mode);
-onMounted(async () =>{
-    if(props.t_id){
-       getTid();
-    }else{
-        let res = await API.hrm.employee.read.req();
-        formData.value.employee_name = res.name;
-        formData.value.belong_dept_name = res.belong_dept_name;
-        formData.value.post_name = res.post_name;
-        formData.value.employee = res.id;
-    }
-})
-const getTid = async () => {
-    let res = await API.hrm.resignation.item.req(props.t_id);
-    formData.value = res;
-    if(res.ticket_.state_.type == 1 && res.create_by == TOOL.data.get("USER_INFO").id ) {
-        mode.value = "edit";
-    }else{
-        mode.value = "show";
-    }
-};
-const submit_b_func = async ()=>{
-    if (mode.value == "add") {
-        await API.hrm.resignation.create.req(formData.value);
+export default {
+    name: 'ResignationForm',
+    components: {
+        ticketd_b,
+        ticketd
+    },
+    props: {
+        mode: {
+            type: String,
+            default: 'show'
+        },
+        t_id: {
+            type: String,
+            default: ""
+        }
+    },
+    data() {
+        return {
+            formData: {
+                employee_name: ""
+            },
+            localMode: this.mode,
+            ticketTitle: "离职申请"
+        }
+    },
+    watch: {
+        mode(newVal) {
+            this.localMode = newVal;
+        }
+    },
+    mounted() {
+        if (this.t_id) {
+            this.getTid();
+        } else {
+            this.initFormData();
+        }
+    },
+    methods: {
+        async initFormData() {
+            try {
+                let res = await this.$API.hrm.employee.read.req();
+                this.formData.employee_name = res.name;
+                this.formData.belong_dept_name = res.belong_dept_name;
+                this.formData.post_name = res.post_name;
+                this.formData.employee = res.id;
+                this.localMode = "add";
+            } catch (error) {
+                console.error('初始化表单数据失败:', error);
+            }
+        },
+        async getTid() {
+            try {
+                let res = await this.$API.hrm.resignation.item.req(this.t_id);
+                this.formData = res;
+                if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) {
+                    this.localMode = "edit";
+                }
+            } catch (error) {
+                console.error('获取离职数据失败:', error);
+            }
+        },
+        async submit_b_func() {
+            if (this.localMode == "add") {
+                try {
+                    let res = await this.$API.hrm.resignation.create.req(this.formData);
+                    this.ticketTitle = this.formData.employee_name + "的离职申请";
+                    this.formData.id = res.id;
+                    return res.id;
+                } catch (error) {
+                    console.error('提交离职申请失败:', error);
+                    throw error;
+                }
+            } else if (this.localMode == "edit") {
+                this.$message.error("不支持编辑");
+                throw new Error("不支持编辑");
+            }
+        }
     }
 }
 </script>
\ No newline at end of file
diff --git a/src/views/ofm/booking_form.vue b/src/views/ofm/booking_form.vue
index 6035a403..5134cbd7 100644
--- a/src/views/ofm/booking_form.vue
+++ b/src/views/ofm/booking_form.vue
@@ -68,7 +68,7 @@
       <el-footer>
          <el-button @click="$emit('closed')" style="margin-right: 4px">取消</el-button>
 					<ticketd_b 
-            :workflow_key="'mroombooking.create'" 
+            :workflow_key="'booking'" 
             :title="form.title+'-会议室预定'" 
             :t_id="form.id" 
             :ticket_="form.ticket_"

From 83fe31b76a00041fc77893443956ffd74f5535b7 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 9 Nov 2025 23:15:36 +0800
Subject: [PATCH 7/9] =?UTF-8?q?feat:=20resignation=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/hrm.js               |  8 ++++++++
 src/views/hrm/resignation_form.vue | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/api/model/hrm.js b/src/api/model/hrm.js
index 9f5b3ba2..6acccebf 100644
--- a/src/api/model/hrm.js
+++ b/src/api/model/hrm.js
@@ -187,5 +187,13 @@ export default {
 					data);
 			}
 		},
+		delete: {
+			name: "删除",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/hrm/resignation/${id}/`
+				);
+			}
+		},
 	}
 }
diff --git a/src/views/hrm/resignation_form.vue b/src/views/hrm/resignation_form.vue
index 05abea57..96710249 100644
--- a/src/views/hrm/resignation_form.vue
+++ b/src/views/hrm/resignation_form.vue
@@ -26,6 +26,11 @@
                 </el-form-item>
             </el-form>
             <el-footer>
+                <el-button type="danger"
+                v-if="localMode=='edit'"
+                style="margin-right: 4px;"
+                @click="handleDel"
+                >删除</el-button>
                 <ticketd_b 
                         :workflow_key="'wf_resignation'" 
                         :title="ticketTitle"
@@ -108,6 +113,17 @@ export default {
                 console.error('获取离职数据失败:', error);
             }
         },
+        handleDel() {
+            this.$confirm(`确定删除吗？`, "提示", {
+				type: "warning",
+			})
+				.then(()=>{
+                    this.$API.hrm.resignation.delete.req(this.formData.id).then(res=>{
+                        this.$message.success("删除成功");
+                        this.$emit('success');
+                    })
+                })
+        },
         async submit_b_func() {
             if (this.localMode == "add") {
                 try {

From 21d0ec18ffccc95fe3ea5cf416e9812e0c4d2d95 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 9 Nov 2025 23:15:56 +0800
Subject: [PATCH 8/9] =?UTF-8?q?feat:=20base=20myticket=E5=8F=98=E6=9B=B4dr?=
 =?UTF-8?q?awerName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wf/myticket.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/wf/myticket.vue b/src/views/wf/myticket.vue
index fbb6f00d..4a330dd6 100644
--- a/src/views/wf/myticket.vue
+++ b/src/views/wf/myticket.vue
@@ -128,7 +128,7 @@
 		</el-main>
 		<el-drawer v-model="drawer" size="90%" :show-close="false">
 			<template #header="{ close, titleId, titleClass }">
-				<h4 :id="titleId" :class="titleClass">工单信息</h4>
+				<h4 :id="titleId" :class="titleClass">{{drawerName}}</h4>
 				<el-button type="danger" @click="close">关闭</el-button>
 			</template>
 			<component :is="currentComponent" :ticketId="ticketId" :t_id="t_id" @closed="drawer = false"
@@ -155,6 +155,7 @@ export default {
 	data() {
 		return {
 			actStateEnum, interveneTypeEnum,
+			drawerName: "工单详情",
 			drawer: false,
 			tvalue: "待办",
 			toptions: {
@@ -231,6 +232,7 @@ export default {
 			this.drawer = true;
 			this.ticketId = row.id;
 			this.t_id = row.ticket_data.t_id;
+			this.drawerName = row.title;
 			const viewPath = row.workflow_.view_path;
 			// 动态 import
 			this.currentComponent = markRaw(
@@ -241,6 +243,7 @@ export default {
 			this.dialogVisible = false;
 			this.drawer = true;
 			this.t_id = null;
+			this.drawerName = item.name;
 			const viewPath = item.view_path;
 			// 动态 import
 			this.currentComponent = markRaw(

From a44a07154d36b452cb534f0c6c340c154953a7ea Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 9 Nov 2025 23:29:19 +0800
Subject: [PATCH 9/9] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E7=A6=BB?=
 =?UTF-8?q?=E8=81=8C=E7=94=B3=E8=AF=B7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hrm/resignation.vue | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/views/hrm/resignation.vue b/src/views/hrm/resignation.vue
index 9ec9c79d..73a87bd6 100644
--- a/src/views/hrm/resignation.vue
+++ b/src/views/hrm/resignation.vue
@@ -13,28 +13,39 @@
             row-key="id"
             stripe
             :query="query"
+            @row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
             >
-            <el-table-column label="姓名" prop="name" width="200"></el-table-column>
-            <el-table-column label="审批状态" width="200"></el-table-column>
-            <el-table-column label="部门" width="200"></el-table-column>
-            <el-table-column label="岗位" width="200"></el-table-column>
-            <el-table-column label="身份证号" width="300"></el-table-column>
-            <el-table-column label="离职日期" width="200"></el-table-column>
-            <el-table-column label="原因" ></el-table-column>
+            <el-table-column label="姓名" prop="employee_name" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="审批状态" width="200" show-overflow-tooltip>
+                <template #default="scope">
+                                <el-tag :type="actStateEnum[scope.row.ticket_?.act_state]?.type">
+                        {{ actStateEnum[scope.row.ticket_?.act_state]?.text }}
+                    </el-tag>
+            <el-tag type="info" effect="plain">{{ scope.row.ticket_?.state_.name }}</el-tag>
+
+          </template>
+            </el-table-column>`
+            <el-table-column label="部门" prop="belong_dept_name" width="120" show-overflow-tooltip></el-table-column>`
+            <el-table-column label="岗位" prop="post_name" width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column label="身份证号" prop="employee_id_number" width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column label="离职日期" prop="end_date" width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column label="原因" prop="reason" show-overflow-tooltip></el-table-column>
             </scTable>
         </el-main>
     </el-container>
     <el-drawer title="离职申请" v-model="drawerVisible" :size="'80%'" destroy-on-close>
-        <resignation-form :mode="mode"></resignation-form>
+        <resignation-form :mode="mode" :t_id="t_id"></resignation-form>
     </el-drawer>
 </template>
 <script setup>
 import { ref } from 'vue'
 import API from '@/api'
 import resignationForm from './resignation_form.vue'
+import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
 const query = ref({});
 const drawerVisible = ref(false);
 const mode = ref('add');
+const t_id = ref(null);
 const handleAdd = () => {
     mode.value = 'add';
     drawerVisible.value = true;