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/index.vue

@@ -3,7 +3,7 @@
         <div class="position">
             <bread-crumb :crumbs="crumbs"></bread-crumb>
             <div style="display:flex;align-items:center">
-                <el-button type="primary" @click="setting">设置</el-button>
+                <!-- <el-button type="primary" @click="setting">设置</el-button> -->
                 <el-button type="primary" @click="DeleteStaffSchedule">清除</el-button>
                 <el-button type="primary" @click="copyStaffSchedule">复制</el-button>
                 <el-button type="primary" icon="el-icon-printer" @click="toPrint">打印</el-button>
@@ -214,81 +214,110 @@
                     <el-tabs v-model="activeName">
                         <el-tab-pane label="护士" name="nurse">
                             <el-table
-                                :data="nurseTableData"
+                                :data="nurseList"
                                 border
                                 height="250"
                                 style="width: 100%">
-                                <el-table-column
-                                align="center"
-                                prop="name"
-                                label="姓名"
-                                width="180">
-                                </el-table-column>
-                                <el-table-column
-                                align="center"
-                                prop="date"
-                                label="职称"
-                                width="180">
-                                </el-table-column>
-                                <el-table-column
-                                align="center"
-                                label="排序">
-                                <template slot-scope="scope">
-                                    <el-input v-model="input" placeholder="请输入内容"></el-input>
-                                </template>
-                                </el-table-column>
-                                <el-table-column
-                                align="center"
-                                label="是否排班">
-                                <template slot-scope="scope">
-                                    <el-radio v-model="radio" label="1">是</el-radio>
-                                    <el-radio v-model="radio" label="2">否</el-radio>
-                                </template>
-                                </el-table-column>
-                            </el-table>
-                        </el-tab-pane>
+                           <el-table-column align="center" prop="name" label="姓名" width="180">
+                              <template slot-scope="scope">
+                                  {{scope.row.user_name}}
+                              </template>
+                          </el-table-column>
+                          <el-table-column align="center" prop="date" label="职称" width="180">
+                             <template slot-scope="scope">
+                                <span v-if="scope.row.user_title == 1">医士</span>
+                                <span v-if="scope.row.user_title == 2">医师</span>
+                                <span v-if="scope.row.user_title == 3">住院医师</span>
+                                <span v-if="scope.row.user_title == 4">主治医师</span>
+                                <span v-if="scope.row.user_title == 5">副主任医师</span>
+                                <span v-if="scope.row.user_title == 6">主任医师</span>
+                                <span v-if="scope.row.user_title == 7">护士</span>
+                                <span v-if="scope.row.user_title == 8">护师</span>
+                                <span v-if="scope.row.user_title == 9">主管护师</span>
+                                <span v-if="scope.row.user_title == 10">副主任护师</span>
+                                <span v-if="scope.row.user_title == 11">主任护师</span>
+                                <span v-if="scope.row.user_title == 12">运营专员</span>
+                                <span v-if="scope.row.user_title == 13">运营主管</span>
+                             </template>
+                          </el-table-column>
+                          <el-table-column
+                            align="center"
+                            label="排序">
+                            <template slot-scope="scope">
+                                 <el-input v-model="scope.row.sort" @change="changeSort(scope.row)" placeholder="请输入内容"></el-input>
+                           </template>
+                          </el-table-column>
+                          <el-table-column
+                            align="center"
+                            label="是否排班">
+                            <template slot-scope="scope">           
+                              <el-radio-group v-model="scope.row.is_sort" @change="changeRadio(scope.row)">
+                                 <el-radio :label="1">是</el-radio>
+                                 <el-radio :label="0">否</el-radio>
+                              </el-radio-group>
+                            </template>
+                           </el-table-column>
+                         </el-table>
+                     </el-tab-pane>
+
                         <el-tab-pane label="医生" name="doctor">
                             <el-table
-                                :data="nurseTableData"
+                                :data="doctorList"
                                 border
                                 height="250"
                                 style="width: 100%">
