柳香萍 6 年之前
父節點
當前提交
f602f6def9
共有 29 個文件被更改,包括 101 次插入98 次删除
  1. 4 1
      src/styles/index.scss
  2. 6 0
      src/views/layout/components/Navbar.vue
  3. 1 1
      src/xt_pages/stock/cancelStockOrder.vue
  4. 1 1
      src/xt_pages/stock/detail/cancelStockDetail.vue
  5. 1 1
      src/xt_pages/stock/detail/salesReturnDetail.vue
  6. 1 1
      src/xt_pages/stock/detail/stockInDetail.vue
  7. 1 1
      src/xt_pages/stock/detail/stockOutDetail.vue
  8. 1 1
      src/xt_pages/stock/otherCancelStockOrder.vue
  9. 1 1
      src/xt_pages/stock/otherSalesReturnOrder.vue
  10. 1 1
      src/xt_pages/stock/otherStockInOrder.vue
  11. 1 1
      src/xt_pages/stock/otherStockOutOrder.vue
  12. 1 1
      src/xt_pages/stock/salesReturnOrder.vue
  13. 1 1
      src/xt_pages/stock/stockDetail.vue
  14. 1 1
      src/xt_pages/stock/stockInOrder.vue
  15. 1 1
      src/xt_pages/stock/stockOutOrder.vue
  16. 11 11
      src/xt_pages/user/components/PatientDetail.vue
  17. 16 16
      src/xt_pages/user/components/PatientForm.vue
  18. 1 2
      src/xt_pages/user/components/PatientSidebar.1.vue
  19. 1 2
      src/xt_pages/user/components/PatientSidebar.vue
  20. 18 19
      src/xt_pages/user/dialysisRecord.vue
  21. 1 1
      src/xt_pages/user/doctorAdvice.vue
  22. 6 0
      src/xt_pages/user/editPatient.vue
  23. 1 1
      src/xt_pages/user/patient.vue
  24. 1 1
      src/xt_pages/user/patients.vue
  25. 1 1
      src/xt_pages/user/proeducation.vue
  26. 1 0
      src/xt_pages/user/rescueRecord.vue
  27. 1 1
      src/xt_pages/workforce/components/setup_template_dialog.vue
  28. 18 28
      src/xt_pages/workforce/components/tableData.vue
  29. 1 1
      src/xt_pages/workforce/components/template_table.vue

+ 4 - 1
src/styles/index.scss 查看文件

481
   border-bottom: 1px #E4E7ED solid;
481
   border-bottom: 1px #E4E7ED solid;
482
   margin: 0 18px;
482
   margin: 0 18px;
483
   flex: 1;
483
   flex: 1;
484
-  
485
 }
484
 }
486
 .el-button+.el-button{
485
 .el-button+.el-button{
487
   // margin-left: 0;
486
   // margin-left: 0;
495
 .Total{
494
 .Total{
496
  margin:0 0 10px 0;
495
  margin:0 0 10px 0;
497
  float: right;
496
  float: right;
497
+}
498
+.cellLine{
499
+  color: #C0C4CC;
500
+  padding: 0 3px;
498
 }
501
 }

+ 6 - 0
src/views/layout/components/Navbar.vue 查看文件

255
     left: 0;
255
     left: 0;
256
   }
256
   }
257
 }
257
 }
258
+.el-dropdown-menu{
259
+  z-index: 9999!important;
260
+}
261
+.v-modal{
262
+  z-index: 9999!important;  
263
+}
258
 </style>
264
 </style>

+ 1 - 1
src/xt_pages/stock/cancelStockOrder.vue 查看文件

21
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
24
-        <span class="">-</span>
24
+        <span class="cellLine"> - </span>
25
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
25
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

+ 1 - 1
src/xt_pages/stock/detail/cancelStockDetail.vue 查看文件

11
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
11
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
12
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
12
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
13
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
13
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
14
-        <span class="">-</span>
14
+        <span class="cellLine"> - </span>
15
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
15
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
16
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
16
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
17
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
17
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

+ 1 - 1
src/xt_pages/stock/detail/salesReturnDetail.vue 查看文件

11
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
11
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
12
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
12
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
13
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
13
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
14
-        <span class="">-</span>
14
+        <span class="cellLine"> - </span>
15
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
15
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
16
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
16
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
17
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
17
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

+ 1 - 1
src/xt_pages/stock/detail/stockInDetail.vue 查看文件

11
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
11
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
12
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
12
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
13
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
13
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
14
-        <span class="">-</span>
14
+        <span class="cellLine"> - </span>
15
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
15
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
16
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
16
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
17
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
17
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

+ 1 - 1
src/xt_pages/stock/detail/stockOutDetail.vue 查看文件

11
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
11
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
12
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
12
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
13
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
13
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
14
-        <span class="">-</span>
14
+        <span class="cellLine"> - </span>
15
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
15
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
16
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
16
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
17
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
17
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

+ 1 - 1
src/xt_pages/stock/otherCancelStockOrder.vue 查看文件

21
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
24
-        <span class="">-</span>
24
+        <span class="cellLine"> - </span>
25
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
25
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

+ 1 - 1
src/xt_pages/stock/otherSalesReturnOrder.vue 查看文件

