bug

app/jbsc/html/view_screening_results.html

@@ -510,7 +510,7 @@
          </div>
        </div>
      </div>
	  <template v-if="docInfo.level=='2'&&!userInfo.survey_status">
	  <template v-if="docInfo.level=='2'&&!userInfo.survey_status&&!showOpt">
		  <div class="clear-bottom" v-if="!isView || (userInfo.is_again==1 && userInfo.is_danger==1)">
			<div class="btn-group-bottom flex-box">
			  <button class="btn bgc-2DBE55" @click="jkjy" v-if="result.doctorOtherAdvice || result.doctorAdvice">
@@ -533,14 +533,14 @@
		  </div>
	  </template>
	  <!-- 专科 已管理 待处理 已预约 已接诊-->
	  <template v-if="docInfo.level=='1'&&(userInfo.survey_status == 1||(userInfo.following == 0 && (userInfo.isOrder == 0 || userInfo.is_order == 0))||(userInfo.isOrder == 1 || userInfo.is_order == 1)||(userInfo.isOrder == 2 || userInfo.is_order == 2))">
	  <template v-if="docInfo.level=='1'&&(userInfo.survey_status == 1||(userInfo.following == 0 && (userInfo.isOrder == 0 || userInfo.is_order == 0))||(userInfo.isOrder == 1 || userInfo.is_order == 1)||(userInfo.isOrder == 2 || userInfo.is_order == 2))&&!showOpt">
			<div class="clear-bottom">
				<div class="btn-group-bottom flex-box">
					<button class="btn bgc-12b7f5" @click="lianxijiayi" >联系家医</button>
				</div>
			</div>
	  </template>
	  <template v-if="docInfo.level=='2'">
	  <template v-if="docInfo.level=='2'&&!showOpt">
		  <div class="clear-bottom" v-if="!userInfo.survey_status&&userInfo.screen_result_score==-1&&(userInfo.isDanger == 1 || userInfo.is_danger == 1)&&(userInfo.following == 0 && (userInfo.isOrder == 0 || userInfo.is_order == 0))">
			  <div class="btn-group-bottom flex-box">
				  <button class="btn bgc-FF9630" style="width: 120px;" @click="sqsf" >纳入社区管理</button>
