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

src/xt_pages/hospitalStation/chargeDetailManagement.vue

@@ -6,19 +6,19 @@
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
 
-        <!--        <el-date-picker-->
-        <!--            v-model="record_date"-->
-        <!--            prefix-icon="el-icon-date"-->
-        <!--            @change="changeTimeTwo"-->
-        <!--            :editable="false"-->
-        <!--            style="width: 100%;"-->
-        <!--            type="date"-->
-        <!--            :picker-options="pickerOptions"-->
-        <!--            placeholder="选择开始时间"-->
-        <!--            align="right"-->
-        <!--            format="yyyy-MM-dd"-->
-        <!--            value-format="yyyy-MM-dd">-->
-        <!--        </el-date-picker>-->
+                <el-date-picker
+                    v-model="record_date"
+                    prefix-icon="el-icon-date"
+                    @change="changeTimeTwo"
+                    :editable="false"
+                    style="width: 100%;"
+                    type="date"
+                    :picker-options="pickerOptions"
+                    placeholder="选择开始时间"
+                    align="right"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd">
+                </el-date-picker>
 
 
         <div class="mainCell">
@@ -142,7 +142,9 @@
                   </div>
                   <div class="costBox">
                     <span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>
-<!--                    <span v-if="this.curPrescriptions.order_status  == 1">待结算</span>-->
+                    <span>处方总价：<span style="color:red;">{{ all_total }}元</span></span>
+
+                    <!--                    <span v-if="this.curPrescriptions.order_status  == 1">待结算</span>-->
 <!--                    <span v-if="this.curPrescriptions.order_status  == 2">已结算</span>-->
 <!--                    <span v-if="this.curPrescriptions.order_status  == 3">已退费</span>-->
                   </div>
@@ -250,6 +252,8 @@
                   </div>
                   <div class="costBox">
                     <span>当前处方总费用：<span style="color:red;">{{ month_total }}元</span></span>
+                    <span>处方总价：<span style="color:red;">{{ all_month_total }}元</span></span>
+
                     <!--<span>{{ state }}</span>-->
                   </div>
                 </div>
@@ -395,7 +399,8 @@ export default {
       settle_prescriptions: [],
 
       settle_total: 0,
-
+      all_total:0,
+      all_month_total:0,
       record_date: '',
       tableData: [],
       editableTabsValue: '处方1',
@@ -645,9 +650,7 @@ export default {
           }
         }
       }
-
       return total.toFixed(2)
-
     },
     getMonthTotalOne() {
       var total = 0
@@ -1234,6 +1237,10 @@ export default {
           this.total = 0
           this.total = this.getTotalOne()
           this.month_total = this.getMonthTotalOne()
+          this.all_total = this.getTotal()
+          this.all_month_total = this.getTotalTwo()
+
+
         }
       })
     },