See999 4 lat temu
rodzic
commit
2484c1d6d5

+ 7 - 5
src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue Wyświetl plik

@@ -381,11 +381,14 @@
381 381
         label-width="90px"
382 382
       >
383 383
         <el-row>
384
-          <el-col :span="12">
384
+          <el-col :span="24">
385 385
             <el-form-item label="医嘱内容 :" required prop="advice_name">
386 386
               <el-input v-model="nameForm.advice_name"></el-input>
387 387
             </el-form-item>
388 388
           </el-col>
389
+          
390
+        </el-row>
391
+        <el-row>
389 392
           <el-col :span="12">
390 393
             <!--<el-form-item label="规格 :" prop="advice_desc">-->
391 394
             <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
@@ -413,8 +416,6 @@
413 416
               </el-col>
414 417
             </el-form-item>
415 418
           </el-col>
416
-        </el-row>
417
-        <el-row>
418 419
           <el-col :span="12">
419 420
             <el-form-item label="开药数量 :" prop="prescribing_number">
420 421
               <el-col :span="8">
@@ -464,8 +465,6 @@
464 465
               </el-col>
465 466
             </el-form-item>
466 467
           </el-col>
467
-        </el-row>
468
-        <el-row>
469 468
           <el-col :span="12">
470 469
             <el-form-item label="给药途径 :" prop="delivery_way">
471 470
               <el-select
@@ -486,6 +485,9 @@
486 485
               </el-select>
487 486
             </el-form-item>
488 487
           </el-col>
488
+        </el-row>
489
+        <el-row>
490
+          
489 491
           <el-col :span="12">
490 492
             <el-form-item label="执行频率 :" prop="execution_frequency">
491 493
               <el-select

+ 65 - 23
src/xt_pages/medicalScheduling/index.vue Wyświetl plik

@@ -43,15 +43,18 @@
43 43
                     <el-table :data="tableData" border :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" :row-style="{ color: '#303133' }"  @cell-click="clickThis" :cell-style="tableCellStyle">
44 44
                         <el-table-column prop="name" label="医护姓名" style="width:16%" align="center">
45 45
                             <template slot-scope="scope">
46
-                                 {{scope.row.user_name}}
46
+                                <span>{{scope.row.user_name}}</span>
47 47
                             </template>
48 48
                         </el-table-column>
49 49
                         <el-table-column :label="'周一\n(' + weekDayArr[0] + ')'" style="width:200px" align="center">
50 50
                             <template slot-scope="scope">
51 51
                                 <div @click="hangdleClick(scope.row,scope.$index,0)">
52 52
                                     <el-dropdown trigger="click" @command="changeSchedule">
53
-                                        <span class="el-dropdown-link">
54
-                                        {{ getClass(scope.row.user_name,1) }}<i v-if="getTimestamp(weekDayArr[0])>=timeNow && scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
53
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,1) == 2' style="color:red">
54
+                                            <span>{{ getClass(scope.row.user_name,1) }}</span><i v-if="getTimestamp(weekDayArr[0])>=timeNow && scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
55
+                                        </span>
56
+                                        <span class="el-dropdown-link" v-else>
57
+                                            <span>{{ getClass(scope.row.user_name,1) }}</span><i v-if="getTimestamp(weekDayArr[0])>=timeNow && scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
55 58
                                         </span>
56 59
                                         <el-dropdown-menu slot="dropdown" >
57 60
                                             <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>
@@ -64,8 +67,11 @@
64 67
                              <template slot-scope="scope">
65 68
                                 <div @click="hangdleClick(scope.row,scope.$index,1)">
66 69
                                     <el-dropdown trigger="click" @command="changeSchedule">
