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

src/pages/main/template/DialysisPrintOrdereightyone.vue

@@ -1124,7 +1124,7 @@ import { getDataConfig } from '@/utils/data'
 import { EasyScroller } from 'easyscroller'
 import { jsGetAge, uParseTime, uParseTimeOne } from '@/utils/tools'
 import LabelBox from '../printItem/LabelBox'
-import {Toast} from 'vant'
+import {Toast,Dialog} from 'vant'
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
 import print from 'print-js'
@@ -2088,12 +2088,15 @@ export default {
     getcheckData(val){
       if(val.length >0){
         let message = `记录单未填数据:\n${val.join("\n")}`;
-        Toast({
-          duration:0,
+        Dialog.confirm({
+          allowHtml:true,
           message:message,
-          closeOnClick:true,
-          closeOnClickOverlay:true,
-        })
+        }).then(() => {
+
+          })
+          .catch(() => {
+
+          });
        
         return message
       }else{

src/pages/new_Patientscheduling/new_content.vue

@@ -25,7 +25,7 @@
         </div>
       </div>
     </div>
-    <div style="margin-top: 20px;height: 82vh;">
+    <div style="margin-top: 20px;height: 81vh;">
       <el-table
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
@@ -56,7 +56,7 @@
         ></el-table-column>
         <el-table-column prop="Mon_M" label="上午" min-width="60" align="center">
           <template slot-scope="scope">
-              <el-popover ref="popover" placement="top"
+              <el-popover placement="top"
                 title=""width=""
                 trigger="click"content=""
                 popper-class="ellipsis-pop"
@@ -68,15 +68,15 @@
                 <div style="text-align: center;" v-if="scope.row.Mon_M.patient_id == 0" >
                   <el-button @click='newappend(scope.row.Mon_M)'>新增</el-button>
                 </div>
-                <!-- <schedule-item slot="reference" :schedule-detail="scope.row.Mon_M"></schedule-item> -->
+                <schedule-item slot="reference" :schedule-detail="scope.row.Mon_M"></schedule-item>
               </el-popover>
-              <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_M"></schedule-item>
+              <!-- <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_M"></schedule-item> -->
           </template>
         </el-table-column>
         <el-table-column prop="Mon_A" label="下午" min-width="60" align="center">
           <template slot-scope="scope">
             <div>
-              <el-popover ref="popover" placement="top"
+              <el-popover placement="top"
                 title="" width=""
                 trigger="click" content=""
                 popper-class="ellipsis-pop"
@@ -88,8 +88,9 @@
                 <div style="text-align: center;" v-if="scope.row.Mon_A.patient_id ==''">
                   <el-button @click='newappend(scope.row.Mon_A)'>新增</el-button>
                 </div>
+                <schedule-item slot="reference" :schedule-detail="scope.row.Mon_A"></schedule-item>
               </el-popover>
-              <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_A"></schedule-item>
+              <!-- <schedule-item v-popover:popover :schedule-detail="scope.row.Mon_A"></schedule-item> ref="popover" -->
             </div>
           </template>
           <!-- <schedule-item slot-scope="scope" :schedule-detail="scope.row.Mon_A"></schedule-item> -->