Merge branch '20200710_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

src/xt_pages/medicalScheduling/class.vue

@@ -304,11 +304,11 @@ export default {
                 user_org_id:0,
             },
             rules: {
-              class_name: [{ required: true, message: "请输入班种名称", trigger: "blur" }],
-              class_attributes: [{ required: true, message: "请选择班种属性", trigger: "blur" }],  
-              timeone_start: [{ required: true, message: "请选择班种时间1", trigger: "blur" }], 
-              timeone_type: [{ required: true, message: "请选择班种时间1类型", trigger: "blur" }], 
-              timeone_end: [{ required: true, message: "请选择班种时间1结束时间", trigger: "blur" }], 
+              class_name: [{ required: true, message: "请输入班种名称" }],
+              class_attributes: [{ required: true, message: "请选择班种属性"}],  
+              timeone_start: [{ required: true, message: "请选择班种时间1"}], 
+              timeone_type: [{ required: true, message: "请选择班种时间1类型"}], 
+              timeone_end: [{ required: true, message: "请选择班种时间1结束时间"}], 
             },
             typeOptions:[{ value: 1, label: '出勤'},{ value: 2, label: '缺勤'}],
             dayOptions:[{ value: 1, label: '当日'},{ value: 2, label: '次日'}],
@@ -320,29 +320,30 @@ export default {
     },
     methods:{
         submitAction(formName){
-           if(this.form.timeone_type ==""){
-              this.showError = true
-              return false
-           }
-           
-           if(this.form.timeone_end == ""){
-              this.showError = true
-              return false
-           }
-          const params = {
-             class_name:this.form.class_name,
-             class_attributes:this.form.class_attributes,
-             timeone_start:this.form.timeone_start,
-             timeone_type:this.form.timeone_type,
-             timeone_end:this.form.timeone_end,
-             timetwo_start:this.form.timetwo_start,
-             timetwo_type:this.form.timetwo_type,
-             timetwo_end:this.form.timetwo_end,
-             work_time:this.form.work_time,
-             remarks:this.form.remarks
-         }
          this.$refs[formName].validate((valid=>{
             if(valid){
+                if(this.form.timeone_type ==""){
+                    this.showError = true
+                    return false
+                 }
+           
+                if(this.form.timeone_end == ""){
+                     this.showError = true
+                     return false
+                 }
+                 const params = {
+                    class_name:this.form.class_name,
+                    class_attributes:this.form.class_attributes,
+                    timeone_start:this.form.timeone_start,
+                    timeone_type:this.form.timeone_type,
+                    timeone_end:this.form.timeone_end,
+                    timetwo_start:this.form.timetwo_start,
+                    timetwo_type:this.form.timetwo_type,
+                    timetwo_end:this.form.timetwo_end,
+                    work_time:this.form.work_time,
+                    remarks:this.form.remarks
+                 }
+                 console.log("params",params)
                 saveDoctorSchedules(params).then(response=>{
                   if(response.data.state == 1){
                     var schedules = response.data.data.schedules

src/xt_pages/medicalScheduling/index.vue

@@ -54,7 +54,7 @@
                                         {{ getClass(scope.row.user_name,1) }}<i class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
-                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
+                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[0])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
                                         </el-dropdown-menu>
                                     </el-dropdown>
                                 </div>
@@ -68,7 +68,7 @@
                                         {{ getClass(scope.row.user_name,2) }}<i class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
-                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
+                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[1])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
                                         </el-dropdown-menu>
                                     </el-dropdown>
                                 </div>
@@ -82,7 +82,7 @@
                                         {{ getClass(scope.row.user_name,3) }}<i class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
-                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
+                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[2])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
                                         </el-dropdown-menu>
                                     </el-dropdown>
                                 </div>
@@ -96,7 +96,7 @@
                                         {{ getClass(scope.row.user_name,4) }}<i class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
-                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
+                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[3])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
                                         </el-dropdown-menu>
                                     </el-dropdown>
                                 </div>
@@ -110,7 +110,7 @@
                                         {{ getClass(scope.row.user_name,5) }}<i class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
-                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
+                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[4])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
                                         </el-dropdown-menu>
                                     </el-dropdown>
                                 </div>
@@ -124,7 +124,7 @@
                                         {{ getClass(scope.row.user_name,6) }}<i class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
-                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
+                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[5])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
                                         </el-dropdown-menu>
                                     </el-dropdown>
                                 </div>
@@ -135,10 +135,10 @@
                                 <div @click="hangdleClick(scope.row,scope.$index)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link">
-                                        {{ getClass(scope.row.user_name,7) }}<i class="el-icon-arrow-down el-icon--right"></i>
+                                        {{ getClass(scope.row.user_name,0) }}<i class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
                                         <el-dropdown-menu slot="dropdown" >
-                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
+                                            <el-dropdown-item  :command="item.id" icon="el-icon-plus" :disabled="getTimestamp(weekDayArr[6])<timeNow?true:false" v-for="(item,index) in schedulelist" :key="index">{{item.class_name}}</el-dropdown-item>
                                         </el-dropdown-menu>
                                     </el-dropdown>
                                 </div>
@@ -163,9 +163,9 @@
                 width="600px"
                 :visible.sync="newVisible"
             >
-            <el-form :model="form"  ref="form" label-width="90px">
-                <el-form-item label="复制到 : " required  prop="class_attributes">
-                    <el-select v-model="copyWeek" placeholder="请选择">
+            <el-form :model="form"  ref="form" label-width="90px" :rules="rules">
+                <el-form-item label="复制到 : " required  prop="copyWeek">
+                    <el-select v-model="form.copyWeek" placeholder="请选择">
                         <el-option
                         v-for="item in typeOptions"
                         :key="item.value"
@@ -187,6 +187,7 @@
 
 
 <script>
+const moment = require('moment')
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getDoctorList,getScheduleList,addSchedule,getStaffScheduleList,getNextWeekList,getScheduleByDoctorId,toSearchScheduleList,DeleteStaffSchedule,copyStaffSchedule,UpdateContinusSchedule } from '@/api/doctorSchedule'
 export default {
@@ -218,11 +219,6 @@ export default {
             weekDayArr:[],
             todayDate:'',
             clen:7,
-
-
-
-
-
             nowYear: new Date().getFullYear(),
             schedule_week:0,
             docobj:{},
@@ -231,10 +227,17 @@ export default {
             schedule_date:"",
             newVisible:false,
             typeOptions:[],
+            timeOptions:[],
             copyWeek:'',
-
             weekList: [],
             currentFirstDate1: '',
+            form:{
+              copyWeek:"",
+            },
+           rules: {
+             copyWeek: [{ required: true, message: "请选择复制时间段", trigger: "blur" }],  
+           },
+           timeNow:0,
         }
     },
     methods:{
@@ -281,7 +284,8 @@ export default {
             }) 
         },
         hangdleClick(val,index){
-        this.docobj = val
+         console.log("val",val)
+         this.docobj = val
         },
         clickThis(row, column, cell, event){
             // console.log("row",row)
@@ -327,6 +331,7 @@ export default {
             }
             }
             let arr = [...this.tableData]
+            console.log("arr===",arr)
             for(let i=0;i<arr.length;i++){
             if(this.docobj.id == arr[i].id){
                 arr[i].class_name = class_name
@@ -345,6 +350,7 @@ export default {
             schedule_date:this.getTimestamp(this.schedule_date)
             }
             console.log("params",params)
+            
             addSchedule(params).then(response=>{
             if(response.data.state == 1){
                 var schedule = response.data.data.schedule
@@ -440,6 +446,7 @@ export default {
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList
+                    console.log("所有排班数据",staffList)
                     for(let i=0;i<staffList.length;i++){
                     if(staffList[i].schedule_week == 0){
                         staffList[i].class_index = 0
@@ -467,13 +474,16 @@ export default {
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
+                            console.log("触发了没")
                             newArr.push({
                                 user_name: staffList[i].user_name,
                                 admin_user_id:staffList[i].admin_user_id,
+                                user_type:staffList[i].doctor_type,
                                 list: [{class_name:staffList[i].class_name,schedule_week:staffList[i].schedule_week}]
                             })
                             tempArr.push(staffList[i].user_name);
                         } else {
+                            console.log("hheh")
                             for (let j = 0; j < newArr.length; j++) {
                                 if (newArr[j].user_name == staffList[i].user_name) {
                                     newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week})
@@ -482,14 +492,14 @@ export default {
                         }
                     }
                     let arr = [...newArr]
+                    console.log("arr=======",arr)
                     this.doctorlist.map((item,index) => {
                         if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
-                            arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
+                            arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: [],user_type:item.user_type})
                         }
                     })
                     
-        
-                    console.log(arr)
+                    console.log("arr",arr)
                     this.tableData = arr
         
                 
@@ -516,6 +526,11 @@ export default {
             }
         
         },
+
+     unique(arr) { 
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.admin_user_id) && res.set(arr.admin_user_id, 1))
+     },
         
         //获取上一周下一周的排班数据
         getNextWeekList(){
@@ -752,6 +767,43 @@ export default {
             let num = this.weekNum
             this.currentFirstDate1 = num + 1
         },
+        submitAction(formName){
+            console.log("数据",this.typeOptions)
+            console.log("2222",this.timeOptions)
+            var label = ""
+            for(let i=0;i<this.timeOptions.length;i++){
+               if(this.form.copyWeek == this.timeOptions[i].value){
+                 label = this.timeOptions[i].label
+               }
+            }
+           var start = label.split('~')
+           var copy_startime = this.getTimestamp(start[0])   
+           console.log("copy_startime",copy_startime)   
+           var copy_endtime = this.getTimestamp(start[1]) 
+           console.log("copy_endtime",copy_endtime)
+
+            const params = {
+              start_time:this.getTimestamp(this.weekDayArr[0]),
+              end_time:this.getTimestamp(this.weekDayArr[6]),
+              copy_startime:copy_startime,
+              copy_endtime:copy_endtime,
+            }
+            console.log("params",params)
+           this.$refs[formName].validate(valid=>{
+              if(valid){
+                copyStaffSchedule(params).then(response=>{
+                   if(response.data.state == 1){
+                     var msg = response.data.data.msg
+                     console.log("msg",msg)
+                     this.$message.success("复制成功")
+                     this.newVisible = false
+                   }else{
+                    this.$message.error("排班已存在")
+                  }
+                })
+              }
+           })
+        }
     },
     created(){
         //获取医护人员
@@ -775,14 +827,23 @@ export default {
                 let num = this.weekNum + i + 1
                 let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + num + ')'
                 this.typeOptions.push({value:i,label:str})
+                let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
+                this.timeOptions.push({value:i,label:stt})
             }else{
                 
                 newNum++
                 let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + newNum + ')'
                 this.typeOptions.push({value:i,label:str}) 
+                let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
+                this.timeOptions.push({value:i,label:stt}) 
             }
             
         }
+      var now = moment().locale('zh-cn').format('YYYY-MM-DD 00:00:00')
+      console.log('now',now)
+      this.timeNow = this.getTimestamp(now)
+      console.log("timenow",this.timeNow)
+      
     }
 }
 </script>