Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/workforce/components/tableData.vue

@@ -74,77 +74,79 @@
       </div>
     </div>
 
-    <el-dialog :visible.sync="searchTableVisible" width="80%">
-      <el-table
-        :data="schedulePatients"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-        :row-style="{ color: '#303133' }"
-        style="width: 100%"
-        border
-      >
-        <el-table-column label="姓名" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.patient }}
-          </template>
-        </el-table-column>
-        <el-table-column label="透析日期" width="200">
-          <template slot-scope="scope">
-            {{ getDialysisDate(scope.row) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="分区">
-          <template slot-scope="scope">
-            {{ scope.row.zone.name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="班次" width="80">
-          <template slot-scope="scope">
-            {{ getSchedulesType(scope.row.schedule_type,scope.row) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机号" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.number.number }}
-          </template>
-        </el-table-column>
-        <el-table-column label="透析模式" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.mode.name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="300">
-          <template slot-scope="scope">
-            <span v-if="now_time <=scope.row.schedule_date">
+    <el-dialog :visible.sync="searchTableVisible" width="80%" class="eldialog">
+      <div style="position: relative;">
+        <el-table
+          :data="schedulePatients"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266'
+          }"
+          :row-style="{ color: '#303133' }"
+          style="width: 100%"
+          border
+        >
+          <el-table-column label="姓名" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.patient }}
+            </template>
+          </el-table-column>
+          <el-table-column label="透析日期" width="200">
+            <template slot-scope="scope">
+              {{ getDialysisDate(scope.row) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="分区">
+            <template slot-scope="scope">
+              {{ scope.row.zone.name }}
+            </template>
+          </el-table-column>
+          <el-table-column label="班次" width="80">
+            <template slot-scope="scope">
+              {{ getSchedulesType(scope.row.schedule_type,scope.row) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="机号" width="80">
+            <template slot-scope="scope">
+              {{ scope.row.number.number }}
+            </template>
+          </el-table-column>
+          <el-table-column label="透析模式" width="100">
+            <template slot-scope="scope">
+              {{ scope.row.mode.name }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="300">
+            <template slot-scope="scope">
+              <span v-if="now_time <=scope.row.schedule_date">
+                <el-button
+                size="mini"
+                type="primary"
+                @click="CancelSchedule(scope.row.id)"
+              >
+                取消排班
+              </el-button>
               <el-button
-              size="mini"
-              type="primary"
-              @click="CancelSchedule(scope.row.id)"
-            >
-              取消排班
-            </el-button>
-            <el-button
-              size="mini"
-              type="primary"
-              @click="changeMachineNumber(scope.$index, scope.row)"
-            >
-              调整机号
-            </el-button>
-            <el-button
-              size="mini"
-              type="primary"
-              @click="changeMode(scope.$index, scope.row)"
-            >
-              调整模式
-            </el-button>
-            </span>
-
-          </template>
-        </el-table-column>
-      </el-table>
+                size="mini"
+                type="primary"
+                @click="changeMachineNumber(scope.$index, scope.row)"
+              >
+                调整机号
+              </el-button>
+              <el-button
+                size="mini"
+                type="primary"
+                @click="changeMode(scope.$index, scope.row)"
+              >
+                调整模式
+              </el-button>
+              </span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
     </el-dialog>
+    
     <div class="center-tab">
       <el-table
         :row-style="{ color: '#303133' }"
@@ -3328,6 +3330,21 @@ textarea{
 .backPurple{
   color: #f32424 !important;
 }
+.eldialog{
+  .el-dialog__headerbtn {
+    // position: absolute;
+    // top: 20px;
+    // right: 20px;
+    // padding: 0;
+    // background: 0 0;
+    // border: none;
+    // outline: 0;
+    // cursor: pointer;
+    // font-size: 16px;
+    z-index: 3 !important;
+}
+}
+
 // .el-table td .cell{
 //   padding: 0px 0px !important;
 // }

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -20,20 +20,21 @@
           <div class="table_panel" v-loding="loading"  element-loading-text="拼命加载中">
             <div v-for="(main_collection,index) in scheduleData" :key="index" :class="(org_id == 9671 || org_id == 10340) && parseInt((index+1)%8) == 0  ? 'page-break-after':''"
             style="display: inline-block; width: 42%; margin: 0px 35px 20px; 
+            box-sizing: border-box;
             border: 1px solid black;
-            box-sizing: border-box;">
+            ">
               <!-- <div style="display: flex;justify-content: space-between;flex-wrap: wrap;">
                 box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 20px rgba(0, 0, 0, 0.06) inset; -->
-                <div class="signPrint" style="font-size:16px;  ">
+                <div class="signPrint" style="font-size:16px;width: 100%;padding:5px; word-wrap:break-word;">
                   <div style="font-size:24px;font-weight: 400;">姓名:
                     <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
                     <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
-                    <span v-if="type ==1 && printObj.name == 1">（{{ main_collection.patient.dialysis_no }}，
-                    <span> {{getGender(main_collection.patient.gender)}}，</span> 
-                      {{getNewAge(main_collection.patient.id_card_no) }}岁）</span> 
-                    <span v-if="type ==2 && printObj.name == 1">（{{ main_collection.dialysis_no }}，
-                    <span>{{getGender(main_collection.gender) }}，</span>  
-                      {{getNewAge(main_collection.id_card_no) }}岁）</span> 
+                    <span v-if="type ==1 && printObj.name == 1">({{ main_collection.patient.dialysis_no }},
+                    <span> {{getGender(main_collection.patient.gender)}},</span> 
+                      {{getNewAge(main_collection.patient.id_card_no) }}岁)</span> 
+                    <span v-if="type ==2 && printObj.name == 1">({{ main_collection.dialysis_no }},
+                    <span>{{getGender(main_collection.gender) }},</span>  
+                      {{getNewAge(main_collection.id_card_no) }}岁)</span> 
                     
                   </div>
                <div class="printCell">
@@ -381,7 +382,7 @@
       printAction: function() {
         const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
         const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
-        const style2 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .page-break-after{page-break-after:always;}.signPrint{width:40%;float: left;margin-left: 5%; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; margin-bottom: 20px;padding: 20px 10px;} .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
+        const style2 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .page-break-after{page-break-after:always;} .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
         if (this.org_id == 9671 || this.org_id == 10340) {
           printJS({
             printable: 'print_content',
@@ -812,13 +813,13 @@
     }
   }
 }
-.signPrint{
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-  // margin-bottom: 20px;
-  padding: 20px 5px;
-}
+// .signPrint{
+//   // -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+//   // -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+//   // box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+//   // margin-bottom: 20px;
+//   // padding: 20px 5px;
+// }
 .printCell{
   span{
     display: inline-block;