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

src/api/his/his.js

@@ -605,3 +605,29 @@ export function getHisDoctorAdviceInfo(id, params) {
   })
 }
 
+
+
+export function getHisHospitalPatientList(params) {
+  return request({
+    url: '/api/hospitalchargedetail/list',
+    method: 'get',
+    params: params
+  })
+}
+
+
+export function getHisHospitalDetailList(params) {
+  return request({
+    url: '/api/hospitaldetail/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getHisHospitalDetailInfo(params) {
+  return request({
+    url: '/api/hospitaldetail/info',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/hospitalCharges.js

@@ -42,6 +42,12 @@ export default {
       name: 'summary',
       meta: { title: 'summary', noCache: true }
     },
+    {
+      path: '/hospitalCharges/chargeDetailManagement',
+      component: () => import('@/xt_pages/hospitalStation/chargeDetailManagement'),
+      name: 'chargeDetailManagement',
+      meta: { title: 'chargeDetailManagement', noCache: true }
+    },
     // {
     //   path: '/outpatientCharges/incomeStatistics',
     //   component: () => import('@/xt_pages/outpatientCharges/incomeStatistics'),

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1613,7 +1613,7 @@ export default {
             }
           }
 
-          total = total.toFixed(2)
+          total = total.toFixed(3)
         }
       }
       return total
@@ -1643,7 +1643,7 @@ export default {
           }
         }
       }
-      return total.toFixed(2)
+      return total.toFixed(3)
 
     },
     getCurTotal() {
@@ -1658,7 +1658,7 @@ export default {
         for (let a = 0; a < this.curPrescriptions.project.length; a++) {
           total = total + this.curPrescriptions.project[a].price * this.curPrescriptions.project[a].total
         }
-        return total.toFixed(2)
+        return total.toFixed(3)
 
       }
     },
@@ -1683,7 +1683,7 @@ export default {
         }
       }
 
