Browse Source

3月29日杨青

杨青 2 years ago
parent
commit
5f6bf609e5

+ 31 - 0
src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue View File

@@ -710,6 +710,34 @@
710 710
           </el-input>
711 711
         </el-form-item>
712 712
       </el-form>
713
+      <!-- 六次干体重调整记录 -->
714
+      <!-- <div  style="margin: 10px 50px;"><span style="font-weight: bold;">近六次干体重调整记录</span></div>
715
+      <div class="gantizhong">
716
+        <el-table
717
+          :data="tableData"
718
+          stripe
719
+          style="width: 100%">
720
+          <el-table-column
721
+            prop=""
722
+            label="时间"
723
+            width="180">
724
+          </el-table-column>
725
+          <el-table-column
726
+            prop=""
727
+            label="干体重"
728
+            width="180">
729
+          </el-table-column>
730
+          <el-table-column
731
+            prop=""
732
+            label="医生"
733
+            width="180">
734
+          </el-table-column>
735
+          <el-table-column
736
+            prop=""
737
+            label="备注">
738
+          </el-table-column>
739
+        </el-table>
740
+      </div> -->
713 741
       <div slot="footer" class="dialog-footer">
714 742
         <el-button @click="cancleDryWeight()">取 消</el-button>
715 743
         <el-button type="primary" @click="submitDryWeight()">保 存</el-button>
@@ -1667,6 +1695,9 @@
1667 1695
     margin-bottom: 10px;
1668 1696
     color:#fff;
1669 1697
   }
1698
+  .gantizhong{
1699
+    text-align: center;
1700
+  }
1670 1701
 </style>
1671 1702
 <style lang="scss">
