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/template/prinSeven.vue

@@ -62,8 +62,6 @@
               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 class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
               <template v-if="index==yi+1&&item.advices.length>5">
                 <div style="margin: 20px 0px;">
                   <div class="infoTitle">
@@ -101,7 +99,8 @@
                 </div>
               </template>
               <div style="position: relative;">
-                <div class="drugsOne" :style="{'border-right':item.arr.length>0 && item.arr[0][0].groupno==it.groupno ? '1px solid black': 'none','width':'80%'}">
+                <!-- :style="{'border-right':item.arr.length>0 && (item.arr[0][0].groupno==it.groupno) ? '1px solid black': 'none','width':'80%'}" -->
+                <!-- <div class="drugsOne" >
                   <span style="font-weight: bold" >
                     {{ index + 1 + "."}}
                   </span>
@@ -110,19 +109,17 @@
                     {{ 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="item.arr.length>0 && item.arr[0][0].groupno==it.groupno">
+                  <div v-for="(ite,indexs) in item.arr" :key="indexs">
+                    <template v-if="item.arr.length>0 && ite[0].groupno==it.groupno">
                       <div >
-                        <!-- -->
-                        <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 style="margin-left: 38px;">{{ite[0].advice_name ? ite[0].advice_name : ""}}</span>&nbsp;&nbsp;
+                        <span v-if="ite[0].drug.min_unit != ite[0].drug.dose_unit">
+                          {{ ite[0].drug.dose }}{{ ite[0].drug.dose_unit }}&nbsp;* {{ ite[0].drug.min_number }}{{ ite[0].drug.min_unit }}/
+                          {{ite[0].drug.max_unit}}
                         </span>&nbsp;
                       </div>
-                      <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 }}
-                        <!-- 共{{ it.prescribing_number}}{{ it.prescribing_number_unit }} -->
+                      <div style="display: inline-block;position: absolute;left:85%;top:20px;margin-left: 5px;" >
+                        &nbsp;共{{ ite[0].single_dose }}{{ ite[0].single_dose_unit }}
                       </div>
                     </template>
                   </div>
@@ -138,23 +135,92 @@
                   <div style="margin-left: 70px" v-if="it.remark !=''">
                     备注：<span > {{ it.remark }}</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:30px;margin-left: 10px;" >
+                <div style="display: inline-block;position: absolute;left:80%;bottom:30px;margin-left: 5px;" >
                   ×&nbsp;{{ it.prescribing_number}}
                 </div>
-                <template v-if="item.arr.length>0&&item.arr[0][0].groupno==it.groupno">
-                  <div style="display: inline-block;position: absolute;left:80%;bottom:15px;margin-left: 10px;" >
-                    ×&nbsp;{{ item.arr[0][0].prescribing_number}}
+                <div v-for="(ite,indexs) in item.arr" :key="indexs">
+                  <template v-if="item.arr.length>0&&ite[0].groupno==it.groupno">
+                    <div style="display: inline-block;position: absolute;left:80%;bottom:15px;margin-left: 5px;" >
+                      ×&nbsp;{{ ite[0].prescribing_number}}
+                    </div>
+                  </template>
+                </div>
+                <template>
+
+                    <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="(item.arr.length>0&&item.arr[0][0].groupno!=it.groupno) || item.arr.length==0">
+                      &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
+                    </div>
+
+                    <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="item.arr.length>0&&item.arr[0][0].groupno==it.groupno">
+                      &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }}
+                    </div>
+                </template> -->
+                <!-- --------------------------------------------------------------------- -->
+                <template>
+                  <div v-for="(ite,indexs) in item.arr" :key="indexs">
+                    <div class="drugsOne" :style="{'border-right':item.arr.length>0 && (ite[0].groupno==it.groupno) ? '1px solid black': 'none','width':'80%'}">
+                    <span style="font-weight: bold" >
+                      {{ index + 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;* {{ it.drug.min_number }}{{ it.drug.min_unit }}/
+                      {{it.drug.max_unit}}
+                    </span>&nbsp;
+                    <div >
+                      <template v-if="item.arr.length>0 && ite[0].groupno==it.groupno">
+                        <div >
+                          <span style="margin-left: 38px;">{{ite[0].advice_name ? ite[0].advice_name : ""}}</span>&nbsp;&nbsp;
+                          <span v-if="ite[0].drug.min_unit != ite[0].drug.dose_unit">
+                            {{ ite[0].drug.dose }}{{ ite[0].drug.dose_unit }}&nbsp;* {{ ite[0].drug.min_number }}{{ ite[0].drug.min_unit }}/
+                            {{ite[0].drug.max_unit}}
+                          </span>&nbsp;
+                        </div>
+                        <div style="display: inline-block;position: absolute;left:85%;top:20px;margin-left: 5px;" >
+                          &nbsp;共{{ ite[0].single_dose }}{{ ite[0].single_dose_unit }}
+                          <!-- 共{{ it.prescribing_number}}{{ it.prescribing_number_unit }} -->
+                        </div>
+                      </template>
+                    </div>
+                    <div style="margin-left: 70px">
+                      用法：
+                      <span v-if="(item.arr.length>0 && item.arr[0][0].groupno!=it.groupno)||item.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>
+                    <div style="margin-left: 70px" v-if="it.remark !=''">
+                      备注：<span > {{ it.remark }}</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:30px;margin-left: 5px;" >
+                      ×&nbsp;{{ it.prescribing_number}}
+                    </div>
+                    <div >
+                      <template v-if="item.arr.length>0&&ite[0].groupno==it.groupno">
+                        <div style="display: inline-block;position: absolute;left:80%;bottom:15px;margin-left: 5px;" >
+                          ×&nbsp;{{ ite[0].prescribing_number}}
+                        </div>
+                      </template>
+                    </div>
+                    <template>
+                      <!-- <div v-for="(ite,indexs) in item.arr" :key="indexs"> -->
+                        <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="(item.arr.length>0&&item.arr[0][0].groupno!=it.groupno) || item.arr.length==0">
+                          &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
+                        </div>
+
+                        <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="item.arr.length>0&&item.arr[0][0].groupno==it.groupno">
+                          &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }}
+                        </div>
+                      <!-- </div> -->
+                    </template>
                   </div>
+
                 </template>
-                <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) || item.arr.length==0">
-                  &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
-                </div>
-                <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>
+
               </div>
               <template v-if="index==yi&&item.advices.length>5">
                 <div style="margin: 20px 0px;">

src/xt_pages/workforce/components/editTableData.vue

@@ -166,7 +166,7 @@
             height="calc(100% - 50px)"
             ref="table"
             style="table-layout: fixed;"
-           
+
         >
         <!-- :cell-style ='cellstyle'    :height="tableContainHeight" calc(100% - 50px) 600-->
           <el-table-column
@@ -1344,7 +1344,7 @@
                     :schedulMode="modename_value"
                   >
 
-                  
+
                   </schedule-item>
                 </div>
               </template>
@@ -2526,7 +2526,7 @@ export default {
 
         for(let i = 0; i < this.weeks.length; i++){
           for(let b = 0; b < this.first_weeks.length; b++){
-            if(this.weeks[i].week_type == this.first_weeks[b].week_type && this.first_weeks[b].order_id > 0){
+            if(this.weeks[i].week_type == this.first_weeks[b].week_type){
               console.log(this.weeks[i].week_type)
               console.log(this.first_weeks[b].week_type)
               console.log(this.first_weeks[b].order_id)