67
-                                        <span class="el-dropdown-link">
68
-                                        {{ getClass(scope.row.user_name,2) }}<i v-if="getTimestamp(weekDayArr[1])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
70
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,2) == 2' style="color:red">
71
+                                            <span>{{ getClass(scope.row.user_name,2) }}</span><i v-if="getTimestamp(weekDayArr[1])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
72
+                                        </span>
73
+                                        <span class="el-dropdown-link" v-else>
74
+                                            <span>{{ getClass(scope.row.user_name,2) }}</span><i v-if="getTimestamp(weekDayArr[1])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
69 75
                                         </span>
70 76
                                         <el-dropdown-menu slot="dropdown" >
71 77
                                             <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>
@@ -78,8 +84,11 @@
78 84
                              <template slot-scope="scope">
79 85
                                 <div @click="hangdleClick(scope.row,scope.$index,2)">
80 86
                                     <el-dropdown trigger="click" @command="changeSchedule">
81
-                                        <span class="el-dropdown-link">
82
-                                        {{ getClass(scope.row.user_name,3) }}<i v-if="getTimestamp(weekDayArr[2])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
87
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,3) == 2' style="color:red">
88
+                                            <span>{{ getClass(scope.row.user_name,3) }}</span><i v-if="getTimestamp(weekDayArr[2])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
89
+                                        </span>
90
+                                        <span class="el-dropdown-link" v-else>
91
+                                            <span>{{ getClass(scope.row.user_name,3) }}</span><i v-if="getTimestamp(weekDayArr[2])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
83 92
                                         </span>
84 93
                                         <el-dropdown-menu slot="dropdown" >
85 94
                                             <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>
@@ -92,8 +101,11 @@
92 101
                              <template slot-scope="scope">
93 102
                                 <div @click="hangdleClick(scope.row,scope.$index,3)">
94 103
                                     <el-dropdown trigger="click" @command="changeSchedule">
95
-                                        <span class="el-dropdown-link">
96
-                                        {{ getClass(scope.row.user_name,4) }}<i v-if="getTimestamp(weekDayArr[3])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
104
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,4) == 2' style="color:red">
105
+                                            <span>{{ getClass(scope.row.user_name,4) }}</span><i v-if="getTimestamp(weekDayArr[3])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
106
+                                        </span>
107
+                                        <span class="el-dropdown-link" v-else>
108
+                                            <span>{{ getClass(scope.row.user_name,4) }}</span><i v-if="getTimestamp(weekDayArr[3])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
97 109
                                         </span>
98 110
                                         <el-dropdown-menu slot="dropdown" >
99 111
                                             <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>
@@ -106,8 +118,11 @@
106 118
                              <template slot-scope="scope">
107 119
                                 <div @click="hangdleClick(scope.row,scope.$index,4)">
108 120
                                     <el-dropdown trigger="click" @command="changeSchedule">
109
-                                        <span class="el-dropdown-link">
110
-                                        {{ getClass(scope.row.user_name,5) }}<i v-if="getTimestamp(weekDayArr[4])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
121
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,5) == 2' style="color:red">
122
+                                            <span>{{ getClass(scope.row.user_name,5) }}</span><i v-if="getTimestamp(weekDayArr[4])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
123
+                                        </span>
124
+                                        <span class="el-dropdown-link" v-else>
125
+                                            <span>{{ getClass(scope.row.user_name,5) }}</span><i v-if="getTimestamp(weekDayArr[4])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
111 126
                                         </span>
112 127
                                         <el-dropdown-menu slot="dropdown" >
113 128
                                             <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>
@@ -120,8 +135,11 @@
120 135
                              <template slot-scope="scope">
121 136
                                 <div @click="hangdleClick(scope.row,scope.$index,5)">
122 137
                                     <el-dropdown trigger="click" @command="changeSchedule">
123
-                                        <span class="el-dropdown-link">
124
-                                        {{ getClass(scope.row.user_name,6) }}<i v-if="getTimestamp(weekDayArr[5])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
138
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,6) == 2' style="color:red">
139
+                                            <span>{{ getClass(scope.row.user_name,6) }}</span><i v-if="getTimestamp(weekDayArr[5])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
140
+                                        </span>
141
+                                        <span class="el-dropdown-link" v-else>
142
+                                            <span>{{ getClass(scope.row.user_name,6) }}</span><i v-if="getTimestamp(weekDayArr[5])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
125 143
                                         </span>
