|
|
@@ -122,18 +122,18 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- // let startDate = JSON.parse(JSON.stringify(this.taskData.taskStartTime))
|
|
|
+ let startDate = JSON.parse(JSON.stringify(this.taskData.taskStartTime))
|
|
|
|
|
|
- // startDate = Date.parse(new Date(startDate))
|
|
|
- // let endDate = Date.parse(new Date())
|
|
|
- // if (endDate - startDate <= 3600000) {
|
|
|
- // Dialog({ message: '该调阅未满一个小时请确认' })
|
|
|
- //未满一小时不能结束调阅
|
|
|
- // } else {
|
|
|
+ startDate = Date.parse(new Date(startDate))
|
|
|
+ let endDate = Date.parse(new Date())
|
|
|
+ if (endDate - startDate <= 3600000) {
|
|
|
+ Dialog({ message: '该调阅未满一个小时请确认' })
|
|
|
+ 未满一小时不能结束调阅
|
|
|
+ } else {
|
|
|
this.$refs.scandialog.visible = true
|
|
|
|
|
|
- // startDate = new Date(startDate)
|
|
|
- // }
|
|
|
+ startDate = new Date(startDate)
|
|
|
+ }
|
|
|
},
|
|
|
//文件上传
|
|
|
resultImg(img) {
|