1

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -462,7 +462,7 @@
                         </td>
                         <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;">
                             <span style="padding-left:5px;display:inline-block;">
-                              <span>{{ advice.project.project_name }}</span>
+                              <span>{{ advice && advice.project ? advice.project.project_name : '' }}</span>
                             </span>
                         </td>
 
@@ -757,20 +757,20 @@ export default {
               this.records[recordIndex].his_advices &&
               this.records[recordIndex].his_advices.length + this.records[recordIndex].his_project.length < 6
             ) {
-              delghThree = 6 - this.records[recordIndex].his_advices.length
+              delghThree = 6 - (this.records[recordIndex].his_advices.length + this.records[recordIndex].his_project.length)
             } else {
               delghThree = 0
             }
 
             if (delghThree > 0) {
               if (
-                typeof this.records[recordIndex].his_advices === 'undefined' ||
-                this.records[recordIndex].his_advices == null
+                typeof this.records[recordIndex].his_project === 'undefined' ||
+                this.records[recordIndex].his_project == null
               ) {
-                this.records[recordIndex].his_advices = []
+                this.records[recordIndex].his_project = []
               }
               for (let index = 0; index < delghThree; index++) {
-                this.records[recordIndex].his_advices.push([])
+                this.records[recordIndex].his_project.push([])
               }
             }
             this.records[recordIndex].his_advices = this.records[recordIndex].his_advices.sort((a,b)=>{ return a.id-b.id})

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

@@ -431,7 +431,7 @@
                   </span>
                   </td>
                   <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;">
-                    <span>{{ advice.project.project_name }}</span>
+                    <span>{{ advice && advice.project ? advice.project.project_name : '' }}</span>
                   </td>
                   <td height="32px">
                       <span v-if="setAdminUserES(advice.doctor) == ''">{{ getAdminUser(advice.doctor) }}</span>
@@ -1260,16 +1260,16 @@ export default {
           }
         })
         this.projects = projects
-        if (this.doctor_advices.length + this.projects.length <= 6) {
-          var nl = 6
+        if ((this.doctor_advices.length + this.projects.length) <= 6) {
+          var nl = 6 - (this.doctor_advices.length + this.projects.length)
           this.print_length = 6
 
           for (let index = 0; index < nl; index++) {
             if (
-              this.doctor_advices[index] == undefined ||
-              this.doctor_advices[index].length <= 0
+              this.projects[index] == undefined ||
+              this.projects[index].length <= 0
             ) {
-              this.doctor_advices.push([])
+              this.projects.push([])
             } else {
               continue
             }