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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="医疗类型: " prop="name">
+            <el-select style="margin-right:5px;" v-model="register_type" placeholder="">
+              <el-option
+                v-for="(item,index) in getDictionaryDataConfig('system','register_type')"
+                :key="index"
+                :label="item.name"
+                :value="item.name">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="诊断:" prop="name">
             <el-autocomplete
               style="width:100%;"
               placeholder="请输入内容"
             ></el-autocomplete>
           </el-form-item>
-          <el-form-item label="过敏史及特殊病史: " prop="name">
+          <el-form-item label="过敏病史: " prop="name">
             <el-autocomplete
               style="width:100%;"
               class="inline-input"
           <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showOne">
             <el-tabs class="rightTabs" v-model="activeName">
               <el-tab-pane label="药品列表" name="1">
-                <div style="margin-bottom:5px;">
+                <div style="margin-bottom:5px;display:flex;">
                   <el-input style="width:50%;" v-model="input" placeholder=""></el-input>
-                  <el-select style="margin-right:5px;width:100px;" v-model="value" placeholder="" @change="changeKind">
+                  <el-select style="margin-left:5px;width:50%;" v-model="value" placeholder="" @change="changeKind">
                     <el-option
                       label="全部"
                       value="0">
                     </el-option>
                   </el-select>
                 </div>
-                <el-table ref="multipleTable" :data="drugs" border @select='selectDrugs' style="width: 100%;"
+                <el-table ref="multipleTable" :data="drugs" border @select='selectDrugs' style="width: 100%;flex:1;overflow-y: auto;"
                           :row-style="{ color: '#303133' }"
                           @select-all="changeAllGoodInfoTableData"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row>
-                  <el-table-column align="center" type="selection" width="40"></el-table-column>
-                  <el-table-column align="center" prop="name" label="名称">
+                  <el-table-column type="selection" width="40"></el-table-column>
+                  <el-table-column prop="name" label="名称">
                     <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                   </el-table-column>
-                  <el-table-column align="center" label="规格" width="60">
+                  <el-table-column label="规格" width="60">
                     <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
                   </el-table-column>
-                  <el-table-column align="center" label="单价" width="40">
+                  <el-table-column label="单价" width="40">
                     <template slot-scope="scope">{{ scope.row.retail_price }}</template>
                   </el-table-column>
                 </el-table>
                       </el-option>
                   </el-select>
                 </div>
-                <el-table ref="multipleTableTwo" :data="advices_template" border style="width: 100%;"
+                <el-table ref="multipleTableTwo" :data="advices_template" border style="width: 100%;flex:1;overflow-y: auto;"
                           :row-style="{ color: '#303133' }"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row>
-                  <el-table-column align="center" type="selection" width="40"></el-table-column>
-                  <el-table-column align="center" prop="name" label="名称">
+                  <el-table-column type="selection" width="40"></el-table-column>
+                  <el-table-column prop="name" label="名称">
                     <template slot-scope="scope">{{}}</template>
                   </el-table-column>
-                  <el-table-column align="center" label="规格" width="60">
+                  <el-table-column label="规格" width="60">
                     <template slot-scope="scope">33</template>
                   </el-table-column>
-                  <el-table-column align="center" label="库存" width="60">
+                  <el-table-column label="库存" width="60">
                     <template slot-scope="scope">22</template>
                   </el-table-column>
-                  <el-table-column align="center" label="单价" width="40">
+                  <el-table-column label="单价" width="40">
                     <template slot-scope="scope">12</template>
                   </el-table-column>
                 </el-table>
           <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showTwo">
             <el-tabs class="rightTabs" v-model="activeName">
               <el-tab-pane label="项目列表" name="1">
-                <el-table ref="tables" :data="tabProject" border @select='selectChange' style="width: 100%;"
+                <el-table ref="tables" :data="tabProject" border @select='selectChange' style="width: 100%;flex:1;overflow-y: auto;"
                           :row-style="{ color: '#303133' }"
                           @select-all="changeAllGoodInfoTableDataTwo"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row>
-                  <el-table-column align="center" type="selection" width="40"></el-table-column>
-                  <el-table-column align="center" prop="name" label="名称">
+                  <el-table-column type="selection" width="40"></el-table-column>
+                  <el-table-column prop="name" label="名称">
                     <template slot-scope="scope">{{ scope.row.project_name }}</template>
                   </el-table-column>
-                  <el-table-column align="center" label="规格" width="60">
+                  <el-table-column label="规格" width="60">
                     <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                   </el-table-column>
