mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-19 07:46:46 +08:00
fix:修改项目未通过筛选问题
This commit is contained in:
@@ -113,13 +113,13 @@
|
|||||||
style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
|
style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
|
||||||
>
|
>
|
||||||
<div class="leftt">
|
<div class="leftt">
|
||||||
<img src="../../assets/images/taskpage/left2.png"/>
|
<img src="../../assets/images/taskpage/left2.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="photo">
|
<div class="photo">
|
||||||
<img src="../../assets/images/projectadd/nopro.png"/>
|
<img src="../../assets/images/projectadd/nopro.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="rightt">
|
<div class="rightt">
|
||||||
<img src="../../assets/images/taskpage/right2.png"/>
|
<img src="../../assets/images/taskpage/right2.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="centerbox" style="color: rgba(78, 166, 255, 1)">
|
<div class="centerbox" style="color: rgba(78, 166, 255, 1)">
|
||||||
创建项目
|
创建项目
|
||||||
@@ -287,13 +287,13 @@
|
|||||||
"
|
"
|
||||||
>
|
>
|
||||||
<div class="leftt">
|
<div class="leftt">
|
||||||
<img src="../../assets/images/taskpage/left2.png"/>
|
<img src="../../assets/images/taskpage/left2.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="photo">
|
<div class="photo">
|
||||||
<img src="../../assets/images/taskpage/picture4.png"/>
|
<img src="../../assets/images/taskpage/picture4.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="rightt">
|
<div class="rightt">
|
||||||
<img src="../../assets/images/taskpage/right2.png"/>
|
<img src="../../assets/images/taskpage/right2.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="centerbox" style="color: rgba(78, 166, 255, 1)">
|
<div class="centerbox" style="color: rgba(78, 166, 255, 1)">
|
||||||
单层子项目
|
单层子项目
|
||||||
@@ -307,13 +307,13 @@
|
|||||||
"
|
"
|
||||||
>
|
>
|
||||||
<div class="leftt">
|
<div class="leftt">
|
||||||
<img src="../../assets/images/taskpage/left1.png"/>
|
<img src="../../assets/images/taskpage/left1.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="photo">
|
<div class="photo">
|
||||||
<img src="../../assets/images/taskpage/picture5.png"/>
|
<img src="../../assets/images/taskpage/picture5.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="rightt">
|
<div class="rightt">
|
||||||
<img src="../../assets/images/taskpage/right1.png"/>
|
<img src="../../assets/images/taskpage/right1.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="centerbox" style="color: rgba(255, 182, 78, 1)">
|
<div class="centerbox" style="color: rgba(255, 182, 78, 1)">
|
||||||
多层子项目
|
多层子项目
|
||||||
@@ -374,13 +374,13 @@
|
|||||||
"
|
"
|
||||||
>
|
>
|
||||||
<div class="leftt">
|
<div class="leftt">
|
||||||
<img src="../../assets/images/taskpage/left2.png"/>
|
<img src="../../assets/images/taskpage/left2.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="photo">
|
<div class="photo">
|
||||||
<img src="../../assets/images/taskpage/picture6.png"/>
|
<img src="../../assets/images/taskpage/picture6.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="rightt">
|
<div class="rightt">
|
||||||
<img src="../../assets/images/taskpage/right2.png"/>
|
<img src="../../assets/images/taskpage/right2.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="centerbox" style="color: rgba(78, 166, 255, 1)">
|
<div class="centerbox" style="color: rgba(78, 166, 255, 1)">
|
||||||
单层{{ projectInfo.parentId ? "子" : "" }}项目
|
单层{{ projectInfo.parentId ? "子" : "" }}项目
|
||||||
@@ -399,13 +399,13 @@
|
|||||||
"
|
"
|
||||||
>
|
>
|
||||||
<div class="leftt">
|
<div class="leftt">
|
||||||
<img src="../../assets/images/taskpage/left3.png"/>
|
<img src="../../assets/images/taskpage/left3.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="photo">
|
<div class="photo">
|
||||||
<img src="../../assets/images/taskpage/picture7.png"/>
|
<img src="../../assets/images/taskpage/picture7.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="rightt">
|
<div class="rightt">
|
||||||
<img src="../../assets/images/taskpage/right3.png"/>
|
<img src="../../assets/images/taskpage/right3.png" />
|
||||||
</div>
|
</div>
|
||||||
<div class="centerbox1" style="color: rgba(93, 201, 136, 1)">
|
<div class="centerbox1" style="color: rgba(93, 201, 136, 1)">
|
||||||
多层{{ projectInfo.parentId ? "子" : "" }}项目
|
多层{{ projectInfo.parentId ? "子" : "" }}项目
|
||||||
@@ -627,7 +627,7 @@
|
|||||||
class="aeLoading"
|
class="aeLoading"
|
||||||
:style="{ display: projectPubLoading ? 'flex' : 'none' }"
|
:style="{ display: projectPubLoading ? 'flex' : 'none' }"
|
||||||
>
|
>
|
||||||
<a-spin :spinning="projectPubLoading"/>
|
<a-spin :spinning="projectPubLoading" />
|
||||||
</div>
|
</div>
|
||||||
</a-modal>
|
</a-modal>
|
||||||
<!-- 撤回路径弹窗 -->
|
<!-- 撤回路径弹窗 -->
|
||||||
@@ -814,24 +814,24 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import {reactive, toRefs, ref, watch} from "vue";
|
import { reactive, toRefs, ref, watch } from "vue";
|
||||||
import {message, Modal} from "ant-design-vue";
|
import { message, Modal } from "ant-design-vue";
|
||||||
import {useRouter} from "vue-router";
|
import { useRouter } from "vue-router";
|
||||||
import ProjOwnerShip from "../../components/drawers/ProjectOwn";
|
import ProjOwnerShip from "../../components/drawers/ProjectOwn";
|
||||||
import ProjPowerList from "../../components/drawers/ProjPowerList";
|
import ProjPowerList from "../../components/drawers/ProjPowerList";
|
||||||
import ProjCheckShip from "../../components/drawers/ProjCheckPower";
|
import ProjCheckShip from "../../components/drawers/ProjCheckPower";
|
||||||
import * as api from "../../api/index";
|
import * as api from "../../api/index";
|
||||||
import * as api1 from "../../api/index1";
|
import * as api1 from "../../api/index1";
|
||||||
import {storage} from "../../api/storage";
|
import { storage } from "../../api/storage";
|
||||||
import ProjectManager from "@/components/project/ProjectManagerNew";
|
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 TrainClass from "@/components/project/TrainClass";
|
||||||
import OrgClass from "@/components/project/OrgClass";
|
import OrgClass from "@/components/project/OrgClass";
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import * as moment from "moment";
|
import * as moment from "moment";
|
||||||
import {changeOwnership} from "@/api/method";
|
import { changeOwnership } from "@/api/method";
|
||||||
import NameInput from "@/components/project/NameInput";
|
import NameInput from "@/components/project/NameInput";
|
||||||
import {validateName} from "@/api/index1";
|
import { validateName } from "@/api/index1";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "projectManage",
|
name: "projectManage",
|
||||||
@@ -920,15 +920,15 @@ export default {
|
|||||||
// 数据接入 - start -
|
// 数据接入 - start -
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const sProjectStateList = ref([
|
const sProjectStateList = ref([
|
||||||
{value: 0, label: "草稿"},
|
{ value: 0, label: "草稿" },
|
||||||
{value: 1, label: "审核中"},
|
{ value: 1, label: "审核中" },
|
||||||
{value: 2, label: "审核通过"},
|
{ value: 2, label: "审核通过" },
|
||||||
{value: 3, label: "已发布"},
|
{ value: 3, label: "已发布" },
|
||||||
{value: -2, label: "未通过"},
|
{ value: -5, label: "未通过" },
|
||||||
{value: -1, label: "已结束"},
|
{ value: -1, label: "已结束" },
|
||||||
]);
|
]);
|
||||||
const searchReset = () => {
|
const searchReset = () => {
|
||||||
state.searchParam = {pageNo: 1, pageSize: 10};
|
state.searchParam = { pageNo: 1, pageSize: 10 };
|
||||||
getTableDate();
|
getTableDate();
|
||||||
};
|
};
|
||||||
const searchSubmit = () => {
|
const searchSubmit = () => {
|
||||||
@@ -959,7 +959,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 创建多层项目
|
// 创建多层项目
|
||||||
const createStoreyProject = async() => {
|
const createStoreyProject = async () => {
|
||||||
// 接口需要传递的参数信息
|
// 接口需要传递的参数信息
|
||||||
const errorMsgs = {
|
const errorMsgs = {
|
||||||
name: "请输入项目名称",
|
name: "请输入项目名称",
|
||||||
@@ -976,10 +976,14 @@ export default {
|
|||||||
message.warning("项目名称重复,请修改名称!");
|
message.warning("项目名称重复,请修改名称!");
|
||||||
return;
|
return;
|
||||||
} */
|
} */
|
||||||
const offName = await validateName({name: state.qdms_inputV1, type:1, id:state.projectInfo.projectId}).then(res => {
|
const offName = await validateName({
|
||||||
|
name: state.qdms_inputV1,
|
||||||
|
type: 1,
|
||||||
|
id: state.projectInfo.projectId,
|
||||||
|
}).then((res) => {
|
||||||
return res.data.data == 1;
|
return res.data.data == 1;
|
||||||
});
|
});
|
||||||
if(offName){
|
if (offName) {
|
||||||
message.destroy();
|
message.destroy();
|
||||||
return message.warning("项目名称重复,请重新填写");
|
return message.warning("项目名称重复,请重新填写");
|
||||||
}
|
}
|
||||||
@@ -990,7 +994,7 @@ export default {
|
|||||||
state.currentPage = 1;
|
state.currentPage = 1;
|
||||||
state.projectInfo.projectId ||
|
state.projectInfo.projectId ||
|
||||||
changeOwnership("project", res.data.data.projectId, [
|
changeOwnership("project", res.data.data.projectId, [
|
||||||
{id: res.data.data.createId, name: res.data.data.createName},
|
{ id: res.data.data.createId, name: res.data.data.createName },
|
||||||
]);
|
]);
|
||||||
getTableDate();
|
getTableDate();
|
||||||
});
|
});
|
||||||
@@ -1220,7 +1224,7 @@ export default {
|
|||||||
message.success("模版保存成功");
|
message.success("模版保存成功");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Modal.error({title: res.data.msg});
|
Modal.error({ title: res.data.msg });
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
//关闭存为模版弹窗
|
//关闭存为模版弹窗
|
||||||
@@ -1364,7 +1368,6 @@ export default {
|
|||||||
dayjs().isBefore(value.record.end) ? "进行中" : "已结束",
|
dayjs().isBefore(value.record.end) ? "进行中" : "已结束",
|
||||||
"-1": () => "已结束",
|
"-1": () => "已结束",
|
||||||
"-5": () => "草稿",
|
"-5": () => "草稿",
|
||||||
|
|
||||||
}[value.record.status + ""]() || ""
|
}[value.record.status + ""]() || ""
|
||||||
: "-"}
|
: "-"}
|
||||||
</div>
|
</div>
|
||||||
@@ -1672,7 +1675,7 @@ export default {
|
|||||||
onClick={() => {
|
onClick={() => {
|
||||||
router.push({
|
router.push({
|
||||||
path: "/taskpage",
|
path: "/taskpage",
|
||||||
query: {projectId: value.record.projectId},
|
query: { projectId: value.record.projectId },
|
||||||
});
|
});
|
||||||
storage.set("projectId", value.record.projectId);
|
storage.set("projectId", value.record.projectId);
|
||||||
}}
|
}}
|
||||||
@@ -1706,7 +1709,7 @@ export default {
|
|||||||
: "",
|
: "",
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
console.log(res);
|
// console.log("搜索", res, state.searchParam);
|
||||||
state.tableDataTotal = Number(res.data.data.total);
|
state.tableDataTotal = Number(res.data.data.total);
|
||||||
const data = res.data.data.rows;
|
const data = res.data.data.rows;
|
||||||
initDataSublist("", data);
|
initDataSublist("", data);
|
||||||
@@ -1881,7 +1884,7 @@ export default {
|
|||||||
okReminderModal,
|
okReminderModal,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.projectManage {
|
.projectManage {
|
||||||
@@ -2074,7 +2077,6 @@ export default {
|
|||||||
margin: 20px 38px 30px;
|
margin: 20px 38px 30px;
|
||||||
|
|
||||||
.ant-table-thead > tr > th {
|
.ant-table-thead > tr > th {
|
||||||
|
|
||||||
background-color: #eff4fc;
|
background-color: #eff4fc;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user