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

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -21,9 +21,7 @@
         >下一方
         </el-button>
       </div>
-      <div class="txsj">
-        {{getContent()}}
-      </div>
+      
 
       <!--<el-table-->
       <!--:header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"-->
@@ -80,6 +78,9 @@
         </el-row>
 
       </el-form>
+      <div style='margin-bottom:20px;'>
+        {{getContent()}}
+      </div>
 
       <el-table
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
@@ -159,7 +160,7 @@
 
       <div slot="footer" class="dialog-footer">
         <el-button @click="isLastOrNextVisible = false">取 消</el-button>
-        <el-button type="primary" @click="AddNewAdvice('adForm')">设定为本次透析临嘱</el-button>
+        <el-button type="primary" @click="AddNewAdvice('adForm')">设为本次临嘱</el-button>
       </div>
     </el-dialog>
 

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -777,15 +777,14 @@
       :modal-append-to-body="false"
       :append-to-body="true"
     >
-      <div style="font-size:0.6rem;padding-left:0.38rem;margin-top:0.2rem;">
-        <span style="font-weight: bold;color: #409eff;">开始时间:</span>
+      <div style='display:flex;align-items:center;'>
+        <span style="font-weight: bold;color: #409eff;width:80px;">开始时间:</span>
         <el-date-picker
           type="datetime"
           format="yyyy-MM-dd HH:mm"
           value-format="yyyy-MM-dd HH:mm"
           placeholder="选择时间"
           v-model="start_time"
-          style="width:100%;"
         ></el-date-picker>
 
         <!--<span style="display: inline-block;border: 1px solid #ccc;padding: 10px 20px;border-radius: 5px;" @click="changeStartTime">{{ advice_start_time }}</span>-->

src/xt_pages/dialysis/details/dialog/doubleCheckDialog.vue

@@ -44,7 +44,7 @@
     </el-form>
 
     <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="120px">
-      <el-form-item label="第一次核对时间:">
+      <el-form-item label="第一核对时间:">
         <el-time-picker
           v-model="first_check_time"
           format='HH:mm'
@@ -53,7 +53,7 @@
         </el-time-picker>
       </el-form-item>
 
-      <el-form-item label="第一次核对人">
+      <el-form-item label="第一核对人员">
         <el-select v-model="doubleReview.creater" placeholder="请选择核对人">
           <el-option v-for="(admin, index) in admin_users" :key="index" :value="admin.id"
                      :label="admin.name"></el-option>
@@ -61,7 +61,7 @@
       </el-form-item>
 
 
-      <el-form-item label="第二次核对时间:">
+      <el-form-item label="第二核对时间:">
         <el-time-picker
           v-model="check_time"
           format='HH:mm'
@@ -70,7 +70,7 @@
         </el-time-picker>
       </el-form-item>
 
-      <el-form-item label="第二次核对人">
+      <el-form-item label="第二核对人员">
         <el-select v-model="doubleReview.modifier" placeholder="请选择核对人">
           <el-option v-for="(admin, index) in admin_users" :key="index" :value="admin.id"
                      :label="admin.name"></el-option>
