Commit cb1293a2 by zujiaozhang

'修改问卷详情部分样式与ilcc同步'

parent 0959df3b
......@@ -37,30 +37,33 @@
margin-top: .2rem;
}
.que_title{
height: 1.04rem;
/* height: 1.04rem; */
width: 100%;
border-bottom:.01rem solid #DDDDDD;
text-align: center;
font-size:.4rem;
font-family:PingFangSC-Semibold,PingFang SC;
font-weight:600;
color:rgba(17,17,17,1);
line-height: 1.04rem;
padding: .4rem 0;
color:#111;
box-sizing: border-box;
}
.que_content_title{
font-size:.36rem;
font-size:.4rem;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(17,17,17,1);
margin: .4rem 0;
font-weight:600;
color:#999;
margin-top: .3rem;
}
.body_title{
width:100%;
height:.32rem;
font-size:.32rem;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(17,17,17,1);
font-family:PingFangSC-Semibold,PingFang SC;
font-weight:600;
margin-top:.3rem;
color:#111;
line-height:.32rem;
}
.body_content{
......@@ -69,9 +72,8 @@
font-size:.32rem;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:#666;
margin:.2rem 0 .4rem;
color:#999;
margin:.2rem 0 0;
}
.body_img{
display:flex;
......@@ -89,11 +91,24 @@
/* 详情中的单独样式 */
.left_line{
border-left: .08rem solid #2CBCA0;
padding-left: .16rem
padding-left: .16rem ;
font-size:0.36rem;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:600;
color: #111;
}
.top_margin{
margin-top: .48rem;
}
.que_content_body{
overflow: hidden;
}
.no_border{
border: none;
}
.no_marg_bot{
padding: 0 .32rem 0;
}
.que_content_title_discomfort{
display: none;
}
\ No newline at end of file
......@@ -54,4 +54,7 @@ body {
.que_content_title{
height: .36rem;
line-height: .36rem;
}
.que_content_title_jc{
display: none;
}
\ No newline at end of file
......@@ -51,7 +51,6 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
// 用户点击了无
$('.noHas').on('tap',function(){
examination.flag=false
console.log(examination.flag)
examination.checks = ''
})
// 用户点击了有
......@@ -71,13 +70,12 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
})
examination.checks = list.join(',')
console.log(examination.checks)
// console.log(examination.checks)
})
// 点击下一题
$('.next').on('tap',function(){
console.log(examination.flag)
if(examination.flag){
console.log(examination.checks)
// console.log(examination.checks)
var dataHas = {
"adminId":examination.adminId,
"parentId":examination.parentId,
......@@ -134,7 +132,6 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
"adminId":examination.adminId,
},
success: function(res) {
console.log(res)
if(!res.success) return medtap.winPop('获取数据失败')
// 如果没做过题那么answer没有
if(!res.content.followAnswer.answer) {
......@@ -150,7 +147,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
'12': false
}
$('.bloodTest').prop('checked',true)
console.log(examination.checks)
// console.log(examination.checks)
return
}
// console.log(res.content.followAnswer.answer.checks)
......@@ -217,7 +214,6 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
"adminId":examination.adminId,
},
success: function(res) {
console.log(res)
if(!res.success) return medtap.winPop('获取数据失败')
var parentId = res.content.previousQuestion.parentId||''
var questionId = res.content.previousQuestion.questionId||''
......@@ -233,7 +229,6 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
// 提交答案获取下一题id
getNextQuestion:function(data){
var crm = examination.adminId==''? '':'/crm'
console.log(data)
medtap.submitAjax({
url: 'https://gateway.medtap.cn/operation/followUp'+crm+'/nextQuestion',
type: 'post',
......@@ -241,7 +236,6 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
contentType: 'application/json',
data: data,
success: function(res) {
console.log(res)
if(!res.success) return medtap.winPop('获取数据失败')
// 获取下一题的id和序号通过url传递
var parentId = res.content.nextQuestion.parentId||''
......
......@@ -51,7 +51,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
// 用户点击了有
$('.has').on('tap',function(){
furtherConsultation.flag=true
console.log(furtherConsultation.flag)
// console.log(furtherConsultation.flag)
})
// tab切换(有无)
$(".tabbox li").click(function (){
......@@ -162,8 +162,8 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
// 点击转移部位
$('.input_item_move').click(function(){
furtherConsultation.movePicker.show(function (Items) {
console.log(Items[0].text);
console.log(Items[0].value);
// console.log(Items[0].text);
// console.log(Items[0].value);
$('.input_item_move').val(Items[0].text)
})
})
......@@ -177,7 +177,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
url: window.location.href
},
success: function(res) {
console.log(res)
// console.log(res)
var data = res.content;
wx.config({
debug: false,
......@@ -197,7 +197,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
//选择图片
choseImage: function() {
$('.upload_img').on('click',function() {
console.log('点击了选择图片')
// console.log('点击了选择图片')
var html = '';
wx.ready(function() {
var syncUpload = function(localIds) {
......@@ -221,7 +221,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
sizeType: ['original', 'compressed'],
sourceType: ['album', 'camera'],
success: function(res) {
console.log('选择图片的结果',res)
// console.log('选择图片的结果',res)
furtherConsultation.localIds = res.localIds;
//所有需要上传到图片预览
syncUpload(furtherConsultation.localIds);
......@@ -264,13 +264,13 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
'user-os':'wechat'
},
success: function(data) {
console.log('上传的data',data)
// console.log('上传的data',data)
if (data.success == true) {
var res = data.content;
var imgKey = res.url;
furtherConsultation.imgList.push(imgKey);
console.log('上传后图片的imgKey',imgKey)
console.log(localId)
// console.log('上传后图片的imgKey',imgKey)
// console.log(localId)
var html = '<div class="image_files_item">' +
'<img src="' + localId + '" class="image_files_img" imgkey="' + imgKey + '">' +
'<img src="../images/post_delete_btn@2x.png" class="image_del" >' +
......@@ -295,7 +295,6 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
"questionId": furtherConsultation.questionId,
},
success: function(res) {
console.log(res)
if(!res.success) return medtap.winPop('获取数据失败')
// 如果没做过题那么answer没有
if(!res.content.followAnswer.answer) {
......@@ -347,7 +346,6 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
"followUpId":furtherConsultation.followUpId,
},
success: function(res) {
console.log(res)
if(!res.success) return medtap.winPop('获取数据失败')
var parentId = res.content.previousQuestion.parentId||''
var questionId = res.content.previousQuestion.questionId||''
......@@ -366,7 +364,6 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
contentType: 'application/json',
data: data,
success: function(res) {
console.log(res)
if(!res.success) return medtap.winPop('获取数据失败')
// 获取下一题的id和序号通过url传递
var parentId = res.content.nextQuestion.parentId||''
......
......@@ -209,7 +209,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
//选择图片
choseImage: function() {
$('.upload_img').on('click', function() {
console.log('点击了选择图片')
// console.log('点击了选择图片')
var html = '';
wx.ready(function() {
var syncUpload = function(localIds) {
......@@ -257,12 +257,6 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
});
}
});
$('#ImgUp').on('click', '.image_del', function() {
if (confirm('确定要删除图片吗?')) {
$(this).parent().remove();
console.log($(this))
}
});
},
//上传图片
upLoadImg: function(serverId, localId) {
......@@ -367,7 +361,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
"adminId":geneDetection.adminId,
},
success: function(res) {
console.log(res)
if(!res.success) return medtap.winPop('获取数据失败')
var parentId = res.content.previousQuestion.parentId||''
var questionId = res.content.previousQuestion.questionId||''
......@@ -412,7 +406,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
contentType: 'application/json',
data: data,
success: function(res) {
console.log(res)
if(!res.success) return medtap.winPop('获取数据失败')
var parentId = res.content.nextQuestion.parentId||''
var nextquestionNo = res.content.nextQuestion.questionNo||''
......
......@@ -228,7 +228,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
},
success: function(res) {
if(!res.success) return medtap.winPop('获取数据失败')
console.log(res)
if(!res.content.followAnswer.answer) {
return
}
......@@ -264,7 +264,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
"adminId":generalPage.adminId,
},
success: function(res) {
console.log(res)
if(!res.success) return medtap.winPop('获取数据失败')
var parentId = res.content.previousQuestion.parentId||''
var questionId = res.content.previousQuestion.questionId||''
......@@ -308,7 +308,6 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
contentType: 'application/json',
data: data,
success: function(res) {
console.log(res)
if(!res.success) return medtap.winPop('获取数据失败')
var parentId = res.content.nextQuestion.parentId||''
var nextquestionNo = res.content.nextQuestion.questionNo||''
......
......@@ -50,7 +50,6 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) {
"adminId":index.adminId
},
success: function(res) {
console.log(res)
if(res.content.followUpUser.status=='1' && index.adminId==''){
medtap.pushWindow('pages/questionnaireDetails.html?followUpId='+index.followUpId)
}
......
......@@ -27,7 +27,6 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
"adminId": myQuestionnaireList.adminId
},
success: function(res) {
console.log(res)
var html = ''
var QuestionnaireList = res.content.followUpList
for (var i = 0; i < QuestionnaireList.length; i++) {
......
......@@ -24,12 +24,12 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
// 用户点击了无
$('.noHas').click(function(){
otherTreatment.flag=false
console.log(otherTreatment.flag)
// console.log(otherTreatment.flag)
})
// 用户点击了有
$('.has').click(function(){
otherTreatment.flag=true
console.log(otherTreatment.flag)
// console.log(otherTreatment.flag)
})
// 点击下一题
$('.next').on('click',function(){
......@@ -123,7 +123,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
"adminId":otherTreatment.adminId,
},
success: function(res) {
console.log(res)
if(!res.success) return winPop('获取数据失败')
if(!res.content.followAnswer.answer) {
otherTreatment.flag=true
......@@ -161,7 +161,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
"adminId":otherTreatment.adminId,
},
success: function(res) {
console.log(res)
if(!res.success) return winPop('获取数据失败')
var parentId = res.content.previousQuestion.parentId||''
var questionId = res.content.previousQuestion.questionId||''
......@@ -180,7 +180,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
contentType: 'application/json',
data: data,
success: function(res) {
console.log(res)
if(!res.success) return winPop('获取数据失败')
// 获取下一题的id和序号通过url传递
var parentId = res.content.nextQuestion.parentId||''
......
......@@ -62,9 +62,9 @@ define(['zepto','medtap'],function($,medtap){
case 'question2':
if(questionnaireDetails.queDetailsList[key].status=='1'){
var html = '<div class="que_title">复诊情况</div>'+
var html = '<div class="que_title">复诊情况:<span class="que_content_title">近一个月有进行复诊</span></div>'+
'<div class="que_content">'+
'<p class="que_content_title">近一个月有进行复诊</p>'+
'<div class="que_content_body">'+
'<p class="body_title">医生对疗效的判断:</p>'+
'<p class="body_content">'+questionnaireDetails.queDetailsList[key].judge+'</p>'+
......@@ -98,18 +98,18 @@ define(['zepto','medtap'],function($,medtap){
$('.question_two .question_two_img').remove()
}
}else if(questionnaireDetails.queDetailsList[key].status=='0'){
var html = '<div class="que_title">复诊情况</div>'+
'<div class="que_content">'+
'<p class="que_content_title">近一个月未复诊</p>'+
'</div>'
$('.question_two').append(html)
var html = '<div class="que_title que_title_nobor">复诊情况:<span class="que_content_title">近一个月未复诊</span></div>'
$('.question_two').append(html)
$('.que_title_nobor').addClass('no_border')
$('.question_two').addClass('no_marg_bot')
}
break;
case 'question3':
if(questionnaireDetails.queDetailsList[key].status=='1'){
var html ='<div class="que_title">奥希替尼治疗情况</div>'+
var html ='<div class="que_title">奥希替尼治疗情况: <span class="que_content_title">正在接受包含奥希替尼的治疗</span></div>'+
'<div class="que_content que_content_push">'+
'<p class="que_content_title">正在接受包含奥希替尼的治疗</p>'+
'<div class="que_content_body">'+
'<p class="body_title">使用的奥希替尼:</p>'+
'<p class="body_content">'+questionnaireDetails.queDetailsList[key].drugTypesVal+'</p>'+
......@@ -118,9 +118,9 @@ define(['zepto','medtap'],function($,medtap){
'</div>'
$('.question_three').append(html)
}else if(questionnaireDetails.queDetailsList[key].status=='0'){
var html = '<div class="que_title">奥希替尼治疗情况</div>'+
var html = '<div class="que_title">奥希替尼治疗情况:<span class="que_content_title">近一个月未接受包含奥希替尼的治疗</span></div>'+
'<div class="que_content">'+
'<p class="que_content_title">近一个月未接受包含奥希替尼的治疗</p>'+
'<div class="que_content_body">'+
'<p class="body_title">停药时间:</p>'+
'<p class="body_content">'+questionnaireDetails.queDetailsList[key].stopTimeVal+'</p>'+
......@@ -157,15 +157,16 @@ define(['zepto','medtap'],function($,medtap){
case 'question5':
questionnaireDetails.checksList = questionnaireDetails.queDetailsList[key].checks.split(",")
if(questionnaireDetails.queDetailsList[key].status=='0'){
var html = '<div class="que_title">检验检查情况</div>'+
var html = '<div class="que_title">检验检查情况:<span class="que_content_title">近一个月未做过以下检验检查</span></div>'+
'<div class="que_content">'+
'<p class="que_content_title">近一个月未做过以下检验检查</p>'+
'<p class="body_content">血常规 / 肝功能 / 肾功能;胸透/胸部x线;CT;MRI</p>'+
'</div>'
$('.question_four').append(html)
}else if(questionnaireDetails.queDetailsList[key].status=='1'){
$('.question_four .que_title_isHide').show()
$('.que_content_title_jc').show()
}
break;
case 'question6':
......@@ -178,7 +179,7 @@ define(['zepto','medtap'],function($,medtap){
'</ul>'+
'</div>'+
'<div class="que_content_body top_margin que_content_bot6">'+
'<div class="que_content_body que_content_bot6">'+
'<p class="body_title">医生对检查结果的说明:</p>'+
'<p class="body_content">'+questionnaireDetails.queDetailsList[key].dataText+'</p>'+
'</div>'+
......@@ -209,7 +210,7 @@ define(['zepto','medtap'],function($,medtap){
'</ul>'+
'</div>'+
'<div class="que_content_body top_margin que_content_bot7">'+
'<div class="que_content_body que_content_bot7">'+
'<p class="body_title">医生对检查结果的说明:</p>'+
'<p class="body_content">'+questionnaireDetails.queDetailsList[key].dataText+'</p>'+
'</div>'+
......@@ -240,7 +241,7 @@ define(['zepto','medtap'],function($,medtap){
'</ul>'+
'</div>'+
'<div class="que_content_body top_margin que_content_bot8">'+
'<div class="que_content_body que_content_bot8">'+
'<p class="body_title">医生对检查结果的说明:</p>'+
'<p class="body_content">'+questionnaireDetails.queDetailsList[key].dataText+'</p>'+
'</div>'+
......@@ -271,7 +272,7 @@ define(['zepto','medtap'],function($,medtap){
'</ul>'+
'</div>'+
'<div class="que_content_body top_margin que_content_bot9">'+
'<div class="que_content_body que_content_bot9">'+
'<p class="body_title">医生对检查结果的说明:</p>'+
'<p class="body_content">'+questionnaireDetails.queDetailsList[key].dataText+'</p>'+
'</div>'+
......@@ -302,7 +303,7 @@ define(['zepto','medtap'],function($,medtap){
'</ul>'+
'</div>'+
'<div class="que_content_body top_margin que_content_bot10">'+
'<div class="que_content_body que_content_bot10">'+
'<p class="body_title">医生对检查结果的说明:</p>'+
'<p class="body_content">'+questionnaireDetails.queDetailsList[key].dataText+'</p>'+
'</div>'+
......@@ -334,7 +335,7 @@ define(['zepto','medtap'],function($,medtap){
'</ul>'+
'</div>'+
'<div class="que_content_body top_margin que_content_bot11">'+
'<div class="que_content_body que_content_bot11">'+
'<p class="body_title">医生对检查结果的说明:</p>'+
'<p class="body_content">'+questionnaireDetails.queDetailsList[key].dataText+'</p>'+
'</div>'+
......@@ -366,7 +367,7 @@ define(['zepto','medtap'],function($,medtap){
'</ul>'+
'</div>'+
'<div class="que_content_body top_margin que_content_bot12">'+
'<div class="que_content_body que_content_bot12">'+
'<p class="body_title">医生对检查结果的说明:</p>'+
'<p class="body_content">'+questionnaireDetails.queDetailsList[key].dataText+'</p>'+
'</div>'+
......@@ -390,24 +391,23 @@ define(['zepto','medtap'],function($,medtap){
case 'question13':
if(questionnaireDetails.queDetailsList[key].status=='0'){
var html ='<div class="que_title">基因检测情况</div>'+
'<div class="que_content">'+
'<p class="que_content_title">近一个月未做过基因检测</p>'+
'</div>'
var html ='<div class="que_title que_title_nobor">基因检测情况:<span class="que_content_title">近一个月未做过基因检测</span></div>'
$('.question_five').append(html)
$('.que_title_nobor').addClass('no_border')
$('.question_five').addClass('no_marg_bot')
}else if(questionnaireDetails.queDetailsList[key].status=='1'){
console.log('1')
var html ='<div class="que_title">基因检测情况</div>'+
var html ='<div class="que_title">基因检测情况: <span class="que_content_title">EGFR'+questionnaireDetails.queDetailsList[key].EGFRval+','+questionnaireDetails.queDetailsList[key].positionVal+'</span></div>'+
'<div class="que_content">'+
'<p class="que_content_title">EGFR'+questionnaireDetails.queDetailsList[key].EGFRval+','+questionnaireDetails.queDetailsList[key].positionVal+'</p>'+
'<div class="que_content_body question_five_img13">'+
'<p class="body_title">基因检测报告:</p>'+
'<ul class="body_img ">'+
'</ul>'+
'</div>'+
'<div class="que_content_body top_margin que_content_bot13">'+
'<div class="que_content_body que_content_bot13">'+
'<p class="body_title">医生对检查结果的说明:</p>'+
'<p class="body_content">'+questionnaireDetails.queDetailsList[key].testDescription+'</p>'+
'</div>'+
......@@ -437,10 +437,13 @@ define(['zepto','medtap'],function($,medtap){
questionnaireDetails.checkList = questionnaireDetails.queDetailsList[key].checks.split(",")
if(questionnaireDetails.queDetailsList[key].status=='0'){
var html14 = '<div class="que_content">'+
'<p class="que_content_title">近一个月没有不适症状</p>'+
'</div>'
$('.question_six').append(html14)
$('.question_six').append(html14)
$('.que_content_title_discomfort').show()
$('.que_title_nobor').addClass('no_border')
$('.question_six').addClass('no_marg_bot')
}
break;
case 'question15':
......
......@@ -382,7 +382,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
"adminId":targetedTherapy.adminId,
},
success: function(res) {
console.log(res)
if(!res.success) return medtap.winPop('获取数据失败')
// 如果没做过题那么answer没有
if(!res.content.followAnswer.answer) {
......@@ -403,7 +403,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
$('.input_item_city').val(res.content.followAnswer.answer.cityVal||'')
$('.input_item_medicalType').val(res.content.followAnswer.answer.medicalType||'')
}else if(status=='0'){
console.log('1')
// 无
targetedTherapy.flag=false
$('.noHas').addClass('active').siblings('.has').removeClass('active')
......@@ -416,7 +416,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
$('.input_item_isNext').val(res.content.followAnswer.answer.isNextVal||'')
$('#content_body_programme').val(res.content.followAnswer.answer.programme||'')
}
console.log(targetedTherapy.flag)
// console.log(targetedTherapy.flag)
}
})
},
......@@ -435,7 +435,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
"adminId":targetedTherapy.adminId,
},
success: function(res) {
console.log(res)
if(!res.success) return medtap.winPop('获取数据失败')
var parentId = res.content.previousQuestion.parentId||''
var questionId = res.content.previousQuestion.questionId||''
......@@ -455,7 +455,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) { 
contentType: 'application/json',
data: data,
success: function(res) {
console.log(res)
if(!res.success) return medtap.winPop('获取数据失败')
// 获取下一题的id和序号通过url传递
var parentId = res.content.nextQuestion.parentId||''
......
......@@ -52,7 +52,7 @@
</div>
<div class="question_four question">
<div class="que_title que_title_isHide">
检验检查情况
检验检查情况<span class="que_content_title que_content_title_jc">近一个月做过以下检验检查</span>
</div>
<div class="question6"></div>
<div class="question7"></div>
......@@ -66,8 +66,8 @@
</div>
<div class="question_six question">
<div class="que_title">
不适症状
<div class="que_title que_title_nobor">
不适症状<span class="que_content_title que_content_title_discomfort">近一个月没有不适症状</span>
</div>
<div class="question15"></div>
<div class="question16"></div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment