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

api/http-request.js

@@ -23,7 +23,7 @@
    videoChatIntranetFlag = false
  } else if (publish_version == 2) {
    // 预发布环境配置
    server = '//ijk.xmyys.com.cn/wlyytest/'
    server = 'https://ijk.xmyys.com.cn/wlyytest/'
    imserver = '//ijk.xmyys.com.cn/api/v2'
    socketUrl = '//ijk.xmyys.com.cn'
    articleServer = '//ijk.xmyys.com.cn/wlyy/'

app/sign/html/sign_detail.html

@@ -38,7 +38,7 @@
						<img class="mr5" v-if="patientInfo.deviceType && patientInfo.deviceType.indexOf('1') > -1" height="18" src="../../../images/icon_xuetangyi.png" alt="" />
					</p>
				</dd>
				<dd class="fr">
				<dd class="fr" v-if="isIjkTo">
					<span class="c-fff btn" :class="isSaveBtn || isSaveBtn1 || isSaveBtn2 || isSaveBtn3? 'btn-12b7f5' : 'btn-ddd'" @click="saveChange()">保存改动</span>
				</dd>
			</dl>
@@ -102,10 +102,16 @@
						</p>
						<div class="m0 c-border-b clearfix">
							<span class="fl w-40 c-border-r pl20 c-999">政府补贴费</span>
							<div class="c-position-r fl w-60-1">
							<div class="c-position-r fl w-60-1" v-if="isIjkTo">
								<p class="pl20 w-100 cur-pit set-bg" @click="selectStatus(3)">{{showExpensesName(patientInfo.jtSign.expensesType)}}</p>
								<ul class="pull-list m0 p0 c-border-l c-border-r c-border-b" v-if="isShowList3">
			                        <li class="cur-pit c-999" v-for="(dict, index) in dictList" :key="index" @click="selectLi(3, dict)">{{dict.value}}</li>
			                    </ul>
							</div>
							<div class="c-position-r fl w-60-1" v-else>
								<p class="pl20 w-100 cur-pit">{{showExpensesName(patientInfo.jtSign.expensesType)}}</p>
								<ul class="pull-list m0 p0 c-border-l c-border-r c-border-b" v-if="isShowList3">
			                        <li class="cur-pit c-999" v-for="(dict, index) in dictList" :key="index">{{dict.value}}</li>
			                    </ul>
							</div>
						</div>

app/sign/js/sign_detail.js

@@ -29,6 +29,7 @@ layer.msg(msg, {
new Vue({
el: "#app",
data: {
	isIjkTo:true,
	isLeader: null,
	isShowList1: false,
	isShowList2: false,
@@ -55,11 +56,18 @@ data: {
	serverName: null,
	isShowzkdoctor:false,
},
mounted: function() {
mounted() {
	this.patientSign();
	this.patientTeam();
	this.getDictByDictName();
	this.findPatientSignServerBySignCode()
	const url = new URL(window.location.href);
	const isTO = url.searchParams.get('isTO')
	if (isTO) {
		this.isIjkTo = false
	}else{
		this.isIjkTo = true
	}
},
methods: {
	patientSign: function() {

app/statistics/html/comprehensive-query.html

@@ -443,6 +443,12 @@
                          <el-option v-for="(item,index) in StatusData" :key="item.value" :value="item.code" :label="item.value"></el-option>
                        </el-select>
                      </el-form-item>
                      <!-- <el-form-item label="随访类型：" class="flex formLeft">
                        <el-select v-model="form10.followup_type" class="formWidth" placeholder="请选择">
                          <el-option label="全部" value=""></el-option>
                          <el-option v-for="(item,index) in followupTypeData" :key="item.value" :value="item.code" :label="item.value"></el-option>
                        </el-select>
                      </el-form-item> -->
                    </el-form>
                  </div>
                </div>
@@ -775,6 +781,7 @@
                      <el-table-column prop="statusName" label="服务状态" align="center"></el-table-column>
                      <el-table-column prop="doctor_name" label="服务医生" align="center"></el-table-column>
                      <el-table-column prop="org_name" label="服务机构" align="center"></el-table-column>
                      <!-- <el-table-column prop="followup_type" label="随访类型" align="center"></el-table-column> -->
                      <el-table-column prop="create_time" label="签到时间" align="center"></el-table-column>
                      <el-table-column prop="img" label="签到图片" align="center">
                        <template slot-scope="scope">
@@ -790,6 +797,7 @@
                      <el-table-column prop="age" width="50" label="年龄" align="center"></el-table-column>
                      <el-table-column prop="sex" width="50" label="性别" align="center"></el-table-column>
                      <el-table-column prop="mobile" label="患者手机号" align="center"></el-table-column>
                      <!-- <el-table-column prop="symptoms" label="咨询内容" align="center"></el-table-column> -->
                      <el-table-column prop="hospitalName" width="200" label="社区医院" align="center"></el-table-column>
                      <el-table-column prop="doctorName" label="社区医生" align="center"></el-table-column>
                      <el-table-column prop="createTime" label="邀请时间" align="center"></el-table-column>
@@ -797,6 +805,7 @@
                      <el-table-column prop="specialistHospitalName" label="专科医院" align="center"></el-table-column>
                      <el-table-column prop="specialistDeptName" label="专科科室" align="center"></el-table-column>
                      <el-table-column prop="specialistName" label="专科医生" align="center"></el-table-column>
                      <!-- <el-table-column prop="content" label="回复内容" align="center"></el-table-column> -->
                    </template>
                  </el-table>
                  <mzf-worksheet v-if="handleNodeId==46"></mzf-worksheet>

app/statistics/js/comprehensive-query.js

@@ -7,6 +7,7 @@ new Vue({
    isloading: false, //加载中
    start: '',
    StatusData:[],
    followupTypeData:[],
    health_bank_service_type: [],
    serviceType: '',
    searchStr: 1,
@@ -396,7 +397,9 @@ new Vue({
    },
    form10: {
      resident: '',
      doctorTwo: ''
      doctorTwo: '',
      status: '',
      followup_type: ''
    },
    form11: {
      patientName: '',
@@ -701,6 +704,7 @@ new Vue({
    vm.getQuotaStr()
    vm.getfwDictName()
    vm.getStatus()
    // vm.getFollowupType()
    vm.getDiseaseTypeList()
    vm.height = document.body.offsetHeight - 85
    window.onresize = function () {
@@ -755,6 +759,12 @@ new Vue({
    EventBus.$off('preview-person-info')
  },
  methods: {
    getFollowupType() {
      var vm = this
      statisticAPI.getDictByDictName({ name: 'followup_type' }).then(function (res) {
        vm.followupTypeData = res.list
      })
    },
    getStatus() {
      var vm = this
      statisticAPI.getDictByDictName({ name: 'followup_status' }).then(function (res) {
@@ -1937,7 +1947,8 @@ new Vue({
        page: vm.currentPage,
        patientName: vm.form10.resident || '',
        doctorName: vm.form10.doctorTwo || '',
        status: vm.form10.status || ''
        status: vm.form10.status || '',
        // followupType: vm.form10.followup_type || ''
      }
      return parameter
    },