Skip to content

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

cme接口更新问题

上级 91df185b
隐藏空白字符变更
内嵌 并排
正在显示 包含 38 行增加 和 18 行删除
src/utils/env-config.js
浏览文件 @ 2ebdf5ee
......@@ -12,6 +12,7 @@ export const envConfig = {
// baseUrl: 'http://10.177.15.150:11905/',
// baseUrl: 'https://dev-sc.yunqueyi.com/',
// baseUrl: 'https://test1-sc.yunqueyi.com/',
// baseUrl: 'http://10.177.15.4:11905/',
baseUrl: 'https://dev-sc.yunqueyi.com/',
apiUrl: 'https://uat-api.yunqueyi.com/',
qiniuFileUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token1",
......
src/views/education/edit-cme.vue
浏览文件 @ 2ebdf5ee
......@@ -41,7 +41,7 @@
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="项目编号：" prop="projectNo">
<el-form-item label="项目编号：" prop="projectNo" v-show="projectType == 2">
<el-input
size="small"
v-model="formData.projectNo"
......@@ -76,7 +76,7 @@
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="项目等级：" prop="projectLevel">
<el-form-item label="项目等级：" prop="projectLevel" v-show="projectType == 2">
<el-select size="small" v-model="formData.projectLevel" placeholder="请选择项目等级">
<el-option
v-for="item in projectLevelList"
......@@ -134,7 +134,7 @@
<span class="word-num">{{(formData.projectIntro).replace(/\s+/g,"").length}}/200</span>
</el-col>
</el-form-item>
<el-form-item label="项目负责人：" prop="projectLeaderId">
<el-form-item label="项目负责人：" prop="projectLeaderId" v-show="projectType == 2">
<el-col :span="6">
<el-select size="small" v-model="formData.projectLeaderId" placeholder="请选择负责人" style="width:100%;">
<el-option
......@@ -146,7 +146,7 @@
</el-select>
</el-col>
</el-form-item>
<el-form-item label="项目所属学科：" prop="projectSubject">
<el-form-item label="项目所属学科：" prop="projectSubject" v-show="projectType == 2">
<el-col :span="6">
<!-- style="width:200px;" -->
<el-input
......@@ -246,7 +246,7 @@
</el-form-item>
<p class="upload-message" v-if="uploadImgMessage2">请选择封面</p>
</div>
<el-form-item label="学习需知：" prop="mustKnow">
<el-form-item label="学习需知：" prop="mustKnow" v-show="projectType == 2">
<el-col :span="13">
<el-input
size="small"
......@@ -259,7 +259,7 @@
></el-input>
</el-col>
</el-form-item>
<el-form-item label="配置学分：">
<el-form-item label="配置学分：" v-show="projectType == 2">
<el-radio-group
size="small"
v-model="checkCredit"
......@@ -269,7 +269,7 @@
<el-radio :label="2">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="学分名称：" prop="creditId">
<el-form-item label="学分名称：" prop="creditId" v-show="projectType == 2">
<el-col :span="6">
<el-select size="small" v-model="formData.creditId" placeholder="请选择学分名称" style="width:100%;" @change="changeCredit">
<el-option
......@@ -949,7 +949,7 @@
<el-form-item required label="配置证书：" v-show="projectType !== 2">
<el-form-item required label="配置证书：" v-show="projectType != 2">
<el-col :span="10">
<el-radio-group class="el-configure" v-model="formComponent.configure" :disabled="projectStatus == 3 || projectStatus == 4 || projectStatus == 5 || projectStatus == 6">
<el-radio :label="1">是</el-radio>
......@@ -1350,7 +1350,8 @@ export default {
projectLeaderList: [],
creditList: [],
creditTip: '',
projectType: 2,
projectType: '',
beforeCreditId: '',
props: {
lazy: true,
lazyLoad(node, resolve) {
......@@ -1483,6 +1484,7 @@ export default {
},
created() {
vm = this;
this.projectType = vm.getUrlSearch(window.location.href, "projectType");
(this.projectId = vm.getUrlSearch(window.location.href, "projectId")),
(this.peopleLevel = vm.getUrlSearch(window.location.href, "level"));
......@@ -1656,6 +1658,7 @@ export default {
creditId: editData.projectData.creditId,
};
this.beforeCreditId = editData.projectData.creditId;
this.organizationContent = editData.projectData.creatorOrganizationName;
if (editData.attachmentData.length > 2) {
for (let i = 2; i < editData.attachmentData.length; i++) {
......@@ -1764,13 +1767,13 @@ export default {
authorityType:this.formData.authorityType,
allowLearn:this.formData.allowLearn,
//cme新增
projectType: 2,
projectType: this.projectType,
projectNo: this.formData.projectNo,
projectLevel: this.formData.projectLevel,
projectLeaderId: this.formData.projectLeaderId,
projectSubject: this.formData.projectSubject,
mustKnow: this.formData.mustKnow,
creditId: this.formData.creditId,
editCreditId: this.formData.creditId,
};
let attachmentModel = [
{
......@@ -1806,7 +1809,14 @@ export default {
attachmentPDFModel.push(PDFModel);
}
//}
//creditId学分id的特殊处理
if(option == "add" && this.projectType == 2) {
projectModel.creditId = this.formData.creditId;
}
if (option == "edit" || option == "storageEdit") {
if(this.projectType == 2) {
projectModel.creditId = this.beforeCreditId;
}
//编辑
projectModel.id = this.formData.id;
projectModel.projectStatus = this.projectStatus;
......
src/views/education/item-manager.vue
浏览文件 @ 2ebdf5ee
......@@ -164,7 +164,7 @@
v-show="showCMEButton(scope.row)"
type="primary"
size="small"
>{{ cmeBtnText }}</el-button>
>{{ handleCmeOperate(scope.row.projectStatus) }}</el-button>
<el-button
@click="toShield(scope.row)"
v-show="scope.row.blackModifiable == true"
......@@ -434,11 +434,11 @@ export default {
'updateItemManager'
]),
toPage() {
this.$router.push("edit-manager");
this.$router.push("edit-manager?projectType=1");
},
toCmePage() {
console.log('跳转至 cme 新建项目');
this.$router.push("edit-cme");
this.$router.push("edit-cme?projectType=2");
},
toShield(row) {
this.$router.push("item-shield?projectId="+row.id);
......@@ -482,6 +482,11 @@ export default {
closeLoading(vm);
// debugger;
if (res.code == "000000") {
if(refuse == 1) {
vm.firstCheckVisible = false;
vm.secondCheckVisible = false;
}
vm.getProjectList();
this.$message({
message: '审核成功',
type: 'success'
......@@ -510,11 +515,15 @@ export default {
});
},
showCMEButton(row, type) {
// if(row.projectType == 2) {
// return true;
// } else {
// return false;
// }
// CME 专属状态码 为7~11，是这些代码的直接走新逻辑，别的走老逻辑
let cmeStatus = [7, 8, 9, 10, 11];
let currentStatus = parseInt(row.projectStatus);
if ( cmeStatus.indexOf(currentStatus) > -1 ) {
this.handleCmeOperate(row.projectStatus);
return true;
} else {
return false;
......@@ -572,7 +581,7 @@ export default {
text = '发布';
}
this.cmeBtnText = text;
return text;
// return true / false;
},
//改变状态
......@@ -583,9 +592,9 @@ export default {
this.updateItemManager(this.formInline)
//编辑
if(row.projectType === 1) {
this.$router.push("edit-manager?projectId=" + projectId +"&level="+level+'&pageNum='+this.formInline.pageNo);
this.$router.push("edit-manager?projectType=1&projectId=" + projectId +"&level="+level+'&pageNum='+this.formInline.pageNo);
} else if(row.projectType === 2) {
this.$router.push("edit-cme?projectId=" + projectId +"&level="+level+'&pageNum='+this.formInline.pageNo);
this.$router.push("edit-cme?projectType=2&projectId=" + projectId +"&level="+level+'&pageNum='+this.formInline.pageNo);
}
} else if (type === 7) {
//提醒审核
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或