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:
zty 2025-09-28 08:52:51 +08:00
parent cc0d813ae1 bb992adbfe
commit 4877082104
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/ofm/booking_form.vue
View File

@ -36,7 +36,7 @@
</div> </div>
</el-row> </el-row>
</el-form> </el-form>
<el-footer v-show="mode!=='show'"> <el-footer v-show="type!=='show'">
<ticketd_b_start <ticketd_b_start
:workflow_key="'booking'" :workflow_key="'booking'"
:title="bookingTitle" :title="bookingTitle"
@ -187,9 +187,9 @@ export default {
that.$API.wpm.handover.item.req(that.t_id).then(res=>{ that.$API.wpm.handover.item.req(that.t_id).then(res=>{
that.setData(res); that.setData(res);
if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) {
that.mode = "edit"; that.type = "edit";
}else{ }else{
that.mode = "show"; that.type = "show";
} }
that.$nextTick(()=>{ that.$nextTick(()=>{
that.$refs.ticketd_b_start.init(); that.$refs.ticketd_b_start.init();
@ -227,10 +227,10 @@ export default {
}, },
async submit_b_func() { async submit_b_func() {
let that = this; let that = this;
if(that.mode == "add") { if(that.type == "add") {
let res = await that.$API.ofm.mroombooking.create.req(that.form); let res = await that.$API.ofm.mroombooking.create.req(that.form);
that.form.id = res.id; that.form.id = res.id;
} else if (that.mode == "edit") { } else if (that.type == "edit") {
await that.$API.ofm.mroombooking.update.req(that.form.id, that.form); await that.$API.ofm.mroombooking.update.req(that.form.id, that.form);
} }
}, },

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

@ -50,7 +50,13 @@ const emit = defineEmits(["success"]);
const submit = async (transition_id) => { const submit = async (transition_id) => {
isSaveing.value = true; isSaveing.value = true;
if (props.submit_b_func) { if (props.submit_b_func) {
try{
await props.submit_b_func(); await props.submit_b_func();
}catch (e) {
isSaveing.value = false;
return;
}
} }
if (props.ticketId != null && props.ticketId != undefined) { if (props.ticketId != null && props.ticketId != undefined) {
let params = new Object(); let params = new Object();

27
src/views/wpm_bx/mlog_form2.vue
View File

@ -456,23 +456,18 @@ export default {
}) })
that.form.oinfo_json = oinfo_json; that.form.oinfo_json = oinfo_json;
} }
if(that.bwItemForms.length>0){
let wprs_in = [];
that.bwItemForms.forEach(item=>{
wprs_in.push(item.wpr);
})
that.form.wprs_in = wprs_in;
}
that.$API.wpm.mlog.quick.req(that.form).then((res) => { that.$API.wpm.mlog.quick.req(that.form).then((res) => {
if(that.bwItemForms.length>0&&that.batchCountCando!==that.bwItemForms.length){ that.isSaveing = false;
that.bwItemForms.forEach(item=>{ that.$emit("success",res.mlog);
item.mlogb = res.mlogbin; that.visible = false;
}) that.$message.success("操作成功");
that.$API.wpm.mlogbw.create.req(that.bwItemForms).then((res1) => {
that.isSaveing = false;
that.$emit("success",res.mlog);
that.visible = false;
that.$message.success("操作成功");
})
}else{
that.isSaveing = false;
that.$emit("success",res.mlog);
that.visible = false;
that.$message.success("操作成功");
}
}).catch(()=>{ }).catch(()=>{
that.isSaveing = false; that.isSaveing = false;
}); });