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/template/DialysisPrintOrderSix.vue

@@ -4204,9 +4204,9 @@ export default {
         this.summary = response.data.data.summary;
         this.org_template_info = response.data.data.org_template_info;
 
-        if (this.monitors.length <= 6) {
-          var nl = 6;
-          this.print_length = 6;
+        if (this.monitors.length <= 3) {
+          var nl = 3;
+          this.print_length = 3;
 
           for (let index = 0; index < nl; index++) {
             if (

src/xt_pages/workforce/printOne.vue

@@ -664,7 +664,7 @@ export default {
         for (let i = 0; i < arr.length; i++) {
           arr[i].name = this.nameSplit(arr[i].name)
           if (this.hiddenFlag) {
-            str += arr[i].name + '&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp '
+            str += arr[i].name + '&nbsp&nbsp&nbsp&nbsp'
           } else {
             str += arr[i].name + '(' + '上次床位:' + arr[i].order.DeviceNumber.zone.name + '-' + arr[i].order.DeviceNumber.number + '  ' + '血管通路:' + this.getBloodAccess(arr[i].order.blood_access_id) + '  ' + '排班备注:' + arr[i].order.schedule_remark + ')<br/>'
           }