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

Compare commits

base: zcdsj:641731dcebd5a6d881486101f679a8257096d029
Branches Tags
zcdsj:master
zcdsj:gzerp
zcdsj:base
zcdsj:scui
zcdsj:2.6.2025040209
zcdsj:2.6.2025031916
...
compare: zcdsj:ca99eb54b31469df4e3068caa485fa5ec4afb493
Branches Tags
zcdsj:master
zcdsj:gzerp
zcdsj:base
zcdsj:scui
zcdsj:2.6.2025040209
zcdsj:2.6.2025031916

3 Commits
641731dceb ... ca99eb54b3

Author SHA1 Message Date
caoqianming ca99eb54b3 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-23 15:11:48 +08:00
caoqianming 5b5ca62742 feat: 优化routepack_form 2025-09-23 15:11:47 +08:00
caoqianming 9ebf3e232b feat: base 优化ticket_b_start 2025-09-23 15:11:24 +08:00
2 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
src/views/mtm/routepack_form.vue
View File

@ -177,7 +177,7 @@
</el-main> </el-main>
<el-footer v-if="active === 1" style="text-align: center"> <el-footer v-if="active === 1" style="text-align: center">
<el-button @click="handleLastStep" style="margin-right: 4px">上一步</el-button> <el-button @click="handleLastStep" style="margin-right: 4px">上一步</el-button>
<ticketd_b_start :workflow_key="'routepack'" :title="form.name" :t_id="form.id" <ticketd_b_start :workflow_key="'routepack'" :title="form.name" :t_id="form.id" :ticketId="form.ticket"
@success="$emit('closed')"></ticketd_b_start> @success="$emit('closed')"></ticketd_b_start>
<el-button @click="$emit('closed')" type="warning">退出</el-button> <el-button @click="$emit('closed')" type="warning">退出</el-button>
</el-footer> </el-footer>

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

@ -27,11 +27,11 @@ const props = defineProps({
const workflow = ref(null); const workflow = ref(null);
const transitions = ref([]); const transitions = ref([]);
onMounted(async () => { onMounted(async () => {
if (props.ticketId) { if (props.ticketId != null && props.ticketId != undefined) {
API.wf.ticket.ticketTransitions.req(props.ticketId).then(res => { API.wf.ticket.ticketTransitions.req(props.ticketId).then(res => {
transitions.value = res; transitions.value = res;
}); });
}else if (props.workflow_key) { }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);
transitions.value = res.transitions; transitions.value = res.transitions;
workflow.value = res.workflow workflow.value = res.workflow
@ -49,7 +49,7 @@ const submit = async (transition_id) => {
if (props.submit_b_func) { if (props.submit_b_func) {
await props.submit_b_func(); await props.submit_b_func();
} }
if (props.ticketId != null) { if (props.ticketId != null && props.ticketId != undefined) {
let params = new Object(); let params = new Object();
params.transition = transition_id; params.transition = transition_id;
if (props.ticket_data) { if (props.ticket_data) {