-                                <el-table-column
+                            <el-table-column
                                 align="center"
                                 prop="name"
                                 label="姓名"
                                 width="180">
-                                </el-table-column>
-                                <el-table-column
-                                align="center"
-                                prop="date"
-                                label="职称"
-                                width="180">
-                                </el-table-column>
+                              <template slot-scope="scope">
+                                  {{scope.row.user_name}}
+                              </template>
+                             </el-table-column>
+                             <el-table-column align="center" prop="date" label="职称"width="180">
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.user_title == 1">医士</span>
+                                    <span v-if="scope.row.user_title == 2">医师</span>
+                                    <span v-if="scope.row.user_title == 3">住院医师</span>
+                                    <span v-if="scope.row.user_title == 4">主治医师</span>
+                                    <span v-if="scope.row.user_title == 5">副主任医师</span>
+                                    <span v-if="scope.row.user_title == 6">主任医师</span>
+                                    <span v-if="scope.row.user_title == 7">护士</span>
+                                    <span v-if="scope.row.user_title == 8">护师</span>
+                                    <span v-if="scope.row.user_title == 9">主管护师</span>
+                                    <span v-if="scope.row.user_title == 10">副主任护师</span>
+                                    <span v-if="scope.row.user_title == 11">主任护师</span>
+                                    <span v-if="scope.row.user_title == 12">运营专员</span>
+                                    <span v-if="scope.row.user_title == 13">运营主管</span>  
+                                </template>
+                             </el-table-column>
                                 <el-table-column
                                 align="center"
                                 label="排序">
                                 <template slot-scope="scope">
-                                    <el-input v-model="input" placeholder="请输入内容"></el-input>
+                                    <el-input v-model="scope.row.sort" placeholder="请输入内容" @change="changeSort(scope.row)"></el-input>
                                 </template>
                                 </el-table-column>
                                 <el-table-column
                                 align="center"
                                 label="是否排班">
-                                <template slot-scope="scope">
-                                    <el-radio v-model="radio" label="1">是</el-radio>
-                                    <el-radio v-model="radio" label="2">否</el-radio>
-                                </template>
-                                </el-table-column>
+                                <template slot-scope="scope">           
+                                  <el-radio-group v-model="scope.row.is_sort" @change="changeRadio(scope.row)">
+                                     <el-radio :label="1">是</el-radio>
+                                     <el-radio :label="0">否</el-radio>
+                                 </el-radio-group>
+                               </template>
+                              </el-table-column>
                             </el-table>
                         </el-tab-pane>
                     </el-tabs>
-                    <div style="margin-top:20px;">
+                    <!-- <div style="margin-top:20px;">
                         <p style="line-height:20px;">1.默认科室所有排序在职员工账号</p>
                         <p style="line-height:20px;">2.护士默认排序，按加入机构先后降序排序，最先加入机构的排序为1，显示在列表最下面，自定义排序，最大的序号排在最上面</p>
                         <p style="line-height:20px;">3.职称显示与管理中旬的员工列表显示的职称一样</p>
                         <p style="line-height:20px;">4.是否排班，默认机构所有用户是“是”，如果是否，则该用户不在医护排班列表中</p>
-                    </div>
+                    </div> -->
                 </div>
                 <!-- <div slot="footer" class="dialog-footer">
                 <el-button @click="hide">取 消</el-button>
