Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

This commit is contained in:
zhangyc
2022-12-11 11:55:07 +08:00
35 changed files with 3285 additions and 1437 deletions

View File

@@ -179,13 +179,7 @@
</div>
<div class="inname">项目名称:</div>
<div class="in">
<a-input
v-model:value="projectInfo.name"
show-count
:maxlength="30"
placeholder="请输入项目名称"
style="border-radius: 8px"
/>
<NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name" v-model:validate="projectInfo.validate" :maxlength="30" show-count :id="projectInfo.projectId"></NameInput>
</div>
</div>
<div class="name">
@@ -195,9 +189,9 @@
src="../../assets/images/basicinfo/asterisk.png"
/>
</div>
<div class="inname">分类:</div>
<div class="inname">培训分类:</div>
<div class="in select">
<ProjectClass v-model:value="projectInfo.category"></ProjectClass>
<TrainClass v-model:value="projectInfo.systemId"></TrainClass>
</div>
</div>
<div class="name">
@@ -691,34 +685,34 @@
</div>
</a-modal>
<!-- 创建项目提示框 -->
<a-modal
v-model:visible="reminderModal"
:footer="null"
:closable="closeBack"
wrapClassName="CopyModal"
centered="true"
>
<div class="delete">
<div class="del_header"></div>
<div class="del_main">
<div class="header">
<div class="icon"></div>
<span>温馨提示</span>
<div class="close_exit" @click="closeReminderModal"></div>
</div>
<div class="body">
<div style="margin-left: 60px; margin-right: 60px">
请您根据自身需求选择对应项目类别多层项目与单层项目操作不同层级不同
</div>
</div>
<div class="del_btnbox">
<div class="del_btn btn2" @click="okReminderModal">
<div class="btnText">好的</div>
</div>
</div>
</div>
</div>
</a-modal>
<!-- <a-modal-->
<!-- v-model:visible="reminderModal"-->
<!-- :footer="null"-->
<!-- :closable="closeBack"-->
<!-- wrapClassName="CopyModal"-->
<!-- centered="true"-->
<!-- >-->
<!-- <div class="delete">-->
<!-- <div class="del_header"></div>-->
<!-- <div class="del_main">-->
<!-- <div class="header">-->
<!-- <div class="icon"></div>-->
<!-- <span>温馨提示</span>-->
<!-- <div class="close_exit" @click="closeReminderModal"></div>-->
<!-- </div>-->
<!-- <div class="body">-->
<!-- <div style="margin-left: 60px; margin-right: 60px">-->
<!-- 请您根据自身需求选择对应项目类别多层项目与单层项目操作不同层级不同-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="del_btnbox">-->
<!-- <div class="del_btn btn2" @click="okReminderModal">-->
<!-- <div class="btnText">好的</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </a-modal>-->
<!-- 项目提交审核弹窗 -->
<a-modal
v-model:visible="reviewModal"
@@ -822,11 +816,13 @@ import * as api from "../../api/index";
import * as api1 from "../../api/index1";
import { storage } from "../../api/storage";
import ProjectManager from "@/components/project/ProjectManagerNew";
import ProjectClass from "@/components/project/ProjectClass";
// import ProjectClass from "@/components/project/ProjectClass";
import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass";
import dayjs from "dayjs";
import * as moment from "moment";
import { changeOwnership } from "@/api/method";
import NameInput from "@/components/project/NameInput";
export default {
name: "projectManage",
@@ -834,9 +830,11 @@ export default {
ProjOwnerShip,
ProjPowerList,
ProjCheckShip,
NameInput,
ProjectManager,
ProjectClass,
// ProjectClass,
OrgClass,
TrainClass,
// ProjManageShip
},
setup() {
@@ -956,13 +954,18 @@ export default {
// 接口需要传递的参数信息
const errorMsgs = {
name: "请输入项目名称",
category: "请选择项目分类",
systemId: "请选择培训分类",
manager: "请选择项目经理",
sourceBelongId: "请选择资源归属",
};
if (!validate(state.projectInfo, errorMsgs)) {
return;
}
if (!state.projectInfo.validate) {
message.destroy();
message.warning('项目名称重复,请修改名称!');
return;
}
api.createProject(state.projectInfo).then((res) => {
state.doublepro = false;
message.destroy();
@@ -1304,7 +1307,7 @@ export default {
title: "项目名称",
dataIndex: "name",
key: "name",
width: 280,
width: 480,
// align: "center",
ellipsis: true,
// scopedSlots: { customRender: "action" }, //引入的插槽
@@ -1316,8 +1319,9 @@ export default {
{
title: "项目经理",
dataIndex: "manager",
ellipsis: true,
key: "manager",
width: 100,
width: 300,
align: "center",
},
{
@@ -1394,7 +1398,7 @@ export default {
dataIndex: "operation",
key: "operation",
width: 300,
align: "center",
align: "right",
fixed: "right",
customRender: (value) => {
// console.log("value", value.record.type, value.record.status);
@@ -1540,9 +1544,15 @@ export default {
state.projectInfo = {
parentName: value.record.name,
parentId: value.record.projectId,
name: value.record.name,
sourceBelongId: value.record.sourceBelongId,
sourceBelongame: value.record.sourceBelongName,
manager: value.record.manager,
managerId: value.record.managerId,
systemId: value.record.systemId,
type: 2,
};
state.reminderModal = true;
state.estabish = true;
}}
>
创建子项目
@@ -1712,7 +1722,7 @@ export default {
};
const showModal1 = () => {
state.projectInfo = {};
state.reminderModal = true;
state.estabish = true;
};
const closeModal1 = () => {
state.estabish = false;
@@ -1783,7 +1793,10 @@ export default {
);
function managerChange(e, l, d) {
state.projectInfo.sourceBelongId = d;
!state.projectInfo.sourceBelongId &&
(state.projectInfo.sourceBelongId = d);
!state.projectInfo.sourceBelongId &&
(state.projectInfo.sourceBelongName = d);
}
return {