21
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
24
-        <span class="">-</span>
24
+        <span class="cellLine"> - </span>
25
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
25
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

+ 1 - 1
src/xt_pages/stock/otherStockInOrder.vue 查看文件

20
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
20
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
21
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
22
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
23
-        <span class="">-</span>
23
+        <span class="cellLine"> - </span>
24
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
24
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
25
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
25
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
26
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
26
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

+ 1 - 1
src/xt_pages/stock/otherStockOutOrder.vue 查看文件

19
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
19
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
20
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
20
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
21
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
21
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
22
-        <span class="">-</span>
22
+        <span class="cellLine"> - </span>
23
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
23
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
24
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
24
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
25
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
25
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

+ 1 - 1
src/xt_pages/stock/salesReturnOrder.vue 查看文件

20
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
20
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
21
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
22
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
23
-        <span class="">-</span>
23
+        <span class="cellLine"> - </span>
24
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
24
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
25
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
25
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
26
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
26
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

+ 1 - 1
src/xt_pages/stock/stockDetail.vue 查看文件

21
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
23
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
24
-        <span class="">-</span>
24
+        <span class="cellLine"> - </span>
25
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
25
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
26
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
27
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

+ 1 - 1
src/xt_pages/stock/stockInOrder.vue 查看文件

18
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
18
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
19
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
19
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
20
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
20
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
21
-        <span class="">-</span>
21
+        <span class="cellLine"> - </span>
22
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
22
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
23
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
23
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
24
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
24
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

+ 1 - 1
src/xt_pages/stock/stockOutOrder.vue 查看文件

16
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
16
         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
17
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
17
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
18
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
18
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
19
-        <span class="">-</span>
19
+        <span class="cellLine"> - </span>
20
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
20
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
21
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
21
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
22
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
22
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

+ 11 - 11
src/xt_pages/user/components/PatientDetail.vue 查看文件

1
 <template>
1
 <template>
2
   <div class="app-container ">
2
   <div class="app-container ">
3
     <el-form ref="form" :rules="rules" :model="form" label-width="134px" class="clearfix" id="patient-info" >
3
     <el-form ref="form" :rules="rules" :model="form" label-width="134px" class="clearfix" id="patient-info" >
4
-    <div style="float:right;z-index:8;position: absolute;right: 30px;">
4
+    <div style="float:right;z-index:8;position: absolute;right: 16px;">
5
       <el-button size="small" type="primary" @click="printCard()" style="margin:0 6px 6px 0;z-index:1;">打印签到卡</el-button>
5
       <el-button size="small" type="primary" @click="printCard()" style="margin:0 6px 6px 0;z-index:1;">打印签到卡</el-button>
6
       <el-button size="small" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="$router.push('/patients/patient/'+patientID+'/edit')" style="margin:0 0 6px 0;z-index:1;">修改</el-button>
6
       <el-button size="small" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="$router.push('/patients/patient/'+patientID+'/edit')" style="margin:0 0 6px 0;z-index:1;">修改</el-button>
7
       <el-button size="small" type="primary" @click="printThisInfo()" style="margin:0 6px 6px 0;z-index:1;">打印</el-button>
7
       <el-button size="small" type="primary" @click="printThisInfo()" style="margin:0 6px 6px 0;z-index:1;">打印</el-button>
8
     </div>
8
     </div>
9
       <div class="dataTitle">一般资料</div>
9
       <div class="dataTitle">一般资料</div>
10
       <el-row >
10
       <el-row >
11
-        <el-col :span="4" align="center">
12
-          <img width="100%" height="100%" v-if="form.avatar" :src="form.avatar" class="avatar">
13
-          <el-form-item prop="avatar">
14
-            <el-input v-model="form.avatar"  type="hidden" placeholder=""></el-input>
15
-          </el-form-item>
16
-        </el-col>
17
         <el-col :span="20" >
11
         <el-col :span="20" >
18
           <el-row :gutter="10">
12
           <el-row :gutter="10">
19
             <el-col :span="8">
13
             <el-col :span="8">
168
             </el-col>
162
             </el-col>
169
           </el-row>
163
           </el-row>
170
         </el-col>
164
         </el-col>
165
+         <el-col :span="4" align="center">
166
+          <img width="146px" height="146px" v-if="form.avatar" :src="form.avatar" class="avatar">
167
+          <el-form-item prop="avatar">
168
+            <el-input v-model="form.avatar"  type="hidden" placeholder=""></el-input>
169
+          </el-form-item>
170
+        </el-col>
171
       </el-row>
171
       </el-row>
172
 
172
 
173
       <div class="dataTitle">治疗信息</div>
173
       <div class="dataTitle">治疗信息</div>
174
-      <el-row :gutter="10">
175
-        <el-col :span="24">
174
+      <el-row :gutter="24">
175
+        <el-col :span="12">
176
           <el-form-item label="主诉 : " prop="patient_complains">
176
           <el-form-item label="主诉 : " prop="patient_complains">
177
             <el-input type="textarea" :rows="3" v-model="form.patient_complains" resize="none" placeholder="" readonly></el-input>
