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

src/lang/zh.js

@@ -99,7 +99,7 @@ export default {
     deviceManage: '设备管理',
     modemanagement: '型号管理',
     dialysisMachineManage: '设备管理',
-    workforce: '排班管理',
+    workforce: '患者排班',
     appointment: '排班管理',
     sign: '治疗签到',
     remind: '排班提醒',

src/views/layout/components/TagsView.vue

@@ -28,7 +28,7 @@
     </ul>-->
     <div class="tags-view-wrapper">
       <div style="height:100%">
-        <div style="height:100%" v-if="newIndex == 9">
+        <div style="height:100%" v-if="newIndex == 10">
           <div class="tagsBox" v-if="routerList.length > 0 && newNum != 999">
             <div
               class="tagsOne"
@@ -62,7 +62,7 @@
             </div>
           </div>
         </div>
-        <div class="tagsBox" v-if="newIndex != 9">
+        <div class="tagsBox" v-if="newIndex != 10">
           <div
             class="tagsOne"
             v-if="permission_routers[newIndex].meta"

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -382,9 +382,19 @@
             校对护士
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
-              <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''"> {{ getAdminUser(check == null ? 0 : check.modifier) }} </span>
+              <span v-if="dialysisOrder ? dialysisOrder.start_nurse != check.modifier : false">
+              <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''" style="height:30px;display: inline-block;">
+              {{ getAdminUser(check == null ? 0 : check.modifier) }}
+              </span>
               <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
             </span>
+            <span v-else>
+              <span v-if="setAdminUserES(check == null ? 0 : check.creater) == ''" style="height:30px;display: inline-block;">
+              {{ getAdminUser(check == null ? 0 : check.creater) }}
+              </span>
+              <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt srcset v-else />
+            </span>
+            </span>
             医生签名
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;

src/xt_pages/medicalScheduling/class.vue

@@ -69,7 +69,7 @@
             >
              <el-form :model="form" :rules="rules" ref="form" label-width="90px">
                 <el-form-item label="班种名称 : " required prop="class_name">
-                    <el-input v-model="form.class_name" placeholder="" ></el-input>
+                    <el-input v-model.trim="form.class_name" placeholder="" ></el-input>
                 </el-form-item>
                 <el-form-item label="班种属性 : " required  prop="class_attributes">
                     <el-select v-model="form.class_attributes" placeholder="请选择">
@@ -102,6 +102,7 @@
                         </el-option>
                     </el-select>
                     <el-time-select
+                    @change="changtimeTwo"
                     style="width:140px;"
                     v-model="form.timeone_end"
                     :picker-options="{
@@ -121,7 +122,7 @@
                     style="width:140px;"
                     v-model="form.timetwo_start"
                     :picker-options="{
-                    start: '08:00',
+                    start: '01:00',
                     step: '00:15',
                     end: '24:00'
                     }"
@@ -136,10 +137,11 @@
                         </el-option>
                     </el-select>
                     <el-time-select
+                    @change="changtime"
                     style="width:140px;"
                     v-model="form.timetwo_end"
                     :picker-options="{
-                    start: '08:00',
+                    start: '01:00',
                     step: '00:15',
                     end: '24:00'
                     }"
@@ -206,6 +208,7 @@
                         </el-option>
                     </el-select>
                     <el-time-select
+                    @change="changtime"
                     style="width:140px;"
                     v-model="form.timeone_end"
                     :picker-options="{
@@ -240,6 +243,7 @@
                         </el-option>
                     </el-select>
                     <el-time-select
+                    @change="changtimeTwo"
                     style="width:140px;"
                     v-model="form.timetwo_end"
                     :picker-options="{
