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

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -30,7 +30,10 @@
               <el-radio :label="2" >已发药{{ alreadmount }}人</el-radio>
             </el-radio-group>
           </div>
-          <div class="list">
+          <div
+            class="list"
+            style="display: flex; justify-content: space-between"
+          >
             <el-input
               size="small"
               style="width: 130px"

src/xt_pages/dialysis/details/index.vue

@@ -17,12 +17,12 @@
           @click="next"
           >下一位</el-button
         >
-        <el-button
+        <!-- <el-button
           size="small"
           type="primary"
           @click="printOrderOne"
           icon="el-icon-printer"
-          >打印上机单</el-button>
+          >打印上机单</el-button> -->
 
         <el-button
           size="small"

src/xt_pages/dialysis/dialysisPage.vue

@@ -648,7 +648,7 @@
                     <p>{{ DialysisPrescriptionComfirmUserName }}</p>
                     <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="commitDialysisPrescriptionAndOther">提交并设为长期处方</el-button>
                     <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="commitDialysisPrescription">提交</el-button>
-                    <el-button type="primary" @click="printDan">打印上机单</el-button>
+                    <!-- <el-button type="primary" @click="printDan">打印上机单</el-button> -->
                   </el-form-item>
                 </el-col>
 

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -186,12 +186,7 @@
           </span>
           <span style="position: absolute; top: 235px; left: 250px">
             <span v-if="zhongwen.indexOf('仟') > -1">
-              {{
-                zhongwen.substring(
-                  zhongwen.indexOf("仟") - 1,
-                  zhongwen.indexOf("仟")
-                )
-              }}
+              {{zhongwen.substring(zhongwen.indexOf("仟") - 1,zhongwen.indexOf("仟"))}}
             </span>
             <span v-else>零</span>
           </span>

src/xt_pages/outpatientCharges/summary.vue

@@ -1234,7 +1234,7 @@ export default {
         number: obj.mdtrt_id,
         name: obj.patient.name,
         age: obj.age,
-        gend: obj.gend,
+        gend: obj.patient.gender,
         setl_time: obj.setl_time,
         chargeName: this.getName(obj.creator),
       };