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

Merge branch 'main' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_mp

This commit is contained in:
shijing 2025-10-27 11:19:35 +08:00
parent 2a106deaa0 dcd82aba7b
commit c098ee8bc5
4 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
App.vue
View File

@ -127,8 +127,8 @@
z-index: 1; z-index: 1;
background-color: white; background-color: white;
} }
.footer_fixed { .footer_sticky {
position: fixed; position: sticky;
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;

2
pages/ofm/booking_form.vue
View File

@ -55,7 +55,7 @@
<view>共{{totalCount}}小时</view> --> <view>共{{totalCount}}小时</view> -->
</view> </view>
</scroll-view> </scroll-view>
<view class="footer_fixed"> <view class="footer_sticky">
<ticketd_b :workflow_key="'booking'" :title="form.title + '-会议室预定'" :t_id="form.id" :ticket_="form.ticket_" <ticketd_b :workflow_key="'booking'" :title="form.title + '-会议室预定'" :t_id="form.id" :ticket_="form.ticket_"
@success="()=>{uni.navigateBack()} " :submit_b_func="submit_b_func" ref="ticketd_b_start"></ticketd_b> @success="()=>{uni.navigateBack()} " :submit_b_func="submit_b_func" ref="ticketd_b_start"></ticketd_b>
</view> </view>

7
pages/wf/ticketd.vue
View File

@ -4,9 +4,10 @@
<uni-tag :text="actStateEnum[ticket_?.act_state]?.text" :circle="true" size="small" <uni-tag :text="actStateEnum[ticket_?.act_state]?.text" :circle="true" size="small"
:type="actStateEnum[ticket_?.act_state]?.type" :inverted="true" style="font-weight: 460;"></uni-tag> :type="actStateEnum[ticket_?.act_state]?.type" :inverted="true" style="font-weight: 460;"></uni-tag>
<span style="margin-left: 12rpx" @click="handleDetail">{{ticket_?.state_.name}}</span> <span style="margin-left: 12rpx" @click="handleDetail">{{ticket_?.state_.name}}</span>
<button v-if="ticket_?.state_.enable_retreat && isOwn" type="warn" size="mini" plain="true" <span style="margin-left: 12rpx;color:blue" @click="handleDetail">更多</span>
@click="handleRetreat">撤回</button> </uni-forms-item>
<span style="margin-left: 12rpx;color:blue" @click="handleDetail">更多信息</span> <uni-forms-item label="操作" v-if="ticket_?.state_.enable_retreat && isOwn">
<button type="warn" size="mini" @click="handleRetreat" style="margin-left:0px">撤回</button>
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="可处理人" v-if="ticket_.participant_"> <uni-forms-item label="可处理人" v-if="ticket_.participant_">
<span v-if=" <span v-if="

17
pages/wf/ticketd_b.vue
View File

@ -36,25 +36,16 @@ const props = defineProps({
const workflow = ref(null); const workflow = ref(null);
const transitions = ref([]); const transitions = ref([]);
onMounted(async () => { onMounted(async () => {
await getUser() await getUser()
await init() setTimeout(()=>{init()}, 500)
}) })
watch(
() => props.ticket_,
async (newVal) => {
if (newVal && Object.keys(newVal).length > 0) {
await init()
}
},
{ immediate: false }
)
const actionShow = ref(false); const actionShow = ref(false);
const suggestion = ref("") const suggestion = ref("")
const isOwn = ref(false) const isOwn = ref(false)
const init = async () => { const init = async () => {
transitions.value = []; transitions.value = [];
actionShow.value = false; actionShow.value = false;
if (props.ticket_ != null && props.ticket_ != undefined) { if (props.ticket_ && Object.keys(props.ticket_).length > 0) {
isOwn.value = props.ticket_.create_by === currentUser.value; isOwn.value = props.ticket_.create_by === currentUser.value;
const isParticipant = const isParticipant =
(props.ticket_.participant_type === 1 && props.ticket_.participant === currentUser.value) || (props.ticket_.participant_type === 1 && props.ticket_.participant === currentUser.value) ||
@ -63,7 +54,7 @@ const init = async () => {
actionShow.value = true; actionShow.value = true;
transitions.value = await API.getTransition(props.ticket_.id); transitions.value = await API.getTransition(props.ticket_.id);
} }
}else if (props.workflow_key !=null && props.workflow_key != undefined) { }else if (props.workflow_key) {
let res = await API.workflowInitkey(props.workflow_key); let res = await API.workflowInitkey(props.workflow_key);
actionShow.value = true actionShow.value = true
transitions.value = res.transitions; transitions.value = res.transitions;