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-05 13:21:46 +08:00
parent 14a41a29f0 fbad9178ff
commit 087bd5c50e
2 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@
></ticketd_b> ></ticketd_b>
</el-footer> </el-footer>
</el-main> </el-main>
<el-aside width="20%" v-if="form.ticket"> <el-aside width="20%" v-if="form.ticket_">
<ticketd :ticket_="form.ticket_" @success="$emit('success')"></ticketd> <ticketd :ticket_="form.ticket_" @success="$emit('success')"></ticketd>
</el-aside> </el-aside>
</el-container> </el-container>
@ -98,10 +98,6 @@ export default {
type: String, type: String,
default: "show", default: "show",
}, },
editId: {
type: String,
default: null,
},
bookingIitem: { bookingIitem: {
type: Object, type: Object,
default: null, default: null,
@ -190,8 +186,7 @@ export default {
mounted() { mounted() {
let that = this; let that = this;
that.getmRoomList(); that.getmRoomList();
console.log("that.editId",that.editId); if (that.t_id){
if (that.editId){
that.getTid(); that.getTid();
} }
else { else {
@ -213,17 +208,15 @@ export default {
}, },
getTid (){ getTid (){
var that = this; var that = this;
if (that.editId) { that.$API.ofm.mroombooking.item.req(that.t_id).then(res=>{
that.handleEidt(that.editId); that.form = res;
that.$API.ofm.mroombooking.item.req(that.editId).then(res=>{ that.handleEidt(that.t_id);
that.form = 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.$emit("changeMode", "edit");
that.$emit("changeMode", "edit"); }else{
}else{ that.$emit("changeMode", "show");
that.$emit("changeMode", "show"); }
} })
})
}
}, },
getmRoomSlot(){ getmRoomSlot(){
let that = this; let that = this;

22
src/views/ofm/mroombooking.vue
View File

@ -56,13 +56,6 @@
type="primary" type="primary"
@click="handleShow(scope.row)" @click="handleShow(scope.row)"
>查看</el-button> >查看</el-button>
<el-button
link
size="small"
type="primary"
v-if="scope.row.ticket_.state_.type==1"
@click="handleEidt(scope.row)"
>编辑</el-button>
<el-popconfirm title="确定删除吗？" @confirm="handleDel(scope.row)"> <el-popconfirm title="确定删除吗？" @confirm="handleDel(scope.row)">
<template #reference> <template #reference>
<el-button link size="small" type="danger">删除</el-button> <el-button link size="small" type="danger">删除</el-button>
@ -77,7 +70,7 @@
<bookingDialog <bookingDialog
v-model="limitedVisible" v-model="limitedVisible"
:mode="mode" :mode="mode"
:editId="editId" :t_id="t_id"
:bookingIitem="bookingIitem" :bookingIitem="bookingIitem"
@changeMode="(mode)=>{this.mode=mode;}" @changeMode="(mode)=>{this.mode=mode;}"
@success="handleSuccess" @success="handleSuccess"
@ -97,7 +90,7 @@ export default {
actStateEnum, interveneTypeEnum, actStateEnum, interveneTypeEnum,
apiObj: this.$API.ofm.mroombooking.list, apiObj: this.$API.ofm.mroombooking.list,
query: {}, query: {},
editId: null, t_id: null,
isSaving: false, isSaving: false,
limitedVisible: false, limitedVisible: false,
mode: "add", mode: "add",
@ -131,17 +124,10 @@ export default {
this.$refs.table.refresh(); this.$refs.table.refresh();
this.limitedVisible = false; this.limitedVisible = false;
}, },
handleEidt(row) {
let that = this;
that.mode = "edit";
that.editId = row.id;
that.bookingIitem = row;
that.limitedVisible = true;
},
handleShow(row){ handleShow(row){
let that = this; let that = this;
that.mode = "show"; that.mode = "show";
that.editId = row.id; that.t_id = row.id;
that.bookingIitem = row; that.bookingIitem = row;
that.limitedVisible = true; that.limitedVisible = true;
}, },