177
             <el-input type="textarea" :rows="3" v-model="form.patient_complains" resize="none" placeholder="" readonly></el-input>
178
           </el-form-item>
178
           </el-form-item>
179
         </el-col>
179
         </el-col>
180
-        <el-col :span="24">
180
+        <el-col :span="12">
181
           <el-form-item label="现病史 : " prop="present_history">
181
           <el-form-item label="现病史 : " prop="present_history">
182
             <el-input type="textarea" :rows="3" v-model="form.present_history" resize="none" placeholder="" readonly></el-input>
182
             <el-input type="textarea" :rows="3" v-model="form.present_history" resize="none" placeholder="" readonly></el-input>
183
           </el-form-item>
183
           </el-form-item>
184
         </el-col>
184
         </el-col>
185
-        <el-col :span="24">
185
+        <el-col :span="12">
186
           <el-form-item label="既往史 : " prop="past_history">
186
           <el-form-item label="既往史 : " prop="past_history">
187
             <el-input type="textarea" :rows="3" v-model="form.past_history" resize="none" placeholder="" readonly></el-input>
187
             <el-input type="textarea" :rows="3" v-model="form.past_history" resize="none" placeholder="" readonly></el-input>
188
           </el-form-item>
188
           </el-form-item>

+ 16 - 16
src/xt_pages/user/components/PatientForm.vue 查看文件

1
 <template>
1
 <template>
2
 <div class="main-contain">
2
 <div class="main-contain">
3
-  <div class="position">
4
-
5
-    <div class="" style="float:right;">
6
-       <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
7
-       <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
8
-       <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="success" icon="el-icon-setting" >保存</el-button>
9
-       <el-button v-if="this.isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="warning" >保存并继续新增</el-button>
10
-    </div>
11
-  </div>
3
+    
12
   <div class="app-container " v-loading="pageLoad">
4
   <div class="app-container " v-loading="pageLoad">
13
     <el-form ref="form" :rules="rules" :model="form" label-width="124px" class="clearfix" >
5
     <el-form ref="form" :rules="rules" :model="form" label-width="124px" class="clearfix" >
6
+        <div class="" style="z-index: 9999;position: absolute;right: 20px;">
7
+        <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
8
+        <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
9
+        <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="primary" icon="el-icon-setting" >保存</el-button>
10
+        <el-button v-if="this.isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="warning" >保存并继续新增</el-button>
11
+      </div>
14
       <div class="dataTitle">一般资料</div>
12
       <div class="dataTitle">一般资料</div>
15
       <el-row >
13
       <el-row >
16
         <el-col :span="20" class="form-table" >
14
         <el-col :span="20" class="form-table" >
106
               </el-form-item>
104
               </el-form-item>
107
             </el-col>
105
             </el-col>
108
 
106
 
109
-            <el-col :span="8" >
107
+            <el-col :span="8" :style="isEdit?'width:360px':''">
110
               <el-form-item label="家庭住址 : " prop="homeAddress">
108
               <el-form-item label="家庭住址 : " prop="homeAddress">
111
                 <el-input v-model="form.homeAddress"></el-input>
109
                 <el-input v-model="form.homeAddress"></el-input>
112
               </el-form-item>
110
               </el-form-item>
178
                 </el-select>
176
                 </el-select>
179
               </el-form-item>
177
               </el-form-item>
180
             </el-col>
178
             </el-col>
181
-            <el-col :span="8" >
179
+            <el-col :span="8" :style="isEdit?'width:360px':''">
182
               <el-form-item label="工作单位 : " prop="work">
180
               <el-form-item label="工作单位 : " prop="work">
183
                 <el-input v-model="form.work"></el-input>
181
                 <el-input v-model="form.work"></el-input>
184
               </el-form-item>
182
               </el-form-item>
185
             </el-col>
183
             </el-col>
186
-            <el-col :span="8" >
184
+            <el-col :span="8" :style="isEdit?'width:360px':''">
187
               <el-form-item label="单位地址 : " prop="unit_address">
185
               <el-form-item label="单位地址 : " prop="unit_address">
188
                 <el-input v-model="form.unit_address"></el-input>
186
                 <el-input v-model="form.unit_address"></el-input>
189
               </el-form-item>
187
               </el-form-item>
234
 
232
 
235
       <div class="dataTitle">治疗信息</div>
233
       <div class="dataTitle">治疗信息</div>
236
       <el-row :span="24">
234
       <el-row :span="24">
237
-        <el-col :span="8">
235
+        <el-col :span="12">
238
           <el-form-item label="主诉 : " prop="patient_complains">
236
           <el-form-item label="主诉 : " prop="patient_complains">
239
             <el-input type="textarea" :rows="3" v-model="form.patient_complains" resize="none" placeholder=""></el-input>
237
             <el-input type="textarea" :rows="3" v-model="form.patient_complains" resize="none" placeholder=""></el-input>
240
           </el-form-item>
238
           </el-form-item>
241
         </el-col>
239
         </el-col>
242
-        <el-col :span="8">
240
+        <el-col :span="12">
243
           <el-form-item label="现病史 : " prop="present_history">
241
           <el-form-item label="现病史 : " prop="present_history">
