Skip to content

C
confucius
Commit b5f733a8 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 50373e18
Show whitespace changes
Inline Side-by-side
Showing with 85 additions and 78 deletions
src/api/scheduling/schedu.js
View file @ b5f733a8
......@@ -66,6 +66,15 @@ export function OnDuty(data) {
})
}
//获取我的值班内容
export function queryDutyWork(data) {
return request({
url: '/DutyPlan/GetDutyWork',
method: 'post',
data
})
}
//获取访客列表
export function queryVisitorPage(data) {
return request({
......
src/components/schedul/schedul-orderlist.vue
View file @ b5f733a8
......@@ -194,8 +194,8 @@
<img src="../../assets/images/work_list.png" />
<span class="word_sche">工作清单</span>
<div class="sche_hengLine"></div>
<span class="word_scheNumber" v-if="saveObj&&saveObj.WorkList"
:class="{'schNoneNum':saveObj.WorkList.length==0}">{{this.saveObj.WorkList.length}}</span>
<span class="word_scheNumber" v-if="saveObj&&WorkList"
:class="{'schNoneNum':WorkList.length==0}">{{this.WorkList.length}}</span>
</div>
<div style="min-height:135px;">
<div class="scheList_Bottom">
......@@ -226,24 +226,24 @@
<div class="tufa_xiugai">
<template v-if="WorkObj.ItemType==1">
<q-btn color="accent" v-if="WorkObj.IsChecked==0" style="margin-left:10px;" slot="reference"
@click="WorkObj.IsChecked=1,saveOrder()" size="sm" label="确认完成1" />
@click="WorkObj.IsChecked=1,saveOrder()" size="sm" label="确认完成" />
<q-btn color="accent" v-if="WorkObj.IsChecked==1" style="margin-left:10px;" slot="reference"
@click="WorkObj.IsChecked=0,saveOrder()" size="sm" label="取消" />
@click="WorkObj.IsChecked=0,saveOrder()" size="sm" label="取消完成" />
</template>
<template v-if="WorkObj.ItemType==2">
<q-btn color="accent" style="margin-left:10px;" v-if="isShowSure" slot="reference" @click="saveOrder()"
size="sm" label="确认完成2" />
size="sm" label="确认完成" />
</template>
</div>
</div>
<div class=" sche_Fenye" v-if="saveObj&&saveObj.WorkList.length>0">
<div class=" sche_Fenye" v-if="saveObj&&WorkList.length>0">
<div class="sche_left">
<i class="iconfont icon-arrow-left" :class="{'canClick_Color':WorkIndex!=0}" @click="WorkMove(1)"></i>
</div>
<div class="sche_Page" v-if="saveObj&&saveObj.WorkList">{{WorkIndex+1}}/{{this.saveObj.WorkList.length}}
<div class="sche_Page" v-if="saveObj&&WorkList">{{WorkIndex+1}}/{{this.WorkList.length}}
</div>
<div class="sche_left" v-if="saveObj&&saveObj.WorkList">
<i class="iconfont icon-arrow-right1" :class="{'canClick_Color':WorkIndex!=saveObj.WorkList.length-1}"
<div class="sche_left" v-if="saveObj&&WorkList">
<i class="iconfont icon-arrow-right1" :class="{'canClick_Color':WorkIndex!=WorkList.length-1}"
@click="WorkMove(2)"></i>
</div>
</div>
......@@ -253,8 +253,8 @@
<div class="scheList_TOP">
<img src="../../assets/images/tufa.png" />
<span class="word_sche">突发事件</span>
<span class="word_scheNumber" style="" v-if="saveObj&&saveObj.EmergenciesList"
:class="{'schNoneNum':saveObj.EmergenciesList.length==0}">{{this.saveObj.EmergenciesList.length}}</span>
<span class="word_scheNumber" style="" v-if="saveObj&&EmergenciesList"
:class="{'schNoneNum':EmergenciesList.length==0}">{{this.EmergenciesList.length}}</span>
<div class="sche_hengLine" ref="hengLine"></div>
<el-popover placement="bottom" popper-class="tufaPop" width="410" trigger="click">
<div>
......@@ -283,7 +283,7 @@
</div>
</div>
<div class="tufa_btm"
v-if="EmergenciesObj&&saveObj&&saveObj.EmergenciesList&&saveObj.EmergenciesList.length>0&&workAuthObj.isShowEditAndDelete">
v-if="EmergenciesObj&&saveObj&&EmergenciesList&&EmergenciesList.length>0&&workAuthObj.isShowEditAndDelete">
<div>
<div class="tufa_xiugai">
<el-popover placement="bottom" popper-class="tufaPop" width="410" trigger="click">
......@@ -304,16 +304,15 @@
class="schedu_red" label="删除" />
</div>
</div>
<div class=" sche_Fenye" v-if="saveObj&&saveObj.EmergenciesList.length>0">
<div class=" sche_Fenye" v-if="saveObj&&EmergenciesList.length>0">
<div class="sche_left">
<i class="iconfont icon-arrow-left" :class="{'canClick_Color':EmergenciesIndex!=0}"
@click="EmergenciesMove(1)"></i>
</div>
<div class="sche_Page">{{EmergenciesIndex+1}}/{{this.saveObj.EmergenciesList.length}}</div>
<div class="sche_Page">{{EmergenciesIndex+1}}/{{this.EmergenciesList.length}}</div>
<div class="sche_left">
<i class="iconfont icon-arrow-right1"
:class="{'canClick_Color':EmergenciesIndex!=saveObj.EmergenciesList.length-1}"
@click="EmergenciesMove(2)"></i>
:class="{'canClick_Color':EmergenciesIndex!=EmergenciesList.length-1}" @click="EmergenciesMove(2)"></i>
</div>
</div>
</div>
......@@ -323,8 +322,8 @@
<img src="../../assets/images/jiaojie.png" />
<span class="word_sche">交接工作说明</span>
<div class="sche_hengLine"></div>
<span class="word_scheNumber" style="left:174px;" v-if="saveObj&&saveObj.HandoverList"
:class="{'schNoneNum':saveObj.HandoverList.length==0}">{{this.saveObj.HandoverList.length}}</span>
<span class="word_scheNumber" style="left:174px;" v-if="saveObj&&HandoverList"
:class="{'schNoneNum':HandoverList.length==0}">{{this.HandoverList.length}}</span>
<el-popover placement="bottom" popper-class="tufaPop" width="400" trigger="click">
<div>
<el-upload class="schedul_Upload" action="" list-type="picture-card" :show-file-list="true"
......@@ -352,7 +351,7 @@
</div>
</div>
<div class="tufa_btm"
v-if="HandoverObj&&saveObj&&saveObj.HandoverList&&saveObj.HandoverList.length>0 && workAuthObj.isShowEditAndDelete">
v-if="HandoverObj&&saveObj&&HandoverList&&HandoverList.length>0 && workAuthObj.isShowEditAndDelete">
<div>
<div class="tufa_xiugai">
<el-popover placement="bottom" popper-class="tufaPop" width="410" trigger="click">
......@@ -373,12 +372,12 @@
class="schedu_red" label="删除" />
</div>
</div>
<div class=" sche_Fenye" v-if="saveObj&&saveObj.HandoverList.length>0">
<div class=" sche_Fenye" v-if="saveObj&&HandoverList.length>0">
<div class="sche_left" :class="{'canClick_Color':HandoverIndex!=0}">
<i class="iconfont icon-arrow-left" @click="HandoverMove(1)"></i>
</div>
<div class="sche_Page">{{HandoverIndex+1}}/{{this.saveObj.HandoverList.length}}</div>
<div class="sche_left" :class="{'canClick_Color':HandoverIndex!=saveObj.HandoverList.length-1}">
<div class="sche_Page">{{HandoverIndex+1}}/{{this.HandoverList.length}}</div>
<div class="sche_left" :class="{'canClick_Color':HandoverIndex!=HandoverList.length-1}">
<i class="iconfont icon-arrow-right1" @click="HandoverMove(2)"></i>
</div>
</div>
......@@ -390,7 +389,8 @@
<script>
import {
SetDutyContent,
RemoveDutyContent
RemoveDutyContent,
queryDutyWork
} from '../../api/scheduling/schedu'
import {
UploadSelfFile
......@@ -408,10 +408,13 @@
},
data() {
return {
HandoverList: [], //交接事项列表
HandoverIndex: 0, //交接事项索引
HandoverObj: {}, //交接事项对象
EmergenciesList: [], //突发事项列表
EmergenciesIndex: 0, //突发事项索引
EmergenciesObj: {}, //突发事项对象
WorkList: [], //工作清单列表
WorkIndex: 0, //工作清单索引
WorkObj: {}, //工作清单对象
//突发事件数据
......@@ -444,29 +447,38 @@
workAuthObj: {
isShowAdd: true, //是否显示新增按钮【默认不显示】
isShowEditAndDelete: true, //是否显示编辑和删除按钮【默认不显示】
}
},
qMsg: {
Id: 0,
Shift: 0,
},
}
},
created() {
this.initAuth()
this.qMsg.Id = this.saveObj.Id;
this.qMsg.Shift = this.saveObj.Shift;
this.initAuth();
this.getWorkList();
},
watch: {
saveObj: {
handler() {
if (this.saveObj.EmergenciesList && this.saveObj.EmergenciesList.length > 0) {
this.EmergenciesObj = this.saveObj.EmergenciesList[this.EmergenciesIndex];
methods: {
getWorkList() {
queryDutyWork(this.qMsg).then(res => {
if (res.Code == 1) {
this.HandoverList = res.Data.HandoverList;
this.EmergenciesList = res.Data.EmergenciesList;
this.WorkList = res.Data.WorkList;
if (this.EmergenciesList && this.EmergenciesList.length > 0) {
this.EmergenciesObj = this.EmergenciesList[this.EmergenciesIndex];
}
if (this.saveObj.HandoverList && this.saveObj.HandoverList.length > 0) {
this.HandoverObj = this.saveObj.HandoverList[this.HandoverIndex];
if (this.HandoverList && this.HandoverList.length > 0) {
this.HandoverObj = this.HandoverList[this.HandoverIndex];
}
if (this.saveObj.WorkList && this.saveObj.WorkList.length > 0) {
this.WorkObj = this.saveObj.WorkList[this.WorkIndex];
if (this.WorkList && this.WorkList.length > 0) {
this.WorkObj = this.WorkList[this.WorkIndex];
}
}
});
},
deep: true
},
},
methods: {
//初始化权限信息
initAuth() {
if (this.authObj) {
......@@ -483,14 +495,14 @@
if (type == 1) {
if (this.WorkIndex > 0) {
this.WorkIndex = this.WorkIndex - 1;
this.WorkObj = this.saveObj.WorkList[this.WorkIndex];
this.WorkObj = this.WorkList[this.WorkIndex];
}
}
//下一条
else {
if (this.WorkIndex < this.saveObj.WorkList.length - 1) {
if (this.WorkIndex < this.WorkList.length - 1) {
this.WorkIndex = this.WorkIndex + 1;
this.WorkObj = this.saveObj.WorkList[this.WorkIndex];
this.WorkObj = this.WorkList[this.WorkIndex];
}
}
},
......@@ -500,14 +512,14 @@
if (type == 1) {
if (this.EmergenciesIndex > 0) {
this.EmergenciesIndex = this.EmergenciesIndex - 1;
this.EmergenciesObj = this.saveObj.EmergenciesList[this.EmergenciesIndex];
this.EmergenciesObj = this.EmergenciesList[this.EmergenciesIndex];
}
}
//下一条
else {
if (this.EmergenciesIndex < this.saveObj.EmergenciesList.length - 1) {
if (this.EmergenciesIndex < this.EmergenciesList.length - 1) {
this.EmergenciesIndex = this.EmergenciesIndex + 1;
this.EmergenciesObj = this.saveObj.EmergenciesList[this.EmergenciesIndex];
this.EmergenciesObj = this.EmergenciesList[this.EmergenciesIndex];
}
}
},
......@@ -517,14 +529,14 @@
if (type == 1) {
if (this.HandoverIndex > 0) {
this.HandoverIndex = this.HandoverIndex - 1;
this.HandoverObj = this.saveObj.HandoverList[this.HandoverIndex];
this.HandoverObj = this.HandoverList[this.HandoverIndex];
}
}
//下一条
else {
if (this.HandoverIndex < this.saveObj.HandoverList.length - 1) {
if (this.HandoverIndex < this.HandoverList.length - 1) {
this.HandoverIndex = this.HandoverIndex + 1;
this.HandoverObj = this.saveObj.HandoverList[this.HandoverIndex];
this.HandoverObj = this.HandoverList[this.HandoverIndex];
}
}
},
......@@ -565,8 +577,7 @@
}
SetDutyContent(saveWorkMsg).then(res => {
this.isShowSure = false;
this.$emit('refreshPage');
this.$refs.hengLine.click();
this.getWorkList();
})
this.isShowSure = false;
},
......@@ -574,10 +585,8 @@
saveTufa() {
this.addMsg2.PlanShift = this.saveObj.Shift;
this.addMsg2.PlanId = this.saveObj.Id;
SetDutyContent(this.addMsg2).then(res => {
this.$emit('refreshPage');
this.$refs.hengLine.click();
this.getWorkList();
})
},
//保存编辑突发
......@@ -586,8 +595,7 @@
this.addMsg2.PlanId = obj.PlanId;
this.addMsg2.Id = obj.Id;
SetDutyContent(this.addMsg2).then(res => {
this.$emit('refreshPage');
this.$refs.hengLine.click();
this.getWorkList();
})
},
//保存编辑交接
......@@ -596,8 +604,7 @@
this.addMsg3.PlanId = obj.PlanId;
this.addMsg3.Id = obj.Id;
SetDutyContent(this.addMsg3).then(res => {
this.$emit('refreshPage');
this.$refs.hengLine.click();
this.getWorkList();
})
},
//交接工作
......@@ -605,8 +612,7 @@
this.addMsg3.PlanShift = this.saveObj.Shift;
this.addMsg3.PlanId = this.saveObj.Id;
SetDutyContent(this.addMsg3).then(res => {
this.$emit('refreshPage');
this.$refs.hengLine.click();
this.getWorkList();
})
},
//删除交接新增图片
......@@ -713,7 +719,7 @@
cancel: "取消",
}).onOk(() => {
this.$nextTick(() => {
var Obj = this.saveObj.EmergenciesList[this.EmergenciesIndex];
var Obj = this.EmergenciesList[this.EmergenciesIndex];
let msg = {
Id: Obj.Id
}
......@@ -725,10 +731,9 @@
message: res.Message,
position: 'top'
})
this.EmergenciesObj={};
this.EmergenciesMove(2);
this.$emit('refreshPage');
this.$forceUpdate();
this.EmergenciesObj = {};
this.EmergenciesMove(1);
this.getWorkList();
})
})
}).onCancel(() => {
......@@ -746,7 +751,7 @@
cancel: "取消",
}).onOk(() => {
this.$nextTick(() => {
var Obj = this.saveObj.HandoverList[this.HandoverIndex];
var Obj = this.HandoverList[this.HandoverIndex];
let msg = {
Id: Obj.Id
}
......@@ -758,10 +763,9 @@
message: res.Message,
position: 'top'
})
this.HandoverObj={};
this.HandoverMove(2);
this.$emit('refreshPage');
this.$forceUpdate();
this.HandoverObj = {};
this.HandoverMove(1);
this.getWorkList();
})
})
}).onCancel(() => {
......
src/pages/scheduling/scheduleBoard.vue
View file @ b5f733a8
......@@ -215,7 +215,7 @@
color: #000000;
height: 46px;
border-bottom: 1px solid #F3F3F3;
display:flex;
display: flex;
align-items: center;
}
......@@ -273,7 +273,7 @@
</div>
</div>
<div class="Sche_Bottom">
<schedulOrder :save-obj="msg" @refreshPage="refreshPage"></schedulOrder>
<schedulOrder :save-obj="msg"></schedulOrder>
<schedulVisit :save-obj="msg"></schedulVisit>
</div>
</div>
......@@ -301,9 +301,6 @@
Id: 0,
Shift: 0,
PlanDate: "", //日期
HandoverList: [], //交接事项列表
EmergenciesList: [], //突发事项列表
WorkList: [], //工作清单列表
},
checkMsg: {
Id: 0,
......@@ -331,9 +328,6 @@
if (res.Code == 1) {
this.dataList = res.Data;
this.msg.PlanDate = res.Data.PlanDate;
this.msg.HandoverList = res.Data.HandoverList;
this.msg.EmergenciesList = res.Data.EmergenciesList;
this.msg.WorkList = res.Data.WorkList;
}
})
},
......
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