@@ -276,6 +280,7 @@
 <script>
 import {saveDoctorSchedules,getDoctorScheduleList,getScheduleDetail,UpdateSchedule,deleteScheduleById } from '@/api/doctorSchedule'
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { parseTime } from '@/utils'
 export default {
     components:{
         BreadCrumb
@@ -331,6 +336,7 @@ export default {
                      this.showError = true
                      return false
                  }
+                 
                  const params = {
                     class_name:this.form.class_name,
                     class_attributes:this.form.class_attributes,
@@ -343,7 +349,6 @@ export default {
                     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
@@ -360,6 +365,8 @@ export default {
                     this.form.timetwo_end=""
                     this.form.work_time = ""
                     this.form.remarks = ""
+                  }else{
+                     this.$message.error("班种名称已存在")
                   }
                })
              }
@@ -479,7 +486,8 @@ export default {
                  this.$message.success("修改成功")
                  this.EditNewVisible = false
                  this.getList()
-                 
+               }else{
+                   this.$message.error("班种名称已存在")
                }
              })
           }
@@ -501,15 +509,138 @@ export default {
                 var msg = response.data.data.msg
                 this.$message.success("删除成功")
                 this.getList()
+              }else{
+                this.$message.error("该班种已存在排班,不能删除")
               }
            }) 
         })
-      }
+      },
+     timeDifference(startTime,endTime){ 
+        var start1=startTime.split(":");
+        var startAll=parseInt(start1[0]*60)+parseInt(start1[1]);   
+        var end1=endTime.split(":");
+        var endAll=parseInt(end1[0]*60)+parseInt(end1[1]);
+         return endAll - startAll
+      },
+      timeStamp(StatusMinute){	
+        var day=parseInt(StatusMinute/60/24);
+        var hour=parseInt(StatusMinute/60%24);
+        var min= parseInt(StatusMinute % 60);
+        StatusMinute="";
+        if (day > 0)
+        {
+            StatusMinute= day + "天";
+        } 
+        if (hour>0)
+        {
+            StatusMinute += hour + "小时";
+        } 
+        // if(hour == 0){
+        //    StatusMinute += hour + "小时"
+        // }
+        if (min>0)
+        {
+            StatusMinute += parseFloat(min) + "分钟";
+        }
+            return StatusMinute;
+        },
+     changtime(){
+         //计算时长
+        console.log("timeone",this.form.timeone_start)
+        console.log("timeonend",this.form.timeone_end)
+        console.log("timeonetype",this.form.timeone_type)
+        var longtime = 0
+        var timeone = 0
+        var timetwo = 0
+        //时间选择1的时间差
+       if(this.form.timeone_type == 1){
+          var timeone = this.timeDifference(this.form.timeone_start,this.form.timeone_end)
+           timeone = timeone
+       }
+       if(this.form.timeone_type == 2){
+          var hour = this.form.timeone_end.split(":")
+          var hous = parseInt(hour[0]) + 24
+          var oneHours = hous.toString() +":"+ hour[1]
+          var timeone =  this.timeDifference(this.form.timeone_start,oneHours)
+         timeone = timeone
+        }
+       console.log("时间选择1时长",this.timeStamp(timeone))
+                
+        //时间选择2的时间差
+        if(this.form.timetwo_type == 1){
+            var timetwo = this.timeDifference(this.form.timetwo_start,this.form.timetwo_end)
+            timetwo = timetwo
+        }
+        if(this.form.timetwo_type == 2){
+            var hour = this.form.timetwo_end.split(":")
+            var hous = parseInt(hour[0]) + 24
+            var oneHours = hous.toString() +":"+ hour[1]
+            var timetwo =  this.timeDifference(this.form.timetwo_start,oneHours)
+            timetwo = timetwo
+        }
+          console.log("timetwo",timetwo)
+          console.log("时间选择2时长",this,this.timeStamp(timetwo))
+                  
+        longtime = timeone + timetwo
+        console.log("longtime",longtime)
+        this.form.work_time = this.timeStamp(longtime)
+     },
+     changtimeTwo(){
+           //计算时长
+        console.log("timeone",this.form.timeone_start)
+        console.log("timeonend",this.form.timeone_end)
+        console.log("timeonetype",this.form.timeone_type)
+        var longtime = 0
+        var timeone = 0
+        var timetwo = 0
+        //时间选择1的时间差
+       if(this.form.timeone_type == 1){
+          var timeone = this.timeDifference(this.form.timeone_start,this.form.timeone_end)
+           timeone = timeone
+       }
+       if(this.form.timeone_type == 2){
+          var hour = this.form.timeone_end.split(":")
+          var hous = parseInt(hour[0]) + 24
+          var oneHours = hous.toString() +":"+ hour[1]
+          var timeone =  this.timeDifference(this.form.timeone_start,oneHours)
+         timeone = timeone
+        }
+       console.log("时间选择1时长",this.timeStamp(timeone))
+                
+        //时间选择2的时间差
+        if(this.form.timetwo_type == 1){
+            var timetwo = this.timeDifference(this.form.timetwo_start,this.form.timetwo_end)
+            timetwo = timetwo
+        }
+        if(this.form.timetwo_type == 2){
+            var hour = this.form.timetwo_end.split(":")
+            var hous = parseInt(hour[0]) + 24
+            var oneHours = hous.toString() +":"+ hour[1]
+            var timetwo =  this.timeDifference(this.form.timetwo_start,oneHours)
+            timetwo = timetwo
+        }
+          console.log("timetwo",timetwo)
+          console.log("时间选择2时长",this,this.timeStamp(timetwo))
+                  
+        longtime = timeone + timetwo
+        console.log("longtime",longtime)
+        this.form.work_time = this.timeStamp(longtime) 
+     }
     },
     created(){
         //获取班种列表
         this.getList()
+    },
+    watch: {
+    //  监听对象数据变化
+    work_time: {
+      handler(newVal, oldVal) {
+        console.log(newVal)
+        console,log(oldVal)
+      },
+      deep: true  // 非常非常重要，这个是深度监听，默认是false。true的时候才能监听到对象的变化
     }
+   }
 }
 </script>
 <style scoped>

