|
|
@@ -300,7 +300,7 @@ export default {
|
|
|
let validWorker = [];
|
|
|
let failworker = '';
|
|
|
let ss=this.bookservantInfo.workers.filter(e=>{
|
|
|
- return e.bookDate!=null||e.bookDate!=''||e.bookStartTime!=null||e.bookStartTime!='';
|
|
|
+ return e.bookDate!=null&&e.bookDate!=''&&e.bookStartTime!=null&&e.bookStartTime!='';
|
|
|
})
|
|
|
if(ss==null||ss.length==0){
|
|
|
failworker = "至少选择一个预约日期;";
|
|
|
@@ -315,15 +315,18 @@ export default {
|
|
|
failworker = failworker + e.workerName + " 服务技能或人员类型未选；"
|
|
|
}
|
|
|
|
|
|
- if (e.type != null && e.workerSkillId != null && e.workerSkillId != ''
|
|
|
- && e.workerId != null && e.workerId != '' && e.workerName != null && e.workerName != ''
|
|
|
- ) {
|
|
|
+ if(e.bookDate!=null&&e.bookDate!=''&&e.bookStartTime!=null&&e.bookStartTime!=''){
|
|
|
validWorker.push(e);
|
|
|
- // if (e.type == 0 && e.scheduleId != null && e.scheduleId != '') {
|
|
|
- // } else {
|
|
|
- // validWorker.push(e);
|
|
|
- // }
|
|
|
}
|
|
|
+ // if (e.type != null && e.workerSkillId != null && e.workerSkillId != ''
|
|
|
+ // && e.workerId != null && e.workerId != '' && e.workerName != null && e.workerName != ''
|
|
|
+ // ) {
|
|
|
+ // validWorker.push(e);
|
|
|
+ // // if (e.type == 0 && e.scheduleId != null && e.scheduleId != '') {
|
|
|
+ // // } else {
|
|
|
+ // // validWorker.push(e);
|
|
|
+ // // }
|
|
|
+ // }
|
|
|
})
|
|
|
this.failworker = failworker;
|
|
|
if (validWorker.length > 1) {
|
