浏览代码

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

csx 3 年前
父节点
当前提交
c4e30c5d82
共有 1 个文件被更改,包括 24 次插入17 次删除
  1. 24 17
      src/xt_pages/hospitalStation/chargeDetailManagement.vue

+ 24 - 17
src/xt_pages/hospitalStation/chargeDetailManagement.vue 查看文件

6
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
6
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
7
       <div class="mainLeft">
7
       <div class="mainLeft">
8
 
8
 
9
-        <!--        <el-date-picker-->
10
-        <!--            v-model="record_date"-->
11
-        <!--            prefix-icon="el-icon-date"-->
12
-        <!--            @change="changeTimeTwo"-->
13
-        <!--            :editable="false"-->
14
-        <!--            style="width: 100%;"-->
15
-        <!--            type="date"-->
16
-        <!--            :picker-options="pickerOptions"-->
17
-        <!--            placeholder="选择开始时间"-->
18
-        <!--            align="right"-->
19
-        <!--            format="yyyy-MM-dd"-->
20
-        <!--            value-format="yyyy-MM-dd">-->
21
-        <!--        </el-date-picker>-->
9
+                <el-date-picker
10
+                    v-model="record_date"
11
+                    prefix-icon="el-icon-date"
12
+                    @change="changeTimeTwo"
13
+                    :editable="false"
14
+                    style="width: 100%;"
15
+                    type="date"
16
+                    :picker-options="pickerOptions"
17
+                    placeholder="选择开始时间"
18
+                    align="right"
19
+                    format="yyyy-MM-dd"
20
+                    value-format="yyyy-MM-dd">
21
+                </el-date-picker>
22
 
22
 
23
 
23
 
24
         <div class="mainCell">
24
         <div class="mainCell">
142
                   </div>
142
                   </div>
143
                   <div class="costBox">
143
                   <div class="costBox">
144
                     <span>当前处方总费用:<span style="color:red;">{{ total }}元</span></span>
144
                     <span>当前处方总费用:<span style="color:red;">{{ total }}元</span></span>
145
-<!--                    <span v-if="this.curPrescriptions.order_status  == 1">待结算</span>-->
145
+                    <span>处方总价:<span style="color:red;">{{ all_total }}元</span></span>
146
+
147
+                    <!--                    <span v-if="this.curPrescriptions.order_status  == 1">待结算</span>-->
146
 <!--                    <span v-if="this.curPrescriptions.order_status  == 2">已结算</span>-->
148
 <!--                    <span v-if="this.curPrescriptions.order_status  == 2">已结算</span>-->
147
 <!--                    <span v-if="this.curPrescriptions.order_status  == 3">已退费</span>-->
149
 <!--                    <span v-if="this.curPrescriptions.order_status  == 3">已退费</span>-->
148
                   </div>
150
                   </div>
250
                   </div>
252
                   </div>
251
                   <div class="costBox">
253
                   <div class="costBox">
252
                     <span>当前处方总费用:<span style="color:red;">{{ month_total }}元</span></span>
254
                     <span>当前处方总费用:<span style="color:red;">{{ month_total }}元</span></span>
255
+                    <span>处方总价:<span style="color:red;">{{ all_month_total }}元</span></span>
256
+
253
                     <!--<span>{{ state }}</span>-->
257
                     <!--<span>{{ state }}</span>-->
254
                   </div>
258
                   </div>
255
                 </div>
259
                 </div>
395
       settle_prescriptions: [],
399
       settle_prescriptions: [],
396
 
400
 
397
       settle_total: 0,
401
       settle_total: 0,
398
-
402
+      all_total:0,
403
+      all_month_total:0,
399
       record_date: '',
404
       record_date: '',
400
       tableData: [],
405
       tableData: [],
401
       editableTabsValue: '处方1',
406
       editableTabsValue: '处方1',
645
           }
650
           }
646
         }
651
         }
647
       }
652
       }
648
-
649
       return total.toFixed(2)
653
       return total.toFixed(2)
650
-
651
     },
654
     },
652
     getMonthTotalOne() {
655
     getMonthTotalOne() {
653
       var total = 0
656
       var total = 0
1234
           this.total = 0
1237
           this.total = 0
1235
           this.total = this.getTotalOne()
1238
           this.total = this.getTotalOne()
1236
           this.month_total = this.getMonthTotalOne()
1239
           this.month_total = this.getMonthTotalOne()
1240
+          this.all_total = this.getTotal()
1241
+          this.all_month_total = this.getTotalTwo()
1242
+
1243
+
1237
         }
1244
         }
1238
       })
1245
       })
1239
     },
1246
     },