@@ -601,6 +601,7 @@
		  isloading:false,
		  docInfo:JSON.parse(window.localStorage.getItem('docInfo')),
		  jiayiShow:false,
      showOpt: httpData['opt']
        },
        mounted: function () {
          this.getScreenResultDetail()

component/statistics/FollowDetail/index.js

@@ -92,8 +92,8 @@ Vue.component('follow-detail', {
          { label: '社区', value: 'hospital' },
          { label: '团队', value: 'team' }
        ]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code }]
        this.hospital = [{ label: selectedRole.name, value: selectedRole.code }]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code.substring(0, 6) }]
        this.hospitalOptions = [{ name: selectedRole.name, code: selectedRole.code }]
        this.form = {
          range: 'hospital',
          area: selectedRole.code.substring(0, 6),
@@ -198,18 +198,20 @@ Vue.component('follow-detail', {
        code: code
      }
      httpRequest.post('common/district', { data: params }).then(function (res) {
        vm.hospitalOptions = res.list
        vm.hospitalOptions = [{ code: '', name: '全部' }]
        vm.hospitalOptions = vm.hospitalOptions.concat(res.list)
      })
    },
    getTeam(code) {
      var vm = this
      delete this.form.team
      var params = {
        hospital: code
        hospital: code,
        area: this.form.area
      }
      httpRequest.get('statisticsExport/teamList', { data: params }).then(function (res) {
        vm.teamOptions = res.data
        vm.teamOptions = [{ id: '', name: '全部' }]
        vm.teamOptions = vm.teamOptions.concat(res.data)
      })
    },
    handleCurrentChange(val) {

component/statistics/FollowRecord/index.js

@@ -101,14 +101,14 @@ Vue.component('follow-record', {
          area: selectedRole.code
        }
        this.getHospital(selectedRole.code)
      } else {
      }  else {
        this.level = 3 // 社区管理
        this.rangeOptions = [
          { label: '社区', value: 'hospital' },
          { label: '团队', value: 'team' }
        ]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code }]
        this.hospital = [{ label: selectedRole.name, value: selectedRole.code }]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code.substring(0, 6) }]
        this.hospitalOptions = [{ name: selectedRole.name, code: selectedRole.code }]
        this.form = {
          range: 'hospital',
          area: selectedRole.code.substring(0, 6),
@@ -213,18 +213,20 @@ Vue.component('follow-record', {
        code: code
      }
      httpRequest.post('common/district', { data: params }).then(function (res) {
        vm.hospitalOptions = res.list
        vm.hospitalOptions = [{ code: '', name: '全部' }]
        vm.hospitalOptions = vm.hospitalOptions.concat(res.list)
      })
    },
    getTeam(code) {
      var vm = this
      delete this.form.team
      var params = {
        hospital: code
        hospital: code,
        area: this.form.area
      }
      httpRequest.get('statisticsExport/teamList', { data: params }).then(function (res) {
        vm.teamOptions = res.data
        vm.teamOptions = [{ id: '', name: '全部' }]
        vm.teamOptions = vm.teamOptions.concat(res.data)
      })
    },
    getDictByDictName: function () {

component/statistics/GxbCy/index.js

@@ -166,7 +166,7 @@ Vue.component('gxb-cy', {
          { label: '社区', value: 'hospital' },
          { label: '团队', value: 'team' }
        ]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code }]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code.substring(0, 6) }]
        this.hospitalOptions = [{ name: selectedRole.name, code: selectedRole.code }]
        this.form = {
          range: 'hospital',
@@ -254,10 +254,6 @@ Vue.component('gxb-cy', {
    },
    eliminateClick() {
      this.resetArea()
      this.form.hospital = ''
      this.hospitalOptions = []
      this.form.team = ''
      this.teamOptions = []
      this.yearType = '1'
      this.chooseYear = new Date().getFullYear()
      this.chooseTime = null
@@ -271,25 +267,21 @@ Vue.component('gxb-cy', {
        type: 5,
        code: code
      }
      if (!code) {
        vm.hospitalOptions = [{ name: '全部', value: '' }]
        vm.teamOptions = [{ name: '全部', value: '' }]
        return false
      }
      httpRequest.post('common/district', { data: params }).then(function (res) {
        vm.hospitalOptions = res.list
        vm.hospitalOptions = [{ code: '', name: '全部' }]
        vm.hospitalOptions = vm.hospitalOptions.concat(res.list)
      })
    },
    getTeam(code) {
      var vm = this
      delete this.form.team
      var params = {
        hospital: code
        hospital: code,
        area: this.form.area
      }
      httpRequest.get('statisticsExport/teamList', { data: params }).then(function (res) {
        vm.teamOptions = res.data
        vm.teamOptions = [{ id: '', name: '全部' }]
        vm.teamOptions = vm.teamOptions.concat(res.data)
      })
    },
    handleCurrentChange(val) {

component/statistics/GxbEvaluation/index.js

@@ -94,7 +94,7 @@ Vue.component('gxb-evaluation', {
          { label: '社区', value: 'hospital' },
          { label: '团队', value: 'team' }
        ]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code }]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code.substring(0, 6) }]
        this.hospitalOptions = [{ name: selectedRole.name, code: selectedRole.code }]
        this.form = {
          range: 'hospital',
@@ -184,10 +184,6 @@ Vue.component('gxb-evaluation', {
    },
    eliminateClick() {
      this.resetArea()
      this.form.hospital = ''
      this.hospitalOptions = []
      this.form.team = ''
      this.teamOptions = []
      this.yearType = '1'
      this.chooseYear = new Date().getFullYear()
      this.chooseTime = null
@@ -201,23 +197,21 @@ Vue.component('gxb-evaluation', {
        type: 5,
        code: code
      }
      if (!code) {
        vm.hospitalOptions = [{ name: '全部', value: '' }]
        vm.teamOptions = [{ name: '全部', value: '' }]
        return false
      }
      httpRequest.post('common/district', { data: params }).then(function (res) {
        vm.hospitalOptions = res.list
        vm.hospitalOptions = [{ code: '', name: '全部' }]
        vm.hospitalOptions = vm.hospitalOptions.concat(res.list)
      })
    },
    getTeam(code) {
      var vm = this
      delete this.form.team
      var params = {
        hospital: code
        hospital: code,
        area: this.form.area
      }
      httpRequest.get('statisticsExport/teamList', { data: params }).then(function (res) {
        vm.teamOptions = res.data
        vm.teamOptions = [{ id: '', name: '全部' }]
        vm.teamOptions = vm.teamOptions.concat(res.data)
      })
    },
    handleCurrentChange(val) {

component/statistics/GxbManage/index.js

@@ -84,8 +84,8 @@ Vue.component('gxb-manage', {
          { label: '社区', value: 'hospital' },
          { label: '团队', value: 'team' }
        ]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code }]
        this.hospital = [{ label: selectedRole.name, value: selectedRole.code }]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code.substring(0, 6) }]
        this.hospitalOptions = [{ name: selectedRole.name, code: selectedRole.code }]
        this.form = {
          range: 'hospital',
          area: selectedRole.code.substring(0, 6),
@@ -127,12 +127,12 @@ Vue.component('gxb-manage', {
        pageSize: this.size
      }
      if (this.yearType == '1') {
        params.startDate = this.chooseYear + '-01-01 00:00'
        params.endDate = this.chooseYear + '-12-31 23:59'
        params.startDate = this.chooseYear + '-01-01'
        params.endDate = this.chooseYear + '-12-31'
      } else {
        if (this.chooseTime) {
          params.startDate = this.chooseTime[0] + ' 00:00'
          params.endDate = this.chooseTime[1] + ' 23:59'
          params.startDate = this.chooseTime[0]
          params.endDate = this.chooseTime[1] 
        }
      }
@@ -186,18 +186,20 @@ Vue.component('gxb-manage', {
        code: code
      }
      httpRequest.post('common/district', { data: params }).then(function (res) {
        vm.hospitalOptions = res.list
        vm.hospitalOptions = [{ code: '', name: '全部' }]
        vm.hospitalOptions = vm.hospitalOptions.concat(res.list)
      })
    },
    getTeam(code) {
      var vm = this
      delete this.form.team
      var params = {
        hospital: code
        hospital: code,
        area: this.form.area
      }
      httpRequest.get('statisticsExport/teamList', { data: params }).then(function (res) {
        vm.teamOptions = res.data
        vm.teamOptions = [{ id: '', name: '全部' }]
        vm.teamOptions = vm.teamOptions.concat(res.data)
      })
    },
    handleCurrentChange(val) {

component/statistics/GxbTurnup/index.js

@@ -83,7 +83,7 @@ Vue.component('gxb-turnup', {
          { label: '社区', value: 'hospital' },
          { label: '团队', value: 'team' }
        ]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code }]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code.substring(0, 6) }]
        this.hospitalOptions = [{ name: selectedRole.name, code: selectedRole.code }]
        this.form = {
          range: 'hospital',
@@ -171,10 +171,6 @@ Vue.component('gxb-turnup', {
    },
    eliminateClick() {
      this.resetArea()
      this.form.hospital = ''
      this.hospitalOptions = []
      this.form.team = ''
      this.teamOptions = []
      this.yearType = '1'
      this.chooseYear = new Date().getFullYear()
      this.chooseTime = null
@@ -188,24 +184,21 @@ Vue.component('gxb-turnup', {
        type: 5,
        code: code
      }
      if (!code) {
        vm.hospitalOptions = [{ name: '全部', value: '' }]
        vm.teamOptions = [{ name: '全部', value: '' }]
        return false
      }
      httpRequest.post('common/district', { data: params }).then(function (res) {
        vm.hospitalOptions = res.list
        vm.hospitalOptions = [{ code: '', name: '全部' }]
        vm.hospitalOptions = vm.hospitalOptions.concat(res.list)
      })
    },
    getTeam(code) {
      var vm = this
      delete this.form.team
      var params = {
        hospital: code
        hospital: code,
        area: this.form.area
      }
      httpRequest.get('statisticsExport/teamList', { data: params }).then(function (res) {
        vm.teamOptions = res.data
        vm.teamOptions = [{ id: '', name: '全部' }]
        vm.teamOptions = vm.teamOptions.concat(res.data)
      })
    },
    handleCurrentChange(val) {

component/statistics/SignSituation/index.js

@@ -84,8 +84,8 @@ Vue.component('sign-situation', {
          { label: '社区', value: 'hospital' },
          { label: '团队', value: 'team' }
        ]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code }]
        this.hospital = [{ label: selectedRole.name, value: selectedRole.code }]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code.substring(0, 6) }]
        this.hospitalOptions = [{ name: selectedRole.name, code: selectedRole.code }]
        this.form = {
          range: 'hospital',
          area: selectedRole.code.substring(0, 6),
@@ -186,18 +186,20 @@ Vue.component('sign-situation', {
        code: code
      }
      httpRequest.post('common/district', { data: params }).then(function (res) {
        vm.hospitalOptions = res.list
        vm.hospitalOptions = [{ code: '', name: '全部' }]
        vm.hospitalOptions = vm.hospitalOptions.concat(res.list)
      })
    },
    getTeam(code) {
      var vm = this
      delete this.form.team
      var params = {
        hospital: code
        hospital: code,
        area: this.form.area
      }
      httpRequest.get('statisticsExport/teamList', { data: params }).then(function (res) {
        vm.teamOptions = res.data
        vm.teamOptions = [{ id: '', name: '全部' }]
        vm.teamOptions = vm.teamOptions.concat(res.data)
      })
    },
    handleCurrentChange(val) {

component/statistics/TurndownAnalysis/index.js

@@ -88,8 +88,8 @@ Vue.component('turndown-analysis', {
          { label: '社区', value: 'hospital' },
          { label: '团队', value: 'team' }
        ]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code }]
        this.hospital = [{ label: selectedRole.name, value: selectedRole.code }]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code.substring(0, 6) }]
        this.hospitalOptions = [{ name: selectedRole.name, code: selectedRole.code }]
        this.form = {
          range: 'hospital',
          area: selectedRole.code.substring(0, 6),
@@ -194,18 +194,20 @@ Vue.component('turndown-analysis', {
        code: code
      }
      httpRequest.post('common/district', { data: params }).then(function (res) {
        vm.hospitalOptions = res.list
        vm.hospitalOptions = [{ code: '', name: '全部' }]
        vm.hospitalOptions = vm.hospitalOptions.concat(res.list)
      })
    },
    getTeam(code) {
      var vm = this
      delete this.form.team
      var params = {
        hospital: code
        hospital: code,
        area: this.form.area
      }
      httpRequest.get('statisticsExport/teamList', { data: params }).then(function (res) {
        vm.teamOptions = res.data
        vm.teamOptions = [{ id: '', name: '全部' }]
        vm.teamOptions = vm.teamOptions.concat(res.data)
      })
    },
    handleCurrentChange(val) {
@@ -228,7 +230,7 @@ Vue.component('turndown-analysis', {
        closeBtn: 1,
        shift: 5,
        shadeClose: false, //点击遮罩关闭层
        content: '../../jbsc/html/view_screening_results.html?resultCode=' + scope.row.code
        content: `../../jbsc/html/view_screening_results.html?resultCode=${scope.row.code}&opt=1`
      })
    }
  },

component/statistics/TurndownDetail/index.html

@@ -97,16 +97,14 @@
  <el-table :data="tableData" style="width: 100%" v-loading="loading">
    <el-table-column type="index" min-width="60" label="序号"></el-table-column>
    <el-table-column :label="item.label" v-for="item in tableHeader" :key="item.prop" align="center">
      <template slot-scope="scope">{{scope.row[item.prop]}}</template>
      <template slot-scope="scope">{{transformData(scope.row[item.prop],item.prop)}}</template>
    </el-table-column>
    <el-table-column label="操作" align="center" width="100">
      <template slot-scope="scope">
        <div class="operate">
          <div v-if="scope.row.status==0" @click="operation(1,scope.row)">分配</div>
          <div @click="operation(2,scope.row)">查看签约</div>
          <div v-if="scope.row.status==5" @click="operation(3,scope.row)">同步居民</div>
          <div v-if="scope.row.status==3" @click="operation(4,scope.row)">同步病历</div>
        </div>
        <el-button type="text" v-if="scope.row.status==0" @click="operation(1,scope.row)">分配</el-button>
        <el-button type="text" @click="operation(2,scope.row)">查看签约</el-button>
        <el-button type="text" v-if="scope.row.status==5" @click="operation(3,scope.row)">同步居民</el-button>
        <el-button type="text" v-if="scope.row.status==3" @click="operation(4,scope.row)">同步病历</el-button>
      </template>
    </el-table-column>
  </el-table>

component/statistics/TurndownDetail/index.js

@@ -202,6 +202,17 @@ Vue.component('turndown-detail', {
          })
        this.dialogVisible = true
      }
    },
    transformData(data, prop){
      if(prop == 'sex'){
        if(data == 0){
          return '男'
        }else{
          return '女'
        }
      }else{
        return data
      }
    }
  },
  mounted() {

component/statistics/reservationSituation/index.js

@@ -78,14 +78,14 @@ Vue.component('reservation-situation', {
          area: selectedRole.code
        }
        this.getHospital(selectedRole.code)
      } else {
      }  else {
        this.level = 3 // 社区管理
        this.rangeOptions = [
          { label: '社区', value: 'hospital' },
          { label: '团队', value: 'team' }
        ]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code }]
        this.hospital = [{ label: selectedRole.name, value: selectedRole.code }]
        this.areaOptions = [{ label: selectedRole.name.substring(0, 3), value: selectedRole.code.substring(0, 6) }]
        this.hospitalOptions = [{ name: selectedRole.name, code: selectedRole.code }]
        this.form = {
          range: 'hospital',
          area: selectedRole.code.substring(0, 6),
@@ -174,9 +174,9 @@ Vue.component('reservation-situation', {
    },
    eliminateClick() {
      this.resetArea()
      delete this.form.isSign
      delete this.form.name
      delete this.form.eventType
      delete this.form.doctorName
      this.age = []
      this.$forceUpdate()
    },
@@ -189,18 +189,20 @@ Vue.component('reservation-situation', {
        code: code
      }
      httpRequest.post('common/district', { data: params }).then(function (res) {
        vm.hospitalOptions = res.list
        vm.hospitalOptions = [{ code: '', name: '全部' }]
        vm.hospitalOptions = vm.hospitalOptions.concat(res.list)
      })
    },
    getTeam(code) {
      var vm = this
      delete this.form.team
      var params = {
        hospital: code
        hospital: code,
        area: this.form.area
      }
      httpRequest.get('statisticsExport/teamList', { data: params }).then(function (res) {
        vm.teamOptions = res.data
        vm.teamOptions = [{ id: '', name: '全部' }]
        vm.teamOptions = vm.teamOptions.concat(res.data)
      })
    },
    handleCurrentChange(val) {