src/xt_pages/medicalScheduling/index.vue

@@ -154,7 +154,7 @@
                             {{item.class_name}}&nbsp;({{item.timeone_start}}~{{item.timeone_type}}{{item.timeone_end}} <span v-if="item.timetwo_start!=''">{{item.timetwo_start}}~{{item.timetwo_type}}{{item.timetwo_end}}</span> )
                            </p>
                         </div>
-                        <el-checkbox style="text-align:center"  v-model="isChecked" @change="toContinuous">连续排班</el-checkbox>
+                        <el-checkbox style="text-align:center;padding-bottom: 10px;"  v-model="isChecked" @change="toContinuous">连续排班</el-checkbox>
                     </div>
                 </div>
             </div>
@@ -252,7 +252,7 @@ export default {
             getDoctorList().then(response=>{
                 if(response.data.state == 1){
                     var list =  response.data.data.list
-                    console.log("医护列表",list)
+                    // console.log("医护列表",list)
                     this.tableData = list
                     this.doctorlist = list
                     //获取班种列表
@@ -264,7 +264,7 @@ export default {
             getScheduleList().then(response=>{
                 if(response.data.state == 1){
                     var schedulelist = response.data.data.scheduleList
-                    console.log("schedulelist",schedulelist)
+                    // console.log("schedulelist",schedulelist)
                     for(let i=0;i<schedulelist.length;i++){
                     if(schedulelist[i].timeone_type == 1){
                         schedulelist[i].timeone_type = "当日"
@@ -284,10 +284,10 @@ export default {
             }) 
         },
         hangdleClick(val,index,num){
-         console.log("val",val)
+        //  console.log("val",val)
          this.docobj = val
          if(this.getTimestamp(this.weekDayArr[num]) < this.timeNow){
-            this.$message.warning("过去日期不可以编辑")
+            this.$message.error("过去日期不可以编辑")
             return
          }
         },
@@ -297,7 +297,7 @@ export default {
             // console.log("日期",this.weekDayArr)
             var week = (column.label).split('');
             var weeks = week[0]+week[1]
-            console.log("weeks",weeks)
+            // console.log("weeks",weeks)
             if(weeks == "周日"){
             this.schedule_week = 0
             this.schedule_date = this.weekDayArr[6]
@@ -335,14 +335,14 @@ export default {
             }
             }
             let arr = [...this.tableData]
-            console.log("arr===",arr)
+            // 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
                 arr[i].class_index = this.schedule_week
             }
             }
-            console.log("arr",arr)
+            // console.log("arr",arr)
             this.tableData = arr
             const params = {
             doctor_id:this.docobj.admin_user_id,
@@ -353,12 +353,12 @@ export default {
             end_time:this.getTimestamp(this.weekDayArr[6]),
             schedule_date:this.getTimestamp(this.schedule_date)
             }
-            console.log("params",params)
+            // console.log("params",params)
             
             addSchedule(params).then(response=>{
             if(response.data.state == 1){
                 var schedule = response.data.data.schedule
-                console.log("schedule",schedule)
+                // console.log("schedule",schedule)
                 this.$message.success("保存成功")
                 this.getStaffScheduleList()
                 }
@@ -450,7 +450,7 @@ export default {
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList
-                    console.log("所有排班数据",staffList)
+                   console.log("所有排班数据",staffList)
                     for(let i=0;i<staffList.length;i++){
                     if(staffList[i].schedule_week == 0){
                         staffList[i].class_index = 0
@@ -478,7 +478,6 @@ 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,
@@ -487,10 +486,9 @@ export default {
                             })
                             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})
+                                    newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type})
                                 }
                             }
                         }
@@ -502,10 +500,12 @@ export default {
                       if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
                     
                       }else{
-                        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",arr)
                       }
                     })
+                    console.log("arr=======",arr)
+                    arr.sort(this.compare('user_type'))
                     this.tableData = arr
         
                 
@@ -555,13 +555,14 @@ export default {
                         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 {
                         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})
+                            newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week, user_type:staffList[i].doctor_type,})
                             }
                         }
                         }
