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

             alt=""
           />
           <div>
-          <div class="right">
-            <h3 class="name">
-              {{ schedule.patient.name
-              }}<span class="yc" v-show="isAbnormal(schedule)">异常</span>
-            </h3>
-            <span class="num"
-              >{{ genderText(schedule) }} | {{ getAge(schedule) }} 岁</span
-            >
-            <div style="margin-left:10px;font-size:12px;color:#34495e;margin-right: 5px;" v-if="schedule.assessment_before_dislysis && patientStateVal == 1">签到时间：{{ getTime(schedule.assessment_before_dislysis.created_time) }}</div>
-          </div>
-          <div style="margin-top:5px;text-align:left;height:24px;">
-            <span class="tip1" v-if="schedule.prescription == null || schedule.prescription.creater == 0" @click.stop="open(schedule)">
-              开处方
-            </span>
-            <span class="tip2" v-if="schedule.treatment_summary == null || schedule.treatment_summary.dialysis_summary == ''" @click.stop="open1(schedule)">
-              开小结
-            </span>
-            <span class="online" v-show="computeState(schedule) != 4">
-              <span :class="stateColor(schedule)">{{ stateText(schedule) }}</span>
-            </span>
+            <div class="right">
+              <h3 class="name">
+                {{ schedule.patient.name
+                }}<span class="yc" v-show="isAbnormal(schedule)">异常</span>
+              </h3>
+              <span class="num"
+                >{{ genderText(schedule) }} | {{ getAge(schedule) }} 岁</span
+              >
+              <div
+                style="
+                  margin-left: 10px;
+                  font-size: 12px;
+                  color: #34495e;
+                  margin-right: 5px;
+                "
+                v-if="
+                  schedule.assessment_before_dislysis && patientStateVal == 1
+                "
+              >
+                签到时间：{{
+                  getTime(schedule.assessment_before_dislysis.created_time)
+                }}
+              </div>
+            </div>
+            <div style="margin-top: 5px; text-align: left; height: 24px">
+              <span
+                class="tip1"
+                v-if="
+                  schedule.prescription == null ||
+                  schedule.prescription.creater == 0
+                "
+                @click.stop="open(schedule)"
+              >
+                开处方
+              </span>
+              <span
+                class="tip2"
+                v-if="
+                  schedule.treatment_summary == null ||
+                  schedule.treatment_summary.dialysis_summary == ''
+                "
+                @click.stop="open1(schedule)"
+              >
+                开小结
+              </span>
+              <span class="online" v-show="computeState(schedule) != 4">
+                <span :class="stateColor(schedule)">{{
+                  stateText(schedule)
+                }}</span>
+              </span>
+            </div>
           </div>
+          <!-- v-if="schedule.patient.troble_shoot == 1" -->
+          <div class="difficult" v-if="schedule.patient.troble_shoot == 1">疑难内瘘</div>
+          <div></div>
 
-          <div class="difficult" v-if="schedule.patient.troble_shoot == 1">
-            疑难内瘘
-          </div>
-        </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>
         </div>
       </div>
       <div class="dislysisInfo">
-        <p>体重(前/后kg):
-          {{ schedule.assessment_before_dislysis ? schedule.assessment_before_dislysis.weight_before : '' }}
-          <span v-if="schedule.assessment_after_dislysis && schedule.assessment_after_dislysis.weight_after>0">/{{ schedule.assessment_after_dislysis ? schedule.assessment_after_dislysis.weight_after : '' }}</span> </p>
-        <p>目标超滤量:
-          <span v-if="schedule.prescription && schedule.prescription.target_ultrafiltration>0">{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}</span>
-       
+        <p>
+          体重(前/后kg):
+          {{
+            schedule.assessment_before_dislysis
+              ? schedule.assessment_before_dislysis.weight_before
+              : ""
+          }}
+          <span
+            v-if="
+              schedule.assessment_after_dislysis &&
+              schedule.assessment_after_dislysis.weight_after > 0
+            "
+            >/{{
+              schedule.assessment_after_dislysis
+                ? schedule.assessment_after_dislysis.weight_after
+                : ""
+            }}</span
+          >
         </p>
