Commit cc46b5d3 authored by zhengke's avatar zhengke

修改

parent 9512ce6b
...@@ -137,6 +137,10 @@ ...@@ -137,6 +137,10 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 25px; height: 25px;
position: absolute;
bottom:20px;
width:100%;
right:0;
} }
.tufa_xiugai { .tufa_xiugai {
...@@ -290,7 +294,7 @@ ...@@ -290,7 +294,7 @@
</template> </template>
</div> </div>
</template> </template>
<template v-if="workAuthObj.isShowEditAndDelete"> <template v-if="workAuthObj.isShowEditAndDelete&&WorkObj.ItemImgList.length>0">
<el-upload class="schedul_Upload MyUpload" style="display:inline;" action="" list-type="picture-card" <el-upload class="schedul_Upload MyUpload" style="display:inline;" action="" list-type="picture-card"
:show-file-list="false" :http-request="UploadWorkFile"> :show-file-list="false" :http-request="UploadWorkFile">
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
...@@ -318,8 +322,8 @@ ...@@ -318,8 +322,8 @@
<div class="tufa_xiugai"> <div class="tufa_xiugai">
<template v-if="WorkObj.ItemType==1 && workAuthObj.isShowEditAndDelete"> <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" <q-btn color="primary" flat v-if="WorkObj.IsChecked==0" dense style="margin-left:10px;" slot="reference"
@click="WorkObj.IsChecked=1,saveOrder()" label="确认完成" /> @click="saveOrder(1)" label="确认完成" />
<q-btn v-if="WorkObj.IsChecked==1" dense flat @click="WorkObj.IsChecked=0,saveOrder()" <q-btn v-if="WorkObj.IsChecked==1" dense flat @click="saveOrder(0)"
style="margin-left:10px;" class="schedu_red" label="取消完成" /> style="margin-left:10px;" class="schedu_red" label="取消完成" />
</template> </template>
<template v-if="WorkObj.ItemType==2 && workAuthObj.isShowEditAndDelete"> <template v-if="WorkObj.ItemType==2 && workAuthObj.isShowEditAndDelete">
...@@ -623,7 +627,6 @@ ...@@ -623,7 +627,6 @@
this.HandoverList = res.Data.HandoverList; this.HandoverList = res.Data.HandoverList;
this.EmergenciesList = res.Data.EmergenciesList; this.EmergenciesList = res.Data.EmergenciesList;
this.WorkList = res.Data.WorkList; this.WorkList = res.Data.WorkList;
console.log(this.WorkList, 'WorkList');
if (this.EmergenciesList && this.EmergenciesList.length > 0) { if (this.EmergenciesList && this.EmergenciesList.length > 0) {
this.EmergenciesObj = this.EmergenciesList[this.EmergenciesIndex]; this.EmergenciesObj = this.EmergenciesList[this.EmergenciesIndex];
} }
...@@ -725,6 +728,20 @@ ...@@ -725,6 +728,20 @@
}, },
//保存工作清单 //保存工作清单
saveOrder(type) { saveOrder(type) {
if(this.WorkObj.FileList==null){
this.WorkObj.FileList=[];
}
if(type==1){
if(this.WorkObj.ItemImgList.length>0&&this.WorkObj.FileList.length==0){
this.$q.notify({
type: 'negative',
message: '请上传图片',
position: 'top'
})
return
}
}
this.WorkObj.IsChecked=type;
var saveWorkMsg = { var saveWorkMsg = {
Id: this.WorkObj.Id, //编号 Id: this.WorkObj.Id, //编号
PlanShift: this.saveObj.Shift, //值班班次 PlanShift: this.saveObj.Shift, //值班班次
......
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