1672 1703
   .newDialog{

+ 3 - 1
src/xt_pages/workforce/appointment.vue View File

@@ -720,6 +720,7 @@ export default {
720 720
     changeZone(val){
721 721
     },
722 722
     setScheduleTemplateAction: function () {
723
+      this.schedulingTableVisible=true
723 724
       this.$router.push({path: '/workforce/template'})
724 725
     },
725 726
     export_file: function () {
@@ -2021,7 +2022,8 @@ export default {
2021 2022
           break
2022 2023
       }
2023 2024
 
2024
-    }, getDateByResultsStr(key) {
2025
+    }, 
2026
+    getDateByResultsStr(key) {
2025 2027
 
2026 2028
       switch (key) {
2027 2029
         case '周一' + "(" + this.days[0] + ")" : //本周一

+ 24 - 9
src/xt_pages/workforce/components/template_table.vue View File

@@ -1,6 +1,7 @@
1 1
 <template>
2
-  <div>
3
-    <div id="table_data">
2
+  <div  >
3
+    <div id="tem_table_data" v-show="schedulingTableVisible">
4
+      <slot></slot>
4 5
       <div class="table_contain">
5 6
         <div class="left_contain">
6 7
           <div
@@ -1269,6 +1270,7 @@ export default {
1269 1270
   },
1270 1271
   data() {
1271 1272
     return {
1273
+      schedulingTableVisible:true,//全屏
1272 1274
       changeLoadingOne:false,
1273 1275
       changeLoadingTwo:false,
1274 1276
       tipDialogVisibleTwo:false,
@@ -3131,7 +3133,8 @@ export default {
3131 3133
       }
3132 3134
 
3133 3135
       this.$message.error("设备不存在");
3134
-    },  will_add_schedule_action_four: function(patient_id, treat_mode, weekday, time_type, device_number_id) {
3136
+    }, 
3137
+     will_add_schedule_action_four: function(patient_id, treat_mode, weekday, time_type, device_number_id) {
3135 3138
       var patient = null
3136 3139
       for (let index = 0; index < this.patients.length; index++) {
3137 3140
         const p = this.patients[index]
@@ -4550,6 +4553,7 @@ export default {
4550 4553
 <style lang="scss">
4551 4554
 .table_contain {
4552 4555
   display: flex;
4556
+  margin-top: 30px;
4553 4557
 .left_contain {
4554 4558
   width: 14%;
4555 4559
   margin-right: 50px;
@@ -4620,15 +4624,26 @@ export default {
4620 4624
   white-space: normal !important;
4621 4625
 }
4622 4626
 
4623
-#table_data {
4627
+#tem_table_data {
4624 4628
   /*min-height: calc(100vh - 350px);*/
4629
+  position: fixed;
4630
+  top: 0;
4631
+  right: 0;
4632
+  bottom: 0;
4633
+  left: 0;
4634
+  overflow: auto;
4635
+  margin: 0;
4636
+  background: #fff;
4637
+  padding: 20px;
4638
+  z-index:2000;
4639
+  height: 100%;
4625 4640
 }
4626 4641
 
4627
-#table_data ::-webkit-scrollbar {
4642
+#tem_table_data ::-webkit-scrollbar {
4628 4643
   height: 15px;
4629 4644
 }
4630 4645
 
4631
-#table_data {
4646
+#tem_table_data {
4632 4647
 .el-table__body tr.current-row > td {
4633 4648
   background-color: #ecf5ff !important;
4634 4649
   color: #3a8ee6;
@@ -4652,7 +4667,7 @@ export default {
4652 4667
 //   min-height: calc(100vh - 350px);
4653 4668
 // }
4654 4669
 
4655
-#table_data ::-webkit-scrollbar {
4670
+#tem_table_data ::-webkit-scrollbar {
4656 4671
   height: 15px;
4657 4672
 }
4658 4673
 
@@ -4670,11 +4685,11 @@ export default {
4670 4685
 // }
4671 4686
 // }
4672 4687
 
4673
-#table_data {
4688
+#tem_table_data {
4674 4689
   min-height: calc(100vh - 350px);
4675 4690
 }
4676 4691
 
4677
-#table_data ::-webkit-scrollbar {
4692
+#tem_table_data ::-webkit-scrollbar {
4678 4693
   height: 15px;
4679 4694
 }
4680 4695
 

+ 90 - 20
src/xt_pages/workforce/template.vue View File

@@ -112,47 +112,48 @@
112 112
       <!-- </el-col> -->
113 113
     </div>
114 114
     <div class="app-container">
115
-      <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick">
115
+      
116
+      <!-- <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick"> -->
116 117
 <!--        <el-tab-pane name="schedules">-->
117 118
 <!--          <span slot="label"> 排班信息 </span>-->
118 119
 <!--          <template-table :editable="false" :device_numbers="device_numbers" :template="this_week_schedules" :is_editing="false"-->
119 120
 <!--                          :patients="patients" :data="data"></template-table>-->
120 121
 <!--        </el-tab-pane>-->
121
-        <el-tab-pane name="first" :disabled="template_mode.mode == 0" >
122
+        <!-- <el-tab-pane name="first" :disabled="template_mode.mode == 0" > -->
122 123
 <!--          <span slot="label">-->
123 124
 <!--          </span>-->
124
-          <span slot="label"> {{first_template.week?'一周模版':'一周模版'}}
125
+          <!-- <span slot="label"> {{first_template.week?'一周模版':'一周模版'}} -->
125 126
 <!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>-->
126 127
 <!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>-->
127 128
 
128
-             <span v-if="schedule.mode ==1">(本周)</span>
129
+             <!-- <span v-if="schedule.mode ==1">(本周)</span>
129 130
              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
130 131
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
131 132
           </span>
132 133
 
133 134
         </el-tab-pane>
134 135
 
135
-        <el-tab-pane  name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
136
+        <el-tab-pane  name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4"> -->
136 137
 <!--          <template-table   ref="table_two"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
137 138
 <!--                           :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
138
-          <span slot="label"> {{second_template.week?'二周模版':'二周模版'}}
139
+          <!-- <span slot="label"> {{second_template.week?'二周模版':'二周模版'}} -->
139 140
 <!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>-->
140 141
 <!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>-->
141 142
 <!--            -->
142
-              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
143
+              <!-- <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
143 144
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
144 145
           </span>
145
-        </el-tab-pane>
146
+        </el-tab-pane> -->
146 147
 
147 148
 
148 149
 
149
-        <el-tab-pane :label="  third_template.week? '三周模版':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
150
+        <!-- <el-tab-pane :label="  third_template.week? '三周模版':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4"> -->
150 151
 
151 152
 <!--          <template-table  ref="table_three"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
152 153
 <!--                           :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
153
-        </el-tab-pane>
154
+        <!-- </el-tab-pane> -->
154 155
 
155
-      <el-tab-pane :label="four_template.week?'四周模版':'四周模版'" name="four" :disabled="template_mode.mode  != 4 ">
156
+      <!-- <el-tab-pane :label="four_template.week?'四周模版':'四周模版'" name="four" :disabled="template_mode.mode  != 4 "> -->
156 157
 <!--          <span slot="label"> 四周模版 {{ four_template.week?four_template.week+'周':""}}-->
157 158
 <!--             <span v-if="schedule.execute_times%2==0">(下一周)</span>-->
158 159
 <!--             <span v-if="schedule.execute_times%2!=0">(本周)</span>-->
@@ -164,7 +165,7 @@
164 165
 <!--        <template-table   ref="table_four"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
165 166
 <!--                         :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
166 167
 
167
-        </el-tab-pane>
168
+        <!-- </el-tab-pane> -->
168 169
 
169 170
 
170 171
 <!--        <template-table-two   v-show="activeName =='second'"  ref="table_two"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="second_template"-->
@@ -175,9 +176,70 @@
175 176
 <!--                               :modes="modes"    :patients="patients" :data="data" @cancel_sch="refresh"  :template_mode="template_mode" @saveSuccess="refresh" @cur_info="cur_info" @saveData="saveData"   @saveSuccessTwo="refresh"></template-table-four>-->
176 177
 
177 178
 
178
-      </el-tabs>
179
+      <!-- </el-tabs> -->
179 180
       <template-table  v-loading="dataloading"  ref="table"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="template"
180
-                        :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh" @setTemplate="setTemplate" @changeLoading="changeLoading"></template-table>
181
+                        :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode" 
182
+                         @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh" 
183
+                         @setTemplate="setTemplate" @changeLoading="changeLoading">
184
+            <div class="position">
185
+              <div>
186
+                <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick">
187
+
188
+        <el-tab-pane name="first" :disabled="template_mode.mode == 0" >
189
+
190
+          <span slot="label"> {{first_template.week?'一周模版':'一周模版'}}
191
+
192
+             <span v-if="schedule.mode ==1">(本周)</span>
193
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
194
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
195
+          </span>
196
+
197
+        </el-tab-pane>
198
+
199
+        <el-tab-pane  name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
200
+
201
+          <span slot="label"> {{second_template.week?'二周模版':'二周模版'}}
202
+
203
+              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
204
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
205
+          </span>
206
+        </el-tab-pane>
207
+
208
+        <el-tab-pane :label="  third_template.week? '三周模版':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
209
+
210
+        </el-tab-pane>
211
+
212
+      <el-tab-pane :label="four_template.week?'四周模版':'四周模版'" name="four" :disabled="template_mode.mode  != 4 ">
213
+        </el-tab-pane>
214
+      </el-tabs>
215
+              </div>
216
+              <div style="display:flex;align-items:center">
217
+
218
+                <!--<upload-excel style="float:right;" :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>-->
219
+                <schedule-template-upload-excel style="margin-right:10px;"
220
+                                                :on-success='handleSuccess'></schedule-template-upload-excel>
221
+
222
+                <!-- <el-col :span="3" style="text-align: right;"> -->
223
+                <el-button v-loading="downloadLoading" v-if="template_mode"
224
+                          size="small" icon="el-icon-setting" type="primary" @click="import_file()">下载模版
225
+                </el-button>
226
+                <el-button size="small" icon="el-icon-setting" type="primary" @click="setData" v-if="template_mode.mode>0">同步数据</el-button>
227
+                <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置</el-button>
228
+
229
+                <el-button size="small" icon="el-icon-setting" type="primary" @click="editClick">智能排班</el-button>
230
+                <el-button size="small" icon="el-icon-setting" type="primary" @click="saveClick">保存并退出</el-button>
231
+
232
+                <el-button
233
+                    @click="generateLog()"
234
+                    class="filter-item"
235
+                    type="primary"
236
+                    size="small"
237
+                    v-loading="generateLoading"
238
+                >下载日志
239
+                </el-button>
240
+              </div>
241
+            </div>
242
+      </template-table>
181 243
 
182 244
 
183 245
 <!--      <template-table  ref="table" :editable="true" :device_numbers="device_numbers" :template="tar_template" :is_editing="is_editing"-->
@@ -271,6 +333,7 @@ export default {
271 333
   },
272 334
   data: function () {
273 335
     return {
336
+      schedulingTableVisible:false,
274 337
       dataloading:true,
275 338
       is_editing:true,
276 339
       editable:false,
@@ -1510,7 +1573,8 @@ export default {
1510 1573
 
1511 1574
       }
1512 1575
 
1513
-    },getInitData(){
1576
+    },
1577
+    getInitData(){
1514 1578
       let params = {
1515 1579
         patitionid:""
1516 1580
       }
@@ -3121,7 +3185,8 @@ export default {
3121 3185
 
3122 3186
       }
3123 3187
 
3124
-    },changeZone(val){
3188
+    },
3189
+    changeZone(val){
3125 3190
       this.getWeekPanels(val)
3126 3191
       let params = {
3127 3192
         patitionid:val
@@ -3197,7 +3262,8 @@ export default {
3197 3262
       })
3198 3263
 
3199 3264
 
3200
-    },saveData(val,del_data){
3265
+    },
3266
+    saveData(val,del_data){
3201 3267
       var tempDataOne = []
3202 3268
       for(let i = 0; i < val.length; i++){
3203 3269
           tempDataOne.push(val[i])
@@ -3377,7 +3443,8 @@ export default {
3377 3443
           })
3378 3444
         }
3379 3445
       })
3380
-    },editClick:function (){
3446
+    },
3447
+    editClick:function (){
3381 3448
       this.$nextTick(function() {
3382 3449
         if(this.activeName == "first"){
3383 3450
           this.activeName = "first"
@@ -3394,15 +3461,18 @@ export default {
3394 3461
         }
3395 3462
       })
3396 3463
 
3397
-    },saveClick:function (){
3464
+    },
3465
+    // 退出排班模板
3466
+    saveClick:function (){
3398 3467
       if(this.template_mode.mode == 0){
3399 3468
         // this.$router.go(-1)
3400 3469
         this.$router.back()
3401 3470
 
3402 3471
       }else{
3472
+        this.schedulingTableVisible=false
3403 3473
         this.$message.success("保存成功")
3404 3474
         this.$router.back()
3405
-
3475
+        
3406 3476
       }
3407 3477
 
3408 3478
     },