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

src/xt_pages/data/components/addDrugs.vue

@@ -31,7 +31,7 @@
                             </el-select>
                         </el-form-item>
                         <div style="width:100%;">
-                          <div><span style="width:120px;text-align:right;display:inline-block"><span style="color:red;">*</span>单位&规格：</span><span style="color:#999">例如：0.75 g * 60 粒 / 盒</span></div>
+                          <div><span style="width:120px;text-align:right;display:inline-block;margin-bottom:10px;"><span style="color:red;">*</span>单位&规格：</span><span style="color:#999">例如：0.75 g * 60 粒 / 盒</span></div>
                         </div>
                         <div style="width:100%;display:flex;align-items:center;margin-left:120px;">
                             <el-form-item prop="dose" class="noMargin">
@@ -47,7 +47,7 @@
                                 </el-option>
                               </el-select>
                             </el-form-item>
-                            <span style="margin-bottom:20px;font-size:20px;">*</span>
+                            <span style="margin-bottom:20px;font-size:20px;padding:0 10px;">*</span>
                             <el-form-item prop="min_number" class="noMargin">
                               <el-input v-model="form.min_number" style="width:100px;margin-right:5px;" :disabled="dosageShow" type="number" placeholder="拆零"> </el-input>
                             </el-form-item>
@@ -61,7 +61,7 @@
                                 </el-option>
                               </el-select>
                             </el-form-item>
-                          <span style="margin-bottom:20px;font-size:20px;">/</span>
+                          <span style="margin-bottom:20px;font-size:20px;padding:0 10px;">/</span>
                           <el-form-item prop="max_unit" class="noMargin">
                             <el-select v-model="form.max_unit" style="width:160px;" placeholder="包装单位">
                               <el-option

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -214,7 +214,13 @@
               </el-form-item>
             </div>
             <div v-else>
-              <el-form-item :label="'首剂(mg) : '">
+              <el-form-item v-if="dialysisPrescription.anticoagulant == 2" :label="'首剂(mg) : '">
+                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                          v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
+                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                          v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
+              </el-form-item>
+              <el-form-item v-else :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -241,7 +247,13 @@
                 </el-form-item>
               </div>
               <div v-else>
-                <el-form-item :label="'维持(mg/h) : '">
+                <el-form-item v-if="dialysisPrescription.anticoagulant == 2" :label="'维持(mg/h) : '">
+                  <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                            v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
+                  <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                            v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
+                </el-form-item>
+                <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-else>
                   <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                             v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                   <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -267,7 +279,13 @@
               </el-form-item>
             </div>
             <div v-else>
-              <el-form-item :label="'总量(mg) : '">
+              <el-form-item v-if="dialysisPrescription.anticoagulant == 2" :label="'总量(mg) : '">
+                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                          v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
+                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                          v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
+              </el-form-item>
+              <el-form-item v-else :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -14,7 +14,7 @@
             <!-- <div>{{scope.row.single_dose_unit}}</div> -->
             <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;" @change="getAllChange(scope)">
               <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
-              <el-option :label="scope.row.drug.dose_unit" :value="scope.row.drug.dose_unit"></el-option>
+              <el-option :label="scope.row.drug.dose_unit" v-if="scope.row.drug.dose_unit != scope.row.drug.min_unit" :value="scope.row.drug.dose_unit"></el-option>
             </el-select>
           </div>
         </template>
@@ -60,7 +60,7 @@
             <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
             <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;" @change="getAllChange(scope)">
               <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
-              <el-option :label="scope.row.drug.max_unit" :value="scope.row.drug.max_unit"></el-option>
+              <el-option :label="scope.row.drug.max_unit" v-if="scope.row.drug.min_unit != scope.row.drug.max_unit" :value="scope.row.drug.max_unit"></el-option>
             </el-select>
           </div>
         </template>

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -14,7 +14,7 @@
                         <!-- <div>{{scope.row.single_dose_unit}}</div> -->
                         <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;" @change="getAllChange(scope)">
                           <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
-                          <el-option :label="scope.row.drug.dose_unit" :value="scope.row.drug.dose_unit"></el-option>
+                          <el-option :label="scope.row.drug.dose_unit" v-if="scope.row.drug.dose_unit != scope.row.drug.min_unit" :value="scope.row.drug.dose_unit"></el-option>
                         </el-select>
                     </div>
                 </template>
@@ -60,7 +60,7 @@
                         <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
                         <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;" @change="getAllChange(scope)">
                           <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
-                          <el-option :label="scope.row.drug.max_unit" :value="scope.row.drug.max_unit"></el-option>
+                          <el-option :label="scope.row.drug.max_unit" v-if="scope.row.drug.min_unit != scope.row.drug.max_unit" :value="scope.row.drug.max_unit"></el-option>
                         </el-select>
                     </div>
                 </template>

src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue

@@ -76,7 +76,7 @@
                                 </template>
                             </el-table-column>
                         </el-table>
-                        <el-table v-if="subItem.project.length > 0" :data="subItem.project" border style="width: 99%;"
+                        <el-table v-if="subItem.project.length > 0" :data="subItem.project" border style="marin-top:10px;"
                                   :row-style="{ color: '#303133' }"
                                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                                   highlight-current-row>

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -192,6 +192,7 @@
 
             this.$refs.tab.setCurrentRow(this.data[0])
             this.patient_id = this.data[0].id
+            this.patient_name = this.data[0].name
             this.GetPrescriptionTemplateList()
 
           }

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -2,8 +2,8 @@
     <div class="main-contain new-main-contain">
 
         <div style="height: calc(100% - 0px);display: flex;flex-direction: column;">
-            <div style="display:flex;justify-content: space-between;align-items:center;margin-bottom:10px;padding:0 10px;color:#606266;">
-              <div>姓名：{{ $route.query.patient_name }}</div>
+            <div style="display:flex;justify-content: space-between;align-items:center;margin:10px 0;padding:0 10px;color:#606266;">
+              <div style="font-size:14px;">姓名：{{ $route.query.patient_name }}</div>
               <el-button size="small" @click="save" type="primary">保存</el-button>
             </div>