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

app/statistics/html/comprehensive-query.html

@@ -21,7 +21,7 @@
    <link rel="stylesheet" type="text/css" href="../../../component/statistics/CopdServiceRecord/index.css" />
    <link rel="stylesheet" type="text/css" href="../../../component/statistics/HealthRecord/index.css" />
    <link rel="stylesheet" type="text/css" href="../../../component/statistics/CopdRecordSearch/index.css" />
    <link rel="stylesheet" type="text/css" href="../../../component/statistics/copdPatientRecord/index.css" />
    <link rel="stylesheet" type="text/css" href="../../../component/statistics/CopdPatientRecord/index.css" />
    <link rel="stylesheet" type="text/css" href="../../../component/common/jtbc.css" />
  </head>
  <style>

component/statistics/CopdPatientRecord/index.css

@@ -30,25 +30,29 @@
    border: none!important;
    padding: 0 20px!important;
}
.tag{
.tag_0{
    padding: 1px 10px;
    display: inline-block;
    border-radius: 6px;
    border-radius: 25px;
}
.success{
    background-color: #c0efd0;
    color: #33CC66;
    background-color: #52c41a;
    color: #fff;
}
.warning{
    background-color: #ffdfb0;
    color: #FF6600;
    background-color: #faad14;
    color: #fff;
}
.danger{
    background-color: #ffc0c0;
    color: #FF3333;
    background-color: #ff5b05;
    color: #fff;
}
.primary{
    background-color: #b0dfff;
    color: #0066FF;
    background-color: #3597f2;
    color: #fff;
}
.info{
    background-color: #e4e7ed;
    color: #909399;
}

component/statistics/CopdPatientRecord/index.html

@@ -266,8 +266,8 @@
          <el-select v-model="batchForm.status">
            <el-option label="全部" value=""></el-option>
            <el-option label="未分配" value="2"></el-option>
            <el-option label="未接受" value="0"></el-option>
            <el-option label="已接受" value="1"></el-option>
            <el-option label="未接收" value="0"></el-option>
            <el-option label="已接收" value="1"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="签约状态：">
@@ -292,21 +292,20 @@
        <el-table-column type="selection" width="70" :selectable="selectable"></el-table-column>
        <el-table-column min-width="100" label="基本信息" align="center">
          <template slot-scope="{row}">
            <div>{{row.name}}</div>
            <div>{{row.idcard}}</div>
            <div>{{row.name}} &nbsp;&nbsp; {{row.idcard}}</div>
            <div>{{row.liveAddress}}</div>
          </template>
        </el-table-column>
        <el-table-column min-width="70" label="签约信息" align="center">
          <template slot-scope="{row}">
            <div :class="`tag ${row.isSign == '已签约'?'success':'warning'}`">{{row.isSign}}</div>
            <div v-if="row.doctorName">{{row.signDoctorName}}</div>
            <div v-if="row.hospitalName">{{row.signHospitalName}}</div>
            <div :class="`tag_0 ${row.isSign == '已签约'?'success':'warning'}`">{{row.isSign}}</div>
            <div>{{row.signDoctorName}}</div>
            <div>{{row.signHospitalName}}</div>
          </template>
        </el-table-column>
        <el-table-column min-width="100" label="当前分配信息" align="center">
          <template slot-scope="{row}">
            <div :class="`tag ${row.statusName == '已接收'?'success':row.statusName == '未接收'?'primary':'danger'}`">{{row.statusName}}</div>
            <div :class="`tag_0 ${row.statusName == '已接收'?'primary':row.statusName == '未接收'?'danger':'info'}`">{{row.statusName}}</div>
            <div>{{row.doctorName}}</div>
            <div>{{row.hospitalName}}</div>
          </template>

component/statistics/CopdPatientRecord/index.js

@@ -479,7 +479,10 @@ Vue.component('copd-patient-record', {
        (this.hospital = ''),
        (this.doctorName = ''),
        (this.isLive = ''),
        (this.firstOrg = '')
        (this.firstOrg = ''),
        (this.isSign = ''),
        (this.registAddress = []),
        (this.liveAddress = [])
    },
    //下转状态
    getDictByDictName(value) {