@@ -573,10 +574,11 @@ export default {
                       if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
                     
                       }else{
-                        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",arr)
                       }
                     })
+                    arr.sort(this.compare('user_type'))
                     this.tableData = arr
                 }
             })
@@ -597,6 +599,7 @@ export default {
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
                             newArr.push({
+                                user_type:staffList[i].doctor_type,
                                 user_name: staffList[i].user_name,
                                 admin_user_id:staffList[i].admin_user_id,
                                 list: [{class_name:staffList[i].class_name,schedule_week:staffList[i].schedule_week}]
@@ -605,7 +608,7 @@ export default {
                         } else {
                             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})
+                                    newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week, user_type:staffList[i].doctor_type})
                                 }
                             }
                         }
@@ -619,10 +622,12 @@ export default {
                           if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
                         
                           }else{
-                            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",arr)
                           }
                         })
+                        console.log("全部=======",arr)
+                        arr.sort(this.compare('user_type'))
                         this.tableData = arr
                     }
                     if(id == 2){
@@ -833,7 +838,7 @@ export default {
             return function(a,b){
                 var value1 = a[property];
                 var value2 = b[property];
-                return value1 - value2;
+                return value2 - value1;
             }
         },
     },
@@ -892,7 +897,7 @@ export default {
 .classBox{
     width:28%;
     height: 100%;
-    border: 1px solid #EBEEF5;
+    border: 1px solid #d0d3da;
     .classTitle{
         height: 42px;
         text-align: center;

src/xt_pages/medicalScheduling/medical_print.vue

@@ -107,6 +107,7 @@ export default {
               for (let i = 0; i < staffList.length; i++) {
                 if(tempArr.indexOf(staffList[i].user_name) === -1) {
                   newArr.push({
+                    user_type:staffList[i].doctor_type,
                     user_name: staffList[i].user_name,
                     admin_user_id:staffList[i].admin_user_id,
                     list: [{class_name:staffList[i].class_name,schedule_week:staffList[i].schedule_week}]
@@ -115,7 +116,7 @@ export default {
                 } else {
                   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})
+                      newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type})
                     }
                   }
                 }
@@ -127,10 +128,11 @@ export default {
                 if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
               
                 }else{
-                  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",arr)
                 }
               })
+              arr.sort(this.compare('user_type'))
               this.tableData = arr
               
             }
@@ -172,7 +174,7 @@ export default {
         return function(a,b){
             var value1 = a[property];
             var value2 = b[property];
-            return value1 - value2;
+            return value2 - value1;
         }
       },
     },
@@ -218,7 +220,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 20px;
+            font-size: 18px;
             padding: 15px 5px;
           }
         }