Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2023-02-12 19:02:18 +08:00

View File

@@ -100,10 +100,10 @@
<a-button v-if="(record.status===0 || record.status===2 || record.status===-5) && checkPer(record.permissions)" @click="handleEdit(record)" type="link">编辑</a-button>
<a-button v-if="record.type===1 && checkPer(record.permissions)" @click="createSub(record)" type="link">创建子项目</a-button>
<a-button v-if="record.type===2 && checkPer(record.permissions)" @click="createClass(record)" type="link">创建班级</a-button>
<a-button v-if="record.status===0 && record.type===3 && checkPer(record.permissions)" @click="showReviewModal(record.projectId)" type="link">提交审核</a-button>
<a-button v-if="record.status===1 && record.type===3 && checkPer(record.permissions)" @click="showRecallReviewModal(record.projectId)" type="link">撤回审核</a-button>
<a-button v-if="record.status===0 && record.type===3 && checkPer(record.permissions)" @click="showReviewModal(record.id)" type="link">提交审核</a-button>
<a-button v-if="record.status===1 && record.type===3 && checkPer(record.permissions)" @click="showRecallReviewModal(record.id)" type="link">撤回审核</a-button>
<a-button v-if="record.status===2 && record.type===3 && checkPer(record.permissions)" @click="push(record)" type="link">发布</a-button>
<a-button v-if="record.status===3 && record.type===3 && checkPer(record.permissions)" @click="showBackModal(record.projectId)" type="link">撤回发布</a-button>
<a-button v-if="record.status===3 && record.type===3 && checkPer(record.permissions)" @click="showBackModal(record.id)" type="link">撤回发布</a-button>
<a-button v-if="record.type===3" @click="baseInfo(record)" type="link">管理</a-button>
<DropDown v-if="checkPer(record.permissions)" value="授权">
<OwnerTableModelStudent :types="[4,5,6]" :id="record.projectId" :type="6">权限名单</OwnerTableModelStudent>
@@ -111,10 +111,10 @@
<CommonStudent :type="5" :id="record.projectId" title="管理权">管理权</CommonStudent>
</DropDown>
<DropDown v-if="checkPer(record.permissions)" value="更多">
<a-button @click="showCopyModal(record.projectId)" type="link">复制</a-button>
<a-button v-if="record.status!==3" @click="showDeleteModal(record.projectId)" type="link" danger>删除</a-button>
<a-button v-if="record.status===3" @click="showStartModal(record.projectId)" type="link">存为模版</a-button>
<a-button v-if="record.status===3 && record.type===3" @click="showStopModal(record.projectId)" type="link">结束</a-button>
<a-button @click="showCopyModal(record.id)" type="link">复制</a-button>
<a-button v-if="record.status!==3" @click="showDeleteModal(record.id)" type="link" danger>删除</a-button>
<a-button v-if="record.status===3" @click="showStartModal(record.id)" type="link">存为模版</a-button>
<a-button v-if="record.status===3 && record.type===3" @click="showStopModal(record.id)" type="link">结束</a-button>
<a-button v-if="record.status!==-1 && record.type===3" @click="showBackFinashModal(record.projectId)" type="link">撤回</a-button>
</DropDown>
</a-space>
@@ -1200,9 +1200,9 @@ export default {
state.stopModal = false;
};
//打开删除弹窗
const showDeleteModal = (projectId) => {
const showDeleteModal = (id) => {
state.deleteModal = true;
state.deleteProjectId = projectId;
state.deleteProjectId = id;
};
//确认删除
const deleteProject = () => {
@@ -1463,7 +1463,7 @@ export default {
if (data && data.length) {
data.forEach((e) => {
e.parentName = parentName;
e.key = e.projectId;
e.key = e.id;
initDataSublist(
(parentName ? parentName + "——" : "") + e.name,
e.subList
@@ -1480,7 +1480,7 @@ export default {
router.push({
path: "/projectadd",
query: {
projectId: record.projectId,
projectId: record.id,
parentId: record.parentId,
parentName: record.parentName,
},
@@ -1595,7 +1595,7 @@ export default {
function createSub(record){
state.projectInfo = {
parentName: record.name,
parentId: record.projectId,
parentId: record.id,
name: "",
sourceBelongId: record.sourceBelongId,
sourceBelongName: record.sourceBelongName,
@@ -1611,7 +1611,7 @@ export default {
router.push({
path: "/projectadd",
query: {
parentId: record.projectId,
parentId: record.id,
parentName: record.parentName + "——" + record.name,
ptojectType: 3,
}
@@ -1621,7 +1621,7 @@ export default {
function baseInfo(record){
router.push({
path: "/taskpage",
query: { projectId: record.projectId },
query: { projectId: record.id },
});
storage.set("projectId", record.projectId);
}