244
             <el-input type="textarea" :rows="3" v-model="form.present_history" resize="none" placeholder=""></el-input>
242
             <el-input type="textarea" :rows="3" v-model="form.present_history" resize="none" placeholder=""></el-input>
245
           </el-form-item>
243
           </el-form-item>
246
         </el-col>
244
         </el-col>
247
-        <el-col :span="8">
245
+        <el-col :span="12">
248
           <el-form-item label="既往史 : " prop="past_history">
246
           <el-form-item label="既往史 : " prop="past_history">
249
             <el-input type="textarea" :rows="3" v-model="form.past_history" resize="none" placeholder=""></el-input>
247
             <el-input type="textarea" :rows="3" v-model="form.past_history" resize="none" placeholder=""></el-input>
250
           </el-form-item>
248
           </el-form-item>
988
 </script>
986
 </script>
989
 
987
 
990
 <style rel="stylesheet/scss" lang="scss" scoped>
988
 <style rel="stylesheet/scss" lang="scss" scoped>
991
-
989
+.app-container{
990
+  margin: 0;
991
+}
992
 .uploadHeadBtn {
992
 .uploadHeadBtn {
993
   width: 148px;
993
   width: 148px;
994
   margin-top: 10px;
994
   margin-top: 10px;

+ 1 - 2
src/xt_pages/user/components/PatientSidebar.1.vue 查看文件

1
 <template>
1
 <template>
2
   <div>
2
   <div>
3
     <div class="patient-menu">
3
     <div class="patient-menu">
4
-
5
       <el-autocomplete
4
       <el-autocomplete
6
-        style="margin:13px 5px"
5
+        style="margin:16px 5px"
7
         popper-class="my-autocomplete"
6
         popper-class="my-autocomplete"
8
         v-model="value"
7
         v-model="value"
9
         :fetch-suggestions="querySearchAsync"
8
         :fetch-suggestions="querySearchAsync"

+ 1 - 2
src/xt_pages/user/components/PatientSidebar.vue 查看文件

2
   <div>
2
   <div>
3
     <div class="patient-menu">
3
     <div class="patient-menu">
4
       <el-autocomplete
4
       <el-autocomplete
5
-        style="margin:13px 5px"
5
+        style="margin:16px 5px"
6
         popper-class="my-autocomplete"
6
         popper-class="my-autocomplete"
7
         v-model="value"
7
         v-model="value"
8
         :fetch-suggestions="querySearchAsync"
8
         :fetch-suggestions="querySearchAsync"
232
 }
232
 }
233
 .el-tree-node .el-tree-node.is-current > .el-tree-node__content {
233
 .el-tree-node .el-tree-node.is-current > .el-tree-node__content {
234
   color:#409eff;
234
   color:#409eff;
235
-  /* background-color: transparent; */
236
 }
235
 }
