1

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -61,15 +61,10 @@
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">
-          {{getGroup(scope.row.statistical_classification)}}
-        </template>
+        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>-->
-          {{scope.row.single_dose}}
-        </template>
+        <template slot-scope="scope">{{scope.row.single_dose}}</template>
       </el-table-column>
       <el-table-column align="center" prop="delivery_way" width="80" label="用法">
         <template slot-scope="scope">
@@ -121,7 +116,7 @@
 
     <div class="additionalBox">
       <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
-        <span>{{item.item_name}}</span>
+        <span :title="item.item_name">{{item.item_name}}</span>
         <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
         共
         <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -5,21 +5,21 @@
     </div>
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
-         <div class="mainCell" style="justify-content: space-between;">
+         <!-- <div class="mainCell" style="justify-content: space-between;font-size:14px;">
           <p >未收费：<span style="color: red">{{cal_one}}</span>人</p>
           <p>已收费：<span  style="color: red">{{cal_two}}</span>人</p>
           <p>已退费：<span  style="color: red">{{cal_three}}</span>人</p>
-        </div>
+        </div> -->
         <div class="mainCell">
           <el-radio-group v-model="radio" @change="changeRadio">
-            <el-radio :label=1>未收费</el-radio>
+            <!-- <el-radio :label=1>未收费</el-radio>
             <el-radio :label=2>已收费</el-radio>
             <el-radio :label=3>已退费</el-radio>
+            <el-radio :label=4>全部</el-radio> -->
+            <el-radio :label=1>未收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_one}}</span>人</el-radio>
+            <el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人</el-radio>
+            <el-radio :label=3>已退费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人</el-radio>
             <el-radio :label=4>全部</el-radio>
-            <!--<el-radio :label=1>未收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_one}}</span>人</el-radio>-->
-            <!--<el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人</el-radio>-->
-            <!--<el-radio :label=3>已退费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人</el-radio>-->
-            <!--<el-radio :label=4>全部</el-radio>-->
 
           </el-radio-group>
         </div>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -66,7 +66,7 @@
 
                       <div class="additionalBox">
                         <div class="additionalOne" v-for="(item,index) in additions" :key="index">
-                          <span>{{item.item_name}}</span>
+                          <span :title="item.item_name">{{item.item_name}}</span>
                           <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
                           共
                           <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
@@ -95,7 +95,7 @@
                         <li style="width:50%;">体重：{{patientInfo.weight?patientInfo.weight:''}}</li>
                         <li style="width:50%;">电话：{{patientInfo.phone}}</li>
                     </ul>
-                    <p class="centerRightTitle">收费信息</p>
+                    <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
                     <ul class="basicUl">
                         <li style="width:50%;">应收金额：{{order.medfee_sumamt }}元</li>
                         <li style="width:50%;">实收金额：{{order.medfee_sumamt}}元</li>
@@ -360,7 +360,7 @@ export default {
     }
     .centerRightTitle{
         color:#409EFF;
-        padding: 10px 0;
+        padding:0 0 10px 0;
     }
     .basicUl{
         border-top: 1px solid #e5e5e5;
@@ -377,6 +377,29 @@ export default {
             font-size: 14px;
         }
     }
+    .additionalBox{
+      margin-top: 20px;
+      display: flex;
+      flex-wrap: wrap;
+      .additionalOne{
+        margin-right:20px;
+        margin-bottom:10px;
+        display: flex;
+        align-items: center;
+        >span{
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          width:80px;
+          display: inline-block;
+          font-size: 14px;
+        }
+      }
+      .deleteIcon{
+        color:red;
+        margin-left:5px;
+      }
+    }
 }
 </style>
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -68,9 +68,6 @@
               placeholder="请输入内容"
             ></el-autocomplete>
           </el-form-item>
-          <el-form-item label="过敏病史: " prop="name" style="visibility: hidden;">
-            <el-input placeholder="" readonly></el-input>
-          </el-form-item>
         </el-form>
         <div class="tabsBox">
 

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -92,7 +92,7 @@
     <el-form class="recordForm" :model="case_history" ref="form" label-width="80px">
      
 
-      <el-form-item label="发病日期: " prop="name">
+      <el-form-item label="发病日期: " prop="name" style="width:49%;">
         <el-date-picker
           style="width:100%;"
           v-model="start_time"
@@ -100,12 +100,9 @@
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="" prop="name">
+      <el-form-item label="" prop="name" style="width:49%;">
         <el-checkbox v-model="case_history.is_infect">是否传染</el-checkbox>
       </el-form-item>
-      <el-form-item label="" prop="name" style="visibility: hidden;">
-        <div></div>
-      </el-form-item>
       <el-form-item label="主诉:" style="width:49%;">
         <el-select @change="changeMainTemplate" v-model="value" style="width:100%;margin-bottom:10px;">
             <el-option

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -561,8 +561,8 @@ export default {
         let arr = this.medicalCare
         let str = ''
         arr.map(item => {
-          if(item.value == type)
-          str = item.label
+          if(item.id == type)
+          str = item.name
         })
         return str
       },

src/xt_pages/workforce/components/tableData.vue

@@ -1950,9 +1950,9 @@ export default {
     ScheduleItem
   },
   mounted() {
-    console.log(this.tableContainHeight);
+    console.log('this.tableContainHeight,',this.$refs.table.$el.offsetTop);
     this.tableContainHeight =
-      window.innerHeight - this.$refs.table.$el.offsetTop - 160;
+      window.innerHeight - this.$refs.table.$el.offsetTop - 120;
     console.log(this.tableContainHeight);
     // var theType = this.weekType(this.weekTime);
     // this.getSchedules(theType);
@@ -1963,7 +1963,7 @@ export default {
         if (window.fullHeight < 200) {
           that.tableHeight = 200;
         } else {
-          that.tableHeight = window.fullHeight - 200;
+          that.tableHeight = window.fullHeight - 160;
         }
       })();
     };