@@ -268,7 +268,7 @@
             for (let index = 0; index < leng; index++) {
               if (this.admin_users[index].id == this.doubleReview.creater) {
                 let name = this.admin_users[index].name
-                desc = '首次核对人员:' + name + ' 首次核对时间:' + time
+                desc = '第一核对人员:' + name + ' 第一核对时间:' + time
 
                 break
               }
@@ -299,7 +299,7 @@
             for (let index = 0; index < leng; index++) {
               if (this.admin_users[index].id == this.doubleReview.modifier) {
                 let name = this.admin_users[index].name
-                desc = '首次核对人员:' + name + ' 首次核对时间:' + time
+                desc = '第一核对人员:' + name + ' 第一核对时间:' + time
 
                 break
               }
@@ -331,7 +331,7 @@
           for (let index = 0; index < leng; index++) {
             if (this.admin_users[index].id == this.doubleReview.creater) {
               let name = this.admin_users[index].name
-              desc = '首次核对人员:' + name + ' 首次核对时间:' + time
+              desc = '第一核对人员:' + name + ' 第一核对时间:' + time
 
               break
             }
@@ -366,7 +366,7 @@
             for (let index = 0; index < leng; index++) {
               if (this.admin_users[index].id == this.doubleReview.modifier) {
                 let name = this.admin_users[index].name
-                desc = '第二次核对人员:' + name + ' 第二次核对时间:' + time
+                desc = '第二核对人员:' + name + ' 第二核对时间:' + time
                 break
               }
             }
@@ -393,7 +393,7 @@
             for (let index = 0; index < leng; index++) {
               if (this.admin_users[index].id == this.doubleReview.creater) {
                 let name = this.admin_users[index].name
-                desc = '第二次核对人员:' + name + ' 第二次核对时间:' + time
+                desc = '第二核对人员:' + name + ' 第二核对时间:' + time
                 break
               }
             }
@@ -421,7 +421,7 @@
           for (let index = 0; index < leng; index++) {
             if (this.admin_users[index].id == this.doubleReview.modifier) {
               let name = this.admin_users[index].name
-              desc = '第二次核对人员:' + name + ' 第二次核对时间:' + time
+              desc = '第二核对人员:' + name + ' 第二核对时间:' + time
               break
             }
           }

src/xt_pages/medicalScheduling/schedulingStatistics.vue

@@ -89,7 +89,7 @@
                 <line-chart :options="chart"></line-chart>
             </div>
             <div class="tableTitle">统计表</div>
-            <el-table class='statisticsTable' :data="tableData" height="250" border ref="tab">
+            <el-table class='statisticsTable' :data="tableData" height="250" border ref="tab" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" :row-style="{ color: '#303133' }">
                 <el-table-column fixed align="center" prop="date" label="医护姓名" width="100">
                     <template slot-scope="scope">
                         <span>{{scope.row.user_name}}</span>
@@ -656,84 +656,89 @@ export default {
 
             //      this.getArrLength(this.chart.xAxis.data)
                 let tempArr = [], newArr = []
-                    for (let i = 0; i < scheudleTotal.length; i++) {
-                        if (tempArr.indexOf(scheudleTotal[i].user_name) === -1) {
-                            newArr.push({
-                                user_name: scheudleTotal[i].user_name,
-                                doctor_id:scheudleTotal[i].doctor_id,
-                                list: [{class_name:scheudleTotal[i].class_name,doctor_id:scheudleTotal[i].doctor_id,Count:scheudleTotal[i].Count}]
-                            })
-                            tempArr.push(scheudleTotal[i].user_name);
-                        } else {
-                            for (let j = 0; j < newArr.length; j++) {
-                                if (newArr[j].user_name == scheudleTotal[i].user_name) {
-                                    newArr[j].list.push({class_name:scheudleTotal[i].class_name,doctor_id:scheudleTotal[i].doctor_id,Count:scheudleTotal[i].Count})
-                                }
+                for (let i = 0; i < scheudleTotal.length; i++) {
+                    if (tempArr.indexOf(scheudleTotal[i].user_name) === -1) {
+                        newArr.push({
+                            user_name: scheudleTotal[i].user_name,
+                            doctor_id:scheudleTotal[i].doctor_id,
+                            list: [{class_name:scheudleTotal[i].class_name,doctor_id:scheudleTotal[i].doctor_id,Count:scheudleTotal[i].Count}]
+                        })
+                        tempArr.push(scheudleTotal[i].user_name);
+                    } else {
+                        for (let j = 0; j < newArr.length; j++) {
+                            if (newArr[j].user_name == scheudleTotal[i].user_name) {
+                                newArr[j].list.push({class_name:scheudleTotal[i].class_name,doctor_id:scheudleTotal[i].doctor_id,Count:scheudleTotal[i].Count})
                             }
                         }
                     }
+                }
 
-                    newArr.map(item => {
-                        list.map(it => {
-                            if(item.doctor_id == it.doctor_id){
-                                item.totalminute = it.totalminute
-                            }
-                        })
+                newArr.map(item => {
+                    list.map(it => {
+                        if(item.doctor_id == it.doctor_id){
+                            item.totalminute = it.totalminute
+                        }
                     })
-                    newArr.map(item => {
-                        workday.map(it => {
-                            if(item.doctor_id == it.doctor_id){
-                                item.attendance = it.Count
-                            }
-                        })
+                })
+                newArr.map(item => {
+                    workday.map(it => {
+                        if(item.doctor_id == it.doctor_id){
+                            item.attendance = it.Count
+                        }
                     })
-                    newArr.map(item => {
-                        noWorkDay.map(it => {
-                            if(item.doctor_id == it.doctor_id){
-                                item.absence = it.Count
-                            }
-                        })
+                })
+                newArr.map(item => {
+                    noWorkDay.map(it => {
+                        if(item.doctor_id == it.doctor_id){
+                            item.absence = it.Count
+                        }
                     })
-
-                    let arr = [...newArr]
-                    if(val == 0){
-                        arr.sort(this.compare('doctor_id'))
-                        this.doctorlist.sort(this.compare('admin_user_id'))
-                        this.doctorlist.forEach((item, index) => {
-                          if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
-
-                          }else{
-                            arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
-                          }
-                        })
-
-                        this.tableData = arr
-                    }else if(val == 2){
-                        arr.sort(this.compare('doctor_id'))
-                        this.doctorArr.sort(this.compare('admin_user_id'))
-                        this.doctorArr.forEach((item, index) => {
-                          if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
-
-                          }else{
-                            arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
-                          }
-                        })
-                       this.tableData = arr
-                    }else if(val == 3){
-                        arr.sort(this.compare('doctor_id'))
-                        this.nurseArr.sort(this.compare('admin_user_id'))
-                        this.nurseArr.forEach((item, index) => {
-                          if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
-
-                          }else{
-                            arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
-                          }
-                        })
-                        this.tableData = arr
-                        this.$nextTick(() => {
-                          this.$refs.tab.doLayout()
-                        })
-                    }
+                })
+                
+                let arr = [...newArr]
+                if(val == 0){
+                    arr.sort(this.compare('doctor_id'))
+                    this.doctorlist.sort(this.compare('admin_user_id'))
+                    this.doctorlist.forEach((item, index) => {
+                      if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
+                    
+                      }else{
+                        arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
+                      }
+                    })
+                    this.tableData = arr
+                    this.$nextTick(() => {
+                        this.$refs.tab.doLayout()
+                    }) 
+                }else if(val == 2){
+                    arr.sort(this.compare('doctor_id'))
+                    this.doctorArr.sort(this.compare('admin_user_id'))
+                    this.doctorArr.forEach((item, index) => {
+                      if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
+                    
+                      }else{
+                        arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
+                      }
+                    })
+                    this.tableData = arr
+                    this.$nextTick(() => {
+                        this.$refs.tab.doLayout()
+                    }) 
+                }else if(val == 3){
+                    arr.sort(this.compare('doctor_id'))
+                    this.nurseArr.sort(this.compare('admin_user_id'))
+                    this.nurseArr.forEach((item, index) => {
+                      if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
+                    
+                      }else{
+                        arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
+                      }
+                    })
+                    this.tableData = arr
+                    this.$nextTick(() => {
+                        this.$refs.tab.doLayout()
+                    }) 
+                }   
               }
             })
         },