-        <p :title="schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : ''">
-          透析器/灌流器:{{ schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : '' }}
-           <span v-if="schedule.prescription!=null">{{schedule.prescription?schedule.prescription.dialysis_dialyszers:''}}</span>
-           <span v-if="schedule.prescription!=null && schedule.prescription.dialysis_irrigation!=''">/</span>
-           <span v-if="schedule.prescription!=null">{{schedule.prescription?schedule.prescription.dialysis_irrigation:''}}</span>
+        <p>
+          目标超滤量:
+          <span
+            v-if="
+              schedule.prescription &&
+              schedule.prescription.target_ultrafiltration > 0
+            "
+            >{{
+              schedule.prescription
+                ? schedule.prescription.target_ultrafiltration
+                : ""
+            }}</span
+          >
+        </p>
+        <p
+          :title="
+            schedule.prescription
+              ? schedule.prescription.dialyzer_perfusion_apparatus
+              : ''
+          "
+        >
+          透析器/灌流器:{{
+            schedule.prescription
+              ? schedule.prescription.dialyzer_perfusion_apparatus
+              : ""
+          }}
+          <span v-if="schedule.prescription != null">{{
+            schedule.prescription
+              ? schedule.prescription.dialysis_dialyszers
+              : ""
+          }}</span>
+          <span
+            v-if="
+              schedule.prescription != null &&
+              schedule.prescription.dialysis_irrigation != ''
+            "
+            >/</span
+          >
+          <span v-if="schedule.prescription != null">{{
+            schedule.prescription
+              ? schedule.prescription.dialysis_irrigation
+              : ""
+          }}</span>
         </p>
       </div>
-      <div class="function" :class="functionColor(schedule)" :id="modeColor(schedule.mode_id)">
+      <div
+        class="function"
+        :class="functionColor(schedule)"
+        :id="modeColor(schedule.mode_id)"
+      >
         <ul>
           <li>
-            <span class="iconfont" :id="modeColor(schedule.mode_id)">&#xe6f5;</span>班次 :
+            <span class="iconfont" :id="modeColor(schedule.mode_id)"
+              >&#xe6f5;</span
+            >班次 :
             {{ timeTypeText(schedule) }}
           </li>
           <li>
-            <span class="iconfont" :id="modeColor(schedule.mode_id)">&#xe6de;</span>床位号 :
+            <span class="iconfont" :id="modeColor(schedule.mode_id)"
+              >&#xe6de;</span
+            >床位号 :
             {{ schedule.device_number.number }}
           </li>
           <li>
