11月29

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -59,10 +59,6 @@
 
                   </el-form-item>
 
-
-
-
-
                   <el-form-item label="过敏病史: " prop="name" label-position="right">
                       <el-autocomplete
                               style="width:100%;"
@@ -4047,6 +4043,7 @@ export default {
       display: flex;
       flex-direction: column;
       position: relative;
+      width: 30%;
 
   .el-form-item {
       width: 33%;

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -3,7 +3,7 @@
         <el-table v-if="activeType  == 1" :data="prescription.advices" 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" prop="day" width="70" label="序号">
+            <el-table-column align="center" prop="day" width="70" label="序号" fixed>
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
                         <el-input :disabled="prescription.is_medicine_status" v-model="scope.row.groupno" placeholder=""></el-input>
@@ -12,7 +12,7 @@
             </el-table-column>
 
 
-            <el-table-column align="center" prop="drug_name" label="名称">
+            <el-table-column align="center" prop="drug_name" label="名称" fixed>
                 <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span>
                 </template>
             </el-table-column>
@@ -61,7 +61,6 @@
                 </template>
             </el-table-column>
 
-
             <el-table-column align="center" prop="day" width="70" label="天数">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
@@ -132,7 +131,7 @@
                     <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
                 </template>
             </el-table-column>
-            <el-table-column align="center" width="40" prop="name" label="操作">
+            <el-table-column align="center" width="40" prop="name" label="操作" fixed="right">
                 <template slot-scope="scope">
                     <i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>
                 </template>
@@ -142,8 +141,8 @@
         <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="index" width="40" label="序号"></el-table-column>
-            <el-table-column align="center" prop="project_name" label="名称">
+            <el-table-column align="center" type="index" width="40" label="序号" fixed></el-table-column>
+            <el-table-column align="center" prop="project_name" label="名称" fixed>
                 <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
                 </template>
             </el-table-column>
@@ -218,7 +217,7 @@
                     <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
                 </template>
             </el-table-column>
-            <el-table-column align="center" width="40" prop="name" label="操作">
+            <el-table-column align="center" width="40" prop="name" label="操作" fixed="right">
                 <template slot-scope="scope">
                     <i class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)"></i>
                 </template>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -120,21 +120,7 @@
             </el-button>
             <el-button size="small" ref="button_three" @click="open_two()" type="primary">处方调用</el-button>
             <el-button size="small" @click="open_three()" type="primary">保存模板</el-button>
-
-            <!-- <el-popover
-                                placement="bottom"
-                                width="300"
-                                trigger="click">
-                            <el-button size="small" ref="button_two" @click="open(2)">处方单</el-button>
-                            <el-button size="small" ref="button_six" @click="open(6)">治疗单</el-button>
-                            <el-button size="small" ref="button_six" @click="open(20)">检验单</el-button>
-                            <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印
-                            </el-button>
-
-                        </el-popover> -->
             <el-button size="small" @click="openPrint" type="primary">打印</el-button>
-
-            <!-- <el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button> -->
           </div>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
             <el-button size="small" @click="opentwo(1)" type="primary">保存</el-button>
@@ -148,9 +134,33 @@
             </el-button>
           </div>
         </div>
+
+        <!-- <div> -->
+          <desk-prescription v-on:setData="setData" :diagnoses="diagnoses" :loading="isloading"
+                        :sick="sick" :record_date="record_date"
+                        :drugs="drugs"
+                        :allDrugs="allDrugs"
+                        :advices_template="advices_template"
+                        :additions="additions"
+                        :doctors="doctors"
+                        :department="department"
+                        v-on:change="changeOther"
+                        v-on:month="changeMonth"
+                        v-on:day="changeDay"
+
+                        :month_prescriptions="month_prescriptions"
+                        :org_id="org_id"
+                        ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
+                        v-on:getSunziValue="getSunziValue"
+                        :hisPatientInfo="hisPatientInfo" :patient_diagnoses="patient_diagnoses"
+                        @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
+                        v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
+        <!-- </div> -->
+
         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
         <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
-        <desk-prescription v-on:setData="setData" :diagnoses="diagnoses" :loading="isloading"
+
+        <!-- <desk-prescription v-on:setData="setData" :diagnoses="diagnoses" :loading="isloading"
                            :sick="sick" :record_date="record_date"
                            :drugs="drugs"
                            :allDrugs="allDrugs"
@@ -168,7 +178,7 @@
                            v-on:getSunziValue="getSunziValue"
                            :hisPatientInfo="hisPatientInfo" :patient_diagnoses="patient_diagnoses"
                            @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
-                           v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
+                           v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription> -->
 
 
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"