@@ -303,7 +332,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'
+import { getDoctorList,getScheduleList,addSchedule,getStaffScheduleList,getNextWeekList,getScheduleByDoctorId,toSearchScheduleList,DeleteStaffSchedule,copyStaffSchedule,UpdateContinusSchedule,SaveNurseSort,SaveIsSchedule } from '@/api/doctorSchedule'
 export default {
     components:{
         BreadCrumb
@@ -381,8 +410,9 @@ export default {
             }],
             nurseVisible:false,
             activeName:'nurse',
-            radio:'1'
-            
+            radio:'1',
+            nurseList:[],
+            doctorList:[],
         }
     },
     methods:{
@@ -397,11 +427,27 @@ 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
                     //获取班种列表
                     this.getStaffScheduleList()
+
+                    // var doctorlist =  response.data.data.doctorlist
+                    // for(let i=0;i<doctorlist.length;i++){
+                    //    if(doctorlist[i].sort == 0){
+                    //       doctorlist[i].sort = ""
+                    //    }
+                    // }
+                    // console.log('doctorlist',doctorlist)
+                    // this.doctorList = doctorlist
+                    // var nurselist = response.data.data.nurselist
+                    // for(let i=0;i<nurselist.length;i++){
+                    //    if(nurselist[i].sort == 0){
+                    //        nurselist[i].sort = ""
+                    //    }
+                    // }
+                    // this.nurseList = nurselist
                 }
             })
         },
@@ -411,18 +457,18 @@ export default {
                     var schedulelist = response.data.data.scheduleList
                     // console.log("schedulelist",schedulelist)
                     for(let i=0;i<schedulelist.length;i++){
-                    if(schedulelist[i].timeone_type == 1){
-                        schedulelist[i].timeone_type = "当日"
-                    }
-                    if(schedulelist[i].timeone_type == 2){
-                        schedulelist[i].timeone_type = "次日"
-                    }
-                    if(schedulelist[i].timetwo_type == 1){
-                        schedulelist[i].timetwo_type = "当日"
-                    }
-                    if(schedulelist[i].timetwo_type == 2){
-                        schedulelist[i].timetwo_type = "次日"
-                    }
+                        if(schedulelist[i].timeone_type == 1){
+                            schedulelist[i].timeone_type = "当日"
+                        }
+                        if(schedulelist[i].timeone_type == 2){
+                            schedulelist[i].timeone_type = "次日"
+                        }
+                        if(schedulelist[i].timetwo_type == 1){
+                            schedulelist[i].timetwo_type = "当日"
+                        }
+                        if(schedulelist[i].timetwo_type == 2){
+                            schedulelist[i].timetwo_type = "次日"
+                        }
                     }
                     this.schedulelist = schedulelist
                 }
