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

src/xt_pages/medicalScheduling/index.vue

@@ -1991,5 +1991,9 @@ export default {
         white-space: pre-line;/*保留换行符*/
     }
 }
+.el-dropdown-menu{
+    max-height:96%;
+    overflow-y: auto;
+}
 
 </style>

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -47,17 +47,17 @@
 
       <el-form-item class="specialFormItem" label="折扣金额：">
         <div style="display:flex;">
-          <el-input v-model="form.discount_price"></el-input>
+          <el-input v-model="form.discount_price" :disabled="form.preferential_price != 0" @change="changeDiscountPrice"></el-input>
         </div>
       </el-form-item>
       <el-form-item class="specialFormItem" label="优惠金额：">
         <div style="display:flex;">
-          <el-input v-model="form.preferential_price"></el-input>
+          <el-input v-model="form.preferential_price" :disabled="form.discount_price != 0" @change="changePreferentialPrice"></el-input>
         </div>
       </el-form-item>
       <el-form-item label="实收金额：">
         <div style="display:flex;">
-          <el-input v-model="form.reality_price"></el-input>
+          <el-input v-model="form.reality_price" @change="realityPrice"></el-input>
         </div>
       </el-form-item>
       <el-form-item label="找回金额：">
@@ -151,6 +151,8 @@
         this.form.private_price = total
         this.form.pay_price = total
         this.form.total = total + this.form.medical_insurance_price
+        this.form.discount_price = 0.0
+        this.form.preferential_price = 0.0
 
         this.visibility = true
 
@@ -174,6 +176,27 @@
         let form = {}
         form = this.form
         return form
+      },
+      realityPrice(val){
+        if(val < (this.form.total - this.form.discount_price - this.form.preferential_price)){
+          this.$message.error('实收金额不能小于收费金额')
+          return
+        }
+        this.form.found_price = parseInt(val) - parseInt(this.form.total) + parseInt(this.form.discount_price) + parseInt(this.form.preferential_price)
+      },
+      changeDiscountPrice(val){
+        if(val > this.form.total){
+          this.$message.error('折扣金额不能超过费用总额')
+          return
+        }
+        this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.preferential_price)
+      },
+      changePreferentialPrice(val){
+        if(val > this.form.total){
+          this.$message.error('优惠金额不能超过费用总额')
+          return
+        }
+        this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.discount_price)
       }
     },mounted() {
       var nowDate = new Date()

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -327,10 +327,12 @@
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             this.loadingtwo = false
+            this.$refs.charge.hide()
             return false
           } else {
             this.state = '已收费'
             this.$message({message: '收费成功', type: 'success'})
+            this.$refs.charge.hide()
             this.loadingtwo = false
             this.cal_one = this.cal_one - 1
             this.cal_two = this.cal_two + 1

src/xt_pages/outpatientCharges/treatPrint.vue

@@ -82,7 +82,7 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;line-height: 1px;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}}';
+        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
         printJS({
             printable: "prescription-print",
             type: "html",

src/xt_pages/outpatientCharges/treatTemplate/printOne.vue

@@ -2,15 +2,15 @@
     <div id='prescription-print' class="prescription-print">
         <div class="printTitle">{{orgname}}&nbsp;&nbsp; 血液透析中心医药费收据及收费项目清单</div>
         <div class="infoMain">
-            <p class="infoP">医院(药店)编号：</p>
-            <p class="infoP">名称：血液透析中心</p>
-            <p class="infoP">医生工号：</p>
-            <p class="infoP">门诊流水号：</p>
-            <p class="infoP">科别：{{list.p_info.departments?list.p_info.departments:""}}</p>
-            <p class="infoP">处方单据号：</p>
-            <p class="infoP">姓名：{{patient.name}}</p>
-            <p class="infoP">医疗账号：</p>
-            <p class="infoP">医疗类别：普通</p>
+            <div class="infoP">医院(药店)编号：</div>
+            <div class="infoP">名称：血液透析中心</div>
+            <div class="infoP">医生工号：</div>
+            <div class="infoP">门诊流水号：</div>
+            <div class="infoP">科别：{{list.p_info.departments?list.p_info.departments:""}}</div>
+            <div class="infoP">处方单据号：</div>
+            <div class="infoP">姓名：{{patient.name}}</div>
+            <div class="infoP">医疗账号：</div>
+            <div class="infoP">医疗类别：普通</div>
         </div>
         <div class="chargeBox">
             <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
@@ -49,7 +49,7 @@
                         <p style="width:50%;">{{list.order_info.psn_cash_pay}}</p>
                     </div>
                 </div>
-                <div style="width:80%;display:flex;height:600px;">
+                <div style="width:80%;display:flex;height:300px;">
                   
                     <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
                         <p v-for="(item,i) in prescription[0].advices" :key="i" class="chargeP">{{item.advice_name}}</p>
@@ -78,8 +78,8 @@
             <p>找赎金：</p>
         </div>
         <div class="actionBar">
-            <p>收费员：</p>
-            <p>日期：{{this.$route.query.record_date}}</p>
+            <div>收费员：</div>
+            <div>日期：{{this.$route.query.record_date}}</div>
         </div>
     </div>
 </template>
@@ -206,7 +206,7 @@ export default {
     line-height: 24px;
     padding:0 10px;
 }
-.actionBar p{
+.actionBar div{
     width:150px;
 }
 </style>

src/xt_pages/outpatientDoctorStation/components/newPrescriptionTable.vue

@@ -61,12 +61,12 @@
       <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)}}
+          <div>{{getGroup(scope.row.statistical_classification)}}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="single_dose" width="130" :label="'单次\n用量'">
+      <el-table-column align="center" prop="single_dose" width="100" label="单次用量">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>-->
           <div> {{scope.row.single_dose}}</div>
@@ -80,30 +80,26 @@
 
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="execution_frequency" width="130" label="频率">
+      <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
           <div> {{scope.row.execution_frequency}}</div>
 
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="number_days" width="130" label="天数">
+      <el-table-column align="center" prop="number_days" width="100" label="天数">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
           <div> {{scope.row.number_days}}</div>
 
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="total" width="100" label="总量">
+      <el-table-column align="center" prop="total" width="80" label="总量">
         <template slot-scope="scope">
-          <div style="display:flex;">
-            <!--<el-input v-model="scope.row.total" style="width:50" placeholder="" readonly></el-input>-->
             <div> {{scope.row.total}}</div>
-
-          </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> {{scope.row.price}}</div>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -13,7 +13,7 @@
           </div>
           <div class="infoMain">
               <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
-              <div style="margin-bottom: 10px;">科室：{{getDepart(item.info.departments)?getDepart(item.info.departments):''}}</div>
+              <div style="margin-bottom: 10px;">科室：{{item.info.departments?getDepart(item.info.departments):''}}</div>
               <div style="margin-bottom: 10px;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
               <div style="margin-bottom: 10px;">电话：{{item.patient.phone}}</div>
               <div>地址：{{item.patient.home_address}}</div>