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

                           <label-box :isChecked="record.prescription.calcium=='1.75'?true :false" showValue="1.75mmo1/L"></label-box>&nbsp;&nbsp;
                         </div>
                         <div style="flex: 1;">
-                          医师签名:杨能华/
-                          <span style="display: inline-block;width: 50%;" v-if="setAdminUserES(record.prescription,'creater') == ''">
+                          医师签名:徐华
+                          <!-- <span style="display: inline-block;width: 50%;" v-if="setAdminUserES(record.prescription,'creater') == ''">
                             {{ getAdminUser(record.prescription, 'creater')}}
                           </span>
                           <span style="display: inline-block;width: 50%;" v-else>
                             <img style="height:30px;" :src="setAdminUserES(record.prescription,'creater')" alt srcset />
-                          </span>
+                          </span> -->
                         </div>
                       </div>
                       
                       <td>{{ advice[0].delivery_way }}</td>
                       <td>{{ getTime(advice[0].execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
                       <td style="height:30px;line-height:30px">
-                        <span v-if="advice[0].start_time>0">杨能华/</span>
+                        徐华
+                        <!-- <span v-if="advice[0].start_time>0">杨能华/</span>
                         <span v-if="setAdminUserES(advice[0],'advice_doctor') == ''">
                           {{ getAdminUser(advice[0],'advice_doctor')}}
                         </span>
                           style="display:flex;align-items:center;justify-content:space-around;height:25px;"
                         >
                           <img style="height:25px;" :src="setAdminUserES(advice[0],'advice_doctor')" alt srcset />
-                        </span>
+                        </span> -->
                       </td>
                       <td style="height:30px;line-height:30px">
                         <span v-if="setAdminUserES(advice[0], 'execution_staff') == ''">{{ getAdminUser(advice[0], 'execution_staff') }}</span>
                 <div style="display: flex;border: 1px solid black;padding: 5px;">
                   <div style="flex: 1;">
                     <div style="display: inline-block;margin-right: 120px;">
-                      <span style="display: inline-block;">医生签名:</span>杨能华/
-                      <span>
+                      <span style="display: inline-block;">医生签名:</span>徐华
+                      <!-- <span>
                         <span v-if="setAdminUserES(record.prescription,'creater') == ''">
                           {{ getAdminUser(record.prescription,'creater') }}
                         </span>
                         <img class="es-img" :src="setAdminUserES(record.prescription,'creater')" alt=""
                           srcset="" v-else style="height: 30px;" />
-                      </span>
+                      </span> -->
                     </div>
                   </div>
                   <div style="flex: 1;">  

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                             org_id == 10629 ||
                             org_id == 10510 ||
                             org_id == 10598 ||
-                            org_id == 10567
+                            org_id == 10567 ||
+                            org_id ==10234 ||
+                            org_id == 10121
 
                           ">
                             KT/V
                             org_id == 10629 ||
                             org_id == 10510 ||
                             org_id == 10598 ||
-                            org_id == 10567
+                            org_id == 10567 ||
+                            org_id == 10234 || 
+                            org_id == 10121
                           ">
                             {{ monitor_record.ktv }}
                           </td>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo(patient.id)">{{ patient.name }}</el-button>
             <div style="position: absolute;left: 20%;top: 3%;width: 70%;">
-              <span  v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702">
+              <span  v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702&&this.$store.getters.xt_user.template_info.org_id!=10744">
                 透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
               </span>&nbsp;&nbsp;
 
-              <span style="" v-if="this.$store.getters.xt_user.template_info.org_id ==0||this.$store.getters.xt_user.template_info.org_id==10702">
+              <span style="" v-if="this.$store.getters.xt_user.template_info.org_id ==0||this.$store.getters.xt_user.template_info.org_id==10702||this.$store.getters.xt_user.template_info.org_id==10744">
                 透前体重：{{predialysis&&(predialysis.weight_before-predialysis.additional_weight).toFixed(2)?(predialysis.weight_before-predialysis.additional_weight).toFixed(2):"" }} kg
               </span>&nbsp;&nbsp;
               <!-- style="position: absolute;left: 20%;top: 3%"  position: absolute;left:38%;top: 3%-->

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                           </td>
                           <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
                           <td width="50"
-                            v-if="org_id == 9538 || org_id == 10600 || org_id == 10629 || org_id == 10510 || org_id == 10580 || org_id == 10598 || org_id == 10567">
+                            v-if="org_id == 9538 || org_id == 10600 || org_id == 10629 || org_id == 10510 || org_id == 10580 || org_id == 10598 || org_id == 10567 || org_id ==10234 || org_id == 10121">
                             KT/V</td>
                           <td width="50" v-if="org_id == 9919">在线尿素监测</td>
                           <td width="50" v-if="org_id == 9671">在线尿素监测</td>
                           <td width="50" v-if="org_id == 3877 || org_id == 10449">{{
                             monitor.filter_pressure ? monitor.filter_pressure : "" }}</td>
                           <td width="50"
-                            v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id == 10600 || org_id == 10629 || org_id == 10510 || org_id == 10580 || org_id == 10598 || org_id == 10567">
+                            v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id == 10600 || org_id == 10629 || org_id == 10510 || org_id == 10580 || org_id == 10598 || org_id == 10567 || org_id == 10234 || org_id == 10121">
                             {{ monitor.ktv ? monitor.ktv : "" }}
                           </td>
                           <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">

src/xt_pages/dialysis/template/DialysisPrintOrdereightyfour.vue

                     <label-box :isChecked="prescription.calcium=='1.75'?true :false" showValue="1.75mmo1/L"></label-box>&nbsp;&nbsp;
                   </div>
                   <div style="flex: 1;">
-                    医师签名:杨能华/
-                    <span style="display: inline-block;width: 50%;" v-if="setAdminUserES(prescription.creater) == ''">
+                    医师签名:徐华
+                    <!-- <span style="display: inline-block;width: 50%;" v-if="setAdminUserES(prescription.creater) == ''">
                       {{ getAdminUser(prescription.creater)}}
                     </span>
                     <span style="display: inline-block;width: 50%;" v-else>
                       <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt srcset />
-                    </span>
+                    </span> -->
                   </div>
                 </div>
                 
                 <td>{{ advice.delivery_way }}</td>
                 <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
                 <td style="height:30px;line-height:30px">
-                  <span v-if="advice.start_time>0">杨能华/</span>
+                  徐华
+                  <!-- <span v-if="advice.start_time>0">徐华/</span>
                   <span v-if="setAdminUserES(advice.advice_doctor) == ''">
                     {{ getAdminUser(advice.advice_doctor)}}
                   </span>
                     style="display:flex;align-items:center;justify-content:space-around;height:25px;"
                   >
                     <img style="height:25px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
-                  </span>
+                  </span> -->
                 </td>
                 <td style="height:30px;line-height:30px">
                   <span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
           <div style="display: flex;border: 1px solid black;padding: 5px;">
             <div style="flex: 1;">
               <div style="display: inline-block;margin-right: 120px;">
-                <span style="display: inline-block;">医生签名:</span>杨能华/
-                <span>
+                <span style="display: inline-block;">医生签名:</span>徐华
+                <!-- <span>
                   <span style="display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
                     {{ getAdminUser(prescription.creater)}}
                   </span>
                   <span style="display: inline-block;" v-else>
                     <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt srcset />
                   </span>
-                </span>
+                </span> -->
               </div>
             </div>
             <div style="flex: 1;">

src/xt_pages/outpatientDoctorStation/template/printOne.vue

 <template>
   <div id="prescriptionPrint">
-    <div v-for="(item, index) in advicePrint" :key="index"  style="page-break-after: always">
-      <div
-        id="prescription-print"
-        class="prescription-print"
-       
-      >
+    <div v-for="(item, index) in advicePrint" :key="index" style="page-break-after: always">
+      <div id="prescription-print" class="prescription-print">
         <div class="printTitle" v-if="prescriptions[index].med_type == '1111'">
           {{ orgname }}第一类精神处方笺
         </div>
         <div class="printTitle" v-if="prescriptions[index].med_type == '1112'">
           {{ orgname }}第二类精神处方笺
         </div>
-        <div
-          class="printTitle"
-          v-if="
-            prescriptions[index].med_type != '1111' &&
-            prescriptions[index].med_type != '1112'
-          "
-        >
+        <div class="printTitle" v-if="
+          prescriptions[index].med_type != '1111' &&
+          prescriptions[index].med_type != '1112'
+        ">
           {{ orgname }}处方笺
         </div>
-        <div >
+        <div>
           <div class="infoTitle">
             <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
             <p>
               科室：{{ item.info ? getDepart(item.info.departments) : "" }}
             </div>
             <div style="margin-bottom: 10px" v-if="org_id == 10537">
-              身份证号：{{newHisPatient.id_card_no | testfile}}
+              身份证号：{{ newHisPatient.id_card_no | testfile }}
             </div>
             <div style="margin-bottom: 10px" v-else>
               医保卡号：
             </div>
           </div>
         </div>
-        <div class="prescriptionBox" :style="{'min-height':org_id != 10724? '350px':'450px'}">
+        <div class="prescriptionBox" :style="{ 'min-height': org_id != 10724 ? '350px' : '450px' }">
           <div class="Rp">Rp:</div>
-          <div class="drugsBox" 
-            v-for="(it, index1) in item.advices"
-            :key="index1"
-            :style="{'page-break-after':index1==yi&&item.advices.length>7? 'always':'auto','position': 'relative'}"
-          >
-            <template v-if="index1==yi+1&&item.advices.length>7">
+          <div class="drugsBox" v-for="(it, index1) in item.advices" :key="index1"
+            :style="{ 'page-break-after': index1 == yi && item.advices.length > 7 ? 'always' : 'auto', 'position': 'relative' }">
+            <template v-if="index1 == yi + 1 && item.advices.length > 7">
 
               <div class="printTitle" v-if="prescriptions[index].med_type == '1111'">
                 {{ orgname }}第一类精神处方笺
               <div class="printTitle" v-if="prescriptions[index].med_type == '1112'">
                 {{ orgname }}第二类精神处方笺
               </div>
-              <div
-                class="printTitle"
-                v-if="
-                  prescriptions[index].med_type != '1111' &&
-                  prescriptions[index].med_type != '1112'
-                "
-              >
+              <div class="printTitle" v-if="
+                prescriptions[index].med_type != '1111' &&
+                prescriptions[index].med_type != '1112'
+              ">
                 {{ orgname }}处方笺
               </div>
               <div style="margin-bottom: 10px;">
                     科室：{{ item.info ? getDepart(item.info.departments) : "" }}
                   </div>
                   <div style="margin-bottom: 10px" v-if="org_id == 10537">
-                    身份证号：{{newHisPatient.id_card_no | testfile}}
+                    身份证号：{{ newHisPatient.id_card_no | testfile }}
                   </div>
                   <div style="margin-bottom: 10px" v-else>
                     医保卡号：
               </div>
             </template>
             <div class="drugsOne">
-              <span style="font-weight: bold">{{ index1 + 1 + "." }}</span
-              >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
-              v-if="it.drug.min_unit != it.drug.dose_unit"
-              >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
-              >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
+              <span style="font-weight: bold">{{ index1 + 1 + "." }}</span>{{ it.advice_name ? it.advice_name : ""
+              }}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{ it.drug.dose }}{{ it.drug.dose_unit
+                }}&nbsp;*
+                &nbsp;</span>{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
                   it.drug.max_unit
                 }}&nbsp;×&nbsp; {{ it.prescribing_number
-                }}{{ it.prescribing_number_unit }}
+              }}{{ it.prescribing_number_unit }}
               <!-- <div style="display: inline-block;margin-left: 30px;" v-if="org_id ==10210 || org_id ==0">
                 <span>{{ it.price}}</span>
               </div> -->
             </div>
             <div style="margin-left: 100px">
-                <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
-                >&nbsp;&nbsp;<span
-              >{{ it.execution_frequency }}&nbsp;{{
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span>&nbsp;&nbsp;<span>{{ it.execution_frequency
+                }}&nbsp;{{
                   it.delivery_way
-                }}&nbsp;</span
-              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+                }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
             </div>
             <!-- 单价 -->
             <div style="display: inline-block;position: relative; top:-38px;left: 80%;"
-              v-if="org_id ==10210 || org_id ==0">
-                <span>{{ it.price}}</span>
+              v-if="org_id == 10210">
+              <span>{{ it.price }}</span>
             </div>
-            <template v-if="index1==yi&&item.advices.length>7">
+            <template v-if="index1 == yi && item.advices.length > 7">
               <div class="doctorBox">
                 <p v-if="org_id == 10217">
                   医师：
-                  <span
-                    style="width: 100px; display: inline-block"
-                    v-if="item.creator == ''"
-                  >
-                      {{ item.doctor }}
-                    </span>
-                  <span
-                    style="width: 100px; display: inline-block"
-                    v-else-if="doc_name != ''"
-                  >
-                      {{ doc_name }}
-                    </span>
-                  <img
-                    style="height: 50px;"
-                    :src="setAdminUserES(item.creator,item.doctor)"
-                    alt=""
-                    srcset=""
-                    v-else
-                  />
+                  <span style="width: 100px; display: inline-block" v-if="item.creator == ''">
+                    {{ item.doctor }}
+                  </span>
+                  <span style="width: 100px; display: inline-block" v-else-if="doc_name != ''">
+                    {{ doc_name }}
+                  </span>
+                  <img style="height: 50px;" :src="setAdminUserES(item.creator, item.doctor)" alt="" srcset="" v-else />
                 </p>
                 <p v-if="org_id == 10510 || org_id == 10265">
                   医师：
-                  <span
-                    style="width: 100px; display: inline-block"
-                    v-if="item.creator == ''"
-                  >
-                      {{ item.doctor }}
-                    </span>
-                  <span
-                    style="width: 100px; display: inline-block"
-                    v-else-if="doc_name != ''"
-                  >
-                      {{ doc_name }}
-                    </span>
-                  <img
-                    style="height: 50px;"
-                    :src="setAdminUserES(item.creator,item.doctor)"
-                    alt=""
-                    srcset=""
-                    v-else
-                  />
+                  <span style="width: 100px; display: inline-block" v-if="item.creator == ''">
+                    {{ item.doctor }}
+                  </span>
+                  <span style="width: 100px; display: inline-block" v-else-if="doc_name != ''">
+                    {{ doc_name }}
+                  </span>
+                  <img style="height: 50px;" :src="setAdminUserES(item.creator, item.doctor)" alt="" srcset="" v-else />
                 </p>
-                <p v-if="org_id!=10217 && org_id!=10510 && org_id !=10265">
+                <p v-if="org_id != 10217 && org_id != 10510 && org_id != 10265">
                   医师： {{ item.doctor ? item.doctor : "" }}
                 </p>
                 <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
             </template>
           </div>
 
-          <div
-            class="drugsBox"
-            v-for="(it, i) in item.additionalcharge"
-            :key="i"
-          >
+          <div class="drugsBox" v-for="(it, i) in item.additionalcharge" :key="i">
             <div class="drugsOne">
               {{ it.item_name ? it.item_name : "" }}:&nbsp;{{ it.price }}元/{{
                 it.count
             </div>
           </div>
 
-          <div
-            class="drugsBox"
-            v-for="(it, index) in item.project"
-            :key="index"
-          >
+          <div class="drugsBox" v-for="(it, index) in item.project" :key="index">
             <div class="drugsOne">
-              <span style="font-weight: bold">{{ index + 1 + "." }}</span
-              >{{
+              <span style="font-weight: bold">{{ index + 1 + "." }}</span>{{
                 it.type == 2
                   ? getProjectName(it.project_id)
                     ? getProjectName(it.project_id)
               }}{{ it.single_dose_unit }}&nbsp;×&nbsp; {{ it.count }}{{ unit }}
             </div>
             <div style="margin-left: 100px">
-              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
-              >&nbsp;&nbsp;<span>{{ it.delivery_way }}</span
-            >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span>&nbsp;&nbsp;<span>{{ it.delivery_way
+                }}</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
             </div>
           </div>
 
-          <div
-            class="drugsBox"
-            v-for="(it, i) in item.additionalcharge"
-            :key="i"
-          >
+          <div class="drugsBox" v-for="(it, i) in item.additionalcharge" :key="i">
             <div class="drugsOne">
               {{ it.project_id ? it.project_id : "" }}:&nbsp;{{
                 it.price.toFixed(2)
         <div class="doctorBox">
           <p v-if="org_id == 10217">
             医师：
-            <span
-              style="width: 100px; display: inline-block"
-              v-if="item.creator == ''"
-            >
-                {{ item.doctor }}
-              </span>
-            <span
-              style="width: 100px; display: inline-block"
-              v-else-if="doc_name != ''"
-            >
-                {{ doc_name }}
-              </span>
-            <img
-              style="height: 50px;"
-              :src="setAdminUserES(item.creator,item.doctor)"
-              alt=""
-              srcset=""
-              v-else
-            />
+            <span style="width: 100px; display: inline-block" v-if="item.creator == ''">
+              {{ item.doctor }}
+            </span>
+            <span style="width: 100px; display: inline-block" v-else-if="doc_name != ''">
+              {{ doc_name }}
+            </span>
+            <img style="height: 50px;" :src="setAdminUserES(item.creator, item.doctor)" alt="" srcset="" v-else />
           </p>
-          <p v-if="org_id == 10510  || org_id == 10265 || org_id ==0">
+          <p v-if="org_id == 10510 || org_id == 10265">
             医师：
-            <span
-              style="width: 100px; display: inline-block"
-              v-if="item.creator == ''"
-            >
-                {{ item.doctor }}
-              </span>
-            <span
-              style="width: 100px; display: inline-block"
-              v-else-if="doc_name != ''"
-            >
-                {{ doc_name }}
-              </span>
-            <img
-              style="height: 50px;"
-              :src="setAdminUserES(item.creator,item.doctor)"
-              alt=""
-              srcset=""
-              v-else
-            /> &nbsp;&nbsp;
-            <span v-if="org_id == 10265 || org_id ==0">
+            <span style="width: 100px; display: inline-block" v-if="item.creator == ''">
+              {{ item.doctor }}
+            </span>
+            <span style="width: 100px; display: inline-block" v-else-if="doc_name != ''">
+              {{ doc_name }}
+            </span>
+            <img style="height: 50px;" :src="setAdminUserES(item.creator, item.doctor)" alt="" srcset="" v-else />
+            &nbsp;&nbsp;
+            <span v-if="org_id == 10265 || org_id == 0">
               {{ item.doctor ? item.doctor : "" }}
             </span>
-            
+
           </p>
-          <p v-if="org_id!=10217 && org_id!=10510 && org_id !=10265 && org_id !=0">
+          <p v-if="org_id != 10217 && org_id != 10510 && org_id != 10265 && org_id != 0">
             医师： {{ item.doctor ? item.doctor : "" }}
           </p>
-          <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
+          <p v-if="org_id !=10751">日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
+          <p v-if="org_id ==10751 || org_id == 0">日期：{{ getTime(item.pre_time) ? getTime(item.pre_time) : "" }}</p>
         </div>
         <div class="actionBar">
           <p>审核：</p>
   getHisPatientDetail,
 } from "@/api/project/project";
 import { getInitData } from "@/api/his/his";
-export default{
+export default {
   props: {
     patient_id: Number,
     record_date: String,
   },
   data() {
     return {
-      doc_name:"",
+      doc_name: "",
       doctorList: [],
       advicePrint: {},
-      yi:4,
-      arr:[],
-      arrs:{},
-      advicess:[],
-      page:sessionStorage.getItem('dayin'),
+      yi: 4,
+      arr: [],
+      arrs: {},
+      advicess: [],
+      page: sessionStorage.getItem('dayin'),
       patient: {},
       tableData: [],
       prescriptionInfo: [],
       operators: [],
       doctorList_1: [],
     };
-  },filters: {
-    testfile (value) {
+  }, filters: {
+    testfile(value) {
       const start = value.slice(0, 6)
       const end = value.slice(-4)
       return `${start}******${end}`
   },
   methods: {
     // 电子签名
-    setAdminUserES(id,name) {
+    setAdminUserES(id, name) {
       console.log(id)
       console.log(name)
       console.log(this.operatorMaps)
       }
     },
     getAge(patient) {
-      if(patient.id_card_no == "TWN001836483"){
+      if (patient.id_card_no == "TWN001836483") {
         return patient.age
-      }else{
+      } else {
         var thisLen = patient.id_card_no.length;
         var birth = "";
         if (thisLen == 15) {
       }
       return name;
     },
-    merge(arrA){
-      var len=arrA.lenfth
+    merge(arrA) {
+      var len = arrA.lenfth
       // for(let j=0;j<this.advicess.length;j++){
       //   for(let x=j+1;x<this.advicess.length;x++){
       //     if(this.advicess[j].groupno == this.advicess[x].groupno){
       //     }
       //   }
       // }
-      for(let j=0;j<len;j++){
-        for(let x=j+1;x<len;x++){
-          if(arrA[j].groupno == arrA[x].groupno){
-            this.arr.push(arrA.splice(x,1))
+      for (let j = 0; j < len; j++) {
+        for (let x = j + 1; x < len; x++) {
+          if (arrA[j].groupno == arrA[x].groupno) {
+            this.arr.push(arrA.splice(x, 1))
           }
         }
       }
-      console.log('777777777',this.arr);
+      console.log('777777777', this.arr);
       return this.arr
     }
   },
 <style lang="scss" scoped>
 .prescription-print {
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
-  0 0 60px rgba(0, 0, 0, 0.06) inset;
+    0 0 60px rgba(0, 0, 0, 0.06) inset;
   -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
-  0 0 40px rgba(0, 0, 0, 0.06) inset;
+    0 0 40px rgba(0, 0, 0, 0.06) inset;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
   margin-bottom: 20px;
   padding: 20px 10px;
 }
+
 .printTitle {
   font-size: 22px;
   text-align: center;
   font-weight: bold;
 }
+
 .infoTitle {
   display: flex;
   border-bottom: 2px solid #000;
   line-height: 24px;
   padding: 0 10px;
 }
+
 .infoTitle p {
   width: 200px;
 }
+
 .infoMain {
   display: flex;
   flex-wrap: wrap;
   border-bottom: 2px solid #000;
   padding: 0 10px;
 }
+
 .infoMain div {
   width: 50%;
   line-height: 24px;
 }
+
 .prescriptionBox {
   padding: 0 10px;
   min-height: 450px;
 }
+
 .Rp {
   font-size: 22px;
   font-weight: bold;
 }
+
 .drugsBox {
   padding-left: 40px;
   margin-bottom: 10px;
   position: relative;
 }
+
 .drugsBox div {
   line-height: 20px;
 }
+
 .drugsOne {
   line-height: 24px;
   display: inline-block;
 }
+
 .drugsOne span {
   margin-right: 20px;
 }
+
 .doctorBox {
   display: flex;
   justify-content: space-between;
   line-height: 24px;
   border-bottom: 2px solid #000;
 }
-.doctorBoxs{
+
+.doctorBoxs {
   width: 100%;
   margin-right: 30px;
   text-align: right;
   line-height: 24px;
 
 }
+
 .doctorBoxtwo {
   display: flex;
   justify-content: space-between;
   line-height: 24px;
 
 }
+
 .actionBar {
   display: flex;
   justify-content: space-between;
   line-height: 24px;
   padding: 0 10px;
 }
+
 .actionBar p {
   width: 150px;
 }

src/xt_pages/outpatientTool/labelPrint.vue

                         textPosition:"top",//设置文本的垂直位置
                         textMargin:5,//设置条形码和文本之间的间距
                         fontSize:15,//设置文本的大小
-                        margin:15//设置条形码周围的空白边距
+                        margin:0,//设置条形码周围的空白边距
+                        marginTop:0
                       })
 
                     });

src/xt_pages/user/components/EditGroupAdvice.vue

                   v-model="nameForm.advice_desc"
                   :fetch-suggestions="querySearch1"
                   placeholder="请输入内容"
-                  @input="changeDrugDesc"
                 ></el-autocomplete>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
       handleSelect1(){
 
       },
-      handleSelect(){
-
+      handleSelect(val){
+         console.log("val233333333333",val)
+       this.drug_id = val.drug_id
+        this.nameForm.drug_id = val.drug_id
+        this.nameForm.way = 1
+        this.nameForm.drug_name_id = val.drug_id
+        var tmp = val.drug_specs[0]
+        console.log("tmp",tmp)
+        this.nameForm.advice_desc = tmp.dose+tmp.dose_unit+"*"+tmp.min_number+tmp.min_unit+"/"//药品规格
+        this.nameForm.drug_spec_unit = tmp.max_unit
+        this.nameForm.prescribing_number = tmp.prescribing_number//开药数量
+        this.nameForm.prescribing_number_unit = tmp.prescribing_number_unit
+        this.nameForm.single_dose = tmp.single_dose//单次用量
+        this.nameForm.single_dose_unit = tmp.drug_dose_unit
+        this.nameForm.delivery_way = tmp.delivery_way//给药途径
+        this.nameForm.execution_frequency = tmp.execution_frequency//执行频率
+        this.nameForm.drug_id = tmp.id
       },
 
        querySearch(queryString, cb) {

src/xt_permission.js

 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
  // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))