Skip to content

C
confucius
Commit af705199 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent f2bf278d
Show whitespace changes
Inline Side-by-side
Showing with 136 additions and 37 deletions
src/App.vue
View file @ af705199
......@@ -12,7 +12,7 @@ export default {
<style>
@import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_fcok86bmlfj.css');
@import url('//at.alicdn.com/t/font_2077629_4k0qyo13aqi.css');
html,
body,
......
src/components/schedul/schedul-orderlist.vue
View file @ af705199
......@@ -6,7 +6,7 @@
-webkit-box-orient: vertical;
overflow: hidden;
width: 100%;
padding-right:10px;
padding-right: 10px;
}
.sche_List_in {
......@@ -141,9 +141,9 @@
align-items: center;
height: 25px;
position: absolute;
bottom:10px;
width:100%;
right:0;
bottom: 10px;
width: 100%;
right: 0;
}
.tufa_xiugai {
......@@ -245,10 +245,12 @@
-webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
background-color: #0ae;
}
.OtherListContent{
height:135px;
.OtherListContent {
height: 135px;
overflow: auto;
}
.OtherListContent::-webkit-scrollbar {
width: 3px;
height: 3px;
......@@ -327,8 +329,8 @@
</div>
</template>
<template v-if="workAuthObj.isShowEditAndDelete&&WorkObj.ItemImgList&&WorkObj.ItemImgList.length>0">
<el-upload class="schedul_Upload MyUpload" style="display:inline;" action="" list-type="picture-card"
:show-file-list="false" :http-request="UploadWorkFile">
<el-upload class="schedul_Upload MyUpload" style="display:inline;" action=""
list-type="picture-card" :show-file-list="false" :http-request="UploadWorkFile">
<i class="el-icon-plus"></i>
</el-upload>
</template>
......@@ -338,7 +340,8 @@
<template v-if="WorkObj.ItemType==2">
<div style="margin:10px 0;">
<template v-if="workAuthObj.isShowEditAndDelete">
<span v-if="!isShowSure&&WorkObj.WorkContent" title="点击进行修改" @click="isShowSure=true">{{WorkObj.WorkContent}}</span>
<span v-if="!isShowSure&&WorkObj.WorkContent" title="点击进行修改"
@click="isShowSure=true">{{WorkObj.WorkContent}}</span>
<el-input v-else v-model="WorkObj.WorkContent" @focus="isShowSure=true" placeholder="完成情况怎么样">
</el-input>
</template>
......@@ -353,7 +356,8 @@
<div class="OtherListContent">
<div v-for="(item,index) in WorkRuleList">
<div style="margin-bottom:10px;">{{index+1}}.{{item.ItemName}}</div>
<div v-if="item.ItemImgList&&item.ItemImgList.length>0" style="width:100%;display:flex;flex-wrap:wrap">
<div v-if="item.ItemImgList&&item.ItemImgList.length>0"
style="width:100%;display:flex;flex-wrap:wrap">
<div v-for="subItem in item.ItemImgList" style="width:40px;height:40px;margin:0 10px 10px 0;">
<el-image :src="subItem" style="width:100%;height:100%;" :preview-src-list="item.ItemImgList">
</el-image>
......@@ -370,8 +374,8 @@
<template v-if="WorkObj.ItemType==1 && workAuthObj.isShowEditAndDelete">
<q-btn color="primary" flat v-if="WorkObj.IsChecked==0" dense style="margin-left:10px;" slot="reference"
@click="saveOrder(1)" label="确认完成" />
<q-btn v-if="WorkObj.IsChecked==1" dense flat @click="saveOrder(0)"
style="margin-left:10px;" class="schedu_red" label="取消完成" />
<q-btn v-if="WorkObj.IsChecked==1" dense flat @click="saveOrder(0)" style="margin-left:10px;"
class="schedu_red" label="取消完成" />
</template>
<template v-if="WorkObj.ItemType==2 && workAuthObj.isShowEditAndDelete">
<q-btn color="primary" flat dense style="margin-left:10px;" v-if="isShowSure" slot="reference"
......@@ -678,12 +682,12 @@
Shift: 0,
DutyMan: 0
},
WorkActive:'1',
TufaActive:'1',
handActive:'1',
WorkRuleList:[],
EmergenciesRuleList:[],
HandoverRuleList:[]
WorkActive: '1',
TufaActive: '1',
handActive: '1',
WorkRuleList: [],
EmergenciesRuleList: [],
HandoverRuleList: [],
}
},
watch: {
......@@ -716,7 +720,7 @@
getWorkList() {
queryDutyWork_V2(this.qMsg).then(res => {
if (res.Code == 1) {
console.log(res,'数据');
console.log(res, '数据');
this.HandoverList = res.Data.HandoverList;
this.EmergenciesList = res.Data.EmergenciesList;
this.WorkList = res.Data.WorkList;
......@@ -735,7 +739,20 @@
}
});
},
//获取突发和交接
getTufaHand() {
var obj = {
IsBurst:0,
IsHandover:0
}
if (this.EmergenciesList.length > 0) {
obj.IsBurst=1
}
if (this.HandoverList.length > 0) {
obj.IsHandover=1
}
return obj;
},
//初始化权限信息
initAuth() {
if (this.authObj) {
......@@ -825,11 +842,11 @@
},
//保存工作清单
saveOrder(type) {
if(this.WorkObj.FileList==null){
this.WorkObj.FileList=[];
if (this.WorkObj.FileList == null) {
this.WorkObj.FileList = [];
}
if(type==1){
if(this.WorkObj.ItemImgList.length>0&&this.WorkObj.FileList.length==0){
if (type == 1) {
if (this.WorkObj.ItemImgList.length > 0 && this.WorkObj.FileList.length == 0) {
this.$q.notify({
type: 'negative',
message: '请上传图片',
......@@ -838,7 +855,7 @@
return
}
}
this.WorkObj.IsChecked=type;
this.WorkObj.IsChecked = type;
var saveWorkMsg = {
Id: this.WorkObj.Id, //编号
PlanShift: this.saveObj.Shift, //值班班次
......
src/pages/scheduling/scheduleBoard.vue
View file @ af705199
......@@ -256,7 +256,7 @@
<schedulHead :dataList="dataList"></schedulHead>
<div class="Sche_Bottom">
<template v-if="dataList.Status!=2">
<schedulOrder :save-obj="msg"></schedulOrder>
<schedulOrder :save-obj="msg" ref="schOrder"></schedulOrder>
<schedulVisit :save-obj="msg"></schedulVisit>
</template>
<template v-else>
......@@ -273,6 +273,30 @@
</div>
</div>
</div>
<q-dialog v-model="isShowTuFA" style="width:400px">
<q-card>
<q-card-section>
<div class="text-h6">值班交接</div>
</q-card-section>
<q-card-section class="q-pt-none">
<div class="q-gutter-sm" style="width:280px;" v-if="isShowOne">
<span style="position:relative;top:6px;">有无突发：</span>
<q-radio v-model="isHaveTufa" :val="2" label="有" />
<q-radio v-model="isHaveTufa" :val="1" label="无" />
</div>
<div class="q-gutter-sm" style="width:280px;" v-if="isShowTwo">
<span style="position:relative;top:6px;">有无交接：</span>
<q-radio v-model="isHaveHand" :val="2" label="有" />
<q-radio v-model="isHaveHand" :val="1" label="无" />
</div>
</q-card-section>
<q-card-actions align="right">
<q-btn flat label="确定" color="primary" @click="submitHand" />
</q-card-actions>
</q-card>
</q-dialog>
</div>
</template>
<script>
......@@ -306,6 +330,8 @@
Id: 0,
Shift: 0,
Status: 0, //Status(1-值班打卡，2-交接打卡)
IsBurst:0, //突发
IsHandover:0 //交接
},
dataList: {},
//是否显示访客操作按钮
......@@ -317,8 +343,13 @@
workAuthObj: {
isShowAdd: false, //是否显示新增按钮【默认不显示】
isShowEditAndDelete: false, //是否显示编辑和删除按钮【默认不显示】
}
},
isShowTuFA: false,
isHaveTufa:2, //是否有突发
isHaveHand:2, //是否有交接
isShowOne:false,
isShowTwo:false,
status:0
}
},
created() {
......@@ -344,11 +375,31 @@
},
//值班打卡或值班交接
SetDutyCheck(status) {
this.status = status;
this.checkMsg.IsBurst = this.$refs.schOrder.getTufaHand().IsBurst;
this.checkMsg.IsHandover = this.$refs.schOrder.getTufaHand().IsHandover;
//突发事件
if(this.$refs.schOrder.getTufaHand().IsBurst==0){
this.isShowOne=true;
this.isShowTuFA=true;
}
//交接工作
if(this.$refs.schOrder.getTufaHand().IsHandover==0){
this.isShowTwo=true;
this.isShowTuFA=true;
}
if(this.$refs.schOrder.getTufaHand().IsBurst>0&&this.$refs.schOrder.getTufaHand().IsHandover>0){
this.saveInfo()
}
},
//保存
saveInfo(){
let diaMsg='';
if(status==1){
if(this.status==1){
diaMsg='是否确定值班打卡?'
}
if(status==2){
if(this.status==2){
diaMsg='是否确定值班交接?'
}
this.$q.dialog({
......@@ -359,7 +410,7 @@
ok: "确定",
cancel: "取消",
}).onOk(() => {
this.checkMsg.Status = status;
this.checkMsg.Status = this.status;
saveDutyCheck(this.checkMsg).then(res => {
if (res.Code == 1) {
this.getList();
......@@ -383,8 +434,39 @@
}).onCancel(() => {
});
},
//确定是否有突发
submitHand(){
if(this.isHaveTufa==2){
this.$q.notify({
type: 'negative',
position: "top",
message: `请填写突发事件`
})
this.isShowTuFA = false;
return
}
if(this.isHaveHand==2){
this.$q.notify({
type: 'negative',
position: "top",
message: `请填写交接`
})
this.isShowTuFA = false;
return
}
if(this.isHaveTufa==1){
this.checkMsg.IsBurst=1;
this.saveInfo();
}
if(this.isHaveHand==1){
this.checkMsg.IsHandover=1;
this.saveInfo();
}
this.isShowTuFA = false;
},
//刷新父页面
refreshPage() {
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