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

src/xt_pages/dialysis/PatientBox.vue

                 }}
               </div>
             </div>
-            <div style="margin-top: 5px; text-align: left; height: 24px">
+            <div
+              style="
+                margin-top: 5px;
+                text-align: left;
+                height: 24px;
+                min-width: 205px;
+              "
+            >
               <span
                 class="tip1"
                 v-if="
           <div class="difficult" v-if="schedule.patient.troble_shoot == 1">
             疑难内瘘
           </div>
-          <div></div>
-
           <!-- <div style="height:24px;margin-right: 10px;">
             <div class="online" v-show="computeState(schedule) != 4">
               <p :class="stateColor(schedule)">{{ stateText(schedule) }}</p>
     .tx {
       @include display-flex;
       // @include align-items-center;
-      width: 90%;
+      width: 100%;
       img {
         width: 45px;
         height: 45px;
 }
 
 .difficult {
-  width: 72px;
+  width: 71px;
   height: 25px;
   font-size: 12px;
   border-radius: 0 0 0 30px;
   line-height: 25px;
   position: relative;
   bottom: 10px;
-  left: 73px;
+  left: 3px;
   color: white;
 }
 </style>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                             class="advice-name"
                             style="padding-left:7px;"
                           >
-                            <span v-if="advice[0].parent_id > 0">---></span>
-                            <span>{{ advice[0].advice_name }}</span>
+                          <!-- <span v-if="advice.parent_id > 0">-.-.-></span> -->
+                            
+                            <!-- <span>{{ advice[0].advice_name }}</span> -->
+                             <span>{{ advice[advice_index].parent_id }}</span>
+                            <!-- <span>{{advice[0].children[0].advice_name}}</span> -->
+
                             <span v-if=" advice[advice_index] && advice[0].advice_desc != undefined">
                                ({{ advice[0].advice_desc}}{{ advice[0].drug_spec_unit }} )
                             </span>
+
+
                             <span v-if="advice[0].prescribing_number"
                               >&nbsp;&nbsp; {{ advice[0].prescribing_number
                               }}{{ advice[0].prescribing_number_unit }}</span
                               "
                               >{{ advice[0].delivery_way }}</span
                             >
+                            
                             <span
                               v-if="
                                 advice[0].parent_id == 0 &&
                               >({{ advice[0].remark }})</span
                             >
                           </td>
+
+
                           <td height="35px">
                             <span
                               v-if="

src/xt_pages/dialysis/bloodPresssWatch.vue

           >
         </div>
       </template>
-      <template v-if="this.template_id == 6">
+      <template v-if="this.template_id == 6 || this.template_id == 48">
         <el-button
           size="small"
           icon="el-icon-printer"
           >批量打印</el-button
         >
       </template>
+      <!-- <template v-if="this.template_id == 48">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template> -->
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
         this.$router.push({ path: "/dialysis/print/batch/fortyThree" });
       } else if (this.template_id == 47) {
         this.$router.push({ path: "/dialysis/print/batch/fortyThree" });
+      } else if (this.template_id == 48) {
+        this.$router.push({ path: "/dialysis/print/batch/six" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                   <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 colspan="2" height="60px" style="text-align: center" v-else >

src/xt_pages/stock/inventoryTransfer/Addtrans.vue

                   :disabled="true"
                   style="width: 180px"
                 ></el-input>
-                <div style="visibility: hidden">/</div>
+                <div style="height: 20px;visibility: hidden">/</div>
               </el-form-item>
             </template>
           </el-table-column>
                   style="width: 200px"
                   :disabled="true"
                 ></el-input>
-                <div style="visibility: hidden">/</div>
+                <div style="height: 20px;visibility: hidden">/</div>
               </el-form-item>
             </template>
           </el-table-column>
                   >
                   </el-option>
                 </el-select>
-                <div style="visibility: hidden">/</div>
+                <div style="height: 20px;visibility: hidden">/</div>
               </el-form-item>
             </template>
           </el-table-column>
                   style="width: 150px"
                   :disabled="true"
                 ></el-input>
-                <div style="visibility: hidden">/</div>
+                <div style="visibility: hidden;height: 20px;">/</div>
               </el-form-item>
             </template>
           </el-table-column>
                 v-model="scope.row.remake"
                 style="width: 160px"
               ></el-input>
-              <div style="visibility: hidden">/</div>
+              <div style="visibility: hidden;height: 20px;">/</div>
             </template>
           </el-table-column>
 

src/xt_pages/stock/inventoryTransfer/transEdit.vue

                   :disabled="true"
                   style="width: 180px"
                 ></el-input>
-                <div style="visibility: hidden">/</div>
+                <div style="height: 20px;visibility: hidden">/</div>
               </el-form-item>
             </template>
           </el-table-column>
                   style="width: 200px"
                   :disabled="true"
                 ></el-input>
-                <div style="visibility: hidden">/</div>
+                <div style="height: 20px;visibility: hidden">/</div>
               </el-form-item>
             </template>
           </el-table-column>
                   >
                   </el-option>
                 </el-select>
-                <div style="visibility: hidden">/</div>
+                <div style="height: 20px;visibility: hidden">/</div>
               </el-form-item>
             </template>
           </el-table-column>
                   style="width: 150px"
                   :disabled="true"
                 ></el-input>
-                <div style="visibility: hidden">/</div>
+                <div style="height: 20px;visibility: hidden">/</div>
               </el-form-item>
             </template>
           </el-table-column>
                 style="width: 160px"
                 :disabled="store_disabled"
               ></el-input>
-              <div style="visibility: hidden">/</div>
+              <div style="height: 20px;visibility: hidden">/</div>
             </template>
           </el-table-column>