提交 4b8202ae 编写于 作者: tao.wu's avatar tao.wu

no message

上级 49ccc596
...@@ -270,12 +270,12 @@ ...@@ -270,12 +270,12 @@
}, },
// 选择居民 // 选择居民
handleSelectionChange(val) { handleSelectionChange(val) {
console.log('每次选中居民',val) // console.log('每次选中居民',val)
this.eachSelects = val this.eachSelects = val
}, },
// 切换分页 // 切换分页
handleCurrentChangePre(val) { handleCurrentChangePre(val) {
console.log('handleCurrentChangePre') // console.log('handleCurrentChangePre')
this.paginationSet.pageNum = val this.paginationSet.pageNum = val
this.getPatientsList() this.getPatientsList()
}, },
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
this.$emit('sureSelectPatient',false,this.eachSelects) this.$emit('sureSelectPatient',false,this.eachSelects)
}, },
handleSizeChangePre(val) { handleSizeChangePre(val) {
console.log('handleSizeChangePre') // console.log('handleSizeChangePre')
this.paginationSet.pageSize = val this.paginationSet.pageSize = val
this.getPatientsList() this.getPatientsList()
}, },
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
:value="timeForm.pushDay"> :value="timeForm.pushDay">
</el-option> </el-option>
</el-select> </el-select>
<el-button plain class="ml20" @click="goSelectCartoon" v-if="!timeForm.hasSelected">选择健康漫画</el-button> <el-button plain class="ml20" @click="goSelectCartoon" v-if="!timeForm.hasSelected && !isStandedTemplate">选择健康漫画</el-button>
<div class="selected-div ml20" v-if="timeForm.hasSelected"> <div class="selected-div ml20" v-if="timeForm.hasSelected">
<span>{{timeForm.comentMsg.header_name}}</span> <span>{{timeForm.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>
...@@ -192,12 +192,13 @@ ...@@ -192,12 +192,13 @@
formOptions: Array, formOptions: Array,
patientIdList: Array, patientIdList: Array,
isStandedTemplate: Boolean, isStandedTemplate: Boolean,
planId: String
}, },
watch: { watch: {
timeForm(val){ timeForm(val){
this.timeForm = val this.timeForm = val
if(this.isStandedTemplate){ if(this.isStandedTemplate || this.planId){
console.log('表单子组件监听到的form数据',this.timeForm) // console.log('表单子组件监听到的form数据',this.timeForm)
this.timeForm.isDisabled = true this.timeForm.isDisabled = true
if(this.timeForm.remindList.length > 0){// remindDay if(this.timeForm.remindList.length > 0){// remindDay
this.remindOptionsCopy = this.timeForm.remindList this.remindOptionsCopy = this.timeForm.remindList
...@@ -226,6 +227,7 @@ ...@@ -226,6 +227,7 @@
this.timeForm.followResourceId.push(item.startDays) this.timeForm.followResourceId.push(item.startDays)
}) })
} }
} }
}, },
valBegin(val){ valBegin(val){
...@@ -236,10 +238,11 @@ ...@@ -236,10 +238,11 @@
} }
}, },
saveValiedBegin(val){ saveValiedBegin(val){
console.log('保存按钮子组件的校验',val) // console.log('保存按钮子组件的校验',val)
// console.log('++++',this.timeForm.formRef)
if(val && this.timeForm.formRef){ if(val && this.timeForm.formRef){
this.$refs[this.timeForm.formRef].validate((valid) => { this.$refs[this.timeForm.formRef].validate((valid) => {
console.log('告诉父组件,校验结果' + valid) // console.log('告诉父组件,校验结果' + valid)
this.$emit('checkValid',{valid: valid, type: 'save'}) this.$emit('checkValid',{valid: valid, type: 'save'})
}); });
} }
...@@ -250,11 +253,8 @@ ...@@ -250,11 +253,8 @@
console.log(val) console.log(val)
}, },
changeFollowId(val){ changeFollowId(val){
console.log(val)
this.formOptions.forEach((item1)=>{ this.formOptions.forEach((item1)=>{
console.log('item1',item1)
val.forEach((item2)=>{ val.forEach((item2)=>{
console.log('item2',item2)
if(item2==item1.scaleNo){ if(item2==item1.scaleNo){
this.timeForm.followResourceIdStr.push(item1.name) this.timeForm.followResourceIdStr.push(item1.name)
} }
......
<template> <template>
<div> <div>
<p><el-button plain icon="el-icon-plus" size="small" round @click="addNewNode">新增时间节点</el-button><br></p> <p><el-button plain icon="el-icon-plus" size="small" round v-if="!isStandedTemplate" @click="addNewNode">新增时间节点</el-button><br></p>
<div class="add-time-content"> <div class="add-time-content">
<div class="time-line-scroll"> <div class="time-line-scroll">
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
v-for="(item, index) in setTimeNodeList1" v-for="(item, index) in setTimeNodeList1"
:key="index" :key="index"
:label="index">开始后{{item.timeNo + item.timeUnitStr}} :label="index">开始后{{item.timeNo + item.timeUnitStr}}
<i class="el-icon-circle-close-outline" @click="deleteTimeNode(item, index)"></i> <i class="el-icon-circle-close-outline" v-if="!isStandedTemplate" @click="deleteTimeNode(item, index)"></i>
</el-radio-button> </el-radio-button>
<el-radio-button <el-radio-button
label="setNewRef" label="setNewRef"
v-if="showSetBtn">设置随访时间 v-if="showSetBtn && !isStandedTemplate">设置随访时间
<i class="el-icon-circle-close-outline" @click="deleteAddNode" v-if="setTimeNodeList.length>0"></i> <i class="el-icon-circle-close-outline" @click="deleteAddNode" v-if="setTimeNodeList.length>0"></i>
</el-radio-button> </el-radio-button>
</el-radio-group> </el-radio-group>
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<set-time-form <set-time-form
v-if="index == activeTab" v-if="index == activeTab"
:isStandedTemplate="isStandedTemplate" :isStandedTemplate="isStandedTemplate"
:planId="planId"
:timeForm="timeFormHas" :timeForm="timeFormHas"
:valBegin="valBegin" :valBegin="valBegin"
:saveValiedBegin="saveValiedBegin" :saveValiedBegin="saveValiedBegin"
...@@ -47,6 +48,7 @@ ...@@ -47,6 +48,7 @@
<!--新增时间节点--> <!--新增时间节点-->
<div class="form-div" v-if="activeTab == 'setNewRef'"> <div class="form-div" v-if="activeTab == 'setNewRef'">
<set-time-form <set-time-form
:planId="planId"
:timeForm="timeForm" :timeForm="timeForm"
:valBegin="valBegin" :valBegin="valBegin"
:saveValiedBegin="saveValiedBegin" :saveValiedBegin="saveValiedBegin"
...@@ -88,7 +90,9 @@ ...@@ -88,7 +90,9 @@
activeTab: null, activeTab: null,
currentFormRef: 1, currentFormRef: 1,
showSetBtn: true, showSetBtn: true,
timeForm: {}, timeForm: {
formRef: ''
},
timeFormRules: { timeFormRules: {
timeNo: [{ required: true, message: '请添加随访时间', trigger: 'change' }], timeNo: [{ required: true, message: '请添加随访时间', trigger: 'change' }],
timeUnit: [{ required: true, message: '请添加随访时间', trigger: 'change' }], timeUnit: [{ required: true, message: '请添加随访时间', trigger: 'change' }],
...@@ -101,6 +105,7 @@ ...@@ -101,6 +105,7 @@
patientIdList: Array, patientIdList: Array,
checkForm: Boolean, checkForm: Boolean,
isStandedTemplate: Boolean, isStandedTemplate: Boolean,
planId: String,
}, },
computed: { computed: {
...mapState('planManage',{ ...mapState('planManage',{
...@@ -124,28 +129,28 @@ ...@@ -124,28 +129,28 @@
created() { created() {
this.initNewForm(); this.initNewForm();
this.getConstData() this.getConstData()
console.log(this.isStandedTemplate)
if(this.isStandedTemplate){
this.deleteAddNode()
}else{
//初始化一个随访时间节点 //初始化一个随访时间节点
this.activeTab = 'setNewRef'; this.activeTab = 'setNewRef';
this.timeForm.formRef = this.getNowTime(); this.timeForm.formRef = this.getNowTime();
}
}, },
watch: { watch: {
setTimeNodeList(val){ setTimeNodeList(val){
this.setTimeNodeList = val this.setTimeNodeList = val
if(this.setTimeNodeList.length>0) { if(this.setTimeNodeList.length>0) {
console.log(this.timeForm)
if(this.timeForm){ if(this.timeForm){
this.timeForm.isDisabled = true; this.timeForm.isDisabled = true;
this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit; this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit;
// console.log(this.isStandedTemplate)
if(this.isStandedTemplate || this.planId){
this.deleteAddNode()
} }
} }
}
}, },
checkForm(val){ checkForm(val){
console.log('触发 保存 校验',val) // console.log('触发 保存 校验',val)
// 触发 保存 校验 // 触发 保存 校验
this.saveValiedBegin = val this.saveValiedBegin = val
...@@ -156,7 +161,7 @@ ...@@ -156,7 +161,7 @@
this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit; this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit;
} }
this.timeForm = val this.timeForm = val
console.log('表单父组件的数据',this.timeForm) // console.log('表单父组件的数据',this.timeForm)
}, },
setTimeNodeList1(val) { setTimeNodeList1(val) {
if(val.length > 0){ if(val.length > 0){
...@@ -216,6 +221,8 @@ ...@@ -216,6 +221,8 @@
this.$emit('addListenSave',false) this.$emit('addListenSave',false)
} }
}else{ }else{
// 不是固定模板
if(!this.isStandedTemplate){
if(this.timeForm.remindDay.length>0){ if(this.timeForm.remindDay.length>0){
this.timeForm.remindDay.forEach((item)=>{ this.timeForm.remindDay.forEach((item)=>{
this.timeForm.remindList.push({ this.timeForm.remindList.push({
...@@ -223,6 +230,7 @@ ...@@ -223,6 +230,7 @@
}) })
}) })
} }
console.log(this.timeForm)
console.log(this.timeForm.followResourceIdStr) console.log(this.timeForm.followResourceIdStr)
if(this.timeForm.pushDay){ if(this.timeForm.pushDay){
this.timeForm.pushContentList.push({ this.timeForm.pushContentList.push({
...@@ -253,6 +261,13 @@ ...@@ -253,6 +261,13 @@
this.timeForm.formRef = this.getNowTime(); this.timeForm.formRef = this.getNowTime();
this.timeForm.isDisabled = true; this.timeForm.isDisabled = true;
} }
}else{// 是固定模板
// 只能保存提交
// this.setTimeNodeList.push(this.timeForm);
this.$emit('setTimeNodeListOnCom',this.setTimeNodeList)
this.$emit('addListenSave',true)
}
} }
// 校验没通过 // 校验没通过
...@@ -266,7 +281,7 @@ ...@@ -266,7 +281,7 @@
}, },
// 点击 新增时间节点 // 点击 新增时间节点
addNewNode() { addNewNode() {
console.log('是否新增一个新的时间节点 ' + (this.activeTab == 'setNewRef')) // console.log('是否新增一个新的时间节点 ' + (this.activeTab == 'setNewRef'))
this.checkTimeIsRepeat() this.checkTimeIsRepeat()
if(this.timeIsRepeat){ if(this.timeIsRepeat){
this.$notify.success({ this.$notify.success({
...@@ -290,8 +305,6 @@ ...@@ -290,8 +305,6 @@
// 验证是否重复 // 验证是否重复
checkTimeIsRepeat(){ checkTimeIsRepeat(){
this.timeIsRepeat = false; this.timeIsRepeat = false;
console.log('+++',this.setTimeNodeList)
console.log('+++',this.timeForm.timeNo)
if(this.setTimeNodeList.length > 0){ if(this.setTimeNodeList.length > 0){
if(this.showSetBtn){ if(this.showSetBtn){
this.setTimeNodeList.forEach(item=>{ this.setTimeNodeList.forEach(item=>{
...@@ -345,9 +358,8 @@ ...@@ -345,9 +358,8 @@
this.timeForm.hasSelected = ''; this.timeForm.hasSelected = '';
}, },
changeTab(val){ changeTab(val){
this.activeTab = val;
console.log('当前的 activeTab ',val) console.log('当前的 activeTab ',val)
this.activeTab = val;
if(val == 'setNewRef') { if(val == 'setNewRef') {
this.initNewForm(); this.initNewForm();
......
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
}, },
// 监听保存校验结果 // 监听保存校验结果
addListenSave(val){ addListenSave(val){
console.log('监听保存校验结果',val) // console.log('监听保存校验结果',val)
this.checkForm = false this.checkForm = false
if(val){ if(val){
this.baseInfo.fPlanTimeReqList = this.setTimeNodeList this.baseInfo.fPlanTimeReqList = this.setTimeNodeList
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
// console.log('保存setTimeNodeList1',this.$refs.getTimeNodeList.setTimeNodeList1) // console.log('保存setTimeNodeList1',this.$refs.getTimeNodeList.setTimeNodeList1)
// console.log('store中的setTimeNodeList数据为=>',JSON.stringify(this.setTimeNodeList)) // console.log('store中的setTimeNodeList数据为=>',JSON.stringify(this.setTimeNodeList))
}else{ }else{
console.log('点击保存按钮之后校验失败') // console.log('点击保存按钮之后校验失败')
} }
}, },
setTimeNodeListOnCom(val){ setTimeNodeListOnCom(val){
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
} }
if (valid) { if (valid) {
// this.$refs['statusForm'].resetFields(); // this.$refs['statusForm'].resetFields();
console.log('当前选择的随访模板id为',this.baseInfo.resourceId) // console.log('当前选择的随访模板id为',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=>{
......
...@@ -49,9 +49,11 @@ ...@@ -49,9 +49,11 @@
</el-form> </el-form>
<div class="edit-plan-content"> <div class="edit-plan-content">
<set-time-node <set-time-node
:isStandedTemplate="isStandedTemplate"
:setTimeNodeList="setTimeNodeList" :setTimeNodeList="setTimeNodeList"
@setTimeNodeListOnCom="setTimeNodeListOnCom" @setTimeNodeListOnCom="setTimeNodeListOnCom"
:checkForm="checkForm" :checkForm="checkForm"
:planId="planId"
@addListenSave="addListenSave" @addListenSave="addListenSave"
/> />
</div> </div>
...@@ -92,6 +94,9 @@ ...@@ -92,6 +94,9 @@
}, },
data() { data() {
return { return {
planId: '',
isStandedTemplate: false, // 是否是固定的随访模板
standedTimeNodeList: [], // 如果是国定随访模板,获取固定数据后不可更改,只读
checkForm: false, checkForm: false,
patientIdList: [], //获取的病人列表 patientIdList: [], //获取的病人列表
hasSelectedList: [], //已选居民 hasSelectedList: [], //已选居民
...@@ -257,11 +262,17 @@ ...@@ -257,11 +262,17 @@
}, },
watch: { watch: {
planDetail(val) { planDetail(val) {
// console.log(val)
// this.setTimeNodeList = val.fPlanTimeDtoList // this.setTimeNodeList = val.fPlanTimeDtoList
this.setTimeNodeListOnCom(val.fPlanTimeReqList) this.setTimeNodeListOnCom(val.fPlanTimeReqList)
console.log(val) // console.log(this.setTimeNodeList)
this.patientIdList = val.patientIdList this.patientIdList = val.patientIdList
// this.hasSelectedList = this.planId = String(val.id)
if(val.resourceId){
this.isStandedTemplate = true
}else{
this.isStandedTemplate = false
}
}, },
} }
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册