-            <span class="iconfont" :id="modeColor(schedule.mode_id)">&#xe6f6;</span>透析模式 :
+            <span class="iconfont" :id="modeColor(schedule.mode_id)"
+              >&#xe6f6;</span
+            >透析模式 :
             {{
               schedule.mode_id &&
               $store.getters.treatment_mode[schedule.mode_id]
       :last_prescription="lastDialysisPrescribe"
       :dry_weight="lastDryWeightDislysis"
       :schedual="temp_schedual"
-      :date='date'
+      :date="date"
       :stockType="stockType"
     ></dialysis-prescription-dialog>
     <treatment-summary-dialog
 </template>
 
 <script>
-
 import { parseTime } from "@/utils";
 import { jsGetAge } from "@/utils/tools";
 import dialysisPrescriptionDialog from "../dialysis/details/dialog/dialysisPrescriptionDialog";
 
 export default {
   name: "PatientBox",
-  components:{
+  components: {
     dialysisPrescriptionDialog,
-    treatmentSummaryDialog
+    treatmentSummaryDialog,
   },
   data() {
     return {
           yc: false,
           name: "张三",
           sex: "女",
-          age: 90
+          age: 90,
         },
         {
           state: 3,
           yc: true,
           name: "张三",
           sex: "女",
-          age: 90
+          age: 90,
         },
         {
           state: 4,
           yc: true,
           name: "张三",
           sex: "女",
-          age: 90
+          age: 90,
         },
         {
           state: 1,
           yc: true,
           name: "张三",
           sex: "女",
-          age: 90
-        }
+          age: 90,
+        },
       ],
       //
       longAdvices: [],
       headNurses: [],
       lastDialysisPrescribe: { id: 0 },
       temp_schedual: null,
-      date:'',
-      modedata:0,
-      stockType:[],
+      date: "",
+      modedata: 0,
+      stockType: [],
     };
   },
   props: {
     schedules: {
-      type: Array
+      type: Array,
     },
-    patientStateVal:Number
+    patientStateVal: Number,
   },
- 
+
   methods: {
-    stateColor: function(schedual) {
+    stateColor: function (schedual) {
       var state = this.computeState(schedual);
       if (state == 1) {
         return "blue";
         return "blue";
       }
     },
-    functionColor: function(schedual) {
+    functionColor: function (schedual) {
       var state = this.computeState(schedual);
       if (state == 1 || state == 3) {
         return "blue";
         return "blue";
       }
     },
-    borderColor: function(schedual) {
+    borderColor: function (schedual) {
       var yc = this.isAbnormal(schedual);
       if (yc == true) {
         return "red";
         return "gray";
       }
     },
-    stateText: function(schedual) {
+    stateText: function (schedual) {
       var state = this.computeState(schedual);
       if (state == 1) {
         return "已上机";
         return "未上机";
       }
     },
-    computeState: function(schedual) {
+    computeState: function (schedual) {
       if (schedual.dialysis_order == null) {
         // 未上机
         return 4;
       }
     },
 
-    orderState: function(schedual) {
+    orderState: function (schedual) {
       if (schedual.dialysis_order == null) {
         // 未上机
         return 4;
         return 1;
       }
     },
-    isAbnormal: function(schedual) {
+    isAbnormal: function (schedual) {
       return false; // schedual.yc;
     },
-    timeTypeText: function(schedual) {
+    timeTypeText: function (schedual) {
       if (schedual.schedule_type == 1) {
         return "上午";
       } else if (schedual.schedule_type == 2) {
         return "晚上";
       }
     },
-    genderText: function(schedual) {
+    genderText: function (schedual) {
       if (schedual.patient.gender == 0) {
         return "未知";
       } else if (schedual.patient.gender == 1) {
         return "女";
       }
     },
-    age: function(schedual) {
+    age: function (schedual) {
       if (schedual.patient.birthday == 0) {
         return "";
       } else {
       // // console.log(birthdayYear)
       // return nowYear - birthdayYear
     },
-    getAge: function(val) {
+    getAge: function (val) {
       var thisLen = val.patient.id_card_no.length;
       var birth = "";
       if (thisLen == 15) {
       var age = jsGetAge(birthtwo, "-");
       return age;
     },
-    detailAction: function(schedual) {
+    detailAction: function (schedual) {
       var patient_id = schedual.patient_id;
       var date = schedual.schedule_date;
       this.$router.push({
           patient_id: patient_id,
           date: date,
           patient_name: schedual.patient.name,
-          mode_id:schedual.mode_id
-        }
+          mode_id: schedual.mode_id,
+        },
       });
     },
     //
-    getScheduleDetail: function() {
+    getScheduleDetail: function () {
       var dateStr = parseTime(this.date, "{y}-{m}-{d}");
       this.doctor_advices = [];
-      getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
+      getDialysisScheduleDetail(this.patient_id, dateStr).then((rs) => {
         var resp = rs.data;
         if (resp.state == 1) {
           var patient = resp.data.patient; // 患者信息
-         
+
           var schedual = resp.data.schedual; // 患者排班信息
           var prescription = resp.data.prescription; // 透析处方
-          if(prescription!=null){
-              if(prescription.body_fluid == -2 ){
-                 prescription.body_fluid = 0
-             }
+          if (prescription != null) {
+            if (prescription.body_fluid == -2) {
+              prescription.body_fluid = 0;
+            }
           }
-          console.log("透析处方323332323223323223",prescription)
+          console.log("透析处方323332323223323223", prescription);
           var solution = resp.data.solution; // 透析方案
           var receiver_treatment_access = resp.data.receiver_treatment_access; // 接诊评估
-          console.log("receiver_treatment_access",receiver_treatment_access)
+          console.log("receiver_treatment_access", receiver_treatment_access);
           var predialysis_evaluation = resp.data.predialysis_evaluation; // 透前评估
-          console.log("透前评估",predialysis_evaluation)
-           if(predialysis_evaluation !=null){
-             if(predialysis_evaluation.blood_access_part_id == -2){
-                predialysis_evaluation.blood_access_part_id = 0
-             }
-           }
+          console.log("透前评估", predialysis_evaluation);
+          if (predialysis_evaluation != null) {
+            if (predialysis_evaluation.blood_access_part_id == -2) {
+              predialysis_evaluation.blood_access_part_id = 0;
+            }
+          }
           var doctor_advices = resp.data.doctor_advices; // 临时医嘱
-          
+
           var double_check = resp.data.double_check; // 双人核对
           var assessment_after_dislysis = resp.data.assessment_after_dislysis; // 透后评估
-        
+
           var treatment_summary = resp.data.treatment_summary; // 治疗小结
           var monitor_records = resp.data.monitor_records; // 透析监测
           var dialysis_order = resp.data.dialysis_order; // 透析记录
           var aliquid_info = resp.data.aliquid_info;
 
           var lastPredialysisEvaluation = resp.data.lastPredialysisEvaluation;
-          console.log("上次透前评估",lastPredialysisEvaluation)
-          if(lastPredialysisEvaluation !=null){
-             if(lastPredialysisEvaluation.blood_access_part_id == -2){
-               lastPredialysisEvaluation.blood_access_part_id = 0
-             }
+          console.log("上次透前评估", lastPredialysisEvaluation);
+          if (lastPredialysisEvaluation != null) {
+            if (lastPredialysisEvaluation.blood_access_part_id == -2) {
+              lastPredialysisEvaluation.blood_access_part_id = 0;
+            }
           }
           var lastMonitorRecord = resp.data.lastMonitorRecord;
           var lastAssessmentAfterDislysis =
           var lastDryWeightDislysis = resp.data.lastDryWeightDislysis;
 
           var system_prescribe = resp.data.system_prescribe;
-          
-          var stockType =  resp.data.stockType
-          this.stockType = stockType
-          console.log("元单快乐222222",this.stockType)
-          
+
+          var stockType = resp.data.stockType;
+          this.stockType = stockType;
+          console.log("元单快乐222222", this.stockType);
+
           this.$refs.prescription.setLastRecord(
             schedual,
             lastAssessmentAfterDislysis,
           this.patient = patient;
           this.schedual = schedual == null ? { id: 0 } : schedual;
           this.prescription = prescription == null ? { id: 0 } : prescription;
-          console.log('this.prescription',this.prescription)
+          console.log("this.prescription", this.prescription);
           this.solution = solution == null ? { id: 0 } : solution;
-          console.log('this.solution',this.solution)
+          console.log("this.solution", this.solution);
           this.receiver_treatment_access =
             receiver_treatment_access == null
               ? { id: 0 }
           this.devices = resp.data.devices;
           this.device_numbers = resp.data.device_numbers;
 
-          
-
           var device_map = {};
           for (let index = 0; index < this.devices.length; index++) {
             const device = this.devices[index];
             device_number_map[device_number.id] = device_number;
           }
           this.device_number_map = device_number_map;
-          this.getLongAdvice()
+          this.getLongAdvice();
         } else {
           this.$message.error(resp.msg);
-         
         }
 
         if (this.lastDialysisPrescribe != null) {
     },
     getLongAdvice() {
       let params = {
-        patient_id: this.patient_id
+        patient_id: this.patient_id,
       };
-      getLongAdvice(params).then(rs => {
+      getLongAdvice(params).then((rs) => {
         var resp = rs.data;
         if (resp.state == 1) {
           var status = parseInt(resp.data.status);
         }
       });
     },
-    adviceFunc: function() {
+    adviceFunc: function () {
       this.$emit("advice");
     },
-    open(schedual){
-     
-      this.date = schedual.schedule_date
-      this.patient_id = schedual.patient_id
-      this.modedata = 1
-      this.getScheduleDetail()
+    open(schedual) {
+      this.date = schedual.schedule_date;
+      this.patient_id = schedual.patient_id;
+      this.modedata = 1;
+      this.getScheduleDetail();
       // this.getLongAdvice()
-      this.$refs.prescription.show(this.prescription,schedual);
-      
+      this.$refs.prescription.show(this.prescription, schedual);
     },
-    open1(schedual){
-      this.date = schedual.schedule_date
-      this.patient_id = schedual.patient_id
-      this.getScheduleDetail()
-      this.getLongAdvice()
-      this.$refs.treatmentSummary.show(this.treatment_summary,this.date);
-      
+    open1(schedual) {
+      this.date = schedual.schedule_date;
+      this.patient_id = schedual.patient_id;
+      this.getScheduleDetail();
+      this.getLongAdvice();
+      this.$refs.treatmentSummary.show(this.treatment_summary, this.date);
     },
-    getTime(date){
-      date = new Date(date * 1000)
-      var Y = date.getFullYear() + '-';
-      var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1);
-      var D = (date.getDate() < 10 ? '0'+date.getDate() : date.getDate());
-      var h = (date.getHours() < 10 ? '0'+date.getHours() : date.getHours());
-      var m = (date.getMinutes() < 10 ? '0'+date.getMinutes() : date.getMinutes());
-      var s = (date.getSeconds() < 10 ? '0'+date.getSeconds() : date.getSeconds());
-      
-      let strDate = h  + ':' + m;
+    getTime(date) {
+      date = new Date(date * 1000);
+      var Y = date.getFullYear() + "-";
+      var M =
+        date.getMonth() + 1 < 10
+          ? "0" + (date.getMonth() + 1)
+          : date.getMonth() + 1;
+      var D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      var h = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
+      var m =
+        date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+      var s =
+        date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+
+      let strDate = h + ":" + m;
       return strDate;
     },
-    modeColor (id) {
+    modeColor(id) {
       if (id == 1) {
-
       } else if (id == 2) {
-        return 'modeRed'
+        return "modeRed";
       } else if (id == 3) {
-        return 'modePurple'
+        return "modePurple";
       }
-    }
+    },
   },
 };
 </script>
       .right {
         // float: left;
         // text-align: left;
-        display:flex;
+        display: flex;
         align-items: center;
         margin-top: 6px;
         .name {
           font-weight: bold;
           height: 20px;
           line-height: 20px;
-          margin-right:10px;
+          margin-right: 10px;
           .yc {
             background: #ff7979;
             color: #fff;
           color: #7b8a97;
         }
       }
-      .tip1{
+      .tip1 {
         background: #4fc7cb;
         border-radius: 5px;
         text-align: center;
         height: 24px;
         line-height: 24px;
       }
-      .tip2{
+      .tip2 {
         background: #7bce91;
         border-radius: 5px;
         text-align: center;
         border-radius: 4px;
         margin: 0 auto;
         font-size: 12px;
-        margin-top:4px;
+        margin-top: 4px;
         display: inline-block;
       }
       .blue {
       }
     }
   }
-  .dislysisInfo{
+  .dislysisInfo {
     color: rgb(123, 138, 151);
     border-bottom: 1px solid rgb(229, 229, 229);
     padding-left: 80px;
-    >p{
+    > p {
       margin-bottom: 5px;
-      overflow:hidden;
-      text-overflow:ellipsis;
-      white-space:nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 }
 .red {
   border: 1px #ff7979 solid;
 }
-#modeRed{
-  color:#ed5555;
+#modeRed {
+  color: #ed5555;
 }
-#modePurple{
+#modePurple {
   color: #53b86e;
 }
 
-.difficult{
-  width: 100px;
-  height: 40px;
+.difficult {
+  width: 82px;
+  height: 33px;
   border-radius: 0 0 0 30px;
   background: #78d660;
   text-align: center;
-  line-height: 40px;
+  line-height: 33px;
   position: relative;
-  bottom: 64px;
-  left: 179px;
+  bottom: 9px;
+  left: 63px;
   color: white;
 }
 </style>

src/xt_pages/outpatientDoctorStation/template/printSix.vue

             <div style="width:120px;">
                 医师：
             <span>{{ item.doctor ? item.doctor : "" }} </span>
+            
             </div>
           
           </div>

src/xt_pages/stock/drugs/query.vue

            <template slot-scope="scope">
              <tr style="background: none" v-for="(item,index) in scope.row.drug_warehouse" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
-               {{getWarehoseInfoSeven(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,item.storehouse_id)}}
+               {{getWarehoseInfoSeven(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,item.storehouse_id)}}&nbsp;
               </td>
             </tr>
            </template>
            <template slot-scope="scope">
             <tr style="background: none" v-for="(item,index) in scope.row.drug_warehouse" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
-              {{getOutFlushNight(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info,item.storehouse_id)}}
+              {{getOutFlushNight(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info,item.storehouse_id)}}&nbsp;
               </td>
             </tr>
            </template>
            <template slot-scope="scope">
               <tr style="background: none" v-for="(item,index) in scope.row.drug_warehouse" :key="index">
                 <td style="border-right: none; border-inline-end: none;text-align: center">
-                {{getOverFlushInfoEight(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,item.storehouse_id,scope.row.storehouse_id)}}
+                {{getOverFlushInfoEight(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,item.storehouse_id,scope.row.storehouse_id)}}&nbsp;
                 </td>
             </tr>
            </template>

src/xt_pages/stock/inventoryTransfer/Addtrans.vue

               placeholder="选择日期"
             ></el-date-picker>
           </el-form-item>
-          <span><span style="color:red">*</span>调出仓库：</span>
+          <span style="display: inline-block;margin-top: 8px;font-size: 14px;"><span style="color:red;font-size: 14px;">*</span>调出仓库：</span>
           <el-form-item  prop="storehouse_out_id">
               <el-select size="small" v-model="storehouse_out_id" filterable placeholder="请选择调出仓库" @change="changeHouseList">
                 <el-option
                 </el-option>
               </el-select>
           </el-form-item>
-          <span><span style="color:red">*</span>调入仓库：</span>
+          <span style="display: inline-block;margin-top: 8px;font-size: 14px;"><span style="color:red;font-size: 14px;">*</span>调入仓库：</span>
           <el-form-item prop="storehouse_in_id">
             <el-select size="small" v-model="storehouse_in_id" filterable placeholder="请选择调入仓库">
             <el-option
       </div>
      <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
       <el-table
-        :row-style="changColor"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266',
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
+
+</style>
+<style scoped>
+/deep/ .el-table__body{
+  width: 100% !important;
+}
+/deep/ .el-table__header{
+ width: 100% !important;
+}
+
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 15px !important;
+  height: 15px !important;
+}
 </style>

src/xt_pages/stock/inventoryTransfer/transEdit.vue

               placeholder="选择日期"
             ></el-date-picker>
           </el-form-item>
-          <span><span style="color:red">*</span>调出仓库：</span>
+          <span style="display: inline-block;margin-top: 8px;font-size: 14px;"><span style="color:red;font-size:14px">*</span>调出仓库：</span>
           <el-form-item  prop="storehouse_out_id">
               <el-select size="small" v-model="storehouse_out_id" filterable placeholder="请选择调出仓库"  :disabled="store_disabled"  @change="changeHouseList">
                 <el-option
                 </el-option>
               </el-select>
           </el-form-item>
-          <span><span style="color:red">*</span>调入仓库：</span>
+          <span style="display: inline-block;margin-top: 8px;font-size: 14px;"><span style="color:red;font-size:14px">*</span>调入仓库：</span>
           <el-form-item prop="storehouse_in_id">
             <el-select size="small" v-model="storehouse_in_id" filterable placeholder="请选择调入仓库"  :disabled="store_disabled">
             <el-option
       </div>
      <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
       <el-table
-        :row-style="changColor"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266',
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
+</style>
+
+<style scoped>
+/deep/ .el-table__body{
+  width: 100% !important;
+}
+/deep/ .el-table__header{
+ width: 100% !important;
+}
+
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 15px !important;
+  height: 15px !important;
+}
 </style>

src/xt_pages/stock/stockQuery.vue

           
             <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
-               {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id)}}
+               {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;
               </td>
             </tr>
          </template>
        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
-          <span>
+          
              <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
-              {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id) - getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}
+              {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id) - getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;
               </td>
             </tr>
-         </span>
+         
 
          </template>
        </el-table-column>
          <template slot-scope="scope">
              <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
-               {{getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}
+               {{getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;&nbsp;
               </td>
             </tr>
          </template>
 .spanClass .cell tr {
   display: inline-block;
   width: 100%;
+  /* height: 44px; */
 }
 
 .spanClass .cell tr td {
   border-bottom: 1px solid #ebeef5;
   display: block;
   width: 100%;
+  min-height: 44px;
 }
 .spanClass .cell tr:last-of-type td{
   border-bottom: none;

src/xt_pages/user/components/PatientForm.vue

                 </el-form-item>
               </el-col>
 
-              <el-col :span="8">
+              <el-col :span="8" style="margin-bottom: 20px;">
                 <el-form-item
                   label="备注 : "
                   prop="sch_remark">
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8">
+              <el-col :span="24">
                 <el-form-item label="传染病 : " prop="contagions">
                   <el-radio-group v-model="form.is_infectious" @change="changeInfectious">
                     <el-radio :label="1">阴性</el-radio>