Skip to content

P
pica.cloud.web-education-admin
提交 eaddb583 编写于 作者: yi.li's avatar yi.li
浏览文件
操作

Merge branch 'dev-followUp-20190312' of... 

Merge branch 'dev-followUp-20190312' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312
上级 1292ee5d 83d89fe0
显示空白字符变更
内嵌 并排
正在显示 包含 142 行增加 和 131 行删除
src/views/followup/plan-manage/dialog/select-cartoon.vue
浏览文件 @ eaddb583
...@@ -37,11 +37,10 @@ ...@@ -37,11 +37,10 @@
</el-select> </el-select>
</div> </div>
<div class="scroll-section"> <div class="scroll-section">
<el-radio-group v-model="sendObj.hasSelected" size="small"> <el-radio-group v-model="sendObj" size="small">
<el-radio <el-radio
v-for="(item, index) in cartoonList" v-for="(item, index) in cartoonList"
:key="index" :key="index"
@change="changeComent(item)"
:label="item" class="radio-item">{{item.header_name}}</el-radio> :label="item" class="radio-item">{{item.header_name}}</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
...@@ -60,10 +59,7 @@ ...@@ -60,10 +59,7 @@
components: {}, components: {},
data() { data() {
return { return {
sendObj: { sendObj: {},
hasSelected: '',
closeStatus: false,
},
saasDisease: '', // 高血压标识 saasDisease: '', // 高血压标识
showSecond: false,//是否显示分类 showSecond: false,//是否显示分类
showCartoonDialog: true, showCartoonDialog: true,
...@@ -158,15 +154,11 @@ ...@@ -158,15 +154,11 @@
return array[id] return array[id]
}, },
clickClose() { clickClose() {
this.$emit('closeSelectCartoon', this.sendObj) this.$emit('closeSelectCartoon')
}, },
sureSelect() { sureSelect() {
console.log(this.sendObj) this.$emit('confirmSelectComent', this.sendObj);
this.$emit('closeSelectCartoon', this.sendObj);
}, },
changeComent(item){
this.$emit('pushConmentMsg',item)
}
}, },
} }
</script> </script>
......
src/views/followup/plan-manage/dialog/set-time-node.vue
浏览文件 @ eaddb583
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</el-option> </el-option>
</el-select> </el-select>
<el-button plain class="ml20" @click="goSelectCartoon" v-if="itemTimeForm.change && !itemTimeForm.hasSelected && !isStandedTemplate && planId">选择健康漫画</el-button> <el-button plain class="ml20" @click="goSelectCartoon" v-if="showConment(itemTimeForm.change,itemTimeForm.hasSelected)">选择健康漫画</el-button>
<div class="selected-div ml20" v-if="itemTimeForm.hasSelected"> <div class="selected-div ml20" v-if="itemTimeForm.hasSelected">
<span>《{{itemTimeForm.comentMsg.header_name}}》</span> <span>《{{itemTimeForm.comentMsg.header_name}}》</span>
<el-button type="text" @click="goSelectCartoon" v-if="!isStandedTemplate">重选</el-button> <el-button type="text" @click="goSelectCartoon" v-if="!isStandedTemplate">重选</el-button>
...@@ -130,11 +130,6 @@ ...@@ -130,11 +130,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<select-cartoon
:isSelectCartoon="isSelectCartoon"
@closeSelectCartoon="closeSelectCartoon"
@pushConmentMsg="pushConmentMsg"
/>
</el-form> </el-form>
</div> </div>
</div> </div>
...@@ -235,15 +230,14 @@ ...@@ -235,15 +230,14 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form>
</div>
</div>
<select-cartoon <select-cartoon
:isSelectCartoon="isSelectCartoon" :isSelectCartoon="isSelectCartoon"
@closeSelectCartoon="closeSelectCartoon" @closeSelectCartoon="closeSelectCartoon"
@pushConmentMsg="pushConmentMsg" @confirmSelectComent="confirmSelectComent"
/> />
</el-form>
</div>
</div>
<!--<select-cartoon :isSelectCartoon="isSelectCartoon" @closeSelectCartoon="closeSelectCartoon"></select-cartoon>--> <!--<select-cartoon :isSelectCartoon="isSelectCartoon" @closeSelectCartoon="closeSelectCartoon"></select-cartoon>-->
</div> </div>
...@@ -266,7 +260,10 @@ ...@@ -266,7 +260,10 @@
const checkDay = (rule, value, callback)=>{ const checkDay = (rule, value, callback)=>{
const num = parseFloat(value) const num = parseFloat(value)
if(num < 1 || num>99){ if(num < 1 || num>99){
return callback(new Error('日期不能大于99天或小于0天')); return callback(new Error('数字范围0-99'));
}
if(!Number.isInteger(num)){
return callback(new Error('数字必须为整数'));
} }
callback(); callback();
} }
...@@ -311,19 +308,7 @@ ...@@ -311,19 +308,7 @@
planId: String, planId: String,
}, },
computed: { computed: {
...mapState('planManage',{
}),
// setTimeNodeList1(){
// return this.sortKey(this.setTimeNodeList,'timeNo')
// },
// item() {
// if(this.setTimeNodeList.length == 0) {
// return;
// }else {
// return this.setTimeNodeList1[0].timeUnit;
// }
// },
}, },
created() { created() {
this.setTimeNodeList = this.standedTimeNodeList this.setTimeNodeList = this.standedTimeNodeList
...@@ -338,21 +323,25 @@ ...@@ -338,21 +323,25 @@
watch: { watch: {
standedTimeNodeList(val){ standedTimeNodeList(val){
this.setTimeNodeList = val this.setTimeNodeList = val
this.$forceUpdate(); //强制刷新，解决页面不会重新渲染的问题 this.$forceUpdate();
}, },
isStandedTemplate(val){ isStandedTemplate(val){
this.isStandedTemplate = val this.isStandedTemplate = val
console.log(this.isStandedTemplate)
}, },
setTimeNodeList(val){ setTimeNodeList(val){
this.setTimeNodeList = val this.setTimeNodeList = val
// console.log(this.setTimeNodeList)
if(this.setTimeNodeList.length>0) { if(this.setTimeNodeList.length>0) {
this.timeUnit = this.setTimeNodeList[0].timeUnit this.timeUnit = this.setTimeNodeList[0].timeUnit
this.markOptions.forEach((ob)=>{
if(this.timeUnit==ob.no){
this.timeUnitStr = ob.value
}
})
// 这里操作时间节点的数据
this.setTimeNodeList.forEach(item=>{ this.setTimeNodeList.forEach(item=>{
item.isDisabled = true; item.isDisabled = true;
item.timeUnit = this.setTimeNodeList[0].timeUnit // item.timeUnit = this.setTimeNodeList[0].timeUnit
if(item.remindList && item.remindList.length > 0){// remindDay 提醒医生预约提前天数 if(item.remindList && item.remindList.length > 0){// remindDay 提醒医生预约提前天数
item.remindDay = [] item.remindDay = []
item.remindList.forEach((kkk)=>{ item.remindList.forEach((kkk)=>{
...@@ -383,9 +372,8 @@ ...@@ -383,9 +372,8 @@
}) })
} }
});
console.log(this.setTimeNodeList)
});
if(!this.isStandedTemplate){ if(!this.isStandedTemplate){
this.setTimeNodeList[0].isDisabled = false; this.setTimeNodeList[0].isDisabled = false;
...@@ -393,7 +381,7 @@ ...@@ -393,7 +381,7 @@
} }
}, },
patientIdList(val){ patientIdList(val){
if(this.planId){//如果是修改计划，发送人数共享给各个时间节点 // if(this.planId){//如果是修改计划，发送人数共享给各个时间节点
// 获取微信和短信用户数量 // 获取微信和短信用户数量
getPatientNumber({ getPatientNumber({
patientIdList: val patientIdList: val
...@@ -410,21 +398,20 @@ ...@@ -410,21 +398,20 @@
}); });
} }
}) })
} // }
}, },
checkForm(val){ checkForm(val){
if(val){// 触发了
// console.log('触发 保存按钮的 校验',val) // console.log('触发 保存按钮的 校验',val)
// 触发 保存 校验 // 触发 保存 校验
// this.saveValiedBegin = val
if(val){// 触发了
console.log('是否固定模板',this.isStandedTemplate) // console.log('是否固定模板',this.isStandedTemplate)
console.log('是否修改计划',this.planId) // console.log('是否修改计划',this.planId)
console.log('是否显示设置时间按钮',this.showSetBtn) // console.log('是否显示设置时间按钮',this.showSetBtn)
console.log('当前的检验是否通过了',this.isValied) // console.log('当前的检验是否通过了',this.isValied)
console.log('表单数据',this.timeForm) // console.log('表单数据',this.timeForm)
console.log('activeTab',this.activeTab) // console.log('activeTab',this.activeTab)
if(this.planId){//修改计划 if(this.planId){//修改计划
...@@ -436,10 +423,36 @@ ...@@ -436,10 +423,36 @@
}) })
}else{ //自定义模板 }else{ //自定义模板
// 如果直接点击保存，需要进行对当前填写的表单进行校验
const isValied = this.checkCurrentForm(this.timeForm.formRef);
this.isValied = isValied
if(isValied){
if(this.setTimeNodeList.length>0 && this.timeForm.timeNo==this.setTimeNodeList[0].timeNo){
}else{
this.checkTimeIsRepeat(()=>{
this.activeTab = this.setTimeNodeList.length;
this.timeForm.formRef = 'form' + this.activeTab;
this.setTimeNodeList.push(this.timeForm)
})
}
// 新增成功之后
this.setTimeNodeList = this.sortKey(this.setTimeNodeList,'timeNo')
}
if(this.isValied){
this.$emit('addListenSave',{ this.$emit('addListenSave',{
status: true, status: true,
setTimeNodeList: this.setTimeNodeList setTimeNodeList: this.setTimeNodeList
}) })
}else{
this.$emit('addListenSave',{
status: false,
setTimeNodeList: this.setTimeNodeList
})
}
} }
} else{//新增计划 } else{//新增计划
...@@ -464,14 +477,13 @@ ...@@ -464,14 +477,13 @@
this.setTimeNodeList.push(this.timeForm) this.setTimeNodeList.push(this.timeForm)
}) })
} }
//
// 新增成功之后 // // 新增成功之后
this.setTimeNodeList = this.sortKey(this.setTimeNodeList,'timeNo') this.setTimeNodeList = this.sortKey(this.setTimeNodeList,'timeNo')
} }
if(this.isValied){ if(this.isValied){
// console.log(this.setTimeNodeList)
this.$emit('addListenSave',{ this.$emit('addListenSave',{
status: true, status: true,
setTimeNodeList: this.setTimeNodeList setTimeNodeList: this.setTimeNodeList
...@@ -487,30 +499,13 @@ ...@@ -487,30 +499,13 @@
} }
} }
}, },
timeForm(val) { timeForm(val) {
if(this.setTimeNodeList.length>0) { if(this.setTimeNodeList.length>0) {
this.timeForm.isDisabled = true; this.timeForm.isDisabled = true;
this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit; this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit;
} }
// this.timeForm = val },
console.log('表单父组件的数据',this.timeForm)
},
// setTimeNodeList1(val) {
// if(val.length > 0){
// this.setTimeNodeList1.map(item=>{
// item.isDisabled = true;
// item.timeUnit = this.setTimeNodeList1[0].timeUnit
// this.markOptions.forEach((ob)=>{
// if(item.timeUnit==ob.no){
// item.timeUnitStr = ob.value
// }
// })
// });
// this.setTimeNodeList1[0].isDisabled = false;
// }
// },
}, },
methods: { methods: {
// 一次性获取常量接口数据 // 一次性获取常量接口数据
...@@ -541,12 +536,12 @@ ...@@ -541,12 +536,12 @@
let validback; let validback;
if(this.$refs[form].validate){ if(this.$refs[form].validate){
this.$refs[form].validate((valid) => { this.$refs[form].validate((valid) => {
console.log('新的new校验结果' + valid) // console.log('新的new校验结果' + valid)
validback = valid validback = valid
}); });
}else{ }else{
this.$refs[form][0].validate((valid) => { this.$refs[form][0].validate((valid) => {
console.log('新的new校验结果' + valid) // console.log('新的new校验结果' + valid)
validback = valid validback = valid
}); });
} }
...@@ -555,14 +550,11 @@ ...@@ -555,14 +550,11 @@
changeTabNew(index){ changeTabNew(index){
console.log('点击了下标',index) console.log('点击了下标',index)
this.activeTab= index this.activeTab= index
console.log(this.setTimeNodeList)
this.timeForm = this.setTimeNodeList[index] this.timeForm = this.setTimeNodeList[index]
}, },
// 验证是否重复 // 验证是否重复
checkTimeIsRepeat(callback){ checkTimeIsRepeat(callback){
this.timeIsRepeat = false; this.timeIsRepeat = false;
console.log('=666666666666666!',this.setTimeNodeList)
console.log(this.timeForm)
if(this.setTimeNodeList.length > 0){ if(this.setTimeNodeList.length > 0){
this.setTimeNodeList.forEach((item,index)=>{ this.setTimeNodeList.forEach((item,index)=>{
if(item.timeNo == this.timeForm.timeNo){ if(item.timeNo == this.timeForm.timeNo){
...@@ -605,6 +597,7 @@ ...@@ -605,6 +597,7 @@
this.setTimeNodeList.push(this.timeForm) this.setTimeNodeList.push(this.timeForm)
// 新增成功之后 // 新增成功之后
this.setTimeNodeList = this.sortKey(this.setTimeNodeList,'timeNo') this.setTimeNodeList = this.sortKey(this.setTimeNodeList,'timeNo')
this.$forceUpdate();
//设置单位 //设置单位
this.markOptions.forEach((ob)=>{ this.markOptions.forEach((ob)=>{
if(this.setTimeNodeList[0].timeUnit==ob.no){ if(this.setTimeNodeList[0].timeUnit==ob.no){
...@@ -618,6 +611,19 @@ ...@@ -618,6 +611,19 @@
}) })
} }
}, },
showConment(change,hasSelected){
let flag;
if(this.isStandedTemplate){
flag = false
}else{
if(this.planId){
flag = (change && !hasSelected) ? true : false
}else{
flag = (!hasSelected) ? true : false
}
}
return flag
},
// 初始化新的表单 // 初始化新的表单
initNewForm(){ initNewForm(){
...@@ -629,7 +635,7 @@ ...@@ -629,7 +635,7 @@
remindList: [],//提醒医生预约提前天数 remindList: [],//提醒医生预约提前天数
pushContentList: [],//推送患教提前天数 漫画id pushContentList: [],//推送患教提前天数 漫画id
followupList: [],//随访量表id followupList: [],//随访量表id
hasSelected: '', hasSelected: false,
isDisabled: false, isDisabled: false,
remindDay: [], remindDay: [],
pushDay: '', pushDay: '',
...@@ -648,42 +654,53 @@ ...@@ -648,42 +654,53 @@
this.isSelectCartoon = true; this.isSelectCartoon = true;
}, },
//关闭漫画 //关闭漫画
closeSelectCartoon(val) { closeSelectCartoon() {
this.isSelectCartoon = val.closeStatus; this.isSelectCartoon = false;
this.timeForm.hasSelected = val.hasSelected; },
// this.timeForm.comentMsg = val.hasSelected; // 确认选择漫画
console.log('当前的tab是',this.activeTab) confirmSelectComent(val){
this.pushConmentMsg(val.hasSelected) this.isSelectCartoon = false;
}, // console.log('拿到的漫画选择组件的信息',val)
// 接收漫画选择信息 // console.log('当前的tab是',this.activeTab)
pushConmentMsg(val){ // console.log('当前表单信息',this.timeForm)
this.timeForm.comentMsg = val // console.log('当前是否固定模板',this.isStandedTemplate)
console.log('选择的漫画信息',this.timeForm.comentMsg) // console.log('当前的时间list',this.setTimeNodeList)
// console.log('选择的漫画信息',val)
if(this.planId){//修改
this.setTimeNodeList[this.activeTab].hasSelected = true;
this.setTimeNodeList[this.activeTab].comentMsg = val;
const comdata = this.setTimeNodeList[this.activeTab];
const obj = {
startDays: comdata.pushDay,
resourceId: comdata.comentMsg.id,
sendContent: comdata.comentMsg.header_name
}
this.setTimeNodeList[this.activeTab].pushContentList[0] = obj
}else{//新增
this.timeForm.hasSelected = true;
this.timeForm.comentMsg = val;
const comdata = this.timeForm;
let obj = { let obj = {
startDays: this.timeForm.pushDay, startDays: comdata.pushDay,
resourceId: this.timeForm.comentMsg.id, resourceId: comdata.comentMsg.id,
sendContent: this.timeForm.comentMsg.header_name sendContent: comdata.comentMsg.header_name
} }
this.timeForm.pushContentList[0] = obj this.timeForm.pushContentList[0] = obj;
// activeTab }
// getPatientNumber({
// patientIdList: this.patientIdList
// }).then(res=>{
// if(res.code=='000000'){
// this.timeForm.wechatPatientNum = res.data.wechatPatientNum;
// this.timeForm.messagePatientNum = res.data.messagePatientNum;
// this.timeForm.totalNumber = this.timeForm.wechatPatientNum + this.timeForm.messagePatientNum
// }else{
// this.$notify.success({
// title: '提交失败',
// message: res.message,
// showClose: false
// });
// }
// })
}, },
deleteClick() { deleteClick() {
this.timeForm.hasSelected = ''; if(this.planId){
this.setTimeNodeList[this.activeTab].hasSelected = false;
this.setTimeNodeList[this.activeTab].comentMsg = {};
this.setTimeNodeList[this.activeTab].pushContentList.splice(0,1);
}else{
this.timeForm.hasSelected = false;
this.timeForm.comentMsg = {};
this.timeForm.pushContentList.splice(0,1);
}
this.$forceUpdate();
}, },
deleteTimeNode(item, index) { deleteTimeNode(item, index) {
this.setTimeNodeList.splice(index, 1) this.setTimeNodeList.splice(index, 1)
...@@ -695,25 +712,24 @@ ...@@ -695,25 +712,24 @@
this.showSetBtn = true; this.showSetBtn = true;
this.initNewForm(); this.initNewForm();
} }
this.$forceUpdate(); //强制刷新，解决页面不会重新渲染的问题 this.$forceUpdate();
}, },
deleteAddNode() { deleteAddNode() {
this.showSetBtn = false; this.showSetBtn = false;
this.isValied = true; this.isValied = true;
this.activeTab = 0; this.activeTab = 0;
this.timeForm = this.setTimeNodeList[0]; this.timeForm = this.setTimeNodeList[0];
this.$forceUpdate(); //强制刷新，解决页面不会重新渲染的问题 this.$forceUpdate();
}, },
changeRemindDay(val){ changeRemindDay(val){
console.log(val)
this.timeForm.remindList = [] this.timeForm.remindList = []
val.forEach((item)=>{ val.forEach((item)=>{
this.timeForm.remindList.push({ this.timeForm.remindList.push({
startDays: item startDays: item
}) })
}) })
this.$forceUpdate(); //强制刷新，解决页面不会重新渲染的问题 this.$forceUpdate();
}, },
changePushDay(val){ changePushDay(val){
console.log(val) console.log(val)
...@@ -723,7 +739,7 @@ ...@@ -723,7 +739,7 @@
sendContent: this.timeForm.comentMsg.header_name sendContent: this.timeForm.comentMsg.header_name
} }
this.timeForm.pushContentList[0] = obj this.timeForm.pushContentList[0] = obj
this.$forceUpdate(); //强制刷新，解决页面不会重新渲染的问题 this.$forceUpdate();
}, },
changeFollowId(val){ changeFollowId(val){
console.log(val) console.log(val)
...@@ -739,9 +755,17 @@ ...@@ -739,9 +755,17 @@
}) })
}) })
this.$forceUpdate(); //强制刷新，解决页面不会重新渲染的问题 this.$forceUpdate();
}, },
sortKey(array,key) {
let newList = array.sort((a,b)=>{
const x = parseFloat(a[key]);
const y = parseFloat(b[key]);
return ((x<y) ? -1 : (x>y) ? 1 : 0)
})
return newList
},
getNowTime() { getNowTime() {
const date = new Date(); const date = new Date();
const year = date.getFullYear(); const year = date.getFullYear();
...@@ -753,14 +777,6 @@ ...@@ -753,14 +777,6 @@
let formName = `form${year}${month}${day}${hour}${minute}${second}`; let formName = `form${year}${month}${day}${hour}${minute}${second}`;
return formName; return formName;
}, },
sortKey(array,key) {
return array.sort(function(a,b){
var x = a[key];
var y = b[key];
return ((x<y) ? -1 : (x>y) ? 1 : 0)
})
},
}, },
} }
......
src/views/followup/plan-manage/new-plan.vue
浏览文件 @ eaddb583
...@@ -133,6 +133,7 @@ ...@@ -133,6 +133,7 @@
curmbThird: '新建随访计划', curmbThird: '新建随访计划',
jumPathThird: '/followUp/plan-manage', jumPathThird: '/followUp/plan-manage',
activeTab: 'first', activeTab: 'first',
resourceId: '',//当前选择的随访模板id
noName: false, noName: false,
noResourceId: false, noResourceId: false,
noTime: false, noTime: false,
...@@ -275,6 +276,7 @@ ...@@ -275,6 +276,7 @@
} }
if (valid) { if (valid) {
console.log('当前选择的随访模板id为',this.baseInfo.resourceId) console.log('当前选择的随访模板id为',this.baseInfo.resourceId)
this.resourceId = this.baseInfo.resourceId
if(this.baseInfo.resourceId){ if(this.baseInfo.resourceId){
this.isStandedTemplate = true this.isStandedTemplate = true
getFollowupTableTemplate(this.baseInfo.resourceId).then(res=>{ getFollowupTableTemplate(this.baseInfo.resourceId).then(res=>{
...@@ -283,6 +285,7 @@ ...@@ -283,6 +285,7 @@
}) })
}else{ }else{
this.isStandedTemplate = false this.isStandedTemplate = false
this.standedTimeNodeList = [];
this.activeTab = 'second'; this.activeTab = 'second';
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或