@@ -494,7 +540,7 @@ 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){
@@ -591,7 +637,7 @@ export default {
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList                
-
+                    // console.log("获取所有排班",staffList)
                     var sevenStr = ""
                     var oneStr = ""
                     var twoStr = ""
@@ -611,14 +657,12 @@ export default {
                     if(staffList[i].schedule_week == 0){
                         staffList[i].class_index = 0
                          var arr = []
-                        this.arrZero.push(staffList[i].class_name)
-                        console.log("this.arrZero",this.arrZero)
+                        this.arrZero.push(staffList[i].class_name)             
                         for(let i=0;i<this.arrZero.length;i++){
                            if(this.arrZero[i]!=''){
                               arr.push(this.arrZero[i])
                            }
                         }
-                        console.log("arr",arr)
                         var countedNames = arr.reduce(function (allNames, name) { 
                             if (name in allNames) {
                                 allNames[name]++;
@@ -846,7 +890,6 @@ export default {
                     obj.user_type = 10
                     obj.list = arr2
                     arr.push(obj)
-                    console.log('arr',arr)
                     this.tableData = arr
         
                 
@@ -907,6 +950,7 @@ export default {
             getNextWeekList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList = response.data.data.staffList
+                    // console.log("上下周数据",staffList)
                      var sevenStr = ""
                     var oneStr = ""
                     var twoStr = ""
@@ -1260,6 +1304,7 @@ export default {
             toSearchScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList
+                    // console.log("搜索",staffList)
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
@@ -1292,7 +1337,6 @@ export default {
                             // console.log("arr",arr)
                           }
                         })
-                        console.log("arr",arr)
                         this.tableData = arr
                     }
                 }
@@ -1431,6 +1475,35 @@ export default {
         _close: function(done) {
             done();
         },
+        changeSort(val){
+          console.log('val',val)
+            const params = {
+              sort:parseInt(val.sort), 
+              id:val.id, 
+            }
+            console.log("params",params)
+          SaveNurseSort(params).then(response=>{
+             if(response.data.state == 1){
+               var role = response.data.data.role
+               this.$message.success("保存成功")
+               this.getDoctorList()
+             }
+          })
+        },
+       changeRadio(val){
+          console.log("val",val)
+           const params = {
+              id:val.id,
+              is_sort:val.is_sort, 
+           }
+         SaveIsSchedule(params).then(response=>{
+            if(response.data.state == 1){
+              var role =  response.data.data.role
+              this.$message.success("保存成功")
+              this.getDoctorList()
+            }
+         })
+       }
     },
     created(){
         //获取医护人员
@@ -1469,6 +1542,7 @@ export default {
       var now = moment().locale('zh-cn').format('YYYY-MM-DD 00:00:00')
       this.timeNow = this.getTimestamp(now)
       
+      
     }
 }
 </script>

src/xt_pages/medicalScheduling/schedulingStatistics.vue

@@ -82,23 +82,36 @@
                 :data="tableData"
                 height="250"
                 border
-                style="width: 100%">
+                style="width: 100">
                 <el-table-column
                 align="center"
                 prop="date"
-                label="日期"
+                label="医护姓名"
                 width="180">
                 </el-table-column>
                 <el-table-column
-                align="center"
-                prop="name"
-                label="姓名"
-                width="180">
+                 :label="modeItem.class_name"
+                 property="number"
+                 align="center"
+                 min-width="100"
+                 v-for="(modeItem, index) in scheduleList"
+                 :key="index"
+                >
                 </el-table-column>
                 <el-table-column
-                align="center"
-                prop="address"
-                label="地址">
+                 align="center"
+                 prop="address"
+                 label="总工时/小时">
+                </el-table-column>
+                <el-table-column
+                 align="center"
+                 prop="address"
+                 label="出勤/天">
+                </el-table-column>
+                 <el-table-column
+                 align="center"
+                 prop="address"
+                 label="缺勤/天">
                 </el-table-column>
             </el-table>
         </div>
@@ -110,6 +123,7 @@
 import echarts from "echarts";
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import LineChart from "../qcd/components/LineChart";
+import { getScheduleList,getScheduleListTotal }  from '@/api/doctorSchedule'
 export default {
     components:{
         BreadCrumb,
@@ -247,36 +261,8 @@ export default {
                     }
                 ]
             },
-
-            tableData: [{
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-08',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-06',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-07',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-            }]
+            tableData: [],
+            scheduleList:[],
 
         }
     },
@@ -287,6 +273,13 @@ export default {
         this.weekNum = this.getYearWeek(year,month,date)
         this.todayDate=this.formatDate(new Date())
         this.setDate(new Date())
+      
+
+      //获取所有排班种
+      this.getScheduleList()
+  
+      //获取统计表的数据
+      this.getlist()
     },
     methods:{
         toSearch(){},
@@ -385,6 +378,31 @@ export default {
         getTimestamp(time) { //把时间日期转成时间戳
             return (new Date(time)).getTime() / 1000
         },
+
+        //获取所有班种
+        getScheduleList(){
+          getScheduleList().then(response=>{
+             if(response.data.state == 1){
+                var schedulelist = response.data.data.scheduleList
+                console.log("schedulelist",schedulelist)
+                this.scheduleList = schedulelist
+             } 
+          })
+        },
+
+        //获取统计表数据
+        getlist(){
+          const params = {
+             start_time:this.getTimestamp(this.weekDayArr[0]),
+             end_time:this.getTimestamp(this.weekDayArr[6])
+           }
+          getScheduleListTotal(params).then(response=>{
+             if(response.data.state == 1){
+               var list =  response.data.data.list
+               console.log("list",list)
+             }
+          })
+        }
     }
 }
 </script>