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/batch_print/batch_print_order_seventy.vue

@@ -271,14 +271,7 @@
                                   .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
-                              : ""
-                          }}
+                          {{QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id) }}
                         </div>
                       </div>                    
                     </div>
@@ -291,7 +284,7 @@
                         内瘘：
                         <div
                           class="under_line"
-                          style="width: 120px; text-align: center"
+                          style="width: 200px; text-align: center"
                         >
                           {{
                             record.assessment_before_dislysis &&
@@ -310,7 +303,7 @@
                         导管：
                         <div
                           class="under_line"
-                          style="width: 120px; text-align: center"
+                          style="width: 200px; text-align: center"
                         >
                           {{
                             record.assessment_before_dislysis &&
@@ -320,6 +313,13 @@
                           }}
                         </div>
                       </div>
+
+                      
+                    </div>
+                    <!-- 穿刺 -->
+                    <div class="row"
+                      style="padding: 2px 0; line-height: 23px; display: flex"
+                    >
                       <div
                         class="inline_block"
                         style=" flex: 1"
@@ -413,6 +413,7 @@
                       </div>
                       </div>
                     </div>
+
                     <div
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
@@ -751,7 +752,7 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     > 
 
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex:1">
                         透前症状：
                         <div
                           class="under_line"
@@ -768,7 +769,7 @@
                         </div>
                       </div>
 
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex:1.4">
                         透析(滤)器：
                         <div
                           class="under_line"
@@ -788,7 +789,7 @@
                           }}
                         </div>
                       </div>
-                      <div class="inline_block" style="flex: 0.8">
+                      <div class="inline_block" style="flex:1">
                         灌流器：
                         <div
                           class="under_line"
@@ -803,7 +804,7 @@
                         </div>
                       </div>
 
-                      <div class="inline_block" style="flex: 0.7">
+                      <div class="inline_block" style="flex: 1">
                         透析机号：
                         <div
                           class="under_line"
@@ -820,7 +821,7 @@
                         </div>
                       </div>
 
-                      <div class="inline_block" style="flex: 1">
+                      <!-- <div class="inline_block" style="flex: 1">
                         透析机型：
                         <div
                           class="under_line"
@@ -831,7 +832,7 @@
                               record.assessment_before_dislysis.machine_type : '' 
                           }}
                         </div>
-                      </div>
+                      </div> -->
                      
                     </div>
 
@@ -1854,12 +1855,12 @@
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
-                      <div class="inline_block" style="flex: 2.5">
+                      <div class="inline_block" style="flex: 1">
                         凝血程度：
                         <div
                           class="under_line"
                           style="
-                            width: 170px;
+                            width: 150px;
                             text-align: center;
                             white-space: normal;
                           "
@@ -1872,7 +1873,7 @@
                           }}
                         </div>
                       </div>
-                      <div class="inline_block" style="flex: 2">
+                      <div class="inline_block" style="flex: 1">
                         内瘘：
                         <div
                           class="under_line"
@@ -1891,7 +1892,7 @@
                           }}
                         </div>
                       </div>
-                      <div class="inline_block" style="flex: 4">
+                      <div class="inline_block" style="flex: 1">
                         导管：
                         <div
                           class="under_line"
@@ -1905,6 +1906,20 @@
                           }}
                         </div>
                       </div>
+                      <div class="inline_block" style="flex: 1">
+                        KTV(在线)：
+                        <div
+                          class="under_line"
+                          style="min-width: 100px; text-align: center"
+                        >
+                          {{
+                            record.assessment_after_dislysis &&
+                            record.assessment_after_dislysis.ktv
+                              ? record.assessment_after_dislysis.ktv
+                              : "/"
+                          }}
+                        </div>
+                      </div>
                     </div>
 
                     <div
