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_six.vue

@@ -350,21 +350,14 @@
                                     .blood_access_part_id
                                 : 0
                           }}
-                          <!-- {{
+                          {{
                             record.assessment_before_dislysis &&
                             record.assessment_before_dislysis
                               .blood_access_part_opera_name
                               ? record.assessment_before_dislysis
                                   .blood_access_part_opera_name
                               : ""
-                          }} -->
-                          <span v-for="(item, index) in arrtwo" :key="index">
-                          {{
-                           record.blood_access_part_opera_id == item.id
-                         ? item.name
-                            : ""
                           }}
-                        </span>
                         </div>
                       </div>
                       <div class="inline_block" style="flex:1;">
@@ -1142,7 +1135,6 @@
                             执行人签名
                           </td>
                           <td style="font-size: 16px" width="10%">时间</td>
-                          <td style="font-size: 16px" width="10%" v-if="org_id == 10223 ||org_id == 0||org_id == 4">核对者</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
                         <tr
@@ -1150,51 +1142,54 @@
                           :key="advice_index"
                         >
                           <td height="35px">
-                            <span v-if="advice.start_time">
-                              {{ getTime(advice.start_time, "{h}:{i}") }}
+                            <span v-if="advice[0].start_time">
+                              {{ getTime(advice[0].start_time, "{h}:{i}") }}
                             </span>
+                            <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
                           </td>
-                          
                           <td
                             height="35px"
                             colspan="2"
                             class="advice-name"
                             style="padding-left:7px;"
                           >
-                            <span v-if="advice.parent_id > 0">---></span>
-                            <span>{{ advice.advice_name }}</span>
-                            <span v-if=" advice[advice_index] && advice.advice_desc != undefined">
-                               ({{ advice.advice_desc}}{{ advice.drug_spec_unit }} )
+                            <span v-if="advice[0].parent_id > 0">---></span>
+                            <span>{{ advice[0].advice_name }}</span>
+                            <span v-if=" advice[advice_index] && advice[0].advice_desc != undefined">
+                               ({{ advice[0].advice_desc}}{{ advice[0].drug_spec_unit }} )
                             </span>
-                            <span v-if="advice.prescribing_number"
-                              >&nbsp;&nbsp; {{ advice.prescribing_number
-                              }}{{ advice.prescribing_number_unit }}</span
+                            <span v-if="advice[0].prescribing_number"
+                              >&nbsp;&nbsp; {{ advice[0].prescribing_number
+                              }}{{ advice[0].prescribing_number_unit }}</span
                             >
-                            <span v-if="advice.single_dose != 0">
-                              {{ advice.single_dose
-                              }}{{ advice.single_dose_unit }}</span
+                            <span v-if="advice[0].single_dose != 0">
+                              {{ advice[0].single_dose
+                              }}{{ advice[0].single_dose_unit }}</span
                             >
                             <span
                               v-if="
-                                advice.parent_id == 0
+                                advice[0].parent_id == 0 &&
+                                  advice[0].children.length == 0
                               "
-                              >{{ advice.delivery_way }}</span
+                              >{{ advice[0].delivery_way }}</span
                             >
                             <span
                               v-if="
-                                advice.parent_id == 0 
+                                advice[0].parent_id == 0 &&
+                                  advice[0].children.length == 0
                               "
-                              >{{ advice.execution_frequency }}</span
+                              >{{ advice[0].execution_frequency }}</span
                             >
                             <span
                               v-if="
-                                advice.parent_id ==0 &&
-                                  advice.remark.length > 0
+                                advice[0].parent_id == 0 &&
+                                  advice[0].children &&
+                                  advice[0].children.length == 0 &&
+                                  advice[0].remark.length > 0
                               "
-                              >({{ advice.remark }})</span
+                              >({{ advice[0].remark }})</span
                             >
                           </td>
-
                           <td height="35px">
                             <span
                               v-if="
@@ -1238,35 +1233,11 @@
                               style="height: 40px;"
                             />
                           </td>
-
-
                           <td height="35px">
-                            <span v-if="advice.execution_time">{{
-                              getTime(advice.execution_time, " {h}:{i}")
+                            <span v-if="advice[0].execution_time">{{
+                              getTime(advice[0].execution_time, " {h}:{i}")
                             }}</span>
                           </td>
-
-                          <td height="35px" v-if="org_id == 10223||org_id == 0||org_id == 4">
-                            <span
-                              v-if="
-                                setAdminUserES(advice[0], 'checker') ==
-                                  ''
-                              "
-                              >{{
-                                getAdminUser(advice[0], "checker")
-                              }}</span
-                            >
-                            <img
-                              class="es-img"
-                              :src="
-                                setAdminUserES(advice[0], 'checker')
-                              "
-                              alt=""
-                              srcset=""
-                              v-else
-                              style="height: 40px;"
-                            />
-                          </td>
                         </tr>
                         <!-- </template> -->
                       </tbody>
@@ -2023,7 +1994,7 @@ export default {
       precaution_arr: [],
       intake_arr: [],
       nutrition_arr: [],
-      arrtwo: [],
+
       records: [
         // 模拟有多条数据
         // {
@@ -2085,84 +2056,6 @@ export default {
       "hemodialysis",
       "vascular_access_desc"
     );
-    var arrtwo = [];
-    for (let i = 0; i < bloodAccessParOpera.length; i++) {
-      if (bloodAccessParOpera[i].name == "内瘘波动及震颤-存在") {
-        bloodAccessParOpera[i].name = "存在";
-        arr.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "内瘘波动及震颤-减弱") {
-        bloodAccessParOpera[i].name = "减弱";
-        arr.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "内瘘波动及震颤-消失") {
-        bloodAccessParOpera[i].name = "消失";
-        arr.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "直穿") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "动脉直穿") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "动静脉直穿") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "带隧道带绦纶套股静脉导管") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "带隧道带绦纶套锁骨下静脉导管") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "带隧道带绦纶套颈内静脉导管") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "无绦纶套股静脉导管") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "无绦纶套锁骨下静脉导管") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "无绦纶套颈内静脉导管") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "直线型移植血管动静脉内瘘") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "自体动静脉内瘘") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "袢型移植血管动静脉内瘘") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "静脉直穿") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "AVG") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "自体内瘘") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "AVF") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "颈内静脉") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "股静脉") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "人造血管") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      if (bloodAccessParOpera[i].name == "移植血管") {
-        arrtwo.push(bloodAccessParOpera[i]);
-      }
-      this.arrtwo = arrtwo;
-    }
-    console.log("arrtwo", arrtwo)
-
     for (var key in bloodAccessParOpera) {
       this.bloodAccessParOpera[bloodAccessParOpera[key].id] =
         bloodAccessParOpera[key];
@@ -2201,10 +2094,8 @@ export default {
       .then(rs => {
         var resp = rs.data;
         if (resp.state == 1) {
-          // this.records = this.records.concat(resp.data.schedules);
-          // console.log(rs,'rs')
-          this.records = resp.data.schedules;
-          console.log("记录this.records", this.records);
+          this.records = this.records.concat(resp.data.schedules);
+          console.log("记录", this.records);
 
           for (const recordIndex in this.records) {
             var dlegh = 0;
@@ -2235,82 +2126,59 @@ export default {
             }
 
             var delghTwo = 0;
-            console.log(this.records[recordIndex].advices,'长度')
             if (
               this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 6
+              this.records[recordIndex].advices.length < 12
             ) {
-              delghTwo = 6 - this.records[recordIndex].advices.length;
+              delghTwo = 12 - this.records[recordIndex].advices.length;
             } else {
               delghTwo = 0;
             }
 
             if (delghTwo > 0) {
-              console.log(typeof this.records[recordIndex].advices,'typeof this.records[recordIndex].advices')
               if (
                 typeof this.records[recordIndex].advices === "undefined" ||
                 this.records[recordIndex].advices == null
               ) {
-                for (let index = 0; index < delghTwo; index++) {
-                this.records[recordIndex].advices.push([]);
-              }
+                this.records[recordIndex].advices = [];
               }
               for (let index = 0; index < delghTwo; index++) {
                 this.records[recordIndex].advices.push([]);
               }
             }
 
-            // var childMap = {};
-            // for (const index in this.records[recordIndex].advices) {
-            //   if (this.records[recordIndex].advices[index].parent_id == 0) {
-            //     continue;
-            //   }
-            //   if (
-            //     !(
-            //       this.records[recordIndex].advices[index].parent_id in childMap
-            //     )
-            //   ) {
-            //     childMap[
-            //       this.records[recordIndex].advices[index].parent_id
-            //     ] = [];
-            //   }
-            //   childMap[this.records[recordIndex].advices[index].parent_id].push(
-            //     this.records[recordIndex].advices[index]
-            //   );
-            // }
-            // console.log(childMap,'childMap')
-
-            // var advices = [];
-            // for (const index in this.records[recordIndex].advices) {
-            //   if (this.records[recordIndex].advices[index].parent_id > 0) {
-            //     continue;
-            //   }
-            //   var item = this.records[recordIndex].advices[index];
-            //   if (item.id in childMap) {
-            //     item.children = childMap[item.id];
-            //     // advices.push(childMap[item.id]);
-            //   } else {
-            //     item.children = [];
-            //   }
-            //   advices.push(item);
-              
-            // }
-
-          console.log(" this.records[recordIndex].advices", this.records);
-          this.operators = resp.data.medical_staffs;
-          if (this.operators.length > 0) {
-            var operatorsLen = this.operators.length;
-            for (var index = 0; index < operatorsLen; index++) {
-              this.$set(
-                this.operatorMaps,
-                this.operators[index].id,
-                this.operators[index]
+            var childMap = {};
+            for (const index in this.records[recordIndex].advices) {
+              if (this.records[recordIndex].advices[index].parent_id == 0) {
+                continue;
+              }
+              if (
+                !(
+                  this.records[recordIndex].advices[index].parent_id in childMap
+                )
+              ) {
+                childMap[
+                  this.records[recordIndex].advices[index].parent_id
+                ] = [];
+              }
+              childMap[this.records[recordIndex].advices[index].parent_id].push(
+                this.records[recordIndex].advices[index]
               );
             }
-          }
-          this.adminUser = resp.data.users;
-          console.log("使用者", this.adminUser);
-          this.loading = false;
+
+            var advices = [];
+            for (const index in this.records[recordIndex].advices) {
+              if (this.records[recordIndex].advices[index].parent_id > 0) {
+                continue;
+              }
+              var item = this.records[recordIndex].advices[index];
+              if (item.id in childMap) {
+                item.children = childMap[item.id];
+              } else {
+                item.children = [];
+              }
+              advices.push(item);
+            }
 
             var leftAdvice = [];
             var rightAdvice = [];
@@ -2344,20 +2212,31 @@ export default {
             }
           }
 
-         
-        } 
-        else {
+          console.log(" this.records[recordIndex].advices", this.records);
+          this.operators = resp.data.medical_staffs;
+          if (this.operators.length > 0) {
+            var operatorsLen = this.operators.length;
+            for (var index = 0; index < operatorsLen; index++) {
+              this.$set(
+                this.operatorMaps,
+                this.operators[index].id,
+                this.operators[index]
+              );
+            }
+          }
+          this.adminUser = resp.data.users;
+          console.log("使用者", this.adminUser);
+          this.loading = false;
+        } else {
           this.loading = false;
           this.$message.error(resp.msg);
         }
       })
       .catch(err => {
-        // this.$message.error(err);
-        console.log(err)
+        this.$message.error(err);
       });
   },
   methods: {
-
     getUnit: function(val) {
       if (val.assessment_after_dislysis == null) {
         return "";
@@ -2499,6 +2378,8 @@ export default {
       }
     },
     getAdminUser(key, id) {
+      console.log("key", key);
+      console.log("id", id);
       if (
         typeof key === "undefined" ||
         key == null ||

src/xt_pages/workforce/appointment.vue

@@ -2838,8 +2838,6 @@
               copy_endtime:copy_endtime,
             }
          
-   
-           
            this.$refs[formName].validate(valid=>{
               if(valid){
                 copyPatientSchedule(params).then(response=>{