Skip to content

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

页面修改

parent 83ba2838
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 49 deletions
src/components/schedul/schedul-orderlist.vue
View file @ b1b38b55
......@@ -123,16 +123,17 @@
text-align: center;
line-height: 107px;
position: relative;
background-size:cover;
color:#2961FE;
background-size: cover;
color: #2961FE;
background-repeat: no-repeat;
}
.schedul_Upload .upDiv{
.schedul_Upload .upDiv {
position: absolute;
width:100%;
height:100%;
left:0;
top:0;
width: 100%;
height: 100%;
left: 0;
top: 0;
}
.canClick_Color {
......@@ -151,14 +152,16 @@
<div slot="reference" class="addSche" @click="saveOrder">
<i class="iconfont icon-chenggong" title="点击保存"></i>
</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&&saveObj.WorkList"
:class="{'schNoneNum':saveObj.WorkList.length==0}">{{this.saveObj.WorkList.length}}</span>
</div>
<div class="scheList_Bottom">
<div class="sche_List_in" v-if="WorkObj">
<template v-if="WorkObj.ItemType==1">
<div class="sche_Dian" style="margin-top:5px;"></div>
<div class="sche_ListInner" style="margin:5px 10px 0 0;">{{WorkObj.ItemName}} </div>
<el-checkbox style="margin-top:5" :true-label="1" :false-label="0" v-model="WorkObj.IsChecked"></el-checkbox>
<div class="sche_Dian" style="margin-top:5px;"></div>
<div class="sche_ListInner" style="margin:5px 10px 0 0;">{{WorkObj.ItemName}} </div>
<el-checkbox style="margin-top:5" :true-label="1" :false-label="0" v-model="WorkObj.IsChecked">
</el-checkbox>
</template>
<template v-else-if="WorkObj.ItemType==2">
<div class="sche_Dian"></div>
......@@ -186,13 +189,15 @@
<img v-if="EmergenciesObj&&EmergenciesObj.FileURL" :src="EmergenciesObj.FileURL" />
<img v-else 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&&saveObj.EmergenciesList"
:class="{'schNoneNum':saveObj.EmergenciesList.length==0}">{{this.saveObj.EmergenciesList.length}}</span>
<div class="sche_hengLine" ref="hengLine"></div>
<el-popover placement="bottom" popper-class="tufaPop" width="400" trigger="click">
<div>
<el-upload class="schedul_Upload" action="" :style="{'background-image': 'url('+addMsg2.FileURL+')'}" :show-file-list="false" :http-request="UploadAttachment">
<el-upload class="schedul_Upload" action="" :style="{'background-image': 'url('+addMsg2.FileURL+')'}"
:show-file-list="false" :http-request="UploadAttachment">
<i class="el-icon-plus"></i>
<div class="upDiv"></div>
<div class="upDiv"></div>
</el-upload>
<el-input type="textarea" style="margin-top:20px;" resize="none" placeholder="添加文字内容"
v-model="addMsg2.OtherContent" :rows="5"></el-input>
......@@ -210,11 +215,14 @@
</div>
<div class="sche_Fenye" v-if="saveObj&&saveObj.EmergenciesList.length>0">
<div class="sche_left">
<i class="iconfont icon-arrow-left" :class="{'canClick_Color':EmergenciesIndex!=0}" @click="EmergenciesMove(1)"></i>
<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_left">
<i class="iconfont icon-arrow-right1" :class="{'canClick_Color':EmergenciesIndex!=saveObj.EmergenciesList.length-1}" @click="EmergenciesMove(2)"></i>
<i class="iconfont icon-arrow-right1"
:class="{'canClick_Color':EmergenciesIndex!=saveObj.EmergenciesList.length-1}"
@click="EmergenciesMove(2)"></i>
</div>
</div>
</div>
......@@ -223,21 +231,23 @@
<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&&saveObj.HandoverList"
:class="{'schNoneNum':saveObj.HandoverList.length==0}">{{this.saveObj.HandoverList.length}}</span>
<el-popover placement="bottom" popper-class="tufaPop" width="400" trigger="click">
<div>
<el-upload class="schedul_Upload" action="" :style="{'background-image': 'url('+addMsg3.FileURL+')'}" :show-file-list="false" :http-request="UploadJiaojie">
<el-upload class="schedul_Upload" action="" :style="{'background-image': 'url('+addMsg3.FileURL+')'}"
:show-file-list="false" :http-request="UploadJiaojie">
<i class="el-icon-plus"></i>
<div class="upDiv"></div>
</el-upload>
<el-input type="textarea" style="margin-top:20px;" resize="none" placeholder="添加文字内容"
<div class="upDiv"></div>
</el-upload>
<el-input type="textarea" style="margin-top:20px;" resize="none" placeholder="添加文字内容"
v-model="addMsg3.OtherContent" :rows="5"></el-input>
<q-btn color="accent" size="sm" style="float:right;margin-top:10px;" @click="saveJiaojie" label="保存" />
<q-btn color="accent" size="sm" style="float:right;margin-top:10px;" @click="saveJiaojie" label="保存" />
</div>
<div slot="reference" class="addSche">
<i class="iconfont icon-img_haha"></i>
<i class="iconfont icon-img_haha"></i>
</div>
</el-popover>
</el-popover>
</div>
<div class="secondList_Bottom">
<div class="sche_ListInner" v-if="HandoverObj">{{HandoverObj.OtherContent}}</div>
......@@ -256,7 +266,6 @@
</div>
</template>
<script>
import {
SetDutyContent
} from '../../api/scheduling/schedu'
......@@ -281,17 +290,8 @@
EmergenciesObj: {}, //突发事项对象
WorkIndex: 0, //工作清单索引
WorkObj: {}, //工作清单对象
addMsg: {
Id: 0, //编号
PlanShift: 0, //值班班次
PlanType: 0, //值班类型(1-值班事项，2-交接事项，3-突发事项)
PlanId: 0, //值班编号
FileURL: "", //文件路径
OtherContent: "", //突发事项、工作交接(值班类型为2.3是使用)内容
OtherRemark: "", //突发事项、工作交接(值班类型为2.3是使用)备注
},
//突发事件数据
addMsg2:{
addMsg2: {
Id: 0, //编号
PlanShift: 0, //值班班次
PlanType: 3, //值班类型(1-值班事项，2-交接事项，3-突发事项)
......@@ -301,7 +301,7 @@
OtherRemark: "", //突发事项、工作交接(值班类型为2.3是使用)备注
},
//交接工作说明
addMsg3:{
addMsg3: {
Id: 0, //编号
PlanShift: 0, //值班班次
PlanType: 2, //值班类型(1-值班事项，2-交接事项，3-突发事项)
......@@ -391,7 +391,7 @@
}
})
},
UploadJiaojie(files){
UploadJiaojie(files) {
UploadSelfFile('Attachment', files.file, res => {
if (res.Code == 1) {
this.addMsg3.FileURL = res.FileUrl;
......@@ -399,25 +399,36 @@
})
},
//保存工作清单
saveOrder(){
// console.log(this.saveObj.WorkList,'this.saveObj.WorkList');
saveOrder() {
var saveWorkMsg = {
Id: this.WorkObj.Id, //编号
PlanShift: this.saveObj.Shift, //值班班次
PlanType: 1, //值班类型(1-值班事项，2-交接事项，3-突发事项)
PlanId: this.saveObj.Id, //值班编号
WorkContent: this.WorkObj.WorkContent,
WorkIsFinish: this.WorkObj.IsChecked,
ItemId: this.WorkObj.ItemId,
};
SetDutyContent(saveWorkMsg).then(res => {
this.$emit('refreshPage');
})
},
//保存突发事件
saveTufa(){
this.addMsg2.PlanShift = this.saveObj.Shfit;
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.$emit('refreshPage');
this.$refs.hengLine.click();
})
},
//交接工作
saveJiaojie(){
this.addMsg3.PlanShift = this.saveObj.Shfit;
saveJiaojie() {
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.$emit('refreshPage');
this.$refs.hengLine.click();
})
}
},
......
src/pages/scheduling/scheduleBoard.vue
View file @ b1b38b55
......@@ -294,7 +294,7 @@
return {
msg: {
Id: 0,
Shfit: 0,
Shift: 0,
PlanDate: "", //日期
HandoverList: [], //交接事项列表
EmergenciesList: [], //突发事项列表
......@@ -314,7 +314,7 @@
this.checkMsg.Id = this.$route.query.Id;
}
if (this.$route.query.Shift) {
this.msg.Shfit = this.$route.query.Shift;
this.msg.Shift = this.$route.query.Shift;
this.checkMsg.Shift = this.$route.query.Shift;
}
this.getList();
......
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