237
 .el-tree {
236
 .el-tree {
238
   background: #f6f8f9;
237
   background: #f6f8f9;

+ 18 - 19
src/xt_pages/user/dialysisRecord.vue 查看文件

16
                     <!-- <el-col :span="11"> -->
16
                     <!-- <el-col :span="11"> -->
17
                       <el-date-picker size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间" style="width:150px" v-model="queryParams.start_time" @change="changeSearch" ></el-date-picker>
17
                       <el-date-picker size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间" style="width:150px" v-model="queryParams.start_time" @change="changeSearch" ></el-date-picker>
18
                     <!-- </el-col> -->
18
                     <!-- </el-col> -->
19
-                    <span>-</span>
19
+                    <span class="cellLine">-</span>
20
                     <!-- <el-col :span="11"> -->
20
                     <!-- <el-col :span="11"> -->
21
                       <el-date-picker size="small"   type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束时间" style="width:150px" v-model="queryParams.end_time" @change="changeSearch" ></el-date-picker>
21
                       <el-date-picker size="small"   type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束时间" style="width:150px" v-model="queryParams.end_time" @change="changeSearch" ></el-date-picker>
22
                     <!-- </el-col> -->
22
                     <!-- </el-col> -->
33
         </div>
33
         </div>
34
         <div>
34
         <div>
35
           <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="recordData" border style="width: 100%" @current-change="clickCurrent">
35
           <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="recordData" border style="width: 100%" @current-change="clickCurrent">
36
-              <el-table-column prop="dialysis_date" label="透析日期" align="center" min-width="60">
36
+              <el-table-column prop="dialysis_date" label="透析日期" align="center" width="110" fixed>
37
                 <template slot-scope="scope"><span>{{scope.row.dialysis_date | parseTime('{y}-{m}-{d}')}}</span></template>
37
                 <template slot-scope="scope"><span>{{scope.row.dialysis_date | parseTime('{y}-{m}-{d}')}}</span></template>
38
               </el-table-column>
38
               </el-table-column>
39
-              <el-table-column prop="schedule_type" label="班次" align="center" min-width="40">
39
+              <el-table-column prop="schedule_type" label="班次" align="center" width="80">
40
                 <template slot-scope="scope"><span>{{scheduleType(scope.row.schedule_type)}}</span></template>
40
                 <template slot-scope="scope"><span>{{scheduleType(scope.row.schedule_type)}}</span></template>
41
               </el-table-column>
41
               </el-table-column>
42
-              <el-table-column prop="partition" min-width="60" align="center" label="分区 - 机号">
42
+              <el-table-column prop="partition" width="100" align="center" label="分区 - 机号">
43
                 <template slot-scope="scope"><span>{{scope.row.partition_name}}-{{scope.row.device_number}}</span></template>
43
                 <template slot-scope="scope"><span>{{scope.row.partition_name}}-{{scope.row.device_number}}</span></template>
44
               </el-table-column>
44
               </el-table-column>
45
-              <el-table-column prop="mode" min-width="60" align="center" label="透析模式">
45
+              <el-table-column prop="mode" width="90" align="center" label="透析模式">
46
                 <template slot-scope="scope">{{modeName(scope.row.prescription.mode_id)}}</template>
46
                 <template slot-scope="scope">{{modeName(scope.row.prescription.mode_id)}}</template>
47
               </el-table-column>
47
               </el-table-column>
48
-              <el-table-column prop="prescription.dialysis_duration" width="80" align="center" label="透析时长 h">
48
+              <el-table-column prop="prescription.dialysis_duration" width="100" align="center" label="透析时长(h)">
49
               </el-table-column>
49
               </el-table-column>
50
-              <el-table-column prop="prescription.dry_weight" width="70" align="center" label="干体重 kg">
50
+              <el-table-column prop="prescription.dry_weight" width="96" align="center" label="干体重(kg)">
51
               </el-table-column>
51
               </el-table-column>
52
-              <el-table-column prop="predialysis_evaluation.weight_before" width="80" align="center" label="透前体重 kg">
52
+              <el-table-column prop="predialysis_evaluation.weight_before" width="110" align="center" label="透前体重(kg)">
53
               </el-table-column>
53
               </el-table-column>
54
-              <el-table-column prop="assessment_after_dislysis.weight_after" width="80" align="center" label="透后体重 kg">
54
+              <el-table-column prop="assessment_after_dislysis.weight_after" width="110" align="center" label="透后体重(kg)">
55
               </el-table-column>
55
               </el-table-column>
56
-              <el-table-column prop="predialysis_evaluation" width="80" align="center" label="透前血压 mmhg">
56
+              <el-table-column prop="predialysis_evaluation" width="140" align="center" label="透前血压(mmhg)">
57
                 <template slot-scope="scope"><span>{{scope.row.predialysis_evaluation.systolic_blood_pressure}}/{{scope.row.predialysis_evaluation.diastolic_blood_pressure}}</span></template>
57
                 <template slot-scope="scope"><span>{{scope.row.predialysis_evaluation.systolic_blood_pressure}}/{{scope.row.predialysis_evaluation.diastolic_blood_pressure}}</span></template>
58
               </el-table-column>
58
               </el-table-column>
59
-              <el-table-column prop="assessment_after_dislysis" width="80" align="center" label="透后血压 mmhg">
59
+              <el-table-column prop="assessment_after_dislysis" width="140" align="center" label="透后血压(mmhg)">
60
                 <template slot-scope="scope"><span>{{scope.row.assessment_after_dislysis.systolic_blood_pressure}}/{{scope.row.assessment_after_dislysis.diastolic_blood_pressure}}</span></template>
60
                 <template slot-scope="scope"><span>{{scope.row.assessment_after_dislysis.systolic_blood_pressure}}/{{scope.row.assessment_after_dislysis.diastolic_blood_pressure}}</span></template>
61
               </el-table-column>
61
               </el-table-column>
62
-              <el-table-column prop="predialysis_evaluation.ultrafiltration_amount" width="80" align="center" label="超滤总量 L">
62
+              <el-table-column prop="predialysis_evaluation.ultrafiltration_amount" width="110" align="center" label="超滤总量(L)">
63
               </el-table-column>
63
               </el-table-column>
64
-              <el-table-column  prop="access" min-width="60" align="center" label="血管通路">
64
+              <el-table-column  prop="access" width="100" align="center" label="血管通路">
65
                 <template slot-scope="scope"><span>{{setVascularAccess(scope.row.prescription)}}</span></template>
65
                 <template slot-scope="scope"><span>{{setVascularAccess(scope.row.prescription)}}</span></template>
66
               </el-table-column>
66
               </el-table-column>
67
-              <el-table-column prop="type" width="145" align="center" label="抗凝剂种类 首剂/维持/总量">
67
+              <el-table-column prop="type" width="200" align="center" label="抗凝剂种类 首剂/维持/总量">
68
               <template slot-scope="scope">
68
               <template slot-scope="scope">
69
                 <span>{{setAnticoagulantsConfit(scope.row.prescription)}}</span>
69
                 <span>{{setAnticoagulantsConfit(scope.row.prescription)}}</span>
70
               </template>
70
               </template>
71
               </el-table-column>
71
               </el-table-column>
72
-              <el-table-column prop="model" min-width="60" align="center" label="透析器型号">
72
+              <el-table-column prop="model" width="100" align="center" label="透析器型号">
73
                 <template slot-scope="scope"><span>{{setDialyzerModel(scope.row.prescription)}}</span></template>
73
                 <template slot-scope="scope"><span>{{setDialyzerModel(scope.row.prescription)}}</span></template>
74
               </el-table-column>
74
               </el-table-column>
75
-              <el-table-column  prop="nurse" min-width="60" align="center" label="治疗护士">
75
+              <el-table-column  prop="nurse" width="90" align="center" label="治疗护士">
76
                 <template slot-scope="scope"><span>{{getNurseName(scope.row.treatment_summary)}}</span></template>
76
                 <template slot-scope="scope"><span>{{getNurseName(scope.row.treatment_summary)}}</span></template>
77
               </el-table-column>
77
               </el-table-column>
78
-              <el-table-column prop="doctor" min-width="60" align="center" label="治疗医生">
78
+              <el-table-column prop="doctor" width="90" align="center" label="治疗医生">
79
                 <template slot-scope="scope"><span>{{getDoctorName(scope.row.treatment_summary)}}</span></template>
79
                 <template slot-scope="scope"><span>{{getDoctorName(scope.row.treatment_summary)}}</span></template>
80
               </el-table-column>
80
               </el-table-column>
81
           </el-table>
81
           </el-table>
384
     justify-content: space-between;
384
     justify-content: space-between;
385
     padding: 30px 2em;
385
     padding: 30px 2em;
386
 }
386
 }
