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/index.vue

@@ -76,7 +76,7 @@
                     <!--<el-form-item class="specialFormItem" label="医保卡号：">-->
                     <!--<div style="display:flex;">-->
                     <!--<el-input v-model="form.medicalInsuranceCard"></el-input>-->
-                    <!--<el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>-->
+                    <el-button style="margin-left:10px;" type="primary" @click="check" v-if="form.id_card_no.length > 0">查待遇</el-button>
                     <!--</div>-->
                     <!--</el-form-item>-->
 
@@ -335,7 +335,62 @@
     },
 
     methods: {
+      check(){
+        if(this.form.med_type == 0 || this.form.med_type == ''){
+          this.$message.error("医疗类别不能为空")
+          return
+        }
+        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: this.form.med_type,
+          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) {
+
+            })
+
+      },
       handleSelect(val) {
         this.form.id = val.id
         this.form.name = val.name

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)"-->
-            <!--                                   size="small"-->
+            <!--                    c               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 == 'third' &&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 == 'first' &&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 == 'third' &&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 == 'first' &&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 == '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)"
+                       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)"
                        size="small"
                        @click="open(3)"
                        type="primary">收费
             </el-button>
 
             <el-button size="small" @click="open(4)" type="primary"
-                       v-if="this.activeName == 'third' &&this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
+                       v-if="this.activeName == 'first' &&this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
               退费
             </el-button>
-            <el-button v-if="this.activeName == 'third' &&this.order.order_status == 2" size="small" @click="open(5)"
+            <el-button v-if="this.activeName == 'first' &&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 == 'third' &&this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1)"
+                v-if="(this.activeName == 'first' &&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 == 'third' &&this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+                v-if="(this.activeName == 'first' &&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,185 +189,184 @@
 
         <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">
-                    <!--<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">
+<!--            <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">
               <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">
 
@@ -380,55 +379,16 @@
                       <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/qcd/officesControlAnalysis/time.vue

@@ -86,8 +86,8 @@
         <div class="time">
           <ul class>
             <li
-                :class="item.lapseto == lapsetoType ? 'active' : ''"
-                @click="selectLapseTo(item.lapseto)"
+                :class="item.lapseto == lapseto ? 'active' : ''"
+                @click="changeLapseto(item.lapseto)"
                 v-for="item in lapsetoState"
                 :key="item.value"
             >
@@ -102,7 +102,7 @@
           <ul class>
             <li
                 :class="item.source == originType ? 'active' : ''"
-                @click="selectLapseTo(item.source)"
+                @click="selectOrigin(item.source)"
                 v-for="item in originState"
                 :key="item.value"
             >
@@ -395,8 +395,14 @@ export default {
       return new Date(time).getTime() / 1000
     },
     selectLapseTo(state) {
-      this.stateType = state
-      this.listQuery.state = state
+      this.lapsetoType = state
+      this.getlist()
+      // this.listQuery.state = state
+    },selectOrigin(state) {
+      this.originType = state
+      // this.listQuery.state = state
+      this.getlist()
+
     },
     chooseType(val) {
       this.modesData.series = []
@@ -674,7 +680,8 @@ export default {
       const params = {
         lapseto: this.lapseto,
         startime: this.startime,
-        endtime: this.endtime
+        endtime: this.endtime,
+        origin:this.originType,
       }
       this.isLoading = true
       getFirstQuarter(params).then(response => {