hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-14 21:36:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并

Browse Source
This commit is contained in:
lixg
2022-11-30 13:45:44 +08:00
parent 48412990a0 d83b8668a9
commit cb809c06cc
3 changed files with 79 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/config.js
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52 * @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-11-29 21:03:51 * @LastEditTime: 2022-11-30 13:45:23
* @FilePath: /fe-manage/src/api/config.js * @FilePath: /fe-manage/src/api/config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
@@ -53,7 +53,7 @@ http.interceptors.response.use(
return response; return response;
} else { } else {
if (code === 1000) { if (code === 1000) {
// window.open("https://u-pre.boe.com/web/", '_self'); window.open("https://u-pre.boe.com/web/", '_self');
} }
console.log("api %o", msg); console.log("api %o", msg);
} }

136
src/components/drawers/ProjectAudit.vue
View File

@@ -1,18 +1,18 @@
<template> <template>
<a-drawer <a-drawer
:visible="ProjAuditvisible" :visible="ProjAuditvisible"
class="drawerStyle ProjectAudit" class="drawerStyle ProjectAudit"
placement="right" placement="right"
width="60%" width="60%"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">审核项目</div> <div class="headerTitle">审核项目</div>
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<div class="main" style="padding-right: 10px"> <div class="main" style="padding-right: 10px">
@@ -30,9 +30,9 @@
<div class="setc_name"><span>封面图：</span></div> <div class="setc_name"><span>封面图：</span></div>
<div class="setc_main"> <div class="setc_main">
<img <img
style="width: 151px; height: 84px" style="width: 151px; height: 84px"
:src="picUrl" :src="picUrl"
alt="" alt=""
/> />
</div> </div>
</div> </div>
@@ -40,7 +40,7 @@
<div class="setc_name"><span>项目时间：</span></div> <div class="setc_name"><span>项目时间：</span></div>
<div class="setc_main"> <div class="setc_main">
<span style="color: #999999" <span style="color: #999999"
>{{ startTime }} ～ {{ endTime }}</span >{{ startTime }} ～ {{ endTime }}</span
> >
</div> </div>
</div> </div>
@@ -66,9 +66,9 @@
<div class="setc_name"><span>同步学习记录：</span></div> <div class="setc_name"><span>同步学习记录：</span></div>
<div class="setc_main"> <div class="setc_main">
<a-radio v-model:checked="checkedSty" <a-radio v-model:checked="checkedSty"
><span style="color: #333333" ><span style="color: #333333"
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-radio ></a-radio
> >
</div> </div>
</div> </div>
@@ -88,7 +88,7 @@
<div class="setc_name"><span>是否BOEU实施：</span></div> <div class="setc_name"><span>是否BOEU实施：</span></div>
<div class="setc_main"> <div class="setc_main">
<a-radio v-model:checked="checkedBOEU" <a-radio v-model:checked="checkedBOEU"
><span style="color: #333333">BOEU实施</span></a-radio ><span style="color: #333333">BOEU实施</span></a-radio
> >
</div> </div>
</div> </div>
@@ -101,7 +101,7 @@
</button> </button>
</div> </div>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="2" tab="修改记录"> </a-tab-pane> <a-tab-pane key="2" tab="修改记录"></a-tab-pane>
</a-tabs> </a-tabs>
<div class="audit"> <div class="audit">
<div class="set_content"> <div class="set_content">
@@ -116,7 +116,7 @@
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>审核意见：</span></div> <div class="setc_name"><span>审核意见：</span></div>
<div class="setc_main"> <div class="setc_main">
<a-textarea v-model:value="valueSuggest" :rows="4" /> <a-textarea v-model:value="valueSuggest" :rows="4"/>
</div> </div>
</div> </div>
</div> </div>
@@ -130,11 +130,12 @@
</template> </template>
<script> <script>
import { toRefs, reactive } from "vue"; import {toRefs, reactive} from "vue";
import { getTask } from "../../api/indexTaskadd"; import {getTask} from "../../api/indexTaskadd";
import { toDate } from "../../api/method"; import {toDate} from "../../api/method";
import { auditView } from "../../api/indexAudit"; import {auditView} from "../../api/indexAudit";
import { message } from "ant-design-vue"; import {message} from "ant-design-vue";
export default { export default {
name: "ProjectAudit", name: "ProjectAudit",
components: {}, components: {},
@@ -155,6 +156,10 @@ export default {
type: String, type: String,
default: null, default: null,
}, },
finishdFun: {
type: Function,
default: null
}
}, },
setup(props, ctx) { setup(props, ctx) {
@@ -195,6 +200,8 @@ export default {
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:ProjAuditvisible", false); ctx.emit("update:ProjAuditvisible", false);
console.log(props.finishdFun)
props.finishdFun && props.finishdFun()
state.valueSuggest = null; state.valueSuggest = null;
state.valuePass = "1"; state.valuePass = "1";
}; };
@@ -202,8 +209,7 @@ export default {
//获取项目信息 //获取项目信息
const getTaskInfo = () => { const getTaskInfo = () => {
getTask({ getTask({
// 先使用了固定projectId projectId: props.chooseProject,
projectId: 37,
}).then((res) => { }).then((res) => {
console.log("get task", res.data.data); console.log("get task", res.data.data);
let info = res.data.data.projectInfo; let info = res.data.data.projectInfo;
@@ -219,26 +225,26 @@ export default {
state.manager = info.manager; state.manager = info.manager;
state.remark = info.remark; state.remark = info.remark;
state.level = state.level =
info.level == 1 info.level == 1
? "集团级" ? "集团级"
: info.level == 2 : info.level == 2
? "组织级" ? "组织级"
: info.level == 3 : info.level == 3
? "现地级" ? "现地级"
: info.level == 4 : info.level == 4
? "部门级" ? "部门级"
: "-"; : "-";
state.tlevel = info.level; state.tlevel = info.level;
state.systemId = state.systemId =
info.systemId == 1 info.systemId == 1
? "集团级" ? "集团级"
: info.systemId == 2 : info.systemId == 2
? "组织级" ? "组织级"
: info.systemId == 3 : info.systemId == 3
? "现地级" ? "现地级"
: info.systemId == 4 : info.systemId == 4
? "部门级" ? "部门级"
: "-"; : "-";
state.tsystemId = info.systemId; state.tsystemId = info.systemId;
state.checkedSty = info.courseSyncFlag == 1 ? true : false; state.checkedSty = info.courseSyncFlag == 1 ? true : false;
state.courseSyncFlag = info.courseSyncFlag; state.courseSyncFlag = info.courseSyncFlag;
@@ -254,13 +260,13 @@ export default {
// state.attach = info.attach; // state.attach = info.attach;
// state.templateId = info.templateId; // state.templateId = info.templateId;
state.sourceBelong = state.sourceBelong =
info.sourceBelongId == 1 info.sourceBelongId == 1
? "项目一" ? "项目一"
: info.sourceBelongId == 2 : info.sourceBelongId == 2
? "项目二" ? "项目二"
: info.sourceBelongId == 3 : info.sourceBelongId == 3
? "项目三" ? "项目三"
: "-"; : "-";
}); });
}; };
@@ -278,16 +284,16 @@ export default {
pass: state.valuePass == "1" ? 1 : -1, pass: state.valuePass == "1" ? 1 : -1,
projectId: props.chooseProject, projectId: props.chooseProject,
}) })
.then((res) => { .then((res) => {
console.log("提交成功", res); console.log("提交成功", res);
message.destroy(); message.destroy();
message.success("提交成功"); message.success("提交成功");
closeDrawer(); closeDrawer();
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
message.warning("提交失败"); message.warning("提交失败");
}); });
}; };
return { return {
@@ -310,6 +316,7 @@ export default {
// overflow-x: auto; // overflow-x: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.header { .header {
height: 73px; height: 73px;
border-bottom: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8;
@@ -319,6 +326,7 @@ export default {
// background-color: red; // background-color: red;
margin-bottom: 20px; margin-bottom: 20px;
flex-shrink: 0; flex-shrink: 0;
.headerTitle { .headerTitle {
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
@@ -328,12 +336,14 @@ export default {
// margin-left: 24px; // margin-left: 24px;
} }
} }
.main { .main {
width: 100%; width: 100%;
height: 100%; height: 100%;
// background-color: #bfa; // background-color: #bfa;
overflow-y: auto; overflow-y: auto;
padding-right: 10px; padding-right: 10px;
.content7 { .content7 {
margin-top: 20px; margin-top: 20px;
@@ -401,11 +411,13 @@ export default {
} }
} }
} }
.detaile { .detaile {
width: 100%; width: 100%;
// background-color: blue; // background-color: blue;
display: flex; display: flex;
justify-content: center; justify-content: center;
.can { .can {
width: 130px; width: 130px;
height: 40px; height: 40px;
@@ -415,6 +427,7 @@ export default {
background-color: #fff; background-color: #fff;
margin-right: 30px; margin-right: 30px;
} }
.debtn { .debtn {
width: 130px; width: 130px;
height: 40px; height: 40px;
@@ -425,10 +438,12 @@ export default {
cursor: pointer; cursor: pointer;
} }
} }
.audit { .audit {
margin-left: 34px; margin-left: 34px;
margin-right: 34px; margin-right: 34px;
position: relative; position: relative;
.set_content { .set_content {
margin: 32px auto; margin: 32px auto;
display: flex; display: flex;
@@ -443,6 +458,7 @@ export default {
.setc_main { .setc_main {
flex: 1; flex: 1;
margin-left: 12px; margin-left: 12px;
textarea { textarea {
border-radius: 4px !important; border-radius: 4px !important;
resize: none; resize: none;

1
src/views/examine/ProjectReviewedN.vue
View File

@@ -104,6 +104,7 @@
v-model:chooseProject="chooseProject" v-model:chooseProject="chooseProject"
v-model:chooseCreateId="chooseCreateId" v-model:chooseCreateId="chooseCreateId"
v-model:chooseCreater="chooseCreater" v-model:chooseCreater="chooseCreater"
v-model:finishdFun="getProjList"
/> />
</div> </div>
</template> </template>