Skip to content

Administrator / project_progress

Go to a project
Commit 4e246c6c by liangzhen
Options

增加保存功能

1 parent fff95588
Inline Side-by-side
Showing with 115 additions and 45 deletions
src/api/index.js
...@@ -51,6 +51,10 @@ export function projectInfo(params) { ...@@ -51,6 +51,10 @@ export function projectInfo(params) {
export function fbProjectInfo(params) { export function fbProjectInfo(params) {
return post(`${ARCH_EVALUATION}/projectInfo/fb`, params) return post(`${ARCH_EVALUATION}/projectInfo/fb`, params)
} }
//保存
export function bcProjectInfo(params) {
return post(`${ARCH_EVALUATION}/projectInfo/bc`, params)
}
//删除   //删除  
export function delProjectInfo(params) { export function delProjectInfo(params) {
return post(`${ARCH_EVALUATION}/projectInfo/del`, params) return post(`${ARCH_EVALUATION}/projectInfo/del`, params)
......
src/utils/leftBarRules.js
...@@ -312,11 +312,11 @@ export function trendsRules(type) { ...@@ -312,11 +312,11 @@ export function trendsRules(type) {
// url: "/mainLayout/auxiliaryQuery", // url: "/mainLayout/auxiliaryQuery",
// children: [], // children: [],
// }, // },
{ // {
name: "问题反馈", // name: "问题反馈",
url: "/mainLayout/assistedFeedback", // url: "/mainLayout/assistedFeedback",
children: [], // children: [],
}, // },
{ {
name: "申诉确认", name: "申诉确认",
url: "/mainLayout/assistedConfirm", url: "/mainLayout/assistedConfirm",
...@@ -327,16 +327,16 @@ export function trendsRules(type) { ...@@ -327,16 +327,16 @@ export function trendsRules(type) {
// url: "/mainLayout/assistedRect", // url: "/mainLayout/assistedRect",
// children: [], // children: [],
// }, // },
{ // {
name: "整改核验", // name: "整改核验",
url: "/mainLayout/correctiveAssistanceVerification", // url: "/mainLayout/correctiveAssistanceVerification",
children: [], // children: [],
}, // },
{ // {
name: "同步归档", // name: "同步归档",
url: "/mainLayout/attachSynchronousArchiving", // url: "/mainLayout/attachSynchronousArchiving",
children: [], // children: [],
}, // },
], ],
}, },
{ {
......
src/views/assessChecks/auxiliaryInspection.vue
...@@ -284,11 +284,19 @@ ...@@ -284,11 +284,19 @@
</el-table-column> </el-table-column>
<el-table-column label="上传整改材料" width="400"> <el-table-column label="上传整改材料" width="400">
<template slot-scope="scope" v-if="scope.row.zgFileId"> <template slot-scope="scope" v-if="scope.row.zgFileId">
{{ scope.row.zgName }} <el-tag
size="small"
v-for="(tag,index) in scope.row.tags"
:key="index"
@click="handleClickXZ(scope.row.tagId[index], tag)"
>
{{tag}}
</el-tag>
<!-- {{ scope.row.zgName}}
<el-button <el-button
@click="handleClickXZ(scope.row.zgFileId, scope.row.zgName)" @click="handleClickXZ(scope.row.zgFileId, scope.row.zgName)"
>下载</el-button >下载</el-button
> > -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="情况说明" prop="zgqkFileId" width="400"> <el-table-column label="情况说明" prop="zgqkFileId" width="400">
...@@ -439,6 +447,14 @@ export default { ...@@ -439,6 +447,14 @@ export default {
this.$set(item, "projectStagetext", "6.结决算及转资"); this.$set(item, "projectStagetext", "6.结决算及转资");
break; break;
} }
let arr = [];
let arrID = [];
if (item.zgName) {
arr =item.zgName.split(',')
arrID =item.zgFileId.split(',')
this.$set(item, "tags", arr);
this.$set(item, "tagId", arrID);
}
}); });
console.log(this.tableDataQR, "加不进去？"); console.log(this.tableDataQR, "加不进去？");
this.dataPretreatment(); this.dataPretreatment();
...@@ -672,6 +688,23 @@ export default { ...@@ -672,6 +688,23 @@ export default {
} }
return ""; return "";
}, },
async handleClickXZ(fileId, fileName) {
console.log(fileId, "22222");
let response = await downloadObject({
fileId: fileId * 1,
});
let blob = new Blob([response]);
if ("download" in document.createElement("a")) {
let elink = document.createElement("a");
elink.download = fileName;
elink.style.display = "none";
elink.href = URL.createObjectURL(blob);
document.body.appendChild(elink);
elink.click();
URL.revokeObjectURL(elink.href); // 释放URL 对象
document.body.removeChild(elink);
}
},
//主列表选中行信息 //主列表选中行信息
handleSelectionChange(selection) { handleSelectionChange(selection) {
if (Array.isArray(selection) && selection.length > 1) { if (Array.isArray(selection) && selection.length > 1) {
...@@ -991,6 +1024,10 @@ h3 { ...@@ -991,6 +1024,10 @@ h3 {
overflow-x: hidden !important; overflow-x: hidden !important;
} }
} }
/deep/ .el-tag{
white-space: normal;
height:auto;
}
</style> </style>
\ No newline at end of file
src/views/assessChecks/auxiliarySelection.vue
...@@ -224,6 +224,8 @@ ...@@ -224,6 +224,8 @@
scope.row.fields | filtertfields scope.row.fields | filtertfields
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="expertProfile" label="专家简介" width="auto" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="expertLevel" label="专家级别" width="auto"> <el-table-column prop="expertLevel" label="专家级别" width="auto">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.expertLevel | filtertLevel scope.row.expertLevel | filtertLevel
...@@ -366,6 +368,8 @@ ...@@ -366,6 +368,8 @@
scope.row.fields | filtertfields scope.row.fields | filtertfields
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="expertProfile" label="专家简介" width="auto" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="expertLevel" label="专家级别" width="auto"> <el-table-column prop="expertLevel" label="专家级别" width="auto">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.expertLevel | filtertLevel scope.row.expertLevel | filtertLevel
...@@ -400,14 +404,14 @@ ...@@ -400,14 +404,14 @@
<!-- 选择专家弹窗 --> <!-- 选择专家弹窗 -->
<el-dialog <el-dialog
title="选择专家组长" title="选择专家"
:visible.sync="dialogAddzj" :visible.sync="dialogAddzj"
width="90%" width="90%"
:modal-append-to-body="false" :modal-append-to-body="false"
:append-to-body="false" :append-to-body="false"
> >
<div class="adzjdialog"> <div class="adzjdialog">
<el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm" >
<el-form-item label="专家姓名:" prop="fullName" class="fromItem"> <el-form-item label="专家姓名:" prop="fullName" class="fromItem">
<el-input <el-input
v-model="ruleFormZJ.fullName" v-model="ruleFormZJ.fullName"
...@@ -458,7 +462,7 @@ ...@@ -458,7 +462,7 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item class="cxItem"> <el-form-item class="cxItem">
<span class="zjquery" @click="xzExperts()"> 查询 </span> <span class="zjquery" @click="xzExperts('dj')"> 查询 </span>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscrolldialog"> <div class="setscrolldialog">
...@@ -502,7 +506,7 @@ ...@@ -502,7 +506,7 @@
scope.row.fields | filtertfields scope.row.fields | filtertfields
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="新增字段" label="专家简介" width="auto"> <el-table-column prop="expertProfile" label="专家简介" width="auto" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="expertLevel" label="专家级别" width="auto"> <el-table-column prop="expertLevel" label="专家级别" width="auto">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
...@@ -650,6 +654,8 @@ ...@@ -650,6 +654,8 @@
scope.row.fields | filtertfields scope.row.fields | filtertfields
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="expertProfile" label="专家简介" width="auto" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="expertLevel" label="专家级别" width="auto"> <el-table-column prop="expertLevel" label="专家级别" width="auto">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.expertLevel | filtertLevel scope.row.expertLevel | filtertLevel
...@@ -1008,7 +1014,10 @@ export default { ...@@ -1008,7 +1014,10 @@ export default {
cancelBJ() { cancelBJ() {
this.dialogedit = false; this.dialogedit = false;
}, },
async xzExperts() { async xzExperts(type) {
if(!type){
this.ruleFormZJ={}
}
this.dialogAddzj = true; this.dialogAddzj = true;
let params = { let params = {
current: this.currentZJ, current: this.currentZJ,
...@@ -1205,6 +1214,7 @@ export default { ...@@ -1205,6 +1214,7 @@ export default {
} }
let res = await chEvalBatchInfo(this.checkedList[0]); let res = await chEvalBatchInfo(this.checkedList[0]);
if (res.code == "200") { if (res.code == "200") {
this.$message('已撤回')
this.resetForm(); this.resetForm();
} }
}, },
......
src/views/assessChecks/checkComplianceFZ.vue
...@@ -288,7 +288,7 @@ export default { ...@@ -288,7 +288,7 @@ export default {
padding-top: 0; padding-top: 0;
// display: flex; // display: flex;
// padding: 0 20px; // padding: 0 20px;
padding-bottom: 20px; padding-bottom:80px;
position: relative; position: relative;
} }
......
src/views/assessChecks/confirmRelease.vue
...@@ -447,9 +447,9 @@ ...@@ -447,9 +447,9 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目年度:" prop="projectYear" class="fromItem"> <el-form-item label="项目年度:" prop="projectYearStr" class="fromItem">
<el-select <el-select
v-model="ruleFormZJ.projectYear" v-model="ruleFormZJ.projectYearStr"
placeholder="请选择" placeholder="请选择"
clearable clearable
multiple multiple
...@@ -594,6 +594,7 @@ import { ...@@ -594,6 +594,7 @@ import {
joinProjectInfo, joinProjectInfo,
getProjectInfo, getProjectInfo,
chProjectInfo, chProjectInfo,
bcProjectInfo
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache"; import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default { export default {
...@@ -869,8 +870,8 @@ export default { ...@@ -869,8 +870,8 @@ export default {
}); });
console.log(this.addtableData, "addtableData"); console.log(this.addtableData, "addtableData");
this.addtotal = this.addtableData.length; this.addtotal = this.addtableData.length;
this.handleCurrentChangeZJ(1); // this.handleCurrentChangeZJ(1);
this.handleSizeChangeAdd(5); // this.handleSizeChangeAdd(5);
this.dialogAddzj = false; this.dialogAddzj = false;
}, },
cancelZJ() { cancelZJ() {
...@@ -916,7 +917,7 @@ export default { ...@@ -916,7 +917,7 @@ export default {
expertStr: expertIdList, expertStr: expertIdList,
}; };
params.batchId = this.ruleFormdialogBJ.batchId; params.batchId = this.ruleFormdialogBJ.batchId;
params.prjsOfExpert = this.ruleFormdialogBJ.prjsOfExpert; // params.prjsOfExpert = this.ruleFormdialogBJ.prjsOfExpert;
console.log(params, "222"); console.log(params, "222");
// return // return
fbProjectInfo(params).then((res) => { fbProjectInfo(params).then((res) => {
...@@ -925,13 +926,10 @@ export default { ...@@ -925,13 +926,10 @@ export default {
this.resetForm(); this.resetForm();
}); });
}, },
//保存选择项目
savepro() { savepro() {
if (this.addtableData.length < 1) { if (this.addtableData.length < 1) {
this.$message("请选择待评估项目"); this.$message("没有可保存的项目");
} }
console.log('调取保存接口')
return
console.log(this.addZJList, "this.addZJList"); console.log(this.addZJList, "this.addZJList");
// 确认发布入参 // 确认发布入参
let expertIdList = ""; let expertIdList = "";
...@@ -945,13 +943,13 @@ export default { ...@@ -945,13 +943,13 @@ export default {
expertStr: expertIdList, expertStr: expertIdList,
}; };
params.batchId = this.ruleFormdialogBJ.batchId; params.batchId = this.ruleFormdialogBJ.batchId;
params.prjsOfExpert = this.ruleFormdialogBJ.prjsOfExpert; // params.prjsOfExpert = this.ruleFormdialogBJ.prjsOfExpert;
console.log(params, "222"); console.log(params, "222");
// return // return
fbProjectInfo(params).then((res) => { bcProjectInfo(params).then((res) => {
this.dialogAdd = false; // this.dialogAdd = false;
this.expertIdList = expertIdList; this.expertIdList = expertIdList;
this.resetForm(); // this.resetForm();
}); });
}, },
cancelXZ() { cancelXZ() {
...@@ -1258,16 +1256,20 @@ export default { ...@@ -1258,16 +1256,20 @@ export default {
overflow: auto; overflow: auto;
} }
.setscrolldialog { .setscrolldialog {
width: 100%; // width: 100%;
height: 300px; height: 300px;
overflow-y: auto;
overflow-x: scroll;
position: relative; position: relative;
overflow: auto; overflow: auto;
box-sizing: border-box; .eltable {
/deep/ .el-table { box-sizing: border-box;
height: 300px; text-align: center;
overflow: auto; width: 190%;
position: absolute; min-width: 190%;
min-width: 100%; }
/deep/.el-table--scrollable-x .el-table__body-wrapper {
overflow-x: hidden !important;
} }
} }
.setscrolldialogx { .setscrolldialogx {
...@@ -1286,6 +1288,22 @@ export default { ...@@ -1286,6 +1288,22 @@ export default {
::v-deep.el-table::before { ::v-deep.el-table::before {
display: none !important; display: none !important;
} }
.setTable {
height: 560px;
overflow-y: auto;
overflow-x: scroll;
position: relative;
overflow: auto;
.eltable {
box-sizing: border-box;
text-align: center;
width: 190%;
min-width: 190%;
}
/deep/.el-table--scrollable-x .el-table__body-wrapper {
overflow-x: hidden !important;
}
}
</style> </style>
<style> <style>
......
src/views/assessZC/confirmRelease.vue
...@@ -863,8 +863,8 @@ export default { ...@@ -863,8 +863,8 @@ export default {
}); });
console.log(this.addtableData, "addtableData"); console.log(this.addtableData, "addtableData");
this.addtotal = this.addtableData.length; this.addtotal = this.addtableData.length;
this.handleCurrentChangeZJ(1); // this.handleCurrentChangeZJ(1);
this.handleSizeChangeAdd(5); // this.handleSizeChangeAdd(5);
this.dialogAddzj = false; this.dialogAddzj = false;
}, },
cancelZJ() { cancelZJ() {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!