Skip to content

P
pica.cloud.web-education-admin
提交 4b8202ae 编写于 作者: tao.wu's avatar tao.wu
浏览文件
操作

no message

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