提交 7b89f73d 编写于 作者: yi.li's avatar yi.li

修改originalFlag传值

上级 1b6e2c69
...@@ -278,6 +278,7 @@ export default { ...@@ -278,6 +278,7 @@ export default {
} }
}, },
showOriginal: 2, showOriginal: 2,
originalFlag: null,
roleType: '', roleType: '',
formInline: { formInline: {
region: [], region: [],
...@@ -289,7 +290,9 @@ export default { ...@@ -289,7 +290,9 @@ export default {
pageNo: 1, pageNo: 1,
pageSize: 20, pageSize: 20,
selectRegionId: '', //新增选择的地区id selectRegionId: '', //新增选择的地区id
orgId: '', //新增机构Id orgId: '', //新增机构Id,
// showOriginal: 2,
// originalFlag: null,
}, },
organizationNotice: '选择地区筛选到区才能选择机构', organizationNotice: '选择地区筛选到区才能选择机构',
dialogData: { dialogData: {
...@@ -636,7 +639,8 @@ export default { ...@@ -636,7 +639,8 @@ export default {
this.containHospitalFlag = res.data.containHospitalFlag; this.containHospitalFlag = res.data.containHospitalFlag;
let doctorInfoRep = res.data.doctorInfoRep; let doctorInfoRep = res.data.doctorInfoRep;
vm.showOriginal = doctorInfoRep.status; vm.showOriginal = doctorInfoRep.status;//判断是否显示原始数据
vm.originalFlag = doctorInfoRep.originalFlag;
vm.roleType = doctorInfoRep.roleType; vm.roleType = doctorInfoRep.roleType;
vm.displayCourse = doctorInfoRep.existCourse; vm.displayCourse = doctorInfoRep.existCourse;
vm.displayExam = doctorInfoRep.existExam; vm.displayExam = doctorInfoRep.existExam;
...@@ -646,11 +650,20 @@ export default { ...@@ -646,11 +650,20 @@ export default {
vm.minDate = new Date(doctorInfoRep.minDate); vm.minDate = new Date(doctorInfoRep.minDate);
vm.containOfficialFlag = doctorInfoRep.containOfficialFlag; vm.containOfficialFlag = doctorInfoRep.containOfficialFlag;
vm.finalDateFlag = doctorInfoRep.finalDateFlag; vm.finalDateFlag = doctorInfoRep.finalDateFlag;
// vm.formInline.showOriginal = doctorInfoRep.status;
// if (vm.showOriginal == 2) {
// vm.formInline.originalFlag = vm.originalFlag;
// }
vm.setTimeFlagList(); //设置选择时间 vm.setTimeFlagList(); //设置选择时间
if (vm.showOriginal == 2) {//是否显示原始数据,1显示,2不显示 if (vm.showOriginal == 2) { //不显示原始数据,取接口返回的originalFlag
vm.formInline.checked = true; if (vm.originalFlag == 1) {
vm.formInline.checked = true;
}else if (vm.originalFlag == 2) {
vm.formInline.checked = false;
}
} }
vm.formInline.region = []; vm.formInline.region = [];
vm.formInline.region[0] = res.data.list[0].id; vm.formInline.region[0] = res.data.list[0].id;
vm.allRegionId = res.data.list[0].id; //存储当前所在id vm.allRegionId = res.data.list[0].id; //存储当前所在id
...@@ -756,6 +769,12 @@ export default { ...@@ -756,6 +769,12 @@ export default {
vm.resetForm(); vm.resetForm();
}, },
setExportReq() { setExportReq() {
// let sureOriginalFlag = null;
// if (vm.formInline.showOriginal == 2) { //如果不显示,则取接口返回的数据
// sureOriginalFlag = vm.formInline.originalFlag;
// }else {
// sureOriginalFlag = (vm.formInline.checked == false ? 2 : 1);
// }
vm.exportReq = { vm.exportReq = {
projectId: vm.projectId, projectId: vm.projectId,
beginDate: operationData.setDuringTime(vm.formInline.during,'begin'), beginDate: operationData.setDuringTime(vm.formInline.during,'begin'),
...@@ -868,8 +887,12 @@ export default { ...@@ -868,8 +887,12 @@ export default {
if (vm.orgId) { if (vm.orgId) {
vm.formInline.organization[0] = vm.orgId; vm.formInline.organization[0] = vm.orgId;
} }
if (vm.showOriginal == 2) {//是否显示原始数据,1显示,2不显示 if (vm.showOriginal == 2) { //不显示原始数据,取接口返回的originalFlag
vm.formInline.checked = true; if (vm.originalFlag == 1) {
vm.formInline.checked = true;
}else if (vm.originalFlag == 2) {
vm.formInline.checked = false;
}
} }
vm.areaLen = 0; vm.areaLen = 0;
vm.tags = []; vm.tags = [];
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册