@@ -2533,12 +2548,12 @@ export default {
     //   this.replacementWays = this.$store.getters.replacement_ways;
     //   this.perfusionApparatus = this.$store.getters.perfusion_apparatus;
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
-    // for(let i = 0 ; i < this.records.length ; i++){
-    //   console.log(i,'jhk')
-    //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(
-    //   i.assessment_before_dislysis.blood_access_part_opera_id
-    // );
-    // }
+    for(let i = 0 ; i < this.records.length ; i++){
+      console.log(i,'jhk')
+      this.blood_access_part_opera_name = this.bloodAccessParOperaName(
+      i.assessment_before_dislysis.blood_access_part_opera_id
+    );
+    }
     console.log(this.bloodAccessParOpera, "this.bloodAccessParOpera");
 
     for (var key in bloodAccessParOpera) {
@@ -2956,6 +2971,7 @@ export default {
       }
       return "";
     },
+    
     // 函数说明：因为一次透析记录有些记录不一定是必须填的，比如 record.receive_assessment 可能为 null，所以要取 record.receive_assessment.way 前需要判断 record.receive_assessment 是否为 null，所以这个方法用来简化模板渲染的代码
     // 参数说明：比如判断 record.receive_assessment.way 是不是为1，参数为 (record.receive_assessment, way, 1)
     isCheckBoxChecked: function (record, key, target_value) {
@@ -3009,6 +3025,20 @@ export default {
     getNumber: function (record) {
       console.log(record);
     },
+    QueryPartById: function (val) {
+        let vascular_access_part_name = "/";
+        const vascular_access = getDataConfig(
+          "hemodialysis",
+          "vascular_access_desc"
+        );
+
+        for (let i = 0; i < vascular_access.length; i++) {
+          if (vascular_access[i].id == val) {
+            vascular_access_part_name = vascular_access[i].name;
+          }
+        }
+        return vascular_access_part_name;
+      },
   },
 };
 </script>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue

@@ -256,7 +256,115 @@
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
 
-                    <div class="inline_block" style="">
+                    <div class="inline_block" style="flex: 1;">
+                      内瘘：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 200px;
+                          text-align: center;
+                          white-space: normal;
+                        "
+                      >
+                        {{
+                          predialysis.internal_fistula
+                            ? predialysis.internal_fistula
+                            : "/"
+                        }}
+                      </div>
+                    </div>
+
+                    <div
+                      class="inline_block"
+                      style=" flex: 1"
+                    >
+                      导管：
+                      <div
+                        class="under_line"
+                        style="width: 200px; text-align: center"
+                      >
+                        {{ predialysis.catheter ? predialysis.catheter : "/" }}
+                      </div>
+                    </div>
+                     <!-- <div
+                      class="inline_block"
+                      style=" flex: 0.9"
+
+                    >
+                      穿刺方式：
+                      <div
+                        class="under_line"
+                        style="width: 60px; text-align: center"
+                        v-if="predialysis.puncture_way == ''"
+                      >
+                         /
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 60px; text-align: center"
+                        v-if="predialysis.puncture_way.indexOf('绳梯') > -1"
+                      >
+                        绳梯
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 60px; text-align: center"
+                        v-if="predialysis.puncture_way.indexOf('扣眼') > -1"
+                      >
+                        扣眼
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 60px; text-align: center"
+                        v-if="predialysis.puncture_way.indexOf('区域') > -1"
+                      >
+                        区域
+                      </div>
+                    </div>
+                     <div
+                      class="inline_block"
+                      style=" flex: 1"
+                    >
+                      穿刺针：
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+                      <span>
+                        {{
+                          predialysis.puncture_needle
+                            ? predialysis.puncture_needle
+                            : "/"
+                        }}
+                      </span>
+
+                      </div>
+                    </div>
+                    <div
+                      class="inline_block"
+                      style=" flex: 1"
+                    >
+                      穿刺方向：
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                      >
+                      <span>
+                        {{
+
+                        }}
+                      </span>
+
+                      </div>
+                    </div> -->
+                  </div>
+
+                  <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+
+                    <!-- <div class="inline_block" style="">
                       内瘘：
                       <div
                         class="under_line"
@@ -285,7 +393,7 @@
                       >
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
                       </div>
-                    </div>
+                    </div> -->
                      <div
                       class="inline_block"
                       style=" flex: 1"
@@ -301,21 +409,21 @@
                       </div>
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 60px; text-align: center"
                         v-if="predialysis.puncture_way.indexOf('绳梯') > -1"
                       >
                         绳梯
                       </div>
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 60px; text-align: center"
                         v-if="predialysis.puncture_way.indexOf('扣眼') > -1"
                       >
                         扣眼
                       </div>
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 60px; text-align: center"
                         v-if="predialysis.puncture_way.indexOf('区域') > -1"
                       >
                         区域
@@ -748,7 +856,7 @@
                       </div>
                     </div>
 
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 1.2">
                       透析(滤)器：
                       <!--  透析(滤)器分开取值 -->
                       <div
@@ -798,30 +906,17 @@
 
                     </div>
 
-                    <div
-                      class="inline_block"
-                      style="flex: 1"
-                    >
-                      透析机型号：
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                      >
-                       {{predialysis.machine_type ? predialysis.machine_type : ""}}
-                      </div>
-
-                    </div>
                   </div>
 
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 0.9">
                       干体重：
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 60px; text-align: center"
                       >
                         {{
                           predialysis.dry_weight ? predialysis.dry_weight : "/"
@@ -829,24 +924,24 @@
                       </div>
                       kg
                     </div>
-                    <div class="inline_block" style="flex: 1" >
+                    <div class="inline_block" style="flex: 0.9" >
                       衣物重：
                       <div
                         class="under_line"
-                        style="width: 70px; text-align: center"
+                        style="width: 60px; text-align: center"
                       >
                         {{
                           predialysis.additional_weight
                             ? predialysis.additional_weight
                             : "/"
                         }}
-                      </div>
+                      </div>kg
                     </div>
-                    <div class="inline_block" style="flex: 1" >
+                    <div class="inline_block" style="flex: 1.2" >
                       上次透后体重：
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 60px; text-align: center"
                       >
                         <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495 || org_id == 10460 || org_id==10585">{{
                           lastafterdialysis.weight_after
@@ -864,7 +959,7 @@
                       透前体重：
                       <div
                         class="under_line"
-                        style="width: 70px; text-align: center"
+                        style="width: 60px; text-align: center"
                       >
                       <span v-if="org_id !=10447 && org_id != 9675">{{
                           predialysis.weight_before
@@ -888,11 +983,11 @@
                       </div>
                       kg
                     </div>
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 0.9">
                       体重增加：
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 50px; text-align: center"
                       >
                       {{ predialysis.weight_before > 0 && lastafterdialysis.weight_after > 0
                         ? parseFloat(predialysis.weight_before - lastafterdialysis.weight_after).toFixed(2): "/"
@@ -905,13 +1000,13 @@
                       计划超滤量：
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 60px; text-align: center"
                       >
                         {{
                           prescription.target_ultrafiltration
                             ? prescription.target_ultrafiltration
                             : "/"
-                        }}kg
+                        }}
                       </div>
                       <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">ml</span>
                       <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">L</span>
@@ -2034,7 +2129,7 @@
                       <div
                         class="under_line"
                         style="
-                          width: 170px;
+                          width: 150px;
                           text-align: center;
                           white-space: normal;
                         "
@@ -2066,6 +2161,12 @@
                         {{ afterdialysis.catheter ? afterdialysis.catheter : "/" }}
                       </div>
                     </div>
+                    <div class="inline_block" style="flex:1;">
+                      KTV(在线)：
+                      <div class="under_line" style="min-width: 50px;text-align: center">
+                        {{ afterdialysis.ktv ? afterdialysis.ktv : "/" }}
+                      </div>
+                    </div>
                   </div>
 
                   <div
@@ -2538,134 +2639,134 @@
       </div>
 
       <table class="print-table-no">
-                    <tbody>
-                      <tr style="line-height: 35px; padding: 8px 5px">
-                        <td
-                          colspan="7"
-                          style="
-                            letter-spacing: 5px;
-                            text-align: center;
-                            font-weight: 520;
-                            font-size: 16px;
-                            padding: 6px 8px;
-                            line-height: 30px;
-                          "
-                        >
-                          医嘱内容
-                        </td>
-                      </tr>
-                      <tr style="line-height: 35px; padding: 8px 5px">
-                        <td style="font-size: 16px" width="10%">时间</td>
-                        <td style="font-size: 16px" colspan="2" width="45%">
-                          医嘱内容
-                        </td>
-                        <td style="font-size: 16px" width="10%">医生签名</td>
-                        <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
-                        <td style="font-size: 16px" width="10%">执行人签名</td>
-                        <td style="font-size: 16px" width="10%">时间</td>
-                        <td
-                          style="font-size: 16px"
-                          width="10%"
-                          v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375"
-                        >
-                          核对护士
-                        </td>
-                      </tr>
-
-
-                      <tr
-                        v-for="(advice, advice_index) in doctor_advices"
-                        :key="advice_index"
-                      >
-                        <td height="32px">
-                          <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 v-if="advice.parent_id > 0">---></span>
-                          <span>{{ advice.advice_name }}</span>
-                          <span v-if="advice && advice.advice_desc"
-                            >({{ advice.advice_desc
-                            }}{{ advice.drug_spec_unit }})</span
-                          >
-                          <span v-if="advice.prescribing_number"
-                            >&nbsp;&nbsp; {{ advice.prescribing_number
-                            }}{{ advice.prescribing_number_unit }}</span
-                          >
-                          <span v-if="advice.single_dose != 0"
-                            >{{ advice.single_dose
-                            }}{{ advice.single_dose_unit }}</span
-                          >
-                          <span v-if="advice.parent_id == 0">{{
-                            advice.delivery_way
-                          }}</span>
-                          <span v-if="advice.parent_id == 0">{{
-                            advice.execution_frequency
-                          }}</span>
-                          <span
-                            v-if="
-                              advice.parent_id == 0 && advice.remark.length > 0
-                            "
-                            >({{ advice.remark }})</span
-                          >
-                        </td>
-
-                        <td height="32px">
-                          <span
-                            v-if="setAdminUserES(advice.advice_doctor) == ''"
-                            >{{ getAdminUser(advice.advice_doctor) }}</span
-                          >
-                          <img
-                            style="height: 30px"
-                            :src="setAdminUserES(advice.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>
-                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
-                          <span v-if="setAdminUserES(advice.checker) == ''">{{
-                            getAdminUser(advice.checker)
-                          }}</span>
-                          <img
-                            style="height: 30px"
-                            :src="setAdminUserES(advice.checker)"
-                            alt=""
-                            srcset=""
-                            v-else
-                          />
-                        </td>
-                      </tr>
+          <tbody>
+            <tr style="line-height: 35px; padding: 8px 5px">
+              <td
+                colspan="7"
+                style="
+                  letter-spacing: 5px;
+                  text-align: center;
+                  font-weight: 520;
+                  font-size: 16px;
+                  padding: 6px 8px;
+                  line-height: 30px;
+                "
+              >
+                医嘱内容
+              </td>
+            </tr>
+            <tr style="line-height: 35px; padding: 8px 5px">
+              <td style="font-size: 16px" width="10%">时间</td>
+              <td style="font-size: 16px" colspan="2" width="45%">
+                医嘱内容
+              </td>
+              <td style="font-size: 16px" width="10%">医生签名</td>
+              <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
+              <td style="font-size: 16px" width="10%">执行人签名</td>
+              <td style="font-size: 16px" width="10%">时间</td>
+              <td
+                style="font-size: 16px"
+                width="10%"
+                v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375"
+              >
+                核对护士
+              </td>
+            </tr>
 
 
+            <tr
+              v-for="(advice, advice_index) in doctor_advices"
+              :key="advice_index"
+            >
+              <td height="32px">
+                <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 v-if="advice.parent_id > 0">---></span>
+                <span>{{ advice.advice_name }}</span>
+                <span v-if="advice && advice.advice_desc"
+                  >({{ advice.advice_desc
+                  }}{{ advice.drug_spec_unit }})</span
+                >
+                <span v-if="advice.prescribing_number"
+                  >&nbsp;&nbsp; {{ advice.prescribing_number
+                  }}{{ advice.prescribing_number_unit }}</span
+                >
+                <span v-if="advice.single_dose != 0"
+                  >{{ advice.single_dose
+                  }}{{ advice.single_dose_unit }}</span
+                >
+                <span v-if="advice.parent_id == 0">{{
+                  advice.delivery_way
+                }}</span>
+                <span v-if="advice.parent_id == 0">{{
+                  advice.execution_frequency
+                }}</span>
+                <span
+                  v-if="
+                    advice.parent_id == 0 && advice.remark.length > 0
+                  "
+                  >({{ advice.remark }})</span
+                >
+              </td>
 
-                    </tbody>
+              <td height="32px">
+                <span
+                  v-if="setAdminUserES(advice.advice_doctor) == ''"
+                  >{{ getAdminUser(advice.advice_doctor) }}</span
+                >
+                <img
+                  style="height: 30px"
+                  :src="setAdminUserES(advice.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>
+              <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
+                <span v-if="setAdminUserES(advice.checker) == ''">{{
+                  getAdminUser(advice.checker)
+                }}</span>
+                <img
+                  style="height: 30px"
+                  :src="setAdminUserES(advice.checker)"
+                  alt=""
+                  srcset=""
+                  v-else
+                />
+              </td>
+            </tr>
+
+
+
+          </tbody>
      </table>
 
 

src/xt_pages/user/components/PatientDetail.vue

@@ -267,7 +267,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="8">
               <el-form-item label="透析之前情况 : " prop="predialysis_condition">
                 <el-checkbox-group v-model="form.predialysis_condition">
                   <el-checkbox
@@ -281,7 +281,11 @@
                 </el-checkbox-group>
               </el-form-item>
              </el-col>
-
+             <el-col :span="8">
+                <el-form-item label="住院(门诊)号 : " prop="admissionNumber">
+                  <el-input v-model="form.admissionNumber" disabled></el-input>
+                </el-form-item>
+              </el-col> 
              <el-col :span="8">
                 <el-form-item label="工作单位 : " prop="work">
                   <el-input v-model="form.work" disabled></el-input>
@@ -662,11 +666,11 @@
                 <!-- <el-form-item label=" " style="float:left;" label-width="30px" >
                 </el-form-item> -->
               </el-col>
-              <el-col :span="8">
+              <!-- <el-col :span="8">
                 <el-form-item label="住院(门诊)号 : " prop="admissionNumber">
                   <el-input v-model="form.admissionNumber" disabled></el-input>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="8">
                 <el-form-item label="医保类型 : " prop="reimbursementWayID">
                   <el-select v-model="form.reimbursementWayID" disabled>

src/xt_pages/user/doctorAdvice.vue

@@ -2528,6 +2528,7 @@ export default {
         }
       });
     },
+    // 点击报存
     submitNewAdvice(formName, action) {
       console.log("kkkthis.adviceForm",this.adviceForm)
       this.$refs[formName].validate(valid => {
@@ -3256,6 +3257,7 @@ export default {
       this.dialogFormVisible = true;
     },
     changeAdviceName(key) {
+      
       if (key in this.adviceTemplateMaps) {
         this.adviceForm.advice_name = this.adviceTemplateMaps[key].advice_name;
         this.adviceForm.advice_desc = this.adviceTemplateMaps[key].advice_desc;
@@ -3276,6 +3278,7 @@ export default {
           key
         ].execution_frequency;
       }
+      console.log('444444',this.adviceForm);
     },
     indexMethod(index) {
       if (index === 0) {
@@ -4661,35 +4664,64 @@ export default {
        this.current_drug_name = name
        this.adviceForm.advice_desc = ''
       this.drugSpec = []
+      console.log('7777777',name);
       for (let i = 0; i < this.all_drug.length; i++) {
+        // if(this.all_drug[i].drug_name.indexOf(name) != -1){
+
+        // }
         if (this.all_drug[i].drug_name == name) {
             this.drugSpec = this.all_drug[i].drug_specs
+            console.log('this.drugSpec',this.drugSpec);
+            for(let i=0;i<this.drugSpec.length;i++){
+                console.log('this.drugSpec.length',this.drugSpec[i].drug_name);
+                if (this.drugSpec[i].drug_name == name) {
+                  console.log('22222222',this.drugSpec[i])
+                  this.adviceForm.advice_desc = this.drugSpec[i].drug_spec
+                  this.adviceForm.prescribing_number = this.drugSpec[i].prescribing_number.toString()
+                  this.adviceForm.single_dose = this.drugSpec[i].single_dose.toString()
+                  this.adviceForm.delivery_way = this.drugSpec[i].delivery_way.toString()
+                  this.adviceForm.execution_frequency = this.drugSpec[i].execution_frequency.toString()
+                  this.drug_id = this.drugSpec[i].id
+                  this.src_type = this.drugSpec[i].type
+                  this.adviceForm.drug_id = this.drugSpec[i].id
+                  this.adviceForm.way = this.drugSpec[i].type
+                  this.adviceForm.single_dose_unit = this.drugSpec[i].min_unit
+                  this.adviceForm.drug_spec_unit = this.drugSpec[i].min_unit
+                  this.adviceForm.prescribing_number_unit = this.drugSpec[i].min_unit
+                  if(this.drugSpec[i].drug_name_id){
+                    this.adviceForm.drug_name_id = this.drugSpec[i].drug_name_id
+                  }else{
+                    this.adviceForm.drug_name_id = 0
+                  }
+                }
+            }
           }
        }
     },
    changeDrugDescTwo(name){
       this.current_drug_spec = name
-        for (let i = 0; i < this.drugSpec.length; i++) {
-          if (this.drugSpec[i].drug_spec == name) {
-            this.adviceForm.advice_desc = this.drugSpec[i].drug_spec
-            this.adviceForm.prescribing_number = this.drugSpec[i].prescribing_number.toString()
-            this.adviceForm.single_dose = this.drugSpec[i].single_dose.toString()
-            this.adviceForm.delivery_way = this.drugSpec[i].delivery_way.toString()
-            this.adviceForm.execution_frequency = this.drugSpec[i].execution_frequency.toString()
-            this.drug_id = this.drugSpec[i].id
-            this.src_type = this.drugSpec[i].type
-            this.adviceForm.drug_id = this.drugSpec[i].id
-            this.adviceForm.way = this.drugSpec[i].type
-            this.adviceForm.single_dose_unit = this.drugSpec[i].min_unit
-            this.adviceForm.drug_spec_unit = this.drugSpec[i].min_unit
-            this.adviceForm.prescribing_number_unit = this.drugSpec[i].min_unit
-            if(this.drugSpec[i].drug_name_id){
-               this.adviceForm.drug_name_id = this.drugSpec[i].drug_name_id
-            }else{
-              this.adviceForm.drug_name_id = 0
-            }
-          }
-        }
+        // for (let i = 0; i < this.drugSpec.length; i++) {
+        //   if (this.drugSpec[i].drug_spec == name) {
+        //     console.log('22222222',this.drugSpec[i])
+        //     this.adviceForm.advice_desc = this.drugSpec[i].drug_spec
+        //     this.adviceForm.prescribing_number = this.drugSpec[i].prescribing_number.toString()
+        //     this.adviceForm.single_dose = this.drugSpec[i].single_dose.toString()
+        //     this.adviceForm.delivery_way = this.drugSpec[i].delivery_way.toString()
+        //     this.adviceForm.execution_frequency = this.drugSpec[i].execution_frequency.toString()
+        //     this.drug_id = this.drugSpec[i].id
+        //     this.src_type = this.drugSpec[i].type
+        //     this.adviceForm.drug_id = this.drugSpec[i].id
+        //     this.adviceForm.way = this.drugSpec[i].type
+        //     this.adviceForm.single_dose_unit = this.drugSpec[i].min_unit
+        //     this.adviceForm.drug_spec_unit = this.drugSpec[i].min_unit
+        //     this.adviceForm.prescribing_number_unit = this.drugSpec[i].min_unit
+        //     if(this.drugSpec[i].drug_name_id){
+        //        this.adviceForm.drug_name_id = this.drugSpec[i].drug_name_id
+        //     }else{
+        //       this.adviceForm.drug_name_id = 0
+        //     }
+        //   }
+        // }
    },
    changeDrugName(name){
        this.current_drug_name = name
@@ -4731,12 +4763,13 @@ export default {
     },
 
      querySearch(queryString, cb) {
-        console.log('queryString',queryString)
+        console.log('queryString1111',queryString)
         var restaurants = this.all_drug;
         restaurants.map(item => {
           item.value = item.drug_name
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+      //  var results=arr
         // 调用 callback 返回建议列表的数据
         console.log('results',results)
         cb(results);
@@ -4744,7 +4777,8 @@ export default {
 
      createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          // return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurant.drug_name.indexOf(queryString) != -1);
         };
      },
 
@@ -4784,6 +4818,28 @@ export default {
         this.nameForm.drug_id = tmp.id
         console.log("isiisisthis.adviceForm",this.adviceForm)
         this.adviceForm.drug_id = tmp.id
+        for (let i = 0; i < this.drugSpec.length; i++) {
+          if (this.drugSpec[i].drug_spec == tmp.drug_name) {
+            console.log('22222222',this.drugSpec[i])
+            this.adviceForm.advice_desc = this.drugSpec[i].drug_spec
+            this.adviceForm.prescribing_number = this.drugSpec[i].prescribing_number.toString()
+            this.adviceForm.single_dose = this.drugSpec[i].single_dose.toString()
+            this.adviceForm.delivery_way = this.drugSpec[i].delivery_way.toString()
+            this.adviceForm.execution_frequency = this.drugSpec[i].execution_frequency.toString()
+            this.drug_id = this.drugSpec[i].id
+            this.src_type = this.drugSpec[i].type
+            this.adviceForm.drug_id = this.drugSpec[i].id
+            this.adviceForm.way = this.drugSpec[i].type
+            this.adviceForm.single_dose_unit = this.drugSpec[i].min_unit
+            this.adviceForm.drug_spec_unit = this.drugSpec[i].min_unit
+            this.adviceForm.prescribing_number_unit = this.drugSpec[i].min_unit
+            if(this.drugSpec[i].drug_name_id){
+               this.adviceForm.drug_name_id = this.drugSpec[i].drug_name_id
+            }else{
+              this.adviceForm.drug_name_id = 0
+            }
+          }
+        }
       },
       getTime(val) {
          if(val < 0){

src/xt_pages/workforce/scheduleTablePrintFive.vue

@@ -8,8 +8,8 @@
       <div class="tab" style="margin-top: 10px;">
         <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0" style='width: 100%;table-layout:fixed;text-align: center;word-break: break-all;word-wrap: break-word;'>
             <tr>
-                <td rowspan="2">分区</td>
-                <td rowspan="2">机号</td>
+                <td rowspan="2" width="100">分区</td>
+                <td rowspan="2" width="100">机号</td>
                 <td colspan="3" v-if="first_day == 1">周一({{ weekTitle[0] }})</td>
                 <td colspan="3" v-if="second_day == 2">周二({{ weekTitle[1] }})</td>
                 <td colspan="3" v-if="three_day == 3">周三({{ weekTitle[2] }})</td>

src/xt_pages/workforce/scheduleTablePrintTwo.vue

@@ -8,8 +8,8 @@
       <div class="tab" style="margin-top: 10px;">
         <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0" style='width: 100%;table-layout:fixed;text-align: center;word-break: break-all;word-wrap: break-word;'>
             <tr>
-                <td rowspan="2">分区</td>
-                <td rowspan="2">机号</td>
+                <td rowspan="2" width="100">分区</td>
+                <td rowspan="2" width="100">机号</td>
                 <td colspan="3" v-if="first_day == 1">周一({{ weekTitle[0] }})</td>
                 <td colspan="3" v-if="second_day == 2">周二({{ weekTitle[1] }})</td>
                 <td colspan="3" v-if="three_day == 3">周三({{ weekTitle[2] }})</td>