Skip to content

P
pica.cloud.web-education-admin
提交 2c7a906b 编写于 作者: bo.dang's avatar bo.dang
浏览文件
操作

Merge remote-tracking branch 'origin/dev-liveSix-20200817' into dev-liveSix-20200817

上级 87453cb5 e39af569
隐藏空白字符变更
内嵌 并排
正在显示 包含 230 行增加 和 57 行删除
src/views/education/edit-custom.vue
浏览文件 @ 2c7a906b
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
/> />
<!-- 设定行政范围与设定机构 --> <!-- 设定行政范围与设定机构 -->
<div class="three-step" v-if="active === 2"> <!-- <div class="three-step" v-if="active === 2">
<el-tabs v-model="activeName" @tab-click="handleClickTabs"> <el-tabs v-model="activeName" @tab-click="handleClickTabs">
<el-tab-pane label="设定行政范围" name="first"> <el-tab-pane label="设定行政范围" name="first">
<select-region ref="selectRegion" :projectId="projectId" :status4Flag="status4Flag"></select-region> <select-region ref="selectRegion" :projectId="projectId" :status4Flag="status4Flag"></select-region>
...@@ -65,21 +65,52 @@ ...@@ -65,21 +65,52 @@
></set-organization> ></set-organization>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> -->
<!-- 改为关联小圈 -->
<div class="three-step" v-if="active === 2">
<el-form :model="formCircle" label-width="130px" class="demo-form-inline">
<el-form-item label="关联小圈：" required>
<el-select
size="small"
v-model="formCircle.microecologyId"
placeholder="请选择关联小圈"
:disabled="status4Flag == 1"
>
<el-option
v-for="item in circleList"
:key="item.id"
:label="`${item.id}-${item.name}`"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="formCircle.microecologyId" label="圈内可见范围：" required>
<el-select
size="small"
v-model="formCircle.groupType"
placeholder="请选择圈内可见范围"
>
<el-option label="全体成员" :value="1"></el-option>
</el-select>
</el-form-item>
</el-form>
</div> </div>
</div> </div>
<dialog-componet :dialogObj="dialogObj" @hide="hide"></dialog-componet> <dialog-componet :dialogObj="dialogObj" @hide="hide"></dialog-componet>
<dialog-componet :dialogObj="sendObj" @hide="hidefn" @confirm="confirmFn"></dialog-componet> <dialog-componet :dialogObj="sendObj" @hide="hidefn" @confirm="confirmFn"></dialog-componet>
<PreviewEditCourse <PreviewEditCourse
:dialogVisible="isPreviewEditCourse" :dialogVisible="isPreviewEditCourse"
:courseId="courseId" :courseId="courseId"
@close="closeEditCourse" @close="closeEditCourse"
/> />
<PreviewProtocol <PreviewProtocol
:dialogVisible="isPreviewProtocol" :dialogVisible="isPreviewProtocol"
:protocolId="protocolId" :protocolId="protocolId"
:protocolContent="protocolContent" :protocolContent="protocolContent"
@close="closeProtocol" @close="closeProtocol"
/> />
</div> </div>
</template> </template>
...@@ -170,7 +201,7 @@ export default { ...@@ -170,7 +201,7 @@ export default {
isPreview: 0, // 1表示是查看信息 isPreview: 0, // 1表示是查看信息
maxLimitCreatedCustomProjectCountInYear: 20, // 同一个用户每年能够创建的项目数 maxLimitCreatedCustomProjectCountInYear: 20, // 同一个用户每年能够创建的项目数
allSubList: [], allSubList: [],
isPreviewEditCourse: false, isPreviewEditCourse: false,
courseId: '0', courseId: '0',
...@@ -178,6 +209,13 @@ export default { ...@@ -178,6 +209,13 @@ export default {
protocolId: 22, protocolId: 22,
protocolContent: '', protocolContent: '',
isFirst: true, // 是否是第一次（不做更新） isFirst: true, // 是否是第一次（不做更新）
// 小圈
formCircle: {
microecologyId: '', // 小圈id
groupType: 1, // 关联类型：1 全部 2：分组
groupIds: [], // 分组id，全部为[]
},
circleList: [],
}; };
}, },
computed: { computed: {
...@@ -326,7 +364,7 @@ export default { ...@@ -326,7 +364,7 @@ export default {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
labelIdList: labelIdList || [] labelIdList: labelIdList || []
}; };
this.setSearchParam(searchParam); this.setSearchParam(searchParam);
}, },
...@@ -371,7 +409,7 @@ export default { ...@@ -371,7 +409,7 @@ export default {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
labelIdList: labelIdList || [] labelIdList: labelIdList || []
}; };
this.setSearchParamOrg(searchParam); this.setSearchParamOrg(searchParam);
}, },
...@@ -436,13 +474,15 @@ export default { ...@@ -436,13 +474,15 @@ export default {
next(id) { next(id) {
vm.projectId = id; vm.projectId = id;
vm.active = 2; vm.active = 2;
this.getCircleList();
this.getCircleData();
}, },
// 暂存 // 暂存
save() { save() {
if (vm.active == 1) { if (vm.active == 1) {
vm.$refs.CustomBaseinfo.save(false); vm.$refs.CustomBaseinfo.save(false);
} else if (vm.active == 2) { } else if (vm.active == 2) {
vm.regionComplete(); vm.sendCircleData();
} }
}, },
confirmFn() { confirmFn() {
...@@ -468,7 +508,7 @@ export default { ...@@ -468,7 +508,7 @@ export default {
}, },
// 完成触发的接口 // 完成触发的接口
hidefn() { hidefn() {
vm.regionComplete(vm.changeStatus); vm.sendCircleData(vm.changeStatus);
}, },
// 选择学元范围暂存 // 选择学元范围暂存
...@@ -572,6 +612,53 @@ export default { ...@@ -572,6 +612,53 @@ export default {
}); });
}, },
// 获取圈子列表
getCircleList() {
vm
.GET("circle/portal/circle/list", {})
.then(res => {
// console.log("查询小圈列表", res);
this.circleList = res.data;
});
},
// 获取圈子数据
getCircleData() {
vm
.GET("portal/portalMicroEcology/relation/query", { projectId: this.projectId })
.then(res => {
// console.log("获取圈子数据", res);
if (res.code == "000000" && res.data) {
this.formCircle.microecologyId = res.data.microecologyId;
this.formCircle.groupType = res.data.groupType;
this.formCircle.groupIds = res.data.groupIds;
}
});
},
// 提交、修改圈子数据
sendCircleData(fishFn) {
const { microecologyId, groupType, groupIds } = this.formCircle;
if (!microecologyId) {
vm.$message({
type: "info",
message: "请选择关联小圈"
});
return;
}
const postData = {
projectId: this.projectId,
microecologyId,
groupType,
groupIds: groupType === 1 ? [0] : groupIds,
}
openLoading(vm);
vm.POST("portal/portalMicroEcology/relation/saveOrUpdate", postData).then(res => {
closeLoading(vm);
if (res.code == "000000" && fishFn) {
fishFn();
}
});
},
// 隐藏弹框 // 隐藏弹框
hide() { hide() {
vm.dialogObj.visible = false; vm.dialogObj.visible = false;
...@@ -603,7 +690,7 @@ export default { ...@@ -603,7 +690,7 @@ export default {
vm.status4Flag = s; vm.status4Flag = s;
}, },
/* /*
展示添加机构课程弹框 展示添加机构课程弹框
如果已经加入机构，1：没有同意过协议，则打开协议弹框；2：已经加入，时直接打开添加弹框 如果已经加入机构，1：没有同意过协议，则打开协议弹框；2：已经加入，时直接打开添加弹框
如果没有加入机构，则直接弹出提示（我知道了） 如果没有加入机构，则直接弹出提示（我知道了）
...@@ -654,7 +741,7 @@ export default { ...@@ -654,7 +741,7 @@ export default {
.then(res => { .then(res => {
if (res.code == "000000") { if (res.code == "000000") {
if(!res.data) { // 没有签署，打开协议签署弹框 if(!res.data) { // 没有签署，打开协议签署弹框
this.getProtocolInfoById(); this.getProtocolInfoById();
} else { } else {
this.isPreviewEditCourse = true; this.isPreviewEditCourse = true;
} }
......
src/views/education/edit-manager.vue
浏览文件 @ 2c7a906b
...@@ -569,26 +569,26 @@ ...@@ -569,26 +569,26 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<div v-else> <!-- <div v-else>
<el-form :inline="true" :model="formOrganization" class="demo-form-inline"> <el-form :inline="true" :model="formOrganization" class="demo-form-inline">
<el-form-item label> <el-form-item label>
<el-select <el-select
size="small" size="small"
v-model="formEcology.ecology" v-model="formEcology.ecology"
placeholder="选择小生态" placeholder="选择小生态"
@change="selectChangeEcology" @change="selectChangeEcology"
:disabled="status4Flag == 1" :disabled="status4Flag == 1"
> >
<el-option <el-option
v-for="item in ecologySelect" v-for="item in ecologySelect"
:key="item.id" :key="item.id"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<span class="span_ecology">{{ checkedEcology }}</span> <span class="span_ecology">{{ checkedEcology }}</span>
</el-form> </el-form>
<el-table <el-table
class="rim" class="rim"
ref="multipleEcology" ref="multipleEcology"
...@@ -627,6 +627,34 @@ ...@@ -627,6 +627,34 @@
:total="totalEcology" :total="totalEcology"
></el-pagination> ></el-pagination>
</div> </div>
</div> -->
<div v-else>
<el-form :model="formCircle" label-width="130px" class="demo-form-inline">
<el-form-item label="关联小圈：" required>
<el-select
size="small"
v-model="formCircle.microecologyId"
placeholder="请选择关联小圈"
:disabled="status4Flag == 1"
>
<el-option
v-for="item in circleList"
:key="item.id"
:label="`${item.id}-${item.name}`"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="formCircle.microecologyId" label="圈内可见范围：" required>
<el-select
size="small"
v-model="formCircle.groupType"
placeholder="请选择圈内可见范围"
>
<el-option label="全体成员" :value="1"></el-option>
</el-select>
</el-form-item>
</el-form>
</div> </div>
<el-dialog title :visible.sync="dialogShow" width="40%" center> <el-dialog title :visible.sync="dialogShow" width="40%" center>
<p class="dialog-p">设定范围数据已经被其他管理员修改，是否强制提交进行覆盖</p> <p class="dialog-p">设定范围数据已经被其他管理员修改，是否强制提交进行覆盖</p>
...@@ -1020,7 +1048,7 @@ export default { ...@@ -1020,7 +1048,7 @@ export default {
// callback(new Error(`请输入0~100正整数`)); // callback(new Error(`请输入0~100正整数`));
// } // }
}; };
return { return {
idTypeValue: 1, idTypeValue: 1,
idTypeProject: "", idTypeProject: "",
...@@ -1204,6 +1232,13 @@ export default { ...@@ -1204,6 +1232,13 @@ export default {
lookedEcology: [], lookedEcology: [],
changedEcology: [], changedEcology: [],
changedEcology2: [], changedEcology2: [],
// 小圈
formCircle: {
microecologyId: '', // 小圈id
groupType: 1, // 关联类型：1 全部 2：分组
groupIds: [], // 分组id，全部为[]
},
circleList: [],
//选择项目组件 数据 //选择项目组件 数据
optionsComponent: [], optionsComponent: [],
optionsCertificate: [], optionsCertificate: [],
...@@ -1459,11 +1494,11 @@ export default { ...@@ -1459,11 +1494,11 @@ export default {
this.$message.error('发起机构名称不能重复'); this.$message.error('发起机构名称不能重复');
return false; return false;
} }
} }
} }
return true; return true;
}, },
//表单校验 //表单校验
submitForm(formName) { submitForm(formName) {
let flag = null; let flag = null;
...@@ -1729,8 +1764,10 @@ export default { ...@@ -1729,8 +1764,10 @@ export default {
this.active++; this.active++;
this.stepData = [false, true, false]; this.stepData = [false, true, false];
if (this.formData.scopeType == 1) { if (this.formData.scopeType == 1) {
this.getEcologySelect(); this.getCircleList();
//this.getEcology(); this.getCircleData();
// this.getEcologySelect();
// this.getEcology();
return; return;
} }
// this.projectId = res.data.id; // this.projectId = res.data.id;
...@@ -2066,26 +2103,28 @@ export default { ...@@ -2066,26 +2103,28 @@ export default {
//进入第三步 //进入第三步
if (this.formData.scopeType == 1) { if (this.formData.scopeType == 1) {
//设定小生态范围 //设定小生态范围
if (this.formEcology.ecology == "") { // if (this.formEcology.ecology == "") {
vm.$message({ // vm.$message({
type: "info", // type: "info",
message: "请选择小生态范围" // message: "请选择小生态范围"
}); // });
return; // return;
} // }
let req = {}; // let req = {};
req.ecology = []; // req.ecology = [];
req.ecology[0] = this.formEcology.ecology; // req.ecology[0] = this.formEcology.ecology;
vm // vm
.POST("portal/scope/v1/" + this.projectId + "/organization", req) // .POST("portal/scope/v1/" + this.projectId + "/organization", req)
.then(res => { // .then(res => {
console.log("设定小生态范围", res); // console.log("设定小生态范围", res);
if (res.code == "000000") { // if (res.code == "000000") {
this.active++; // this.active++;
this.stepData = [false, false, true]; // this.stepData = [false, false, true];
this.tagDrop(); // this.tagDrop();
} // }
}); // });
// 设定小圈范围
this.sendCircleData();
return; return;
} }
if (this.idType == 1) { if (this.idType == 1) {
...@@ -3283,7 +3322,54 @@ export default { ...@@ -3283,7 +3322,54 @@ export default {
}); });
}); });
}, },
// // 获取圈子列表
getCircleList() {
vm
.GET("circle/portal/circle/list", {})
.then(res => {
// console.log("查询小圈列表", res);
this.circleList = res.data;
});
},
// 获取圈子数据
getCircleData() {
vm
.GET("portal/portalMicroEcology/relation/query", { projectId: this.projectId })
.then(res => {
// console.log("获取圈子数据", res);
if (res.code == "000000" && res.data) {
this.formCircle.microecologyId = res.data.microecologyId;
this.formCircle.groupType = res.data.groupType;
this.formCircle.groupIds = res.data.groupIds;
}
});
},
// 提交、修改圈子数据
sendCircleData() {
const { microecologyId, groupType, groupIds } = this.formCircle;
if (!microecologyId) {
vm.$message({
type: "info",
message: "请选择关联小圈"
});
return;
}
const postData = {
projectId: this.projectId,
microecologyId,
groupType,
groupIds: groupType === 1 ? [0] : groupIds,
}
openLoading(vm);
vm.POST("portal/portalMicroEcology/relation/saveOrUpdate", postData).then(res => {
closeLoading(vm);
if (res.code == "000000") {
this.active++;
this.stepData = [false, false, true];
this.tagDrop();
}
});
},
//机构table修改 //机构table修改
handleSizeOrganization(val) { handleSizeOrganization(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或