-                  <el-table-column align="center" label="单价" width="40">
+                  <el-table-column label="单价" width="40">
                     <template slot-scope="scope">{{ scope.row.price }}</template>
                   </el-table-column>
                 </el-table>
               </el-tab-pane>
               <el-tab-pane label="项目组套" name="2">
-                <el-table :data="tabPrjectTeam" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                <el-table :data="tabPrjectTeam"  border style="width: 100%;flex:1;overflow-y: auto;" :row-style="{ color: '#303133' }"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row
                           @select='selectTeam'>
-                  <el-table-column align="center" type="selection" width="40"></el-table-column>
-                  <el-table-column align="center" prop="name" label="名称">
+                  <el-table-column type="selection" width="40"></el-table-column>
+                  <el-table-column prop="name" label="名称">
                     <template slot-scope="scope">{{scope.row.project_team}}</template>
                   </el-table-column>
                 </el-table>
   }
   .preTabs {
     height: 100%;
+    display: flex;
+    flex-direction: column;
+    .el-tabs__content{
+      flex:1;
+      overflow-y: auto;
+    }
   }
 
   .costBox {
     color: #fff;
   }
 
+  }
+  .rightTabs{
+    display: flex;
+    flex-direction: column;
   }
   .comfirmBox {
     width: 100%;
 
   }
   .preTabs {
-
-  .el-tabs__content {
-
-  }
-
+    .el-tabs__content{
+      flex:1;
+      overflow-y: auto;
+    }
   }
   .rightTabs {
     height: 100%;
-
-
-  .el-tabs__content {
-
-  }
-
+    .el-tabs__content{
+      flex:1;
+      overflow-y: auto;
+    }
+    .el-tab-pane{
+      display: flex;
+      flex-direction: column;
+    }
   }
   #tab-more {
 

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

         <template slot-scope="scope">{{ scope.row.drug_name }}</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="single_dose" width="50" :label="'单次\n用量'">
+      <el-table-column align="center" prop="single_dose" width="80" :label="'单次\n用量'">
         <template slot-scope="scope">
-          <el-input  v-model="scope.row.single_dose"></el-input>
-          <div> {{scope.row.min_unit}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.single_dose" style="width:60%;"></el-input>
+            <div>{{scope.row.min_unit}}</div>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="delivery_way" width="50" label="用法">
+      <el-table-column align="center" prop="delivery_way" width="100" label="用法">
         <template slot-scope="scope">
           <el-select v-model="scope.row.delivery_way" placeholder="请选择">
             <el-option
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="execution_frequency" width="50" label="频率">
+      <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
         <template slot-scope="scope">
           <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
             <el-option
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="prescribing_number" width="100" label="总量">
+      <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
         <template slot-scope="scope">
-          <div style="display:flex;">
-            <el-input v-model="scope.row.prescribing_number" style="width:50%" placeholder=""></el-input>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder=""></el-input>
             <div> {{scope.row.min_unit}}</div>
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="retail_price" width="50" label="单价">
+      <el-table-column align="center" prop="retail_price" width="60" label="单价">
         <template slot-scope="scope">
           <el-input v-model="scope.row.retail_price" placeholder=""></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="remark" width="50" label="备注">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.remark" style="width:50%" placeholder=""></el-input>
+          <el-input v-model="scope.row.remark" placeholder=""></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" width="40" prop="name" label="操作">
 
     <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-      <el-table-column align="center" type="selection" width="40"></el-table-column>
-      <el-table-column align="center" type="index" width="40" label="序号">
-         <template slot-scope="scope">
-            {{scope.$index + 1}}
-         </template>
-      </el-table-column>
-      <el-table-column align="center" prop="project_name" width="50" label="名称">
+      <!-- <el-table-column align="center" type="index" width="40" label="序号"></el-table-column> -->
+      <el-table-column align="center" prop="project_name" label="名称">
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
-      <el-table-column align="center" prop="statistical_classification" width="50" label="组">
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">
           {{getGroup(scope.row.statistical_classification)}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="single_dose" :label="'单次\n用量'">
+      <el-table-column align="center" prop="single_dose" width="80" :label="'单次\n用量'">
         <template slot-scope="scope">
           <el-input v-model="scope.row.single_dose" placeholder=""></el-input>
         </template>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

                     highlight-current-row
                     ref="tab"
           >
-            <el-table-column align="center" prop="name" label="患者姓名">
+            <el-table-column prop="name" label="姓名">
               <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template>
             </el-table-column>
-            <el-table-column align="center" prop="name" label="就诊号" width="90">
+            <el-table-column prop="name" label="就诊号" width="110">
               <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
             </el-table-column>
           </el-table>