ソースを参照

Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

28169 5 日 前
コミット
c3c3823166
共有2 個のファイルを変更した16 個の追加12 個の削除を含む
  1. 9 6
      src/pages/main/template/DialysisPrintOrdereightyone.vue
  2. 7 6
      src/pages/new_Patientscheduling/new_content.vue

+ 9 - 6
src/pages/main/template/DialysisPrintOrdereightyone.vue ファイルの表示

@@ -1124,7 +1124,7 @@ import { getDataConfig } from '@/utils/data'
1124 1124
 import { EasyScroller } from 'easyscroller'
1125 1125
 import { jsGetAge, uParseTime, uParseTimeOne } from '@/utils/tools'
1126 1126
 import LabelBox from '../printItem/LabelBox'
1127
-import {Toast} from 'vant'
1127
+import {Toast,Dialog} from 'vant'
1128 1128
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
1129 1129
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
1130 1130
 import print from 'print-js'
@@ -2088,12 +2088,15 @@ export default {
2088 2088
     getcheckData(val){
2089 2089
       if(val.length >0){
2090 2090
         let message = `记录单未填数据:\n${val.join("\n")}`;
2091
-        Toast({
2092
-          duration:0,
2091
+        Dialog.confirm({
2092
+          allowHtml:true,
2093 2093
           message:message,
2094
-          closeOnClick:true,
2095
-          closeOnClickOverlay:true,
2096
-        })
2094
+        }).then(() => {
2095
+
2096
+          })
2097
+          .catch(() => {
2098
+
2099
+          });
2097 2100
        
2098 2101
         return message
2099 2102
       }else{

+ 7 - 6
src/pages/new_Patientscheduling/new_content.vue ファイルの表示

@@ -25,7 +25,7 @@
25 25
         </div>
26 26
       </div>
27 27
     </div>
28
-    <div style="margin-top: 20px;height: 82vh;">
28
+    <div style="margin-top: 20px;height: 81vh;">
29 29
       <el-table
30 30
         :row-style="{ color: '#303133' }"
31 31
         :header-cell-style="{
@@ -56,7 +56,7 @@
56 56
         ></el-table-column>
57 57
         <el-table-column prop="Mon_M" label="上午" min-width="60" align="center">
58 58
           <template slot-scope="scope">
59
-              <el-popover ref="popover" placement="top"
59
+              <el-popover placement="top"
60 60
                 title=""width=""
61 61
                 trigger="click"content=""
62 62
                 popper-class="ellipsis-pop"
@@ -68,15 +68,15 @@
68 68
                 <div style="text-align: center;" v-if="scope.row.Mon_M.patient_id == 0" >
69 69
                   <el-button @click='newappend(scope.row.Mon_M)'>新增</el-button>
70 70
                 </div>
71
-                <!-- <schedule-item slot="reference" :schedule-detail="scope.row.Mon_M"></schedule-item> -->
71
+                <schedule-item slot="reference" :schedule-detail="scope.row.Mon_M"></schedule-item>
72 72
               </el-popover>
73
-              <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_M"></schedule-item>
73
+              <!-- <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_M"></schedule-item> -->
74 74
           </template>
75 75
         </el-table-column>
76 76
         <el-table-column prop="Mon_A" label="下午" min-width="60" align="center">
77 77
           <template slot-scope="scope">
78 78
             <div>
79
-              <el-popover ref="popover" placement="top"
79
+              <el-popover placement="top"
80 80
                 title="" width=""
81 81
                 trigger="click" content=""
82 82
                 popper-class="ellipsis-pop"
@@ -88,8 +88,9 @@
88 88
                 <div style="text-align: center;" v-if="scope.row.Mon_A.patient_id ==''">
89 89
                   <el-button @click='newappend(scope.row.Mon_A)'>新增</el-button>
90 90
                 </div>
91
+                <schedule-item slot="reference" :schedule-detail="scope.row.Mon_A"></schedule-item>
91 92
               </el-popover>
92
-              <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_A"></schedule-item>
93
+              <!-- <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_A"></schedule-item> ref="popover" -->
93 94
             </div>
94 95
           </template>
95 96
           <!-- <schedule-item slot-scope="scope" :schedule-detail="scope.row.Mon_A"></schedule-item> -->