126 144
                                         <el-dropdown-menu slot="dropdown" >
127 145
                                             <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>
@@ -134,8 +152,11 @@
134 152
                              <template slot-scope="scope">
135 153
                                 <div @click="hangdleClick(scope.row,scope.$index,6)">
136 154
                                     <el-dropdown trigger="click" @command="changeSchedule">
137
-                                        <span class="el-dropdown-link">
138
-                                        {{ getClass(scope.row.user_name,0) }}<i v-if="getTimestamp(weekDayArr[6])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
155
+                                        <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,0) == 2' style="color:red">
156
+                                            <span>{{ getClass(scope.row.user_name,0) }}</span><i v-if="getTimestamp(weekDayArr[6])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
157
+                                        </span>
158
+                                        <span class="el-dropdown-link" v-else>
159
+                                            <span>{{ getClass(scope.row.user_name,0) }}</span><i v-if="getTimestamp(weekDayArr[6])>=timeNow&&scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
139 160
                                         </span>
140 161
                                         <el-dropdown-menu slot="dropdown" >
141 162
                                             <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>
@@ -661,13 +682,14 @@ export default {
661 682
                                 user_name: staffList[i].user_name,
662 683
                                 admin_user_id:staffList[i].admin_user_id,
663 684
                                 user_type:staffList[i].doctor_type,
664
-                                list: [{class_name:staffList[i].class_name,schedule_week:staffList[i].schedule_week}]
685
+                                user_type:staffList[i].doctor_type,
686
+                                list: [{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,class_attributes:staffList[i].class_attributes}]
665 687
                             })
666 688
                             tempArr.push(staffList[i].user_name);
667 689
                         } else {
668 690
                             for (let j = 0; j < newArr.length; j++) {
669 691
                                 if (newArr[j].user_name == staffList[i].user_name) {
670
-                                    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})
692
+                                    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,class_attributes:staffList[i].class_attributes})
671 693
                                 }
672 694
                             }
673 695
                         }
@@ -693,11 +715,12 @@ export default {
693 715
                     arr2.push({class_name:sixStr,schedule_week:6})
694 716
                     arr2.push({class_name:zeroStr,schedule_week:0})
695 717
                     var obj = {}
696
-                     obj.admin_user_id = "1000000"
697
-                     obj.user_name = "合计"
698
-                     obj.user_type = 10
699
-                     obj.list = arr2
700
-                     arr.push(obj)
718
+                    obj.admin_user_id = "1000000"
719
+                    obj.user_name = "合计"
720
+                    obj.user_type = 10
721
+                    obj.list = arr2
722
+                    arr.push(obj)
723
+                    console.log('arr',arr)
701 724
                     this.tableData = arr
702 725
         
703 726
                 
@@ -724,6 +747,25 @@ export default {
724 747
             }
725 748
         
726 749
         },
750
+        getClassAttributes(name,index){
751
+            if(name != undefined){
752
+                let newClass = '';
753
+                this.tableData.map(item => {
754
+                if(item.user_name == name){
755
+                    if(item.list){
756
+                        item.list.map(it => {
757
+                            if(it.schedule_week == index){
758
+                                newClass = it.class_attributes
759
+                            }
760
+                        })
761
+                    }
762
+                    
763
+                }
764
+                })
765
+                return newClass
766
+            }
767
+        
768
+        },
727 769
 
728 770
      unique(arr) { 
729 771
         const res = new Map();
@@ -1326,7 +1368,7 @@ export default {
1326 1368
 </style>
1327 1369
 <style lang="scss">
1328 1370
 .schedulingTable{
1329
-    .el-table th .cell {
1371
+    .el-table .cell {
1330 1372
         white-space: pre-line;/*保留换行符*/
1331 1373
     }
1332 1374
 }