Commit 2279f88f authored by zhengke's avatar zhengke

修改

parent 861be4ec
...@@ -278,4 +278,16 @@ export function RemoveVisitorReserve(data) { ...@@ -278,4 +278,16 @@ export function RemoveVisitorReserve(data) {
method: 'post', method: 'post',
data data
}) })
}
/**
* 获取交接班次
* @param {JSON参数} data
*/
export function GetHandoverShiftList() {
return request({
url: '/DutyPlan/GetHandoverShiftList',
method: 'post',
data: ""
})
} }
\ No newline at end of file
...@@ -280,16 +280,23 @@ ...@@ -280,16 +280,23 @@
<div class="text-h6">值班交接</div> <div class="text-h6">值班交接</div>
</q-card-section> </q-card-section>
<q-card-section class="q-pt-none"> <q-card-section class="q-pt-none">
<div class="q-gutter-sm" style="width:300px;" v-if="isShowOne"> <div class="q-gutter-sm" style="width:400px;" v-if="isShowOne">
<span style="position:relative;top:6px;">突发事件:</span> <span style="position:relative;top:6px;">突发事件:</span>
<q-radio v-model="isHaveTufa" :val="2" label="有" /> <q-radio v-model="isHaveTufa" :val="2" label="有" />
<q-radio v-model="isHaveTufa" :val="1" label="无" /> <q-radio v-model="isHaveTufa" :val="1" label="无" />
</div> </div>
<div class="q-gutter-sm" style="width:280px;" v-if="isShowTwo"> <div class="q-gutter-sm" style="width:400px;" v-if="isShowTwo">
<span style="position:relative;top:6px;">交接工作:</span> <span style="position:relative;top:6px;">交接工作:</span>
<q-radio v-model="isHaveHand" :val="2" label="有" /> <q-radio v-model="isHaveHand" :val="2" label="有" />
<q-radio v-model="isHaveHand" :val="1" label="无" /> <q-radio v-model="isHaveHand" :val="1" label="无" />
</div> </div>
<div class="q-gutter-sm" style="width:400px;margin-top:10px;">
<span>交接班次:</span>
<q-select filled multiple option-value="Id" style="display:inline-block;width:300px;" option-label="Name"
v-model="classCked" :options="classData" emit-value map-options
label="交接班次">
</q-select>
</div>
</q-card-section> </q-card-section>
<q-card-actions align="right"> <q-card-actions align="right">
<q-btn flat label="关闭" color="primary" @click="isShowTuFA=false" /> <q-btn flat label="关闭" color="primary" @click="isShowTuFA=false" />
...@@ -305,6 +312,7 @@ ...@@ -305,6 +312,7 @@
OnDuty, OnDuty,
OnDuty_V2, OnDuty_V2,
saveDutyCheck, //值班打卡 saveDutyCheck, //值班打卡
GetHandoverShiftList
} from '../../api/scheduling/schedu' } from '../../api/scheduling/schedu'
import schedulOrder from '../../components/schedul/schedul-orderlist' import schedulOrder from '../../components/schedul/schedul-orderlist'
...@@ -332,7 +340,8 @@ ...@@ -332,7 +340,8 @@
Shift: 0, Shift: 0,
Status: 0, //Status(1-值班打卡,2-交接打卡) Status: 0, //Status(1-值班打卡,2-交接打卡)
IsBurst: 0, //突发 IsBurst: 0, //突发
IsHandover: 0 //交接 IsHandover: 0, //交接
HandoverDlandetails:'' //交接班次
}, },
dataList: {}, dataList: {},
//是否显示访客操作按钮 //是否显示访客操作按钮
...@@ -350,7 +359,9 @@ ...@@ -350,7 +359,9 @@
isHaveHand: 1, //是否有交接 isHaveHand: 1, //是否有交接
isShowOne: false, isShowOne: false,
isShowTwo: false, isShowTwo: false,
status: 0 status: 0,
classData:[], //交接班次选择\
classCked:[],
} }
}, },
created() { created() {
...@@ -363,6 +374,7 @@ ...@@ -363,6 +374,7 @@
this.checkMsg.Shift = this.$route.query.Shift; this.checkMsg.Shift = this.$route.query.Shift;
} }
this.getList(); this.getList();
this.GetHandoverList();
}, },
methods: { methods: {
//请求数据 //请求数据
...@@ -410,6 +422,7 @@ ...@@ -410,6 +422,7 @@
if (this.status == 2) { if (this.status == 2) {
diaMsg = '是否确定值班交接?' diaMsg = '是否确定值班交接?'
} }
this.checkMsg.HandoverDlandetails = this.classCked.toString();
this.$q.dialog({ this.$q.dialog({
title: '消息提示', title: '消息提示',
message: diaMsg, message: diaMsg,
...@@ -476,6 +489,14 @@ ...@@ -476,6 +489,14 @@
//刷新父页面 //刷新父页面
refreshPage() { refreshPage() {
this.getList(); this.getList();
},
//获取交接班次下拉
GetHandoverList(){
GetHandoverShiftList().then(res => {
if (res.Code == 1) {
this.classData = res.Data;
}
})
} }
}, },
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment