Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

component/statistics/GxbManage/index.js

@@ -66,6 +66,19 @@ Vue.component('gxb-manage', {
        { label: '最近一次门诊下转时间', prop: 'createTime', width: '90' },
        { label: '最近一次门诊下转诊断', prop: 'diagnosisName', width: '90' }
      ],
      mzToInHopistalTableHeader: [
        { label: '姓名', prop: 'name', width: '90' },
        { label: '性别', prop: 'sex', width: '90' },
        { label: '年龄', prop: 'age', width: '90' },
        { label: '手机号', prop: 'mobile', width: '90' },
        { label: '证件号码', prop: 'idcard', width: '90' },
        { label: '社区医院', prop: 'signHospitalName', width: '90' },
        { label: '签约医生', prop: 'signDoctorName', width: '90' },
        { label: '最近一次门诊下转时间', prop: 'czrq', width: '90' },
        { label: '最近一次上转科室', prop: 'deptName', width: '90' },
        { label: '最近一次出院下转时间', prop: 'createTime', width: '90' },
        { label: '最近一次出院下转诊断', prop: 'diagnosisName', width: '90' }
      ],
      turnDownTableHeader: [
        { label: '姓名', prop: 'name', width: '90' },
        { label: '性别', prop: 'sex', width: '90' },
@@ -127,7 +140,7 @@ Vue.component('gxb-manage', {
          this.title = '上转转门诊明细'
          break
        case 'zyNum':
          vm.dialogTableHeader = vm.mzTableHeader
          vm.dialogTableHeader = vm.mzToInHopistalTableHeader
          this.title = '门诊转住院明细'
          break
        case 'turnDownNum':
@@ -232,7 +245,12 @@ Vue.component('gxb-manage', {
          params.endDate = this.chooseTime[1]
        }
      }
      httpRequest.get('statistics/collaborate/turnDownManageDetailPage', { data: params }).then(function (res) {
      if ((this.title = '上转转门诊明细')) {
        url = 'statistics/collaborate/turnDownManageDetailPage'
      } else if ((this.title = '门诊转住院明细')) {
        url = 'statistics/collaborate/mzToInHopistalDetailPage'
      }
      httpRequest.get(url, { data: params }).then(function (res) {
        if (res.status == 200) {
          vm.dataInfo = res.detailModelList
          vm.total = res.totalCount