From 8b2bd9adff5ebaca51cb319df5e6ebbaa8f790db Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 21 Nov 2025 16:09:41 +0800
Subject: [PATCH 1/3] feat: mroombooking wf_key

---
 src/views/ofm/mroombooking_form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ofm/mroombooking_form.vue b/src/views/ofm/mroombooking_form.vue
index ac2fcca6..ede39d11 100644
--- a/src/views/ofm/mroombooking_form.vue
+++ b/src/views/ofm/mroombooking_form.vue
@@ -68,7 +68,7 @@
       <el-footer>
          <el-button @click="$emit('closed')" style="margin-right: 4px">取消</el-button>
 					<ticketd_b 
-            :workflow_key="'wf_booking'" 
+            :workflow_key="'wf_mroombooking'" 
             :title="form.title+'-会议室预定'" 
             :t_id="form.id" 
             :ticket_="form.ticket_"

From a3b2913e1e0492ce4b962fd5eb7b13526a8390c8 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 21 Nov 2025 16:25:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20base=20ticketd=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wf/ticketd.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wf/ticketd.vue b/src/views/wf/ticketd.vue
index 8743901c..982a097b 100644
--- a/src/views/wf/ticketd.vue
+++ b/src/views/wf/ticketd.vue
@@ -6,6 +6,9 @@
                     <span style="color:darkblue;margin-right: 4px;">({{ ticketDetail.sn }})</span>{{ ticketDetail.title
                     }}
                 </el-descriptions-item>
+                <el-descriptions-item label="提交人:">
+                    {{ ticketDetail.create_by_name }}
+                </el-descriptions-item>
                 <el-descriptions-item label="当前:">
                     <el-tag type="info" effect="plain">{{ ticketDetail.state_.name }}</el-tag>
                     <el-tag :type="actStateEnum[ticketDetail.act_state]?.type" effect="plain">

From 2b639300125164cbd94b993bca8151d3d4f1f0f5 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 21 Nov 2025 16:41:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20base=20ticketd=5Fb=20=E9=9D=9E?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BA=BA=E4=B9=9F=E6=98=BE=E7=A4=BA=E5=87=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wf/ticketd_b.vue b/src/views/wf/ticketd_b.vue
index 7ecc3c6f..7f28467c 100644
--- a/src/views/wf/ticketd_b.vue
+++ b/src/views/wf/ticketd_b.vue
@@ -50,15 +50,17 @@ onMounted(async () => {
 const ticketId = ref(null);
 const actionShow = ref(false);
 const init = async () => {
+    actionShow.value = false;
+    transitions.value = [];
     if (props.ticket_ && props.ticket_.id) {
+        ticketId.value = props.ticket_.id;
         const isParticipant =
         (props.ticket_.participant_type === 1 && props.ticket_.participant === currentUser.value) ||
         (props.ticket_.participant_type === 2 && props.ticket_.participant.includes(currentUser.value))
         if (isParticipant) {
             actionShow.value = true;
+            transitions.value = await API.wf.ticket.ticketTransitions.req(ticketId.value);
         }
-        ticketId.value = props.ticket_.id;
-        transitions.value = await API.wf.ticket.ticketTransitions.req(ticketId.value);
     }else if (props.workflow_key !=null && props.workflow_key != undefined) {
         let res = await API.wf.workflow.initkey.req(props.workflow_key);
         actionShow.value = true