Selaa lähdekoodia

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

yezehua 5 vuotta sitten
vanhempi
commit
041ed08e34

+ 10 - 1
app/followup/v1/html/fangshi-detail-10.html

@ -48,7 +48,7 @@
<body>
    <div id="app">
        <button class="button" @click="editBtn()">编辑</button>
        <button class="button" :class="{'finish':finishedBtn}" @click="finished()" :disabled="finishedBtn" v-if="showFinish">完成随访</button>
        <button class="button" id="isfinish" :class="{'finish':finishedBtn}" @click="finished()" :disabled="finishedBtn" v-if="showFinish">完成随访</button>
        <p class="c-f20 mb10" style="text-align: center;">肺结核患者随访服务记录表</p>
        <div class="ui-grid p10">
            <div class="ui-col-1">
@ -1197,11 +1197,14 @@
                    fangshiAPI.savePhthisis({ jsonData: JSON.stringify(vm.parient) }).then(function (res) {
                        if (res.status == 200) {
                            console.log(res)
                            var btn=document.getElementById('isfinish')
                            //判断是否完成随访,未完成则将完成按钮显示出来
                            if(vm.sfStatus != 1){
                                vm.finishedBtn = false
                                btn.innerText='完成随访'
                            }else{
                                vm.finishedBtn = true
                                btn.innerText='已完成'
                            }
                            vm.getStatus()
                            top.toastr.info("保存成功")
@ -1233,6 +1236,12 @@
                            if (res.status == 200) {
                                console.log(res)
                                vm.sfStatus = res.data.status
                                var btn=document.getElementById('isfinish')
								if (vm.sfStatus != 1) {
									btn.innerText='完成随访'
								} else {
									btn.innerText='已完成'
								}
                                if(res.data.status == 1){
                                    vm.showFinish = false
                                }

+ 9 - 0
app/followup/v1/html/fangshi-detail-5,6.html

@ -337,10 +337,13 @@
					fangshiAPI.savePostpartumVisitDetails({ followupId: this.followupId || '3', postpartumVisitDetails: JSON.stringify(this.postpartumVisitDetails) }).then(function (res) {
						if (res.status == 200) {
							//判断是否完成随访,未完成则将完成按钮显示出来
							var btn=document.getElementById('isfinish')
							if (vm.sfStatus != 1) {
								vm.finishedBtn = false
								btn.innerText='完成随访'
							} else {
								vm.finishedBtn = true
								btn.innerText='已完成'
							}
							vm.getStatus()
							top.toastr.info('保存成功')
@ -355,6 +358,12 @@
					fangshiAPI.getFollowupInfo({ followupId: this.followupId || '1888107' }).then(function (res) {
						if (res.status == 200) {
							vm.sfStatus = res.data.status
							var btn=document.getElementById('isfinish')
								if (vm.sfStatus != 1) {
									btn.innerText='完成随访'
								} else {
									btn.innerText='已完成'
								}
						} else {
							top.toastr.error(res.msg);
						}

+ 9 - 0
app/followup/v1/html/fangshi-detail-7.html

@ -846,10 +846,13 @@
                    fangshiAPI.saveFollowupSevereMentalDisorder({ followupId: this.followupId || '1', severeMentalDisorderData: JSON.stringify(this.severeMentalDisorderData) }).then(function (res) {
                        if (res.status == 200) {
                            //判断是否完成随访,未完成则将完成按钮显示出来
                            var btn=document.getElementById('isfinish')
                            if (vm.sfStatus != 1) {
                                vm.finishedBtn = false
                                btn.innerText='完成随访'
                            } else {
                                vm.finishedBtn = true
                                btn.innerText='已完成'
                            }
                            vm.getStatus()
                            top.toastr.info('保存成功')
@ -877,6 +880,12 @@
                    fangshiAPI.getFollowupInfo({ followupId: this.followupId || '1888107' }).then(function (res) {
                        if (res.status == 200) {
                            vm.sfStatus = res.data.status
                            var btn=document.getElementById('isfinish')
								if (vm.sfStatus != 1) {
									btn.innerText='完成随访'
								} else {
									btn.innerText='已完成'
								}
                        } else {
                            top.toastr.error(res.msg);
                        }

+ 9 - 0
app/followup/v1/html/fangshi-detail-8.html

@ -2603,10 +2603,13 @@
						fangshiAPI.saveOlderPeopleHealthCheckRecord({ followupId: this.followupId || '2', olderPeopleHealthCheckData: JSON.stringify(this.oldmanData) }).then(function (res) {
							if (res.status == 200) {
								//判断是否完成随访,未完成则将完成按钮显示出来
								var btn=document.getElementById('isfinish')
								if (vm.sfStatus != 1) {
									vm.finishedBtn = false
									btn.innerText='完成随访'
								} else {
									vm.finishedBtn = true
									btn.innerText='已完成'
								}
								vm.getStatus()
								top.toastr.info('保存成功')
@ -2634,6 +2637,12 @@
						fangshiAPI.getFollowupInfo({ followupId: this.followupId || '1888107' }).then(function (res) {
							if (res.status == 200) {
								vm.sfStatus = res.data.status
								var btn=document.getElementById('isfinish')
								if (vm.sfStatus != 1) {
									btn.innerText='完成随访'
								} else {
									btn.innerText='已完成'
								}
							} else {
								top.toastr.error(res.msg);
							}

+ 1 - 1
component/followup/finish-followup-btn.js

@ -1,6 +1,6 @@
Vue.component('finish-followup-btn', {
    template: `
    <button class="button" :class="{'finish':finishedbtn}" @click="finished()" :disabled="finishedbtn">完成随访</button>
    <button class="button" id="isfinish" :class="{'finish':finishedbtn}" @click="finished()" :disabled="finishedbtn">完成随访</button>
    `,
    props: ['followupid', 'finishedbtn'],
    data: function () {

+ 1 - 1
component/followup/follow-bottom.js

@ -1,6 +1,6 @@
Vue.component('follow-bottom', {
	template: '<div class="plr30 ptb10">\
		<p class="c-f16 c-37a6ed">签到信息</p>\
		<p class="c-f16 c-37a6ed">签到信息&nbsp;(目前仅支持APP/pad签到)</p>\
		<div class="plr30">\
			<div class="ui-grid mt10">\
				<div v-if="followUpData.type==1" class="ui-col-1">签到方式:&emsp;定位签到</div>\