Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue

@@ -311,7 +311,7 @@
         }
      },
       printAction: function() {
-        if(this.org_id != 10495 && this.org_id != 0){
+        if(this.org_id != 10490 && this.org_id != 0){
           const style = '@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: 16px; padding: 0px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 0px 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; } }'
           printJS({
             printable: 'print_content',

src/xt_pages/workforce/appointment.vue

@@ -841,7 +841,7 @@ export default {
 
           console.log("tablelist020200220",this.tableList)
           
-
+          
           const filename = '排班模版'