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()
+
+
         }
       })
     },

src/xt_pages/hospitalStation/components/registerDialog9504.vue

@@ -233,6 +233,9 @@
         }, IDCardTypes: [{
           value: 1,
           label: '社保卡'
+        },{
+          value: 2,
+          label: '身份证'
         }],
         settlement: [
           {value: 1, label: '医保'},

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -238,6 +238,9 @@
         }, IDCardTypes: [{
           value: 1,
           label: '社保卡'
+        },{
+          value: 2,
+          label: '身份证'
         }],
         settlement: [
           {value: 1, label: '医保'},

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -18,6 +18,7 @@
             :editable="false"
             style="width: 100%;"
             type="date"
+            :picker-options="pickerOptions"
             placeholder="选择开始时间"
             align="right"
             format="yyyy-MM-dd"
@@ -260,8 +261,12 @@
                             value-format="yyyy-MM-dd HH:mm:ss">
                         </el-date-picker>
                       </el-form-item>
+
+
                     </el-form>
+
                   </div>
+
                   <p class="centerRightTitle">人员信息</p>
                   <div style="display:flex;justify-content: space-between;line-height:30px;">
                     <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>
@@ -272,6 +277,8 @@
                     <li style="width:50%;">性别：{{ patientInfo.gender == 1 ? '男' : '女' }}</li>
                     <li style="width:50%;">年龄：{{ patientInfo.age }}</li>
                     <li style="width:50%;">电话：{{ patientInfo.phone }}</li>
+
+
                   </ul>
                   <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>
                   <div style="display:flex;justify-content: space-between;line-height:30px;">
@@ -281,6 +288,7 @@
                     <li style="width:50%;">医生：{{ info.doctor }}</li>
                     <li style="width:50%;">科室：{{ info.departments }}</li>
                     <!--<li style="width:100%;">总费用：{{ getTotal() }}</li>-->
+
                     <li style="width:100%;">判断结果：{{ info.diagnosis }}</li>
                     <li style="width:100%;">是否有传染病：</li>
                     <li style="width:100%;">血压：</li>
@@ -686,17 +694,13 @@ export default {
       register: [
         { value: 11, label: '普通门诊' },
         { value: 14, label: '门诊特殊病' },
-        { value: '9922', label: '家庭通道' },
         { value: '1111', label: '精一' },
-        { value: '1112', label: '精二' },
         { value: '1112', label: '精二' }
-
       ],
 
       registerThree: [
         { value: 11, label: '普通门诊' },
         { value: 14, label: '门诊特殊病' },
-        { value: '9922', label: '家庭通道' },
         { value: '1111', label: '精一' },
         { value: '1112', label: '精二' },
         { value: '9933', label: '门诊特殊病(9933)' },
@@ -707,7 +711,6 @@ export default {
       register_two: [
         { value: '11', label: '普通门诊' },
         { value: '14', label: '门诊特殊病' },
-        { value: '9922', label: '家庭通道' },
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
         { value: '1402', label: '门诊特殊病(1402)' }
@@ -3439,19 +3442,13 @@ export default {
           break
         case 1112:
           return '精二' + '处方' + index
-          break
         case 9933:
           return '门诊特殊病(9933)' + '处方' + index
-          break
         case 990602:
           return '门诊特殊病(990602)' + '处方' + index
-          break
         case 1402:
           return '门诊特殊病(1402)' + '处方' + index
           break
-        case 9922:
-          return '家庭通道' + '处方' + index
-          break
       }
     }, unique_four(array) {
       // res用来存储结果