387
-</style>
388
-<style>
389
 .record-order .el-table__body{
387
 .record-order .el-table__body{
390
     border: 1px solid #333;
388
     border: 1px solid #333;
391
 }
389
 }
396
 .record-order th, .record-order td {
394
 .record-order th, .record-order td {
397
     padding: 5px 10px;
395
     padding: 5px 10px;
398
 }
396
 }
397
+
399
 </style>
398
 </style>

+ 1 - 1
src/xt_pages/user/doctorAdvice.vue 查看文件

27
             <div class="cell clearfix">
27
             <div class="cell clearfix">
28
                 <label class="title"><span class="name">日期查询</span> : </label>
28
                 <label class="title"><span class="name">日期查询</span> : </label>
29
                 <el-date-picker size="small" v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
29
                 <el-date-picker size="small" v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
30
-                <span class="">-</span>
30
+                <span class="cellLine"> - </span>
31
                 <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"  format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
31
                 <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"  format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
32
             </div>
32
             </div>
33
             <el-table @cell-click="clickuseradvicecell" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"  row-class-name="user-advice-table-row" :span-method="mergeSpan" ref="multipleTable" :data="adviceTableData" border fit highlight-current-row @select="selectAdvice" @selection-change="changeAdvice" style="width: 100%;margin-top: 10px;" >
33
             <el-table @cell-click="clickuseradvicecell" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"  row-class-name="user-advice-table-row" :span-method="mergeSpan" ref="multipleTable" :data="adviceTableData" border fit highlight-current-row @select="selectAdvice" @selection-change="changeAdvice" style="width: 100%;margin-top: 10px;" >

+ 6 - 0
src/xt_pages/user/editPatient.vue 查看文件

37
 
37
 
38
 }
38
 }
39
 </script>
39
 </script>
40
+
41
+<style rel="stylesheet/scss" lang="scss" scoped>
42
+.app-container{
43
+  margin: 0;
44
+}
45
+</style>

+ 1 - 1
src/xt_pages/user/patient.vue 查看文件

14
     <div class="cell clearfix">
14
     <div class="cell clearfix">
15
 	    <label class="title"><span class="name">日期查询</span> : </label>
15
 	    <label class="title"><span class="name">日期查询</span> : </label>
16
        <el-date-picker size="small" v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
16
        <el-date-picker size="small" v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
17
-       <span class="">-</span>
17
+       <span class="cellLine"> - </span>
18
        <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>       
18
        <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>       
19
     </div>
19
     </div>
20
     <div class="cell clearfix">
20
     <div class="cell clearfix">

+ 1 - 1
src/xt_pages/user/patients.vue 查看文件

14
     <div class="cell clearfix">
14
     <div class="cell clearfix">
15
       <label class="title"><span class="name">日期查询</span> : </label>
15
       <label class="title"><span class="name">日期查询</span> : </label>
16
       <el-date-picker size="small" clearable v-model="listQuery.start_time"   prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
16
       <el-date-picker size="small" clearable v-model="listQuery.start_time"   prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
17
-      <span class="">-</span>
17
+      <span class="cellLine"> - </span>
18
       <el-date-picker size="small" clearable v-model="listQuery.end_time"   prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
18
       <el-date-picker size="small" clearable v-model="listQuery.end_time"   prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
19
     </div>
19
     </div>
20
     <div class="cell clearfix">
20
     <div class="cell clearfix">

+ 1 - 1
src/xt_pages/user/proeducation.vue 查看文件

5
             <div class="cell clearfix">
5
             <div class="cell clearfix">
6
                 <label class="title"><span class="name">日期查询</span> : </label>
6
                 <label class="title"><span class="name">日期查询</span> : </label>
7
                 <el-date-picker size="small" v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
7
                 <el-date-picker size="small" v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
8
-                <span class="">-</span>
8
+                <span class="cellLine"> - </span> 
9
                 <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"  format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>       
9
                 <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"  format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>       
