Merge remote-tracking branch 'origin/20201109_pc_vue_new_branch' into 20201109_pc_vue_new_branch

src/xt_pages/outpatientCharges/components/monthPrescriptionTable.vue

       </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>
-          <div>{{scope.row.unit}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>
+            <div>{{scope.row.unit}}</div>
+          </div>
 
         </template>
       </el-table-column>
         }],
         value: '1',
         input: 1,
+        efs:[],
+        drugways:[]
       }
     },
     methods:{

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

       </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" @input="getProjectSingleDose(scope)" placeholder=""></el-input>
-          <div>{{scope.row.unit}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)" placeholder=""></el-input>
+            <div>{{scope.row.unit}}</div>
+          </div>
 
         </template>
       </el-table-column>
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="单价">
+      <el-table-column align="center" prop="name" width="70" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
-          <div>{{'元'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+            <div>{{'元'}}</div>
+          </div>
 
         </template>
       </el-table-column>
         }],
         value: '1',
         input: 1,
+        efs:[],
+        drugways:[]
       }
     },
 

src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue

 <template>
     <el-dialog
-            title="长期处方模版"
-            width="600px"
-            :visible.sync="visible"
-            :before-close="_close"
+      title="长期处方模版"
+      width="1200px"
+      :visible.sync="visible"
+      :before-close="_close"
     >
         <div>
-            <el-form :model="form" class="adviceForm" :rules="rules" ref="form" label-width="100px"
-                     >
+            <el-form :model="form" class="adviceForm" :rules="rules" ref="form" label-width="90px">
 
                 <el-form-item label="模板名称:"  prop="name" style="width: 100%;margin-bottom:0;">
                     <el-input v-model="form.name"  placeholder=""></el-input>
                 </el-form-item>
 
-                <el-form-item label="透析模式 : " style="width: 100%;margin-top: 20px" prop="mode">
+                <el-form-item label="透析模式:" style="width: 100%;margin-top: 20px" prop="mode">
                     <el-select v-model="form.mode" style="width:100%;" placeholder="请选择">
                         <el-option
                                 v-for="item in modeOptions"
 
             <div v-for="(item,index) in allPrescription" :key="index">
                     <div v-for="(subItem,index2) in item.prescriptions" :key="index2">
-                        <el-table v-if="subItem.advices.length > 0" :data="subItem.advices" border style="width: 99%;"
+                        <el-table v-if="subItem.advices.length > 0" :data="subItem.advices" border
                                   :row-style="{ color: '#303133' }"
                                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                                   highlight-current-row>