Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -82,6 +82,7 @@
                         <el-date-picker
                           v-model="record_date"
                           type="date"
+                          :clearable="false"
                           @change="changeDate"
                           format="yyyy-MM-dd"
                           value-format="yyyy-MM-dd"
@@ -416,24 +417,21 @@
         if (this.curPrescriptions.type == 1) {
           if (this.curPrescriptions.advices != null) {
             for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
-              console.log(this.curPrescriptions.advices[a].retail_price)
-              console.log(this.curPrescriptions.advices[a].prescribing_number)
+              total = total +  Math.floor((this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number)* 100) / 100
 
-              total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
             }
           }
-          return total
+          return Math.floor(total * 100) / 100
 
         } else {
           var total = 0
           if (this.curPrescriptions.project != null) {
             for (let b = 0; b < this.curPrescriptions.project.length; b++) {
-              console.log(this.curPrescriptions.project[b].price)
-              console.log(this.curPrescriptions.project[b].total)
-              total = total + this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total
+              total = total +  Math.floor((this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total) * 100) / 100
+
             }
           }
-          return total
+          return Math.floor(total * 100) / 100
 
         }
 
@@ -443,21 +441,21 @@
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].advices != null) {
             for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
-              total = total + this.prescriptions[i].advices[a].retail_price * this.prescriptions[i].advices[a].prescribing_number
+              total = total + Math.floor((this.prescriptions[i].advices[a].retail_price * this.prescriptions[i].advices[a].prescribing_number) * 100) / 100
             }
           }
           if (this.prescriptions[i].project != null) {
             for (let b = 0; b < this.prescriptions[i].project.length; b++) {
-              total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total
+
+              total = total + Math.floor((this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total) * 100) / 100
             }
           }
 
+          for (let i = 0; i < this.addtions_charge.length; i++) {
+            total = total + Math.floor(this.addtions_charge[i].price * 100) / 100
+          }
+          return Math.floor(total * 100) / 100
         }
-        for (let i = 0; i < this.addtions_charge.length; i++){
-          total = total +  this.addtions_charge[i].price
-        }
-        return Math.floor(total * 100) / 100
-
       },
       moreState(tab, event) {
         if (tab == 'more') {

src/xt_pages/outpatientDoctorStation/components/newPrescriptionTable.vue

@@ -15,32 +15,42 @@
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="用法">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.delivery_way" readonly></el-input>
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div> {{scope.row.delivery_way}}</div>
+
 
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="频率">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.execution_frequency" readonly></el-input>
+          <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
+          <div> {{scope.row.execution_frequency}}</div>
+
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="100" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;">
-            <el-input v-model="scope.row.prescribing_number" style="width:50%" readonly placeholder=""></el-input>
+            <!--<el-input v-model="scope.row.prescribing_number" style="width:50%" readonly placeholder=""></el-input>-->
+            <div> {{scope.row.prescribing_number}}</div>
+
             <div>{{scope.row.prescribing_number_unit}}</div>
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+          <div> {{scope.row.retail_price}}</div>
+
+          <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.remark" style="width:50%" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.remark" style="width:50%" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.remark}}</div>
+
         </template>
       </el-table-column>
     </el-table>
@@ -58,39 +68,53 @@
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="130" :label="'单次\n用量'">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.single_dose}}</div>
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="delivery_way" width="130" label="用法">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.delivery_way}}</div>
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="execution_frequency" width="130" label="频率">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>
+          <!--<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="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
+          <!--<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="总量">
         <template slot-scope="scope">
           <div style="display:flex;">
-            <el-input v-model="scope.row.total" style="width:50" placeholder="" readonly></el-input>
+            <!--<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="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.price}}</div>
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="120" label="备注">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.remark" readonly></el-input>
+          <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
+          <div> {{scope.row.remark}}</div>
+
         </template>
       </el-table-column>
     </el-table>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -253,6 +253,7 @@
           } else {
 
             this.prescriptions = []
+            this.addtions_charge = []
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
@@ -262,8 +263,6 @@
             this.addtions_charge = response.data.data.addtions_charge
 
 
-
-
             this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
             if (this.case_history.temperature <= 0) {
               this.case_history.temperature = ''