10
             </div>  
10
             </div>  
11
             <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="multipleTable" :data="edusTableData" border fit highlight-current-row  style="width: 100%;margin-top: 10px;" >
11
             <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="multipleTable" :data="edusTableData" border fit highlight-current-row  style="width: 100%;margin-top: 10px;" >

+ 1 - 0
src/xt_pages/user/rescueRecord.vue 查看文件

248
         border-bottom-width: 1px;
248
         border-bottom-width: 1px;
249
         border-bottom-style: solid;
249
         border-bottom-style: solid;
250
         border-bottom-color: #ebeef5;
250
         border-bottom-color: #ebeef5;
251
+        background-color: rgb(245, 247, 250);
251
     }
252
     }
252
     .content {
253
     .content {
253
         padding: 12px 15px;
254
         padding: 12px 15px;

+ 1 - 1
src/xt_pages/workforce/components/setup_template_dialog.vue 查看文件

73
             if (msg.length == 0) {
73
             if (msg.length == 0) {
74
                 this.submit()
74
                 this.submit()
75
             } else {
75
             } else {
76
-                this.$confirm(msg, '提示', {confirmButtonText: '是', cancelButtonText: '否', type: 'warning'})
76
+                this.$confirm(msg, '提示', {confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning'})
77
                 .then(() => {
77
                 .then(() => {
78
                     this.submit()
78
                     this.submit()
79
                 })
79
                 })

+ 18 - 28
src/xt_pages/workforce/components/tableData.vue 查看文件

96
         <el-table-column prop="total" label="总数" width="60" align="center" fixed="right"></el-table-column>
96
         <el-table-column prop="total" label="总数" width="60" align="center" fixed="right"></el-table-column>
97
       </el-table>
97
       </el-table>
98
 
98
 
99
-
100
-
101
-
102
-
103
-
104
-
105
-
106
-
107
-
108
       <el-dialog title="排班" :visible.sync="dialogTableVisible" width="1000px;" :v-model="dialog" >
99
       <el-dialog title="排班" :visible.sync="dialogTableVisible" width="1000px;" :v-model="dialog" >
109
         <div>
100
         <div>
110
            <div class="cell clearfix">
101
            <div class="cell clearfix">
174
       <el-dialog
165
       <el-dialog
175
         title="调整排班"
166
         title="调整排班"
176
         :visible.sync="tzDialogVisible"
167
         :visible.sync="tzDialogVisible"
177
-        width="365px"
178
-        center>
168
+        width="500px"
169
+        >
179
         <div style="width:100%;margin:0 auto">
170
         <div style="width:100%;margin:0 auto">
180
           <el-radio-group v-model="tiaoZhengType" :class="tiaozhengclass" >
171
           <el-radio-group v-model="tiaoZhengType" :class="tiaozhengclass" >
181
             <el-radio :label="1">取消排班</el-radio>
172
             <el-radio :label="1">取消排班</el-radio>
191
       <el-dialog
182
       <el-dialog
192
         title="调整模式"
183
         title="调整模式"
193
         :visible.sync="msDialogVisible"
184
         :visible.sync="msDialogVisible"
194
-        width="350px"
195
-        center>
196
-        <div style="width:100%;margin:0 auto">
185
+        width="500px"
186
+        >
187
+        <div>
197
           <el-form :model="changeSchedule" ref="changeSchedule" :rules="changeRules" >
188
           <el-form :model="changeSchedule" ref="changeSchedule" :rules="changeRules" >
198
             <el-form-item label="" prop="mode_id">
189
             <el-form-item label="" prop="mode_id">
199
               <el-select v-model="changeSchedule.mode_id" placeholder="请选择" style="width:100%">
190
               <el-select v-model="changeSchedule.mode_id" placeholder="请选择" style="width:100%">
216
       <el-dialog
207
       <el-dialog
217
         title="调整机号"
208
         title="调整机号"
218
         :visible.sync="jhDialogVisible"
209
         :visible.sync="jhDialogVisible"
219
-        width="400px"
220
-        center>
221
-        <div style="width:100%;margin:0 auto">
222
-          <el-form :model="changeSchedule" ref="changeSchedule" :rules="changeRules" label-width="90px" label-position="left">
223
-            <el-form-item label="排班日期">
210
+        width="500px"
211
+        >
212
+        <div >
213
+          <el-form :model="changeSchedule" ref="changeSchedule" :rules="changeRules" label-width="90px" >
214
+            <el-form-item label="排班日期: ">
224
               <el-input v-model="currentData.schedule_date" disabled></el-input>
215
               <el-input v-model="currentData.schedule_date" disabled></el-input>
225
             </el-form-item>
216
             </el-form-item>
226
-            <el-form-item label="班次" prop="schedule_type">
217
+            <el-form-item label="班次: " prop="schedule_type">
227
               <el-select v-model="changeSchedule.schedule_type" placeholder="请选择" style="width:100%">
218
               <el-select v-model="changeSchedule.schedule_type" placeholder="请选择" style="width:100%">
228
                 <el-option
219
                 <el-option
229
                   v-for="item in scheduleType"
220
                   v-for="item in scheduleType"
233
                 </el-option>
224
                 </el-option>
234
               </el-select>
225
               </el-select>
235
             </el-form-item>
226
             </el-form-item>
236
-            <el-form-item label="病房" prop="partition_id">
227
+            <el-form-item label="病房: " prop="partition_id">
237
               <el-select v-model="changeSchedule.partition_id" placeholder="请选择" style="width:100%" @change="changePartition">
228
               <el-select v-model="changeSchedule.partition_id" placeholder="请选择" style="width:100%" @change="changePartition">
238
                 <el-option
229
                 <el-option
239
                   v-for="item in partitions"
230
                   v-for="item in partitions"
243
                 </el-option>
234
                 </el-option>
244
               </el-select>
235
               </el-select>
245
             </el-form-item>
236
             </el-form-item>
246
-
247
-            <el-form-item label="透析机" prop="bed_id">
237
+            <el-form-item label="透析机: " prop="bed_id">
248
               <el-select v-model="changeSchedule.bed_id" placeholder="请选择" style="width:100%">
238
               <el-select v-model="changeSchedule.bed_id" placeholder="请选择" style="width:100%">
249
                 <el-option
239
                 <el-option
250
                   v-for="item in jihaos"
240
                   v-for="item in jihaos"
784
                 }
774
                 }
785
               }
775
               }
786
               if (!cflag) {
776
               if (!cflag) {
787
-                this.$confirm('此患者有传染病,与此透析机不匹配,确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
777
+                this.$confirm('此患者有传染病,与此透析机不匹配,确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
788
                 .then(() => {
778
                 .then(() => {
789
                   this.changeSchedule.change_action = "change_device";
779
                   this.changeSchedule.change_action = "change_device";
790
                   this.changeScheduleActon(formName);
780
                   this.changeScheduleActon(formName);
795
                 this.changeScheduleActon(formName);
785
                 this.changeScheduleActon(formName);
796
               }
786
               }
797
             }else if (this.changeSchedule.partition_type > 1) {
787
             }else if (this.changeSchedule.partition_type > 1) {
798
-              this.$confirm('此患者没有传染病,与此透析机不匹配,确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
788
+              this.$confirm('此患者没有传染病,与此透析机不匹配,确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
799
                 .then(() => {
789
                 .then(() => {
800
                   this.changeSchedule.change_action = "change_device";
790
                   this.changeSchedule.change_action = "change_device";
801
                   this.changeScheduleActon(formName);
791
                   this.changeScheduleActon(formName);
929
             }
919
             }
930
           });
920
           });
931
           if (!cflag) {
921
           if (!cflag) {
932
-            this.$confirm('此患者有传染病,与此透析机不匹配,确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
922
+            this.$confirm('此患者有传染病,与此透析机不匹配,确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
933
             .then(() => {
923
             .then(() => {
934
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
924
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
935
             }).catch(() => {
925
             }).catch(() => {
938
             this.CreateSchedule(this.currentData.patient_id, this.currentData);
928
             this.CreateSchedule(this.currentData.patient_id, this.currentData);
939
           }
929
           }
940
         }else if (that.currentData.partition_type > 1) {
930
         }else if (that.currentData.partition_type > 1) {
941
-          this.$confirm('此患者没有传染病,与此透析机不匹配,确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
931
+          this.$confirm('此患者没有传染病,与此透析机不匹配,确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
942
             .then(() => {
932
             .then(() => {
943
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
933
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
944
             }).catch(() => {
934
             }).catch(() => {
1124
   white-space:nowrap !important;
1114
   white-space:nowrap !important;
1125
 }
1115
 }
1126
 .schedule-table-cell-disable {
1116
 .schedule-table-cell-disable {
1127
-    background-color: rgb(245, 245, 245);
1117
+    background-color: rgb(245, 245, 245)!important;
1128
 }
1118
 }
1129
 #table_data{
1119
 #table_data{
1130
    min-height:calc(100vh - 350px);
1120
    min-height:calc(100vh - 350px);

+ 1 - 1
src/xt_pages/workforce/components/template_table.vue 查看文件

466
             // 此患者没有传染病,与此透析机不匹配,确定在此排班吗?
466
             // 此患者没有传染病,与此透析机不匹配,确定在此排班吗?
467
             // 此患者有传染病,与此透析机不匹配,确定在此排班吗?
467
             // 此患者有传染病,与此透析机不匹配,确定在此排班吗?
468
             var msg = havePatientDisease ? '此患者有传染病,与此透析机不匹配,确定在此排班吗?' : '此患者没有传染病,与此透析机不匹配,确定在此排班吗?'
468
             var msg = havePatientDisease ? '此患者有传染病,与此透析机不匹配,确定在此排班吗?' : '此患者没有传染病,与此透析机不匹配,确定在此排班吗?'
469
-            this.$confirm(msg, '提示', { confirmButtonText: '是', cancelButtonText: '否', type: 'warning' })
469
+            this.$confirm(msg, '提示', { confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning' })
470
               .then(() => {
470
               .then(() => {
471
                 this.add_schedule(patient, device_number, treat_mode, weekday, time_type)
471
                 this.add_schedule(patient, device_number, treat_mode, weekday, time_type)
472
               })
472
               })