Skip to content

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

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

Merge branch 'dev-followUp-20190312' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312
上级 d94eb141 dd012c96
显示空白字符变更
内嵌 并排
正在显示 包含 289 行增加 和 196 行删除
package.json
浏览文件 @ 4e58f14b
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
"build": "node build/build.js", "build": "node build/build.js",
"build:dev": "cross-env BUILD_ENV=dev node build/build.js", "build:dev": "cross-env BUILD_ENV=dev node build/build.js",
"build:test": "cross-env BUILD_ENV=test node build/build.js", "build:test": "cross-env BUILD_ENV=test node build/build.js",
"build:test2": "cross-env BUILD_ENV=test node build/build.js",
"build:uat": "cross-env BUILD_ENV=uat node build/build.js", "build:uat": "cross-env BUILD_ENV=uat node build/build.js",
"build:pro": "cross-env BUILD_ENV=pro node build/build.js" "build:pro": "cross-env BUILD_ENV=pro node build/build.js"
}, },
......
src/utils/env-config.js
浏览文件 @ 4e58f14b
...@@ -42,6 +42,17 @@ export const envConfig = { ...@@ -42,6 +42,17 @@ export const envConfig = {
yuequeyiIndexUrl: 'https://test1.yunqueyi.com/pica_index.html', yuequeyiIndexUrl: 'https://test1.yunqueyi.com/pica_index.html',
saasDomainUrl: 'https://test1.yunqueyi.com/', saasDomainUrl: 'https://test1.yunqueyi.com/',
}, },
test2: {
baseUrl: 'https://test1-sc.yunqueyi.com/',
qiniuFileUrl: "https://test1-sc.yunqueyi.com/contents/admin/qiniu/token1",
qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
qiniuImgUrl: "https://test1-file.yunqueyi.com",
loginUrl: 'https://test1.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
followUpSC: 'https://test2-work.yunqueyi.com/sc',
yuequeyiIndexUrl: 'https://test1.yunqueyi.com/pica_index.html',
saasDomainUrl: 'https://test1.yunqueyi.com/',
},
uat: { uat: {
baseUrl: 'https://uat-sc.yunqueyi.com/', baseUrl: 'https://uat-sc.yunqueyi.com/',
qiniuFileUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token1", qiniuFileUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token1",
......
src/views/followup/plan-manage/dialog/select-cartoon.vue
浏览文件 @ 4e58f14b
...@@ -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
浏览文件 @ 4e58f14b
...@@ -101,11 +101,11 @@ ...@@ -101,11 +101,11 @@
</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="showChoseComtent(itemTimeForm)">选择健康漫画</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="showRechoseDelete(itemTimeForm)">重选</el-button>
<el-button type="text" @click="deleteClick" v-if="!isStandedTemplate">删除</el-button> <el-button type="text" @click="deleteClick" v-if="showRechoseDelete(itemTimeForm)">删除</el-button>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -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>
...@@ -251,7 +245,7 @@ ...@@ -251,7 +245,7 @@
<script> <script>
import _ from 'lodash'; import _ from 'lodash';
import SelectCartoon from '@/views/followup/plan-manage/dialog/select-cartoon'; import SelectCartoon from '@/views/followup/plan-manage/dialog/select-cartoon';
import SetTimeForm from '@/views/followup/plan-manage/dialog/set-time-form'; // import SetTimeForm from '@/views/followup/plan-manage/dialog/set-time-form';
import {getFormOptions, getPatientNumber, getBasicData} from '@/utils/followup/followapis' import {getFormOptions, getPatientNumber, getBasicData} from '@/utils/followup/followapis'
import { mapState,mapActions } from 'vuex' import { mapState,mapActions } from 'vuex'
...@@ -260,13 +254,16 @@ ...@@ -260,13 +254,16 @@
export default { export default {
components: { components: {
SelectCartoon, SelectCartoon,
SetTimeForm // SetTimeForm
}, },
data() { data() {
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,48 +308,47 @@ ...@@ -311,48 +308,47 @@
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.initNewForm();
this.getConstData(); this.getConstData();
// 如果是固定模板 // 如果是固定模板
// console.log(this.planId) if(!this.isStandedTemplate && !this.planId){//新建计划并且是自定义模板
if(this.isStandedTemplate || this.planId){ this.initNewForm();
this.activeTab = 0;
} }
}, },
watch: { watch: {
standedTimeNodeList(val){ standedTimeNodeList(val){
this.setTimeNodeList = val this.setTimeNodeList = val
this.$forceUpdate(); //强制刷新，解决页面不会重新渲染的问题 if(this.planId){//这一步，是处理新建计划选择固定模板，或者修改计划（无论固定还是自定义模板）监听传递进来的list
this.activeTab = 0;
this.timeForm = this.setTimeNodeList[this.activeTab]
this.timeForm.formRef = 'form' + this.activeTab;
}
this.$forceUpdate();
}, },
isStandedTemplate(val){ isStandedTemplate(val){
this.isStandedTemplate = val this.isStandedTemplate = val
console.log(this.isStandedTemplate) console.log('是否固定模板',this.isStandedTemplate)
if(this.isStandedTemplate){
this.setTimeNodeList = this.standedTimeNodeList
this.activeTab = 0;
}
}, },
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 +379,8 @@ ...@@ -383,9 +379,8 @@
}) })
} }
});
console.log(this.setTimeNodeList)
});
if(!this.isStandedTemplate){ if(!this.isStandedTemplate){
this.setTimeNodeList[0].isDisabled = false; this.setTimeNodeList[0].isDisabled = false;
...@@ -393,7 +388,7 @@ ...@@ -393,7 +388,7 @@
} }
}, },
patientIdList(val){ patientIdList(val){
if(this.planId){//如果是修改计划，发送人数共享给各个时间节点 // if(this.planId){//如果是修改计划，发送人数共享给各个时间节点
// 获取微信和短信用户数量 // 获取微信和短信用户数量
getPatientNumber({ getPatientNumber({
patientIdList: val patientIdList: val
...@@ -410,21 +405,20 @@ ...@@ -410,21 +405,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 +430,35 @@ ...@@ -436,10 +430,35 @@
}) })
}else{ //自定义模板 }else{ //自定义模板
// 如果直接点击保存，需要进行对当前填写的表单进行校验
console.log(this.timeForm)
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')
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 +483,13 @@ ...@@ -464,14 +483,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 +505,13 @@ ...@@ -487,30 +505,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 +542,12 @@ ...@@ -541,12 +542,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 +556,11 @@ ...@@ -555,14 +556,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 +603,7 @@ ...@@ -605,6 +603,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,7 +617,42 @@ ...@@ -618,7 +617,42 @@
}) })
} }
}, },
// 是否显示选择添加漫画按钮
showChoseComtent(timeObj){
let flag;
if(this.isStandedTemplate){
flag = false
}else{
if(this.planId){
flag = (timeObj.change && !timeObj.id) ? true : false
}else{
flag = (!timeObj.id) ? true : false
}
}
return flag
},
// 是否显示删除重选漫画按钮
showRechoseDelete(timeObj){
let flag;
if(this.isStandedTemplate){
flag = false
}else{
if(this.planId){
if(timeObj.change){
if(timeObj.id){
flag = true
}else{
flag = false
}
}else{
flag = false
}
}else{
flag = (!timeObj.id) ? true : false
}
}
return flag
},
// 初始化新的表单 // 初始化新的表单
initNewForm(){ initNewForm(){
const timeFormInit = { const timeFormInit = {
...@@ -629,7 +663,7 @@ ...@@ -629,7 +663,7 @@
remindList: [],//提醒医生预约提前天数 remindList: [],//提醒医生预约提前天数
pushContentList: [],//推送患教提前天数 漫画id pushContentList: [],//推送患教提前天数 漫画id
followupList: [],//随访量表id followupList: [],//随访量表id
hasSelected: '', hasSelected: false,
isDisabled: false, isDisabled: false,
remindDay: [], remindDay: [],
pushDay: '', pushDay: '',
...@@ -648,44 +682,61 @@ ...@@ -648,44 +682,61 @@
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.$confirm('是否删除该时间节点?', '', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.setTimeNodeList.splice(index, 1) this.setTimeNodeList.splice(index, 1)
// this.activeTab = 0; // this.activeTab = 0;
// this.timeForm = this.setTimeNodeList[0]; // this.timeForm = this.setTimeNodeList[0];
...@@ -695,25 +746,26 @@ ...@@ -695,25 +746,26 @@
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,19 +775,33 @@ ...@@ -723,19 +775,33 @@
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)
this.timeForm.followupList = [] this.timeForm.followupList = []
val.forEach((item)=>{ val.forEach((item)=>{
this.formOptions.forEach((item2)=>{
if(item2.scaleNo==item){
this.timeForm.followupList.push({ this.timeForm.followupList.push({
resourceId: item resourceId: item,
sendContent: item2.name
})
}
}) })
}) })
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();
...@@ -747,14 +813,6 @@ ...@@ -747,14 +813,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
浏览文件 @ 4e58f14b
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
clearable clearable
style="width:380px;"> style="width:380px;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-select <el-select
...@@ -78,12 +77,11 @@ ...@@ -78,12 +77,11 @@
</el-form> </el-form>
</div> </div>
<div class="edit-plan-content" v-if="activeTab === 'second'"> <div class="edit-plan-content" v-show="activeTab === 'second'">
<set-time-node <set-time-node
ref="getTimeNodeList" ref="getTimeNodeList"
:standedTimeNodeList="standedTimeNodeList" :standedTimeNodeList="standedTimeNodeList"
:isStandedTemplate="isStandedTemplate" :isStandedTemplate="isStandedTemplate"
@setTimeNodeListOnCom="setTimeNodeListOnCom"
:patientIdList="baseInfo.patientIdList" :patientIdList="baseInfo.patientIdList"
:checkForm="checkForm" :checkForm="checkForm"
@addListenSave="addListenSave" @addListenSave="addListenSave"
...@@ -134,6 +132,7 @@ ...@@ -134,6 +132,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,
...@@ -175,7 +174,6 @@ ...@@ -175,7 +174,6 @@
}, },
computed: { computed: {
...mapState('planManage',{ ...mapState('planManage',{
// setTimeNodeList: state => state.setTimeNodeList,
remarkOption: state => state.remarkOption, remarkOption: state => state.remarkOption,
templateOptions: state => state.templateOptions, templateOptions: state => state.templateOptions,
}) })
...@@ -219,9 +217,6 @@ ...@@ -219,9 +217,6 @@
}) })
} }
}, },
setTimeNodeListOnCom(val){
this.getTimeNodeList(val)
},
selectPatientHandler() { selectPatientHandler() {
this.isShowSelectPatient = true; this.isShowSelectPatient = true;
}, },
...@@ -276,6 +271,8 @@ ...@@ -276,6 +271,8 @@
} }
if (valid) { if (valid) {
console.log('当前选择的随访模板id为',this.baseInfo.resourceId) console.log('当前选择的随访模板id为',this.baseInfo.resourceId)
this.resourceId = this.baseInfo.resourceId
console.log( 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=>{
...@@ -284,6 +281,7 @@ ...@@ -284,6 +281,7 @@
}) })
}else{ }else{
this.isStandedTemplate = false this.isStandedTemplate = false
this.standedTimeNodeList = [];
this.activeTab = 'second'; this.activeTab = 'second';
} }
......
src/views/followup/plan-manage/plan-list.vue
浏览文件 @ 4e58f14b
...@@ -31,14 +31,33 @@ ...@@ -31,14 +31,33 @@
<div class="content-group-btn"><el-button type="primary" size="small" @click="addNewPlan">新建随访计划</el-button></div> <div class="content-group-btn"><el-button type="primary" size="small" @click="addNewPlan">新建随访计划</el-button></div>
<div> <div>
<el-table :data="planList.fPlanDtoList" style="width: 100%;margin-top: 20px;"> <el-table :data="planList.fPlanDtoList" style="width: 100%;margin-top: 20px;">
<el-table-column prop="name" label="随访计划名称" min-width="100" align="center" :show-overflow-tooltip="true"> <el-table-column
prop="name"
label="随访计划名称"
min-width="180"
align="left"
:show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button class="btn-right-class" type="text" @click="visitDetail(scope.row)">{{scope.row.name}}</el-button> <el-button class="btn-right-class" type="text" @click="visitDetail(scope.row)">{{scope.row.name}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="startYear" label="开始年份" min-width="100" align="center"></el-table-column> <el-table-column
<el-table-column prop="num" label="总人数" min-width="150" align="center"></el-table-column> prop="startYear"
<el-table-column label="操作" fixed="right" align="center" min-width="240"> label="开始年份"
width="150"
align="center">
</el-table-column>
<el-table-column
prop="num"
label="总人数"
width="150"
align="center">
</el-table-column>
<el-table-column
label="操作"
fixed="right"
align="center"
width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button class="btn-right-class" type="text" @click="visitRow(scope.row)">查看居民</el-button>| <el-button class="btn-right-class" type="text" @click="visitRow(scope.row)">查看居民</el-button>|
<el-button class="btn-right-class" type="text" @click="changeRow(scope.row)"> 修改</el-button>| <el-button class="btn-right-class" type="text" @click="changeRow(scope.row)"> 修改</el-button>|
...@@ -203,7 +222,7 @@ ...@@ -203,7 +222,7 @@
this.$router.push({path: '/followup/plan-manage/plan-modify', query: {planId:row.id}}) this.$router.push({path: '/followup/plan-manage/plan-modify', query: {planId:row.id}})
}, },
deleteRow(row){ deleteRow(row){
this.$confirm('此操作将删除该条计划, 是否继续?', '提示', { this.$confirm(`是否确定删除${row.name}, 删除后计划将无法恢复!`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
}).then(() => { }).then(() => {
...@@ -215,10 +234,10 @@ ...@@ -215,10 +234,10 @@
message: '删除成功!' message: '删除成功!'
}); });
}).catch(() => { }).catch(() => {
this.$message({ // this.$message({
type: 'info', // type: 'info',
message: '已取消删除' // message: '已取消删除'
}); // });
}); });
}, },
......
src/views/followup/plan-manage/plan-modify.vue
浏览文件 @ 4e58f14b
<template> <template>
<div class="plan-modify"> <div class="plan-modify">
<div class="bread-crumb"> <div class="bread-crumb">
<el-breadcrumb separator-class="el-icon-arrow-right" > <el-breadcrumb separator="/" >
<el-breadcrumb-item v-for="item in planModifyCrumb"> <el-breadcrumb-item v-for="item in planModifyCrumb">
<a v-if="item.href" :href="item.href">{{item.name}}</a> <a v-if="item.href" :href="item.href">{{item.name}}</a>
<span v-else >{{item.name}}</span> <span v-else >{{item.name}}</span>
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
:isStandedTemplate="isStandedTemplate" :isStandedTemplate="isStandedTemplate"
:standedTimeNodeList="setTimeNodeList" :standedTimeNodeList="setTimeNodeList"
:patientIdList="planDetailData.patientIdList" :patientIdList="planDetailData.patientIdList"
@setTimeNodeListOnCom="setTimeNodeListOnCom"
:checkForm="checkForm" :checkForm="checkForm"
:planId="planId" :planId="planId"
@addListenSave="addListenSave" @addListenSave="addListenSave"
...@@ -289,9 +288,6 @@ ...@@ -289,9 +288,6 @@
closeFollowTime(isShow) { closeFollowTime(isShow) {
this.showFollowTime = isShow this.showFollowTime = isShow
}, },
setTimeNodeListOnCom(val){
this.getTimeNodeList(val)
},
closeAddPatientTime(isShow) { closeAddPatientTime(isShow) {
this.showAddPatientTime = isShow this.showAddPatientTime = isShow
}, },
......
src/views/followup/plan-manage/resident-detail.vue
浏览文件 @ 4e58f14b
<template> <template>
<div class="resident-detail"> <div class="resident-detail">
<div class="bread-crumb"> <div class="bread-crumb">
<el-breadcrumb separator-class="el-icon-arrow-right" > <el-breadcrumb separator="/">
<el-breadcrumb-item v-for="item in residentCrumb"> <el-breadcrumb-item v-for="item in residentCrumb">
<a v-if="item.href" :href="item.href">{{item.name}}</a> <a v-if="item.href" :href="item.href">{{item.name}}</a>
<span v-else >{{item.name}}</span> <span v-else >{{item.name}}</span>
......
src/views/followup/plan-manage/resident-list.vue
浏览文件 @ 4e58f14b
<template> <template>
<div class="resident-list"> <div class="resident-list">
<div class="bread-crumb"> <div class="bread-crumb">
<el-breadcrumb separator-class="el-icon-arrow-right" > <el-breadcrumb separator="/" >
<el-breadcrumb-item v-for="item in residentCrumb"> <el-breadcrumb-item v-for="item in residentCrumb">
<a v-if="item.href" :href="item.href">{{item.name}}</a> <a v-if="item.href" :href="item.href">{{item.name}}</a>
<span v-else >{{item.name}}</span> <span v-else >{{item.name}}</span>
......
src/views/followup/reservation-manage/dialog/send-reservation.vue
浏览文件 @ 4e58f14b
...@@ -192,23 +192,28 @@ ...@@ -192,23 +192,28 @@
//校验额度是否不够 //校验额度是否不够
getCheckReservation({ getCheckReservation({
content: '', content: '',
validContents: this.validContents validContents: _self.validContents
}).then(({data}) => { }).then(({data}) => {
const sendFlagLast = data.sendFlag; const sendFlagLast = data.sendFlag;
const inServiceTimeFlag = data.inServiceTimeFlag;
if(sendFlagLast){ //额度还可用 if(sendFlagLast){ //额度还可用
sendReservation({ sendReservation({
...this.reservationForm, ...this.reservationForm,
patientAppointList: this.selectList patientAppointList: _self.selectList
}).then(({data}) => { }).then(({data}) => {
this.$refs['reservationForm'].resetFields(); _self.$refs['reservationForm'].resetFields();
this.$emit('closeSendReserve',false); _self.$emit('closeSendReserve',false);
}) })
}else { }else {
console.log('余额不足') if(!inServiceTimeFlag) {
_self.$message.warning('已超过发送时间范围!');
return;
}else {
// 额度不足 // 额度不足
this.isNoEnoughShow = true; _self.isNoEnoughShow = true;
return; return;
} }
}
}) })
} else { } else {
return false; return false;
......
src/views/followup/reservation-manage/reservation-list.vue
浏览文件 @ 4e58f14b
...@@ -61,10 +61,13 @@ ...@@ -61,10 +61,13 @@
:data="reservationList.enteringDtos" :data="reservationList.enteringDtos"
center center
style="width: 100%;margin-top: 20px;" style="width: 100%;margin-top: 20px;"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange"
:row-key="getRowKeys"
ref="multipleReservation">
<el-table-column <el-table-column
type="selection" type="selection"
align="center"> align="center"
:reserve-selection="true">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="nickname" prop="nickname"
...@@ -190,6 +193,9 @@ ...@@ -190,6 +193,9 @@
needPara: {}, needPara: {},
dialogDetailShow: false, dialogDetailShow: false,
validContents: [], validContents: [],
getRowKeys(row) {
return row.fuPlanPatientTimesId;
},
} }
}, },
created() { created() {
...@@ -281,25 +287,31 @@ ...@@ -281,25 +287,31 @@
content: '', content: '',
validContents:this.validContents validContents:this.validContents
}) })
const { sendFlag } = this.checkRevervationData const { sendFlag, inServiceTimeFlag } = this.checkRevervationData
//判断短信余额是否不足 //判断短信余额是否不足
if(sendFlag){ if(sendFlag){
this.isDialogShow = true; this.isDialogShow = true;
}else {
if(!inServiceTimeFlag) {
this.$message.warning('已超过发送时间范围!');
return;
}else { }else {
this.isNoEnoughShow = true; this.isNoEnoughShow = true;
} }
}
}, },
sendReservation() { sendReservation() {
if(this.selectionData.length > 0){ // console.log('选择人员长度',this.selectionData.length)
if(this.selectionData.length > 100) {
this.$message.warning('每次最多选择100条单条随访进行预约!');
return;
}else if(this.selectionData.length <= 0){
this.$message.warning('请选择要发送预约的居民!');
return;
}else{
this.selectList = this.selectionData; this.selectList = this.selectionData;
// 发送预约校验 // 发送预约校验
this.initCheck(); this.initCheck();
}else if(this.selectionData.length > 100){
this.$message.warning('每次最多选择100条单条随访进行预约!');
return false;
} else {
this.$message.warning('请选择要发送预约的居民!');
return false;
} }
}, },
sendReservationRow(row){ sendReservationRow(row){
...@@ -340,6 +352,7 @@ ...@@ -340,6 +352,7 @@
...this.setSearchData(), ...this.setSearchData(),
status: this.status, status: this.status,
}) })
this.$refs.multipleReservation.clearSelection();
}, },
closeTipsDialog(val){ closeTipsDialog(val){
this.isNoEnoughShow = val; this.isNoEnoughShow = val;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或