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

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1223,7 +1223,7 @@
   import MsgTip from './MsgTip'
   import request from '@/utils/request'
   import multiSelectBox from './MultiSelectBox'
-
+  const moment = require('moment')
   export default {
     name: 'dialysisPrescriptionDialog',
     components: { MsgTip, multiSelectBox },
@@ -2578,7 +2578,38 @@ mu
 
         this.isVisibility = true
         this.checkedCities = []
+        var total_day = ""
+        if(moment().weekday() == 1){
+           total_day ="周一"
+        }
+        if(moment().weekday() == 2){
+           total_day ="周二"
+        }
+        if(moment().weekday() == 3){
+           total_day ="周三"
+        }
+        if(moment().weekday() == 4){
+           total_day ="周四"
+        }
+        if(moment().weekday() == 5){
+           total_day ="周五"
+        }
+        if(moment().weekday() == 6){
+           total_day ="周六"
+        }
+        if(moment().weekday() == 6){
+           total_day ="周七"
+        }
+        console.log("---------",this.targetAdvices)
+        if(this.targetAdvices!=null && this.targetAdvices.length >0){
+            for (let i = 0; i < this.targetAdvices.length; i++) {
+              if(this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
+                this.targetAdvices[i].isCheck = 1
+              }
+            }
+        }
         for (let i = 0; i < this.targetAdvices.length; i++) {
+         
           if (this.targetAdvices[i].isCheck == 1) {
             this.checkedCities.push(this.targetAdvices[i].id)
           }

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -864,7 +864,7 @@
             width="140"
             v-if="
               isShow('KT/V') &&
-              (org_id == 9987 || org_id == 10215 || org_id == 9800)
+              (org_id == 9987 || org_id == 10215 || org_id == 9800 || org_id == 9598)
             "
           >
             <template slot-scope="scope">

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -44,7 +44,7 @@
           <th v-if="isShow('肝素量')" width="92px">肝素量(mg)</th>
           <th v-if="isShow('脱水')" width="92px">脱水(L)</th>
           <th v-if="isShow('滤前压')" width="92px">滤前压(mmHg)</th>
-          <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)" width="92px">KT/V</th>
+          <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)" width="92px">KT/V</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
 
           <th v-if="isShow('处理')" width="92px">处理</th>
@@ -96,7 +96,7 @@
           <th v-if="isShow('肝素量')" width="92px">{{monitor.heparin_amount ? monitor.heparin_amount : ""}}</th>
           <th v-if="isShow('脱水')" width="92px">{{monitor.dehydration ? monitor.dehydration : ""}}</th>
           <th v-if="isShow('滤前压')" width="92px">{{monitor.filter_pressure ? monitor.filter_pressure : ""}}</th>
-          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)">{{ monitor.ktv?monitor.ktv:""}}</td>
+          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}
             <span v-if="(index == monitores.length-1) && (org_id == 0 || org_id == 10340)">累计血容量:{{monitor.accumulated_blood_volume }}L</span>
           </td>

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -17,12 +17,14 @@
     <div class="app-container" style="background-color: white;">
       <div id="print_content">
         <div class="print_main_content">
-          <div class="table_panel" v-loding="loading"  element-loading-text="拼命加载中"> 
+          <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;
             ">
+              <!-- <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;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>
@@ -203,9 +205,9 @@
                 </div>
               
                 </div> 
+              <!-- </div> -->
            </div>
           </div>
-         
         </div>
       </div>
     </div>
@@ -381,19 +383,12 @@
         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;}}'
-        if (this.org_id == 9671 || this.org_id == 10340) {
-          // printJS({
-          //   printable: 'print_content',
-          //   type: 'html',
-          //   documentTitle: '  ',
-          //   style: style2,
-          //   scanStyles: false
-          // })
+        if (this.org_id == 9671 || this.org_id == 10340 || this.org_id == 0) {
           printJS({
             printable: 'print_content',
             type: 'html',
             documentTitle: '  ',
-            style: style2,
+            style: style,
             scanStyles: false
           })
         } else if (this.org_id == 10188 || this.org_id == 10217) {