zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

This commit is contained in:
shijing 2025-11-21 16:51:25 +08:00
parent 3ec61d3bd3 2b63930012
commit ade3cb8398
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/ofm/mroombooking_form.vue
View File

@ -68,7 +68,7 @@
<el-footer> <el-footer>
<el-button @click="$emit('closed')" style="margin-right: 4px">取消</el-button> <el-button @click="$emit('closed')" style="margin-right: 4px">取消</el-button>
<ticketd_b <ticketd_b
:workflow_key="'wf_booking'" :workflow_key="'wf_mroombooking'"
:title="form.title+'-会议室预定'" :title="form.title+'-会议室预定'"
:t_id="form.id" :t_id="form.id"
:ticket_="form.ticket_" :ticket_="form.ticket_"

3
src/views/wf/ticketd.vue
View File

@ -6,6 +6,9 @@
<span style="color:darkblue;margin-right: 4px;">({{ ticketDetail.sn }})</span>{{ ticketDetail.title <span style="color:darkblue;margin-right: 4px;">({{ ticketDetail.sn }})</span>{{ ticketDetail.title
}} }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="提交人:">
{{ ticketDetail.create_by_name }}
</el-descriptions-item>
<el-descriptions-item label="当前:"> <el-descriptions-item label="当前:">
<el-tag type="info" effect="plain">{{ ticketDetail.state_.name }}</el-tag> <el-tag type="info" effect="plain">{{ ticketDetail.state_.name }}</el-tag>
<el-tag :type="actStateEnum[ticketDetail.act_state]?.type" effect="plain"> <el-tag :type="actStateEnum[ticketDetail.act_state]?.type" effect="plain">

6
src/views/wf/ticketd_b.vue
View File

@ -50,15 +50,17 @@ onMounted(async () => {
const ticketId = ref(null); const ticketId = ref(null);
const actionShow = ref(false); const actionShow = ref(false);
const init = async () => { const init = async () => {
actionShow.value = false;
transitions.value = [];
if (props.ticket_ && props.ticket_.id) { if (props.ticket_ && props.ticket_.id) {
ticketId.value = props.ticket_.id;
const isParticipant = const isParticipant =
(props.ticket_.participant_type === 1 && props.ticket_.participant === currentUser.value) || (props.ticket_.participant_type === 1 && props.ticket_.participant === currentUser.value) ||
(props.ticket_.participant_type === 2 && props.ticket_.participant.includes(currentUser.value)) (props.ticket_.participant_type === 2 && props.ticket_.participant.includes(currentUser.value))
if (isParticipant) { if (isParticipant) {
actionShow.value = true; 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) { }else if (props.workflow_key !=null && props.workflow_key != undefined) {
let res = await API.wf.workflow.initkey.req(props.workflow_key); let res = await API.wf.workflow.initkey.req(props.workflow_key);
actionShow.value = true actionShow.value = true