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

src/xt_pages/outpatientDoctorStation/print.vue

     <div class="dialysisPage" style="padding-top: 40px">
       <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243">
 
-        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id !=0" v-bind:childResponse="childResponse" 
+        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id !=0 " v-bind:childResponse="childResponse" 
         :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" 
         :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" 
         :prescription_id="prescription_id"></printOne>

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

         class="prescription-print"
         style="page-break-after: always;"
       >
-        <div class="printTitle" v-if="prescriptions[index].med_type == '1111'">
+        <!-- <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> -->
         <div
           class="printTitle"
           v-if="
             <div class="Rp">Rp:</div>
             <div
               class="drugsBox"
-              v-for="(it, index) in advicess" :key="index" 
+              v-for="(it, index) in item.advices" :key="index" 
               :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
             >
             <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  :style="{'page-break-after':index==yi&&item.advices.length>3? 'always':'auto'}"-->
                 </div>
               </template>
               <div style="position: relative;">
-                <div class="drugsOne" :style="{'border-right':arr.length>0 && arr[0][0].groupno==it.groupno ? '1px solid black' :'none','width':'80%'}">
+                <div class="drugsOne" :style="{'border-right':item.arr.length>0 && item.arr[0][0].groupno==it.groupno ? '1px solid black': 'none','width':'80%'}">
                   <span style="font-weight: bold" >
                     {{ index + 1 + "." }}
                   </span>
                     {{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* {{ it.drug.min_number }}{{ it.drug.min_unit }}/
                     {{it.drug.max_unit}}
                   </span>&nbsp;
+
                   <div>
-                    <template v-if="arr.length>0 && arr[0][0].groupno==it.groupno">
+                    <template v-if="item.arr.length>0 && item.arr[0][0].groupno==it.groupno">
                       <div >
-                        <!--  v-for="(its,indexs) in arr" :key="indexs" -->
-                        <span style="margin-left: 38px;">{{arr[0][0].advice_name ? arr[0][0].advice_name : ""}}</span>&nbsp;&nbsp;
-                        <span v-if="arr[0][0].drug.min_unit != arr[0][0].drug.dose_unit">
-                          {{ arr[0][0].drug.dose }}{{ arr[0][0].drug.dose_unit }}&nbsp;* {{ arr[0][0].drug.min_number }}{{ arr[0][0].drug.min_unit }}/
-                          {{arr[0][0].drug.max_unit}}
+                        <!-- -->
+                        <span style="margin-left: 38px;">{{item.arr[0][0].advice_name ? item.arr[0][0].advice_name : ""}}</span>&nbsp;&nbsp;
+                        <span v-if="item.arr[0][0].drug.min_unit != item.arr[0][0].drug.dose_unit">
+                          {{ item.arr[0][0].drug.dose }}{{ item.arr[0][0].drug.dose_unit }}&nbsp;* {{ item.arr[0][0].drug.min_number }}{{ item.arr[0][0].drug.min_unit }}/
+                          {{item.arr[0][0].drug.max_unit}}
                         </span>&nbsp;
                       </div>
-                      <div style="display: inline-block;position: absolute;left:87%;top:20px;margin-left: 10px;">
-                        &nbsp;共{{ arr[0][0].single_dose }}{{ arr[0][0].single_dose_unit }}
+                      <div style="display: inline-block;position: absolute;left:85%;top:20px;margin-left: 10px;" >
+                        &nbsp;共{{ item.arr[0][0].single_dose }}{{ item.arr[0][0].single_dose_unit }}
                       </div>
                     </template>
                   </div>
                   
                   <div style="margin-left: 70px">
                     用法：
-                    <span v-if="(arr.length>0 && arr[0][0].groupno!=it.groupno)||arr.length<0">{{ it.single_dose }}{{ it.single_dose_unit }}</span
+                    <span v-if="(item.arr.length>0 && item.arr[0][0].groupno!=it.groupno)||arr.length<0">{{ 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>
                   </div>
-                  
+                  <!-- v-if="arr.length>0 && arr[0][0].groupno==it.groupno" 'border-right':arr.length>0 && arr[0][0].groupno==it.groupno ? '1px solid black' :'none',-->
                 </div>
-                <div style="display: inline-block;position: absolute;left:80%;bottom:0px;margin-left: 10px;" v-if="arr.length>0 && arr[0][0].groupno==it.groupno">
+                <div style="display: inline-block;position: absolute;left:80%;bottom:0px;margin-left: 10px;"  v-if="item.arr.length>0 && item.arr[0][0].groupno==it.groupno">
                   ×&nbsp;{{ it.prescribing_number}}
                 </div>
-                <div style="display: inline-block;position: absolute;left:87%;top:0px;margin-left: 10px;" v-if="arr.length>0 && arr[0][0].groupno==it.groupno">
+                <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 10px;" v-if="item.arr.length>0 && item.arr[0][0].groupno==it.groupno">
                   <!-- &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }} -->
                   &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }}
                 </div>
 
           this.doctorList_1 = response.data.data.eles;
          for(let i=0;i<this.advicePrint.length;i++){
-          this.advicess=advicePrint[i].advices
-         }
-         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){
-                this.arr.push(this.advicess.splice(x,1))
-                // this.arrs=this.advicess.splice(x,1)
+          var arr = new Array()
+          var advicess = new Array()
+          var advicess=advicePrint[i].advices
+          
+         for(let j=0;j<advicess.length;j++){
+            for(let x=j+1;x<advicess.length;x++){
+              if(advicess[j].groupno == advicess[x].groupno){
+                arr.push(advicess.splice(x,1))
               }
             }
           }
-        // this.merge(this.advicess)
-          // console.log('4444444',this.arrs);
-         console.log('55555555',this.arr);
-         console.log('6666666',this.advicess);
+         
+         this.advicePrint[i]["arr"]    = arr
+        //  for(let y=0;y<this.advicePrint[i].arr.length;y++){
+        //   console.log('6666666',this.advicePrint[i].arr[y]);
+        //  }
+          
+         
+        }
+          console.log('4444444',this.advicePrint);
+        //  console.log('55555555',this.arr);
+         
           console.log(this.doctorList_1, "医生列表");
           if (this.doctorList_1.length > 0) {
             var operatorsLen = this.doctorList_1.length;
   margin-top: 10px;
   line-height: 24px;
   padding: 0 10px;
+  
 }
 .infoTitle p {
   width: 200px;

src/xt_pages/sign/Contextowner.vue

             >
         </div>
         <!-- 全屏状态 -->
-        <!-- <div id="fullscreenbroad" v-show="dialogTableVisible">
+        <div id="fullscreenbroad" v-show="dialogTableVisible">
             <el-row class="fullRow">
                 <el-button
                 @click="openSetting"
                 
              </div>
         
-        </div> -->
+        </div>
         <div class="app-container">
             <div class="page_lineUp">
                 <div class="lineUpTitle">