Skip to content

Administrator / project_progress

Go to a project
Commit 765ab9d7 by liangzhen
Options

整改提交

1 parent 16f3541a
Inline Side-by-side
Showing with 55 additions and 115 deletions
src/router/index.js
...@@ -53,7 +53,7 @@ export const routes = [ ...@@ -53,7 +53,7 @@ export const routes = [
name: 'materialAcquisition', name: 'materialAcquisition',
component: () => import('@/views/assessZC/materialAcquisition.vue'), component: () => import('@/views/assessZC/materialAcquisition.vue'),
meta: { meta: {
title: "自查评估材料提交", title: "自查评估材料提交与整改",
}, },
}, },
{ {
...@@ -118,7 +118,7 @@ export const routes = [ ...@@ -118,7 +118,7 @@ export const routes = [
name: 'materialAcquisition', name: 'materialAcquisition',
component: () => import('@/views/assessChecks/materialAcquisition.vue'), component: () => import('@/views/assessChecks/materialAcquisition.vue'),
meta: { meta: {
title: "评估材料提交", title: "评估材料提交与整改",
}, },
}, },
{ {
......
src/utils/leftBarRules.js
...@@ -22,11 +22,6 @@ export function trendsRules(type) { ...@@ -22,11 +22,6 @@ export function trendsRules(type) {
url: "/mainLayout/assistedViewing", url: "/mainLayout/assistedViewing",
children: [], children: [],
}, },
// {
// name: "问题查询",
// url: "/mainLayout/auxiliaryQuery",
// children: [],
// },
], ],
}, },
], ],
...@@ -110,28 +105,7 @@ export function trendsRules(type) { ...@@ -110,28 +105,7 @@ export function trendsRules(type) {
url: "/mainLayout/auxiliaryInspection", url: "/mainLayout/auxiliaryInspection",
children: [], children: [],
}, },
// {
// name: "问题下发",
// url: "/mainLayout/assitedDistribution",
// children: [],
// },
// {
// name: "申诉确认",
// url: "/mainLayout/assistedConfirm",
// children: [],
// },
// {
// name: "整改核验",
// url: "/mainLayout/correctiveAssistanceVerification",
// children: [],
// },
// {
// name: "同步归档",
// url: "/mainLayout/attachSynchronousArchiving",
// children: [],
// },
], ],
}, },
], ],
...@@ -163,7 +137,7 @@ export function trendsRules(type) { ...@@ -163,7 +137,7 @@ export function trendsRules(type) {
url: "", url: "",
children: [ children: [
{ {
name: "评估材料提交", name: "评估材料提交与整改",
url: "/mainLayout/materialAcquisition", url: "/mainLayout/materialAcquisition",
children: [], children: [],
}, },
...@@ -229,7 +203,7 @@ export function trendsRules(type) { ...@@ -229,7 +203,7 @@ export function trendsRules(type) {
children: [], children: [],
}, },
{ {
name: "自查评估材料提交", name: "自查评估材料提交与整改",
url: "/assesszc/materialAcquisition", url: "/assesszc/materialAcquisition",
children: [], children: [],
}, },
...@@ -261,7 +235,7 @@ export function trendsRules(type) { ...@@ -261,7 +235,7 @@ export function trendsRules(type) {
children: [], children: [],
}, },
{ {
name: "评估材料提交", name: "评估材料提交与整改",
url: "/mainLayout/materialAcquisition", url: "/mainLayout/materialAcquisition",
children: [], children: [],
}, },
......
src/views/assessChecks/auxiliaryInspection.vue
...@@ -98,9 +98,6 @@ ...@@ -98,9 +98,6 @@
:class="inspectdisabled ? 'noclick' : ''" :class="inspectdisabled ? 'noclick' : ''"
><i class="el-icon-tickets"></i> &nbsp;&nbsp;合规性检查评估</el-button ><i class="el-icon-tickets"></i> &nbsp;&nbsp;合规性检查评估</el-button
> >
<!-- <el-button @click="submitNexts()"
><i class="el-icon-finished"></i> &nbsp;&nbsp;提交问题清单</el-button
> -->
<el-button <el-button
@click="rectificationReview('ruleForm')" @click="rectificationReview('ruleForm')"
:disabled="confirmdisabled" :disabled="confirmdisabled"
...@@ -109,13 +106,6 @@ ...@@ -109,13 +106,6 @@
<i class="el-icon-chat-dot-square"></i <i class="el-icon-chat-dot-square"></i
>&nbsp;&nbsp;&nbsp;整改复核</el-button >&nbsp;&nbsp;&nbsp;整改复核</el-button
> >
<!-- <el-button @click="subfinished()">
<i class="el-icon-finished"></i
>&nbsp;&nbsp;&nbsp;归档</el-button
> -->
<!-- <el-button @click="withdraw()">
<i class="el-icon-folder-delete"></i>撤回
</el-button> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscroll">
...@@ -377,12 +367,10 @@ ...@@ -377,12 +367,10 @@
import { import {
postEvalQuesInfo, postEvalQuesInfo,
chpostEvalQuesInfo, chpostEvalQuesInfo,
qrscevaluationMaterials,
wtssSelectificationVerification, wtssSelectificationVerification,
bcrectificationVerification, bcrectificationVerification,
tjrectificationVerification,
gdrectificationVerification,
downloadObject, downloadObject,
tjrectificationVerification
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache"; import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default { export default {
...@@ -548,31 +536,21 @@ export default { ...@@ -548,31 +536,21 @@ export default {
} }
}, },
async savetj() { async savetj() {
console.log("提交"); this.$confirm("若所有整改复核状态均为整改完成即为完成归档, 是否继续?", "提示", {
let res = await tjrectificationVerification(this.tableDataQR); confirmButtonText: "确定",
if (res.code == "200") { cancelButtonText: "取消",
this.dialogQR = false; type: "warning",
this.$message("整改复核提交成功"); })
this.resetForm(); .then(async () => {
} else { let res = await tjrectificationVerification(this.tableDataQR);
this.$message("整改复核提交失败"); if (res.code == "200") {
} this.dialogQR = false;
}, this.$message("提交成功");
//提交归档 this.resetForm();
async subfinished() { } else {
if (sessionStorage.getItem("authorName") == 3) { this.$message("提交失败");
this.$message("只有专家可以操作归档"); }
} })
let params = {
projectId: this.checkedList[0].projectId,
batchId: this.checkedList[0].batchId,
};
let res = await gdrectificationVerification(params);
if (res.code == "200") {
this.$message("归档成功");
} else {
this.$message("归档失败");
}
}, },
async submitForm() { async submitForm() {
let params = { let params = {
......
src/views/assessChecks/materialAcquisition.vue
...@@ -1022,8 +1022,6 @@ export default { ...@@ -1022,8 +1022,6 @@ export default {
} }
.eltable { .eltable {
width: 100%; width: 100%;
// height: 650px;
// overflow-y: auto;
box-sizing: border-box; box-sizing: border-box;
} }
/deep/ .el-table .warning-row { /deep/ .el-table .warning-row {
......
src/views/layout/continerView.vue
...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
padding-top:5px; padding-top:5px;
padding-bottom: 0; padding-bottom: 0;
overflow-y: auto; overflow-y: auto;
// overflow-x: hidden; overflow-x: hidden;
// overflow: auto; // overflow: auto;
} }
......
src/views/layout/leftBar.vue
...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
isOpen: false, isOpen: false,
openeds: ["0"], //默认展开导航栏 openeds: ["0"], //默认展开导航栏
activeIndex: "", activeIndex: "",
routerTabs:[], routerTabs: [],
}; };
}, },
props: { props: {
...@@ -68,33 +68,27 @@ export default { ...@@ -68,33 +68,27 @@ export default {
}, },
}, },
watch: { watch: {
"$route": { $route: {
immediate: true, immediate: true,
handler(newParams, oldParams) { handler(newParams, oldParams) {
console.log('路又变了',newParams) console.log("路又变了", newParams);
if ( if (
this.$route.path == "/mainLayout/Compliancefz" || this.$route.path == "/mainLayout/Compliancefz" ||
this.$route.path == "/mainLayout/Compliance" this.$route.path == "/mainLayout/Compliance"
) { ) {
this.activeIndex = "/mainLayout/auxiliaryInspection"; this.activeIndex = "/mainLayout/auxiliaryInspection";
} else if (this.$route.path == "/mainLayout/Compliancexf") { } else {
if (this.$route.query.fromType == "fzcx") { this.activeIndex = this.$route.path;
this.activeIndex = "/mainLayout/auxiliaryQuery"; this.$nextTick(() => {
} else { this.$refs.kzMenu.activeIndex = this.$route.path;
this.activeIndex = "/mainLayout/assitedDistribution"; });
} }
} else { console.log(this.$route.meta.title, "路由名字");
this.activeIndex = this.$route.path; if (!this.routerTabs.includes(this.$route.meta.title)) {
this.$nextTick(() => { this.routerTabs.push(this.$route.meta.title);
this.$refs.kzMenu.activeIndex = this.$route.path; }
}); console.log(this.routerTabs);
} },
console.log( this.$route.meta.title,'路由名字')
if(!this.routerTabs.includes(this.$route.meta.title)){
this.routerTabs.push(this.$route.meta.title)
}
console.log(this.routerTabs)
},
}, },
autho(newVal, oldVal) { autho(newVal, oldVal) {
console.log(newVal, "newValnewVal"); console.log(newVal, "newValnewVal");
...@@ -145,47 +139,40 @@ export default { ...@@ -145,47 +139,40 @@ export default {
this.$router.push({ this.$router.push({
path: "/mainLayout/auxiliarySelection", path: "/mainLayout/auxiliarySelection",
}); });
this.activeIndex = "/mainLayout/auxiliarySelection" this.activeIndex = "/mainLayout/auxiliarySelection";
} else if (newVal == 2) { } else if (newVal == 2) {
this.menuList = trendsRules(2); this.menuList = trendsRules(2);
this.$router.push({ this.$router.push({
path: "/mainLayout/confirmRelease", path: "/mainLayout/confirmRelease",
}); });
this.activeIndex = "/mainLayout/confirmRelease" this.activeIndex = "/mainLayout/confirmRelease";
} else if (newVal == 3) { } else if (newVal == 3) {
this.menuList = trendsRules(3); this.menuList = trendsRules(3);
this.$router.push({ this.$router.push({
path: "/mainLayout/materialAcquisition", path: "/mainLayout/materialAcquisition",
}); });
this.activeIndex = "/mainLayout/materialAcquisition" this.activeIndex = "/mainLayout/materialAcquisition";
} else if (newVal == 99) { } else if (newVal == 99) {
this.menuList = trendsRules(99); this.menuList = trendsRules(99);
this.$router.push({ this.$router.push({
path: "/mainLayout/auxiliarySelection", path: "/mainLayout/auxiliarySelection",
}); });
this.activeIndex = '/mainLayout/auxiliarySelection' this.activeIndex = "/mainLayout/auxiliarySelection";
} }
}, },
}, },
mounted() { mounted() {
console.log('获取父元素的local数据',JSON.parse(localStorage.getItem('user'))) console.log(
console.log('本页面路由是什么',this.$route.path) "获取父元素的local数据",
JSON.parse(localStorage.getItem("user"))
);
console.log("本页面路由是什么", this.$route.path);
this.handleOpen(0, ["0"]); this.handleOpen(0, ["0"]);
if ( if (
this.$route.path == "/mainLayout/Compliancefz" || this.$route.path == "/mainLayout/Compliancefz" ||
this.$route.path == "/mainLayout/Compliance" this.$route.path == "/mainLayout/Compliance"
) { ) {
this.activeIndex = "/mainLayout/auxiliaryInspection"; this.activeIndex = "/mainLayout/auxiliaryInspection";
} else if (this.$route.path == "/mainLayout/Compliancexf") {
if (this.$route.query.fromType == "fzcx") {
this.activeIndex = "/mainLayout/auxiliaryQuery";
} else {
this.activeIndex = "/mainLayout/assitedDistribution";
}
} else { } else {
this.activeIndex = this.$route.path; this.activeIndex = this.$route.path;
} }
......
vue.config.js
...@@ -10,6 +10,9 @@ module.exports = defineConfig({ ...@@ -10,6 +10,9 @@ module.exports = defineConfig({
//如果是hash模式， publicPath:""；如果是history， publicPath:"/" //如果是hash模式， publicPath:""；如果是history， publicPath:"/"
// publicPath: "/", // publicPath: "/",
devServer: { devServer: {
client: {
overlay: false,
},
hot: true, hot: true,
proxy: { proxy: {
'/arch-evaluation':{ '/arch-evaluation':{
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!