-      return total.toFixed(2)
+      return total.toFixed(3)
     }, getMonthTotal() {
       var total = 0
       for (let i = 0; i < this.month_prescriptions.length; i++) {
@@ -1705,7 +1705,7 @@ export default {
         }
       }
 
-      return total.toFixed(2)
+      return total.toFixed(3)
     },
     createFilter(queryString) {
       return (restaurant) => {

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -95,7 +95,7 @@
 
             <!--                        <el-button v-loading="loadingtwo"-->
             <!--                                   v-if="(this.activeName != 'third' && this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.id == 0)"-->
-            <!--                    c               size="small"-->
+            <!--                                   size="small"-->
             <!--                                   @click="open(30)"-->
             <!--                                   type="primary">上传费用明细-->
             <!--                        </el-button>-->
@@ -106,23 +106,23 @@
 <!--            </el-button>-->
 
 
-<!--            <el-button v-loading="loadingtwo"-->
-<!--                       v-if="(( this.activeName != 'third' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.id == 0))"-->
-<!--                       size="small"-->
-<!--                       @click="open(8)"-->
-<!--                       type="primary">上传费用明细-->
-<!--            </el-button>-->
+            <el-button v-loading="loadingtwo"
+                       v-if="(( this.activeName != 'third' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.id == 0))"
+                       size="small"
+                       @click="open(8)"
+                       type="primary">上传费用明细
+            </el-button>
 
             <!--<el-button size="small" @click="open(1)" type="primary">打印</el-button>-->
             <el-button v-loading="loadingone" size="small"
-                       v-if="(this.activeName == 'first' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+                       v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
 
                        @click="open(2)"
                        type="primary">出院
             </el-button>
 
             <el-button v-loading="loadingone" size="small"
-                       v-if="(this.activeName == 'first' &&this.hisPatientInfo.balance_accounts_type == 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+                       v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type == 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
 
                        @click="open(2)"
                        type="primary">出院
@@ -137,27 +137,27 @@
             </el-button>
 
             <el-button v-loading="loadingtwo"
-                       v-if="(this.activeName == 'first' &&this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1  && this.order.order_status != 2)"
+                       v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1  && this.order.order_status != 2)"
                        size="small"
                        @click="open(3)"
                        type="primary">收费
             </el-button>
 
             <el-button size="small" @click="open(4)" type="primary"
-                       v-if="this.activeName == 'first' &&this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
+                       v-if="this.activeName == 'third' &&this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
               退费
             </el-button>
-            <el-button v-if="this.activeName == 'first' &&this.order.order_status == 2" size="small" @click="open(5)"
+            <el-button v-if="this.activeName == 'third' &&this.order.order_status == 2" size="small" @click="open(5)"
                        type="primary"
             >结算单
             </el-button>
 
-<!--            <el-button-->
-<!--                v-if="( this.activeName != 'third' && this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"-->
+            <el-button
+                v-if="( this.activeName != 'third' && this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
 
-<!--                size="small" @click="open(9)" type="primary"-->
-<!--            >撤销明细-->
-<!--            </el-button>-->
+                size="small" @click="open(9)" type="primary"
+            >撤销明细
+            </el-button>
 
             <!--                        <el-button-->
             <!--                                v-if="(this.activeName != 'third' && this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"-->
@@ -167,13 +167,13 @@
             <!--                        </el-button>-->
 
             <el-button
-                v-if="(this.activeName == 'first' &&this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1)"
+                v-if="(this.activeName == 'third' &&this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1)"
                 size="small" @click="open(6)" type="primary"
             >撤销出院
             </el-button>
 
             <el-button
-                v-if="(this.activeName == 'first' &&this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+                v-if="(this.activeName == 'third' &&this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
                 size="small" @click="open(7)" type="primary"
             >撤销入院
             </el-button>
@@ -189,184 +189,185 @@
 
         <div class="mainCenter" v-loading="loading">
           <el-tabs class="settlementTabs" v-model="activeName" @tab-click="handleClick">
-<!--            <el-tab-pane label="日结" name="first">-->
-<!--              <div style="display:flex;height:100%;">-->
-<!--                <div class="centerLeft">-->
-<!--                  <div class="tabsBox">-->
-<!--                    &lt;!&ndash;<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>&ndash;&gt;-->
-<!--                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"-->
-<!--                             @tab-click="tabclickEvent">-->
-<!--                      <el-tab-pane-->
-<!--                          v-for="(item, index) in prescriptions"-->
-<!--                          :key="index"-->
-<!--                          :label="item.name"-->
-<!--                          :name="item.name"-->
-<!--                      >-->
-<!--                      </el-tab-pane>-->
-
-<!--                      &lt;!&ndash;<div class="RP">&ndash;&gt;-->
-<!--                      &lt;!&ndash;Rp&ndash;&gt;-->
-<!--                      &lt;!&ndash;<el-date-picker&ndash;&gt;-->
-<!--                      &lt;!&ndash;v-model="record_date"&ndash;&gt;-->
-<!--                      &lt;!&ndash;type="date"&ndash;&gt;-->
-<!--                      &lt;!&ndash;:clearable="false"&ndash;&gt;-->
-<!--                      &lt;!&ndash;@change="changeDate"&ndash;&gt;-->
-<!--                      &lt;!&ndash;format="yyyy-MM-dd"&ndash;&gt;-->
-<!--                      &lt;!&ndash;value-format="yyyy-MM-dd"&ndash;&gt;-->
-<!--                      &lt;!&ndash;placeholder="选择日期">&ndash;&gt;-->
-<!--                      &lt;!&ndash;</el-date-picker>&ndash;&gt;-->
-<!--                      &lt;!&ndash;</div>&ndash;&gt;-->
-<!--                      &lt;!&ndash;<charge-prescription-table ref="prescription_tables"&ndash;&gt;-->
-<!--                      &lt;!&ndash;:prescription="curPrescriptions"></charge-prescription-table>&ndash;&gt;-->
-<!--                      &lt;!&ndash;<charge-prescription-table ref="prescription_tables" :prescription="curPrescriptions"></charge-prescription-table>&ndash;&gt;-->
-<!--                      <charge-prescription-table ref="prescription_tables"-->
-<!--                                                 :manufacturers="manufacturers"-->
-<!--                                                 :prescription="curPrescriptions"></charge-prescription-table>-->
-
-<!--                    </el-tabs>-->
-
-<!--                  </div>-->
-<!--                  <div class="costBox">-->
-<!--                    <span>当前处方总费用：<span style="color:red;">{{ 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>-->
-<!--                </div>-->
-<!--                <div class="centerRight">-->
-<!--                  <p class="centerRightTitle">人员信息</p>-->
-<!--                  <div style="display:flex;justify-content: space-between;line-height:30px;">-->
-<!--                    <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>-->
-<!--                    <span style="font-size:14px;">日期:{{ record_date }}</span>-->
-<!--                  </div>-->
-<!--                  <ul class="basicUl">-->
-<!--                    <li style="width:50%;">姓名：{{ patientInfo.name }}</li>-->
-<!--                    <li style="width:50%;">性别：{{ patientInfo.gender == 1 ? '男' : '女' }}</li>-->
-<!--                    <li style="width:50%;">年龄：{{ patientInfo.age }}</li>-->
-<!--                    <li style="width:50%;">电话：{{ patientInfo.phone }}</li>-->
-
-<!--                    &lt;!&ndash;<span>过敏病史:</span>&ndash;&gt;-->
-<!--                    &lt;!&ndash;<el-autocomplete&ndash;&gt;-->
-<!--                    &lt;!&ndash;style="width:100%;"&ndash;&gt;-->
-<!--                    &lt;!&ndash;class="inline-input"&ndash;&gt;-->
-<!--                    &lt;!&ndash;v-model="sick_history"&ndash;&gt;-->
-<!--                    &lt;!&ndash;:fetch-suggestions="querySearch2"&ndash;&gt;-->
-<!--                    &lt;!&ndash;placeholder="请输入内容"&ndash;&gt;-->
-<!--                    &lt;!&ndash;&gt;</el-autocomplete>&ndash;&gt;-->
-<!--                    &lt;!&ndash;<li style="width:100%;">地址：{{patientInfo.home_address}}</li>&ndash;&gt;-->
-<!--                    &lt;!&ndash;<li style="width:100%;">过敏史及其他病史：{{info.sick_history}}</li>&ndash;&gt;-->
-<!--                  </ul>-->
-<!--                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>-->
-<!--                  <div style="display:flex;justify-content: space-between;line-height:30px;">-->
-<!--                    <span style="font-size:14px;">住院编号:{{ hisPatientInfo.number }}</span>-->
-<!--                  </div>-->
-<!--                  <ul class="basicUl">-->
-<!--                    <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>-->
-<!--                  </ul>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </el-tab-pane>-->
-<!--            <el-tab-pane label="月结" name="second">-->
-<!--              <div style="display:flex;height:100%;">-->
-<!--                <div class="centerLeft">-->
-<!--                  <div class="tabsBox">-->
-<!--                    &lt;!&ndash; <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button> &ndash;&gt;-->
-<!--                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"-->
-<!--                             @tab-click="tabclickEventTwo">-->
-
-<!--                      <el-tab-pane-->
-<!--                          v-for="(item, index) in month_prescriptions"-->
-<!--                          :key="index"-->
-<!--                          :label="item.name"-->
-<!--                          :name="item.name">-->
-<!--                      </el-tab-pane>-->
-
-<!--                      <div class="RP">-->
-<!--                        Rp-->
-<!--                        <el-date-picker-->
-<!--                            v-model="other_start_time"-->
-<!--                            prefix-icon="el-icon-date"-->
-<!--                            @change="changeTime"-->
-<!--                            :editable="false"-->
-<!--                            style="width: 150px;"-->
-<!--                            type="date"-->
-<!--                            :picker-options="pickerOptions"-->
-<!--                            placeholder="选择开始时间"-->
-<!--                            align="right"-->
-<!--                            format="yyyy-MM-dd"-->
-<!--                            value-format="yyyy-MM-dd">-->
-<!--                        </el-date-picker>-->
-<!--                        <span class>-</span>-->
-<!--                        <el-date-picker-->
-<!--                            v-model="other_end_time"-->
-<!--                            prefix-icon="el-icon-date"-->
-<!--                            @change="changeEndTime"-->
-<!--                            :editable="false"-->
-<!--                            style="width: 150px;"-->
-<!--                            type="date"-->
-<!--                            placeholder="选择结束时间"-->
-<!--                            align="right"-->
-<!--                            format="yyyy-MM-dd"-->
-<!--                            value-format="yyyy-MM-dd">-->
-<!--                        </el-date-picker>-->
-<!--                      </div>-->
-<!--                      &lt;!&ndash;<prescription-table :preTableData='preTableData'></prescription-table>&ndash;&gt;-->
-<!--                      &lt;!&ndash;<month-prescription-table ref="prescription_tables"&ndash;&gt;-->
-<!--                      &lt;!&ndash;:activeType="activeType"  :prescription="curMonthPrescriptions"></month-prescription-table>&ndash;&gt;-->
-<!--                      <charge-month-prescription-table-->
-<!--                          :prescription="curMonthPrescriptions"></charge-month-prescription-table>-->
-
-<!--                    </el-tabs>-->
-
-<!--                  </div>-->
-<!--                  <div class="costBox">-->
-<!--                    <span>当前处方总费用：<span style="color:red;">{{ month_total }}元</span></span>-->
-<!--                    &lt;!&ndash;<span>{{ state }}</span>&ndash;&gt;-->
-<!--                  </div>-->
-<!--                </div>-->
-<!--                <div class="centerRight">-->
-<!--                  <p class="centerRightTitle">人员信息</p>-->
-<!--                  <div style="display:flex;justify-content: space-between;line-height:30px;">-->
-<!--                    <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>-->
-<!--                    <span style="font-size:14px;">日期:{{ record_date }}</span>-->
-<!--                  </div>-->
-
-<!--                  <ul class="basicUl">-->
-<!--                    <li style="width:50%;">姓名：{{ patientInfo.name }}</li>-->
-<!--                    <li style="width:50%;">性别：{{ patientInfo.gender == 1 ? '男' : '女' }}</li>-->
-<!--                    <li style="width:50%;">年龄：{{ patientInfo.age }}</li>-->
-<!--                    <li style="width:50%;">电话：{{ patientInfo.phone }}</li>-->
-<!--                    <li style="width:100%;">过敏史及其他病史：{{ info.sick_history }}</li>-->
-
-<!--                  </ul>-->
-<!--                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>-->
-<!--                  <div style="display:flex;justify-content: space-between;line-height:30px;">-->
-<!--                    <span style="font-size:14px;">门诊编号:{{ hisPatientInfo.number }}</span>-->
-<!--                  </div>-->
-<!--                  <ul class="basicUl">-->
-<!--                    <li style="width:50%;">医生：{{ info.doctor }}</li>-->
-<!--                    <li style="width:50%;">科室：{{ getDepartment(info.departments) }}</li>-->
-<!--                    <li style="width:100%;" v-if="activeName == 'first'">总费用：{{ getTotal() }}</li>-->
-<!--                    <li style="width:100%;" v-if="activeName == 'second'">总费用：{{ getTotalTwo() }}-->
-<!--                    </li>-->
-
-<!--                    <li style="width:100%;">判断结果：{{ info.diagnosis }}</li>-->
-<!--                    &lt;!&ndash;<li style="width:100%;">是否有传染病：</li>&ndash;&gt;-->
-<!--                    &lt;!&ndash;<li style="width:100%;">血压：</li>&ndash;&gt;-->
-<!--                  </ul>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </el-tab-pane>-->
-            <el-tab-pane label="结算" name="first">
+            <el-tab-pane label="日结" name="first">
+              <div style="display:flex;height:100%;">
+                <div class="centerLeft">
+                  <div class="tabsBox">
+                    <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
+                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
+                             @tab-click="tabclickEvent">
+                      <el-tab-pane
+                          v-for="(item, index) in prescriptions"
+                          :key="index"
+                          :label="item.name"
+                          :name="item.name"
+                      >
+                      </el-tab-pane>
+
+                      <!--<div class="RP">-->
+                      <!--Rp-->
+                      <!--<el-date-picker-->
+                      <!--v-model="record_date"-->
+                      <!--type="date"-->
+                      <!--:clearable="false"-->
+                      <!--@change="changeDate"-->
+                      <!--format="yyyy-MM-dd"-->
+                      <!--value-format="yyyy-MM-dd"-->
+                      <!--placeholder="选择日期">-->
+                      <!--</el-date-picker>-->
+                      <!--</div>-->
+                      <!--<charge-prescription-table ref="prescription_tables"-->
+                      <!--:prescription="curPrescriptions"></charge-prescription-table>-->
+                      <!--<charge-prescription-table ref="prescription_tables" :prescription="curPrescriptions"></charge-prescription-table>-->
+                      <charge-prescription-table ref="prescription_tables"
+                                                 :manufacturers="manufacturers"
+                                                 :prescription="curPrescriptions"></charge-prescription-table>
+
+                    </el-tabs>
+
+                  </div>
+                  <div class="costBox">
+                    <span>当前处方总费用：<span style="color:red;">{{ 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>
+                </div>
+                <div class="centerRight">
+                  <p class="centerRightTitle">人员信息</p>
+                  <div style="display:flex;justify-content: space-between;line-height:30px;">
+                    <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>
+                    <span style="font-size:14px;">日期:{{ record_date }}</span>
+                  </div>
+                  <ul class="basicUl">
+                    <li style="width:50%;">姓名：{{ patientInfo.name }}</li>
+                    <li style="width:50%;">性别：{{ patientInfo.gender == 1 ? '男' : '女' }}</li>
+                    <li style="width:50%;">年龄：{{ patientInfo.age }}</li>
+                    <li style="width:50%;">电话：{{ patientInfo.phone }}</li>
+
+                    <!--<span>过敏病史:</span>-->
+                    <!--<el-autocomplete-->
+                    <!--style="width:100%;"-->
+                    <!--class="inline-input"-->
+                    <!--v-model="sick_history"-->
+                    <!--:fetch-suggestions="querySearch2"-->
+                    <!--placeholder="请输入内容"-->
+                    <!--&gt;</el-autocomplete>-->
+                    <!--<li style="width:100%;">地址：{{patientInfo.home_address}}</li>-->
+                    <!--<li style="width:100%;">过敏史及其他病史：{{info.sick_history}}</li>-->
+                  </ul>
+                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>
+                  <div style="display:flex;justify-content: space-between;line-height:30px;">
+                    <span style="font-size:14px;">住院编号:{{ hisPatientInfo.number }}</span>
+                  </div>
+                  <ul class="basicUl">
+                    <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>
+                  </ul>
+                </div>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="月结" name="second">
               <div style="display:flex;height:100%;">
                 <div class="centerLeft">
                   <div class="tabsBox">
+                    <!-- <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button> -->
+                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
+                             @tab-click="tabclickEventTwo">
+
+                      <el-tab-pane
+                          v-for="(item, index) in month_prescriptions"
+                          :key="index"
+                          :label="item.name"
+                          :name="item.name">
+                      </el-tab-pane>
+
+                      <div class="RP">
+                        Rp
+                        <el-date-picker
+                            v-model="other_start_time"
+                            prefix-icon="el-icon-date"
+                            @change="changeTime"
+                            :editable="false"
+                            style="width: 150px;"
+                            type="date"
+                            :picker-options="pickerOptions"
+                            placeholder="选择开始时间"
+                            align="right"
+                            format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd">
+                        </el-date-picker>
+                        <span class>-</span>
+                        <el-date-picker
+                            v-model="other_end_time"
+                            prefix-icon="el-icon-date"
+                            @change="changeEndTime"
+                            :editable="false"
+                            style="width: 150px;"
+                            type="date"
+                            placeholder="选择结束时间"
+                            align="right"
+                            format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd">
+                        </el-date-picker>
+                      </div>
+                      <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
+                      <!--<month-prescription-table ref="prescription_tables"-->
+                      <!--:activeType="activeType"  :prescription="curMonthPrescriptions"></month-prescription-table>-->
+                      <charge-month-prescription-table
+                          :prescription="curMonthPrescriptions"></charge-month-prescription-table>
+
+                    </el-tabs>
+
+                  </div>
+                  <div class="costBox">
+                    <span>当前处方总费用：<span style="color:red;">{{ month_total }}元</span></span>
+                    <!--<span>{{ state }}</span>-->
+                  </div>
+                </div>
+                <div class="centerRight">
+                  <p class="centerRightTitle">人员信息</p>
+                  <div style="display:flex;justify-content: space-between;line-height:30px;">
+                    <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>
+                    <span style="font-size:14px;">日期:{{ record_date }}</span>
+                  </div>
+
+                  <ul class="basicUl">
+                    <li style="width:50%;">姓名：{{ patientInfo.name }}</li>
+                    <li style="width:50%;">性别：{{ patientInfo.gender == 1 ? '男' : '女' }}</li>
+                    <li style="width:50%;">年龄：{{ patientInfo.age }}</li>
+                    <li style="width:50%;">电话：{{ patientInfo.phone }}</li>
+                    <li style="width:100%;">过敏史及其他病史：{{ info.sick_history }}</li>
+
+                  </ul>
+                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>
+                  <div style="display:flex;justify-content: space-between;line-height:30px;">
+                    <span style="font-size:14px;">门诊编号:{{ hisPatientInfo.number }}</span>
+                  </div>
+                  <ul class="basicUl">
+                    <li style="width:50%;">医生：{{ info.doctor }}</li>
+                    <li style="width:50%;">科室：{{ getDepartment(info.departments) }}</li>
+                    <li style="width:100%;" v-if="activeName == 'first'">总费用：{{ getTotal() }}</li>
+                    <li style="width:100%;" v-if="activeName == 'second'">总费用：{{ getTotalTwo() }}
+                    </li>
+
+                    <li style="width:100%;">判断结果：{{ info.diagnosis }}</li>
+                    <!--<li style="width:100%;">是否有传染病：</li>-->
+                    <!--<li style="width:100%;">血压：</li>-->
+                  </ul>
+                </div>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="结算" name="third">
+              <div style="display:flex;height:100%;">
+                <div class="centerLeft">
+                  <div class="tabsBox">
+                    <!-- <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button> -->
                     <el-tabs class="preTabs" v-model="editSettletableTabsValue" type="border-card"
                              @tab-click="tabclickEventThree">
 
@@ -379,16 +380,55 @@
                       <settle-prescription-table
                           :prescription="curSettlePrescriptions"
                       ></settle-prescription-table>
+
+                      <!--                                <charge-month-prescription-table-->
+                      <!--                                    :prescription="curMonthPrescriptions"></charge-month-prescription-table>-->
+
                     </el-tabs>
 
                   </div>
                   <div class="costBox">
                     <span>当前处方总费用：<span style="color:red;">{{ settle_total }}元</span></span>
+                    <!--<span>{{ state }}</span>-->
                   </div>
                 </div>
+                <!--                          <div class="centerRight">-->
+                <!--                            <p class="centerRightTitle">人员信息</p>-->
+                <!--                            <div style="display:flex;justify-content: space-between;line-height:30px;">-->
+                <!--                              <span style="font-size:14px;">人员编码:{{patientInfo.dialysis_no}}</span>-->
+                <!--                              <span style="font-size:14px;">日期:{{record_date}}</span>-->
+                <!--                            </div>-->
+
+                <!--                            <ul class="basicUl">-->
+                <!--                              <li style="width:50%;">姓名：{{patientInfo.name}}</li>-->
+                <!--                              <li style="width:50%;">性别：{{patientInfo.gender == 1 ? '男' : '女' }}</li>-->
+                <!--                              <li style="width:50%;">年龄：{{patientInfo.age }}</li>-->
+                <!--                              <li style="width:50%;">电话：{{patientInfo.phone}}</li>-->
+                <!--                              <li style="width:100%;">过敏史及其他病史：{{info.sick_history}}</li>-->
+
+                <!--                            </ul>-->
+                <!--                            <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>-->
+                <!--                            <div style="display:flex;justify-content: space-between;line-height:30px;">-->
+                <!--                              <span style="font-size:14px;">门诊编号:{{ hisPatientInfo.number}}</span>-->
+                <!--                            </div>-->
+                <!--                            <ul class="basicUl">-->
+                <!--                              <li style="width:50%;">医生：{{ info.doctor }}</li>-->
+                <!--                              <li style="width:50%;">科室：{{ getDepartment(info.departments) }}</li>-->
+                <!--                              <li style="width:100%;" v-if="activeName == 'first'">总费用：{{ getTotal() }}</li>-->
+                <!--                              <li style="width:100%;" v-if="activeName == 'second'">总费用：{{ getTotalTwo() }}-->
+                <!--                              </li>-->
+
+                <!--                              <li style="width:100%;">判断结果：{{info.diagnosis}}</li>-->
+                <!--                              &lt;!&ndash;<li style="width:100%;">是否有传染病：</li>&ndash;&gt;-->
+                <!--                              &lt;!&ndash;<li style="width:100%;">血压：</li>&ndash;&gt;-->
+                <!--                            </ul>-->
+                <!--                          </div>-->
               </div>
             </el-tab-pane>
+
           </el-tabs>
+
+
         </div>
       </div>
     </div>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -192,6 +192,11 @@
           </el-option>
         </el-select>
       </el-form-item>
+
+
+      <el-button style="margin-left:10px;" type="primary" @click="check11" v-if="form.id_card_no.length > 0">查普通门诊待遇</el-button>
+      <el-button style="margin-left:10px;" type="primary" @click="check14" v-if="form.id_card_no.length > 0">查门诊大病待遇</el-button>
+
     </el-form>
 
     <span slot="footer" class="dialog-footer">
@@ -399,6 +404,108 @@
       diagnoses: Array
     },
     methods: {
+      check11(){
+        if(this.form.social_type == 0 || this.form.social_type == ''){
+          this.$message.error("社保类型不能为空")
+          return
+        }
+        var that = this
+        let params={
+          id_card_no: this.form.id_card_no,
+          admin_user_id:this.$store.getters.xt_user.user.id,
+          med_type: 11,
+          insutype: this.form.social_type
+        }
+        axios.get('http://127.0.0.1:9532/api/treatment/check', {
+          params: params,
+          headers: {
+            'Permission': 5
+          }
+        })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingone = false
+                return false
+              } else {
+                that.loadingone = false
+                if (response.data.data.failed_code == -10) {
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+
+                  }).catch(() => {
+                  })
+                } else {
+                  var result_desc = '';
+                  result_desc = response.data.data.msg
+                  that.$alert(result_desc, '结果', {
+                    confirmButtonText: '确定',
+                    callback: action => {
+                      this.dialogFormVisible = false
+                    }
+                  });
+                }
+              }
+            })
+            .catch(function(error) {
+            })
+      },
+      check14(){
+        if(this.form.social_type == 0 || this.form.social_type == ''){
+          this.$message.error("社保类型不能为空")
+          return
+        }
+        var that = this
+        let params={
+          id_card_no: this.form.id_card_no,
+          admin_user_id:this.$store.getters.xt_user.user.id,
+          med_type: "14",
+          insutype: this.form.social_type
+        }
+        axios.get('http://127.0.0.1:9532/api/treatment/check', {
+          params: params,
+          headers: {
+            'Permission': 5
+          }
+        })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingone = false
+                return false
+              } else {
+                that.loadingone = false
+                if (response.data.data.failed_code == -10) {
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+
+                  }).catch(() => {
+                  })
+                } else {
+                  var result_desc = '';
+                  result_desc = response.data.data.msg
+                  that.$alert(result_desc, '结果', {
+                    confirmButtonText: '确定',
+                    callback: action => {
+                      this.dialogFormVisible = false
+                    }
+                  });
+                }
+              }
+            })
+            .catch(function(error) {
+
+            })
+
+      },
       changeDoctor() {
         for (let i = 0; i < this.doctors.length; i++) {
           if (this.doctors[i].admin_user_id == this.form.doctor) {

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -162,6 +162,10 @@
                     </el-option>
                 </el-select>
             </el-form-item>
+
+          <el-button style="margin-left:10px;" type="primary" @click="check11" v-if="form.id_card_no.length > 0">查普通门诊待遇</el-button>
+          <el-button style="margin-left:10px;" type="primary" @click="check14" v-if="form.id_card_no.length > 0">查门诊大病待遇</el-button>
+
         </el-form>
 
         <span slot="footer" class="dialog-footer">
@@ -377,6 +381,108 @@
       diagnoses: Array,
     },
     methods: {
+      check11(){
+        if(this.form.social_type == 0 || this.form.social_type == ''){
+          this.$message.error("社保类型不能为空")
+          return
+        }
+        var that = this
+        let params={
+          id_card_no: this.form.id_card_no,
+          admin_user_id:this.$store.getters.xt_user.user.id,
+          med_type: 11,
+          insutype: this.form.social_type
+        }
+        axios.get('http://127.0.0.1:9532/api/treatment/check', {
+          params: params,
+          headers: {
+            'Permission': 5
+          }
+        })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingone = false
+                return false
+              } else {
+                that.loadingone = false
+                if (response.data.data.failed_code == -10) {
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+
+                  }).catch(() => {
+                  })
+                } else {
+                  var result_desc = '';
+                  result_desc = response.data.data.msg
+                  that.$alert(result_desc, '结果', {
+                    confirmButtonText: '确定',
+                    callback: action => {
+                      this.dialogFormVisible = false
+                    }
+                  });
+                }
+              }
+            })
+            .catch(function(error) {
+            })
+      },
+      check14(){
+        if(this.form.social_type == 0 || this.form.social_type == ''){
+          this.$message.error("社保类型不能为空")
+          return
+        }
+        var that = this
+        let params={
+          id_card_no: this.form.id_card_no,
+          admin_user_id:this.$store.getters.xt_user.user.id,
+          med_type: "14",
+          insutype: this.form.social_type
+        }
+        axios.get('http://127.0.0.1:9532/api/treatment/check', {
+          params: params,
+          headers: {
+            'Permission': 5
+          }
+        })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingone = false
+                return false
+              } else {
+                that.loadingone = false
+                if (response.data.data.failed_code == -10) {
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+
+                  }).catch(() => {
+                  })
+                } else {
+                  var result_desc = '';
+                  result_desc = response.data.data.msg
+                  that.$alert(result_desc, '结果', {
+                    confirmButtonText: '确定',
+                    callback: action => {
+                      this.dialogFormVisible = false
+                    }
+                  });
+                }
+              }
+            })
+            .catch(function(error) {
+
+            })
+
+      },
       changeDoctor() {
         for (let i = 0; i < this.doctors.length; i++) {
           if (this.doctors[i].admin_user_id == this.form.doctor) {

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -180,8 +180,8 @@ export default {
       ],originType:0,
       originState: [
         { value: 0, label: '全部', source: 0},
-        { value: 1, label: '住院', source: 1},
-        { value: 2, label: '门诊', source: 2}
+        { value: 2, label: '住院', source: 2},
+        { value: 1, label: '门诊', source: 1}
       ],
       crumbs: [
         { path: false, name: '质控管理' },