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

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

                             <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
                         </td>
                     </tr>
+                    <tr v-for="(advice, advice_index) in record.his_project" :key="advice_index">
+                        <td height="32px;padding:1px 1px">
+                            <span v-if="advice.start_time">
+                                {{ getTime(advice.start_time, "{h}:{i}") }}
+                            </span>
+                        </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>
+                        </td>
+
+                        <td height="32px">
+                            <span v-if="setAdminUserES(advice, 'doctor') == ''">
+                                {{getAdminUser(advice, 'doctor')}}
+                            </span>
+                            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'doctor')" alt srcset />
+                            </span>
+                        </td>
+                        <td height="32px">
+                            <span v-if="setAdminUserES(advice, 'execution_staff') == ''">
+                                {{getAdminUser(advice, 'execution_staff')}}
+                            </span>
+                            <span v-else>
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'execution_staff')" alt srcset />
+                            </span>
+                        </td>
+                        <td height="32px">
+                            <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
+                        </td>
+                    </tr>
                     <!-- </template> -->
                     </tbody>
                 </table>
                         </div>
                     </div>
                 </div>
-                <div class="row" style="border-bottom:1px solid #000;display:flex;margin-top:150px;">
+                <div class="row" style="border-bottom:1px solid #000;display:flex;margin-top:50px;">
                     <div class="inline_block" style="width:33%">
                         医生签名：
                         <div class="under_line" style="width: 70px;text-align: center;">
             if (this.records[recordIndex].patient.user_org_id == 9535) {
               this.records[recordIndex].isShowZero = true
             }
+
+            let his_project = []
+            this.records[recordIndex].his_project.map(item => {
+              if(item.type == 2){
+                his_project.push(item)
+              }
+            })
+            this.records[recordIndex].his_project = his_project
             
             var delghThree = 0
             if (
               this.records[recordIndex].his_advices &&
-              this.records[recordIndex].his_advices.length < 6
+              this.records[recordIndex].his_advices.length + this.records[recordIndex].his_project.length < 6
             ) {
               delghThree = 6 - this.records[recordIndex].his_advices.length
             } else {

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

                   <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
                   </td>
               </tr>
-              <!-- </template> -->
+              <tr v-for="(advice, advice_index) in projects" :key="advice_index">
+                  <td height="32px;padding:1px 1px">
+                  <span v-if="advice.start_time">
+                      {{ getTime(advice.start_time, "{h}:{i}") }}
+                  </span>
+                  </td>
+                  <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;">
+                    <span>{{ advice.project.project_name }}</span>
+                  </td>
+                  <td height="32px">
+                      <span v-if="setAdminUserES(advice.doctor) == ''">{{ getAdminUser(advice.doctor) }}</span>
+                      <img style="height:30px" :src="setAdminUserES(advice.doctor)" alt="" srcset="" v-else />
+                  </td>
+                  <td height="32px">
+                      <span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
+                      <img style="height:30px" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else />
+                  </td>
+                  <td height="32px">
+                  <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
+                  </td>
+              </tr>
               </tbody>
           </table>
           <div style="border:1px solid #000;margin-top:5px;padding:0 10px;">
                   </div>
               </div>
           </div>
-          <div class="row" style="border-bottom:1px solid #000;display:flex;margin-top:150px;">
+          <div class="row" style="border-bottom:1px solid #000;display:flex;margin-top:50px;">
             <div class="inline_block" style="width:33%">
                   医生签名：
                   <div class="under_line" style="width: 70px;text-align: center;">
         gaijiliang_unit: ''
       },
       org_id:0,
+      projects:[]
     }
   },
   methods: {
         this.$message.error('血流速未填')
       }else if(this.predialysis.symptom_before_dialysis == ""){
         this.$message.error('透前病情未填')
-      }else if(this.dialysisOrder.washpipe_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.washpipe_nurse == 0){
         this.$message.error('预冲者未填')
-      }else if(this.dialysisOrder.puncture_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.puncture_nurse == 0){
         this.$message.error('穿刺者未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('上机者未填')
-      }else if(this.dialysisOrder.finish_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.finish_nurse == 0){
         this.$message.error('下机者未填')
       }else if(this.afterdialysis.weight_after == 0){
         this.$message.error('透后体重未填')
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse != this.check.creater && this.dialysisOrder.start_nurse != this.check.modifier && this.check.creater == 0){
         this.$message.error('查对护士未填')
       }else if(this.tableAdvice.length > 0){
-        this.tableAdvice.map(item => {
-          if(item.id > 0 && item.created_time){
-            this.users.map(it => {
-              if(it.id == item.advice_doctor){
-                if(it.type != 2){
-                  this.$message.error('存在不是医生保存的医嘱')
+        let num = 0
+        if(this.tableAdvice.length > 0){
+          this.tableAdvice.map(item => {
+            if(item.id > 0 && (item.created_time || item.start_time)){
+              this.users.map(it => {
+                if(it.id == item.advice_doctor){
+                  if(it.user_type == 3){
+                    num++
+                    this.$message.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
-              }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士执行的医嘱')
-                }
-              }else if(it.id == item.checker && item.checker > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士核对的医嘱')
-                }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getDisplaceLiquiPart: function(val) {
         //    this.advice_groups.push(group)
         //   }
         // }
-        if (this.doctor_advices.length <= 6) {
+
+        let projects = []
+        response.data.data.projects.map(item => {
+          if(item.type == 2){
+            projects.push(item)
+          }
+        })
+        this.projects = projects
+        if (this.doctor_advices.length + this.projects.length <= 6) {
           var nl = 6
           this.print_length = 6
 
             }
           }
         }
+        
+        console.log('this.projects',this.projects)
 
         // this.totollength = this.doctor_advices.length + this.monitors.length
         // if (this.totollength > 18) {