Skip to content

Administrator / project_progress

Go to a project
Commit 52a0c080 by liangzhen
Options

暂存一下调试pdf

1 parent 440d2be5
Inline Side-by-side
Showing with 636 additions and 420 deletions
src/api/index.js
......@@ -81,6 +81,10 @@ export function evaluationMaterials(params) {
export function ossupload(params) {
return post(`${ARCH_EVALUATION}/oss/upload`, params)
}
//浏览
export function presignedUrl(params) {
return post(`${ARCH_EVALUATION}/oss/presignedUrl`, params)
}
//查询材料清单
export function clqdevaluationMaterials(params) {
......
src/router/index.js
......@@ -227,7 +227,7 @@ export const routes = [
},
//暂用模块
{
path:'/analysisCore',
......
src/views/assessChecks/assistedConfirm.vue
......@@ -65,7 +65,11 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear">
<template slot-scope="scope">
{{scope.row.batchYear}}年
</template>
</el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
......@@ -269,7 +273,7 @@
</el-table-column>
<el-table-column label="解释批注">
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'" >
<el-input v-model="scope.row.feedback" disabled></el-input>
<el-input v-model="scope.row.feedback" ></el-input>
</template>
</el-table-column>
<el-table-column label="附加解释材料" width="400">
......
src/views/assessChecks/assistedFeedback.vue
......@@ -9,11 +9,12 @@
>
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择" clearable>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item+'年'"
:value="item"/>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
......@@ -66,7 +67,9 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear">
<template slot-scope="scope"> {{ scope.row.batchYear }}年 </template>
</el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
......@@ -137,7 +140,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="index">
<el-table-column label="序号" width="100" type="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......@@ -209,7 +212,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="index">
<el-table-column label="序号" width="100" type="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......@@ -256,7 +259,7 @@
<template slot-scope="scope">
<input
type="file"
@change="handleFileUpload($event,scope.row)"
@change="handleFileUpload($event, scope.row)"
v-if="scope.row.confirmStatus == '1'"
/>
</template>
......@@ -283,7 +286,7 @@ import { generateYearOptions } from "@/utils/cache";
export default {
data() {
return {
yearsList:generateYearOptions(),
yearsList: generateYearOptions(),
dialogSS: false,
ruleForm: {
batchYear: "",
......@@ -586,10 +589,10 @@ export default {
this.dataPretreatmentSS();
}
},
handleFileUpload(event,row) {
handleFileUpload(event, row) {
console.log("来了么");
this.file = event.target.files[0];
this.submitFile(row)
this.submitFile(row);
},
submitFile(row) {
if (this.file) {
......
src/views/assessChecks/assistedRect.vue
......@@ -65,7 +65,9 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"><template slot-scope="scope">
{{scope.row.batchYear}}年
</template> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
......@@ -137,7 +139,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="index">
<el-table-column label="序号" width="100" type="index">
</el-table-column>
<el-table-column
......@@ -264,7 +266,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="index">
<el-table-column label="序号" width="100" type="index">
</el-table-column>
<el-table-column
......@@ -461,6 +463,9 @@ export default {
if (res.code == "200") {
this.tableDataQR = res.data.records;
this.tableDataQR.forEach((item) => {
if (!item.confirmStatus) {
this.$set(item, "confirmStatus", "2");
}
switch (item.projectStage) {
case "1":
this.$set(item, "projectStagetext", "1.可研");
......@@ -655,7 +660,7 @@ export default {
break;
}
});
console.log(this.tableDataSS);
console.log(this.tableDataSS,'状态是什么');
this.dataPretreatmentSS();
}
},
......
src/views/assessChecks/assistedVerif.vue
......@@ -52,7 +52,9 @@
>
<el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> <template slot-scope="scope">
{{scope.row.batchYear}}年
</template></el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
......
src/views/assessChecks/assistedViewing.vue
......@@ -10,10 +10,11 @@
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择" clearable>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item+'年'"
:value="item"/>
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="后评估名称:" prop="batchName" class="fromItem">
......@@ -23,7 +24,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<!-- <el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select
v-model="ruleForm.postEvalState"
placeholder="请选择"
......@@ -33,7 +34,7 @@
<el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input
......@@ -77,7 +78,11 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear">
<template slot-scope="scope">
{{ scope.row.batchYear }}年
</template></el-table-column
>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
......@@ -230,7 +235,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="index">
<el-table-column label="序号" width="100" type="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......@@ -282,12 +287,13 @@ import {
wtqdqselect,
clqdselect,
selLcb,
downloadObject
} from "@/api/index";
import { generateYearOptions } from "@/utils/cache";
export default {
data() {
return {
yearsList:generateYearOptions(),
yearsList: generateYearOptions(),
listData: {},
qdtableData: [],
tableDataNew: MaterialsList(),
......@@ -497,6 +503,23 @@ export default {
cancel() {
this.dialog = false;
},
async handleClickXZ(scope) {
console.log(scope.fileId);
let response = await downloadObject({
fileId: scope.fileId * 1,
});
let blob = new Blob([response]);
if ("download" in document.createElement("a")) {
let elink = document.createElement("a");
elink.download = scope.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);
}
},
},
};
</script>
......
src/views/assessChecks/assitedDistribution.vue
......@@ -14,12 +14,26 @@
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleForm.batchName" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<!-- <el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="未下发" value="0"></el-option>
<el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input
v-model="ruleForm.projectName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目ID:" prop="projectId" class="fromItem">
<el-input
v-model="ruleForm.projectId"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item class="button">
<el-button @click="submitForm()">
......@@ -54,7 +68,9 @@
>
<el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"><template slot-scope="scope">
{{scope.row.batchYear}}年
</template> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
......
src/views/assessChecks/attachSynchronousArchiving.vue
......@@ -99,7 +99,9 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" width="auto" prop="batchYear">
<el-table-column label="批次年度" width="auto" prop="batchYear"><template slot-scope="scope">
{{scope.row.batchYear}}年
</template>
</el-table-column>
<el-table-column prop="batchName" label="后评估批次名称" width="auto">
</el-table-column>
......@@ -254,7 +256,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="index">
<el-table-column label="序号" width="100" type="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......
src/views/assessChecks/auxiliaryInspection.vue
......@@ -21,9 +21,10 @@
</el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="未下发" value="0"></el-option>
<el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option>
<el-option label="待提交" value="2"></el-option>
<el-option label="已撤回" value="4"></el-option>
<el-option label="已提交" value="13"></el-option>
<!-- <el-option label="待评估" value="1"></el-option> -->
</el-select>
</el-form-item>
......@@ -73,7 +74,9 @@
>
<el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> <template slot-scope="scope">
{{scope.row.batchYear}}年
</template></el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
......
src/views/assessChecks/auxiliaryQuery.vue
......@@ -51,7 +51,9 @@
>
<el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"><template slot-scope="scope">
{{scope.row.batchYear}}年
</template> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
......
src/views/assessChecks/auxiliarySelection.vue
......@@ -10,17 +10,26 @@
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择" clearable>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item+'年'"
:value="item"/>
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleForm.batchName" placeholder="请输入" clearable></el-input>
<el-input
v-model="ruleForm.batchName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem" >
<el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select
v-model="ruleForm.postEvalState"
placeholder="请选择"
clearable
>
<el-option label="未下发" value="0"></el-option>
<el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option>
......@@ -69,6 +78,7 @@
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" width="auto" prop="batchYear">
<template slot-scope="scope"> {{ scope.row.batchYear }}年 </template>
</el-table-column>
<el-table-column prop="batchName" label="后评估批次名称" width="auto">
</el-table-column>
......@@ -80,7 +90,11 @@
</el-table-column>
<el-table-column prop="expertName" label="后评估专家" width="auto">
</el-table-column>
<el-table-column prop="postEvalStateText" label="批次下发状态" width="auto">
<el-table-column
prop="postEvalStateText"
label="批次下发状态"
width="auto"
>
</el-table-column>
<!-- <el-table-column prop="postEvalState" label="后评估状态" width="auto">
</el-table-column> -->
......@@ -223,11 +237,12 @@
placeholder="请选择"
clearable
>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item+'年'"
:value="item"/>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item
......@@ -235,7 +250,10 @@
prop="batchName"
class="fromItem"
>
<el-input v-model="ruleFormdialogAdd.batchName" clearable></el-input>
<el-input
v-model="ruleFormdialogAdd.batchName"
clearable
></el-input>
</el-form-item>
<el-form-item
label="计划评审日期:"
......@@ -348,7 +366,11 @@
></el-input>
</el-form-item>
<el-form-item label="专业领域:" prop="fields" class="fromItem">
<el-select v-model="ruleFormZJ.fields" placeholder="请选择" clearable>
<el-select
v-model="ruleFormZJ.fields"
placeholder="请选择"
clearable
>
<el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option>
......@@ -356,7 +378,11 @@
</el-select>
</el-form-item>
<el-form-item label="专家状态:" prop="expertState" class="fromItem">
<el-select v-model="ruleFormZJ.expertState" placeholder="请选择" clearable>
<el-select
v-model="ruleFormZJ.expertState"
placeholder="请选择"
clearable
>
<el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option>
......@@ -454,11 +480,12 @@
placeholder="请选择"
clearable
>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item+'年'"
:value="item"/>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item
......@@ -570,12 +597,12 @@ import {
delEvalBatchInfo,
chEvalBatchInfo,
} from "@/api/index";
import { getCurrentDate } from '@/utils/format'
import { getCurrentDate } from "@/utils/format";
import { generateYearOptions } from "@/utils/cache";
export default {
data() {
return {
yearsList:generateYearOptions(),
yearsList: generateYearOptions(),
totalXQ: 0,
XQtableData: [],
currentPageXQ: 1,
......@@ -668,9 +695,8 @@ export default {
};
},
mounted() {
console.log(getCurrentDate(),'222222')
console.log(getCurrentDate(), "222222");
this.submitForm();
},
methods: {
......@@ -679,16 +705,16 @@ export default {
current: this.currentPage,
pageSize: this.pageSize,
};
console.log( this.ruleForm,' this.ruleForm')
console.log(this.ruleForm, " this.ruleForm");
Object.assign(params, this.ruleForm);
console.log(params);
let res = await evalBatchInfo(params);
if (res.code == "200") {
this.tableData = res.data.records;
this.tableData.forEach((item) => {
this.tableData.forEach((item) => {
if (item.postEvalState == "" || item.postEvalState == null) {
this.$set(item, "postEvalStateText", "未下发");
this.$set(item, "postEvalStateText", "未下发");
} else if (item.postEvalState == "0") {
this.$set(item, "postEvalStateText", "未下发");
} else if (item.postEvalState == "2") {
......@@ -868,8 +894,8 @@ export default {
});
let params = {
expertStr: expertStr,
creator:sessionStorage.getItem('author'),
createTime:getCurrentDate(),
creator: sessionStorage.getItem("author"),
createTime: getCurrentDate(),
};
Object.assign(params, this.ruleFormdialogAdd);
this.xfParams = JSON.parse(JSON.stringify(params));
......@@ -1165,12 +1191,11 @@ export default {
}
.textarea {
width: 100%;
/deep/ .el-form-item__content{
/deep/ .el-form-item__content {
display: flex;
}
.el-textarea {
width: 60%;
}
}
.Btn {
......
src/views/assessChecks/checkCompliance.vue
......@@ -49,28 +49,26 @@
:key="index"
class="inputDiv"
v-html="itemzn.checkDesc"
>
</div>
></div>
</div>
<div class="quesznfx">
<p class="tips">辅助分析:</p>
<div
v-for="(itemfz, index) in item.fzfxList"
:key="index"
class="inputDiv"
>
<el-input
<p class="tips">辅助分析:</p>
<div
v-for="(itemfz, index) in item.fzfxList"
:key="index"
class="inputDiv"
>
<el-input
type="textarea"
:autosize="{ minRows: 1, maxRows: 4 }"
v-model="itemfz.checkDesc"
>
</el-input
><el-button @click="adopt(item, index,itemfz)" type="primary"
><el-button @click="adopt(item, index, itemfz)" type="primary"
>采纳</el-button
>
</div>
</div>
</div>
<div class="question">
<p class="tips">问题描述:</p>
<div
......@@ -150,6 +148,7 @@ import {
selZnfx,
bcevalQuesInfo,
ossupload,
presignedUrl,
} from "@/api/index";
import { MaterialsListKY } from "@/utils/cache";
export default {
......@@ -193,21 +192,22 @@ export default {
projectStage: this.active * 1 + 1,
...type,
};
Promise.all([selFile(params), selWtqdFZ(params)]).then((res) => {
Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => {
console.log(res[0], res[1], "777777");
this.urlList = res[0].data;
if (res[1].data) {
this.questionList = res[1].data.records;
this.questionList.forEach(async (item) => {
let respon = await selWtmx({ qid: item.qid });
let paramsFX = {
// batchId: this.clqparams.batchId,
// projectId:this.clqparams.projectId,
// projectStage: item.questionId,
batchId: 46,
batchId: this.clqparams.batchId,
projectId:this.clqparams.projectId,
projectStage: item.questionId,
// batchId: 46,
projectId: "B122XT230004",
projectStage: 4,
// projectId: "B122XT230004",
// projectStage: 4,
};
let responfx = await selZnfx(paramsFX);
if (respon.data.records && respon.data.records.length > 0) {
......@@ -225,11 +225,9 @@ export default {
}
if (responfx.data.records && responfx.data.records.length > 0) {
let znfxList = responfx.data.records.filter((item) => {
if(item.checkDesc){
console.log('来了啊')
item.checkDesc=item.checkDesc.replace(/\n/g, '<br>')
if (item.checkDesc) {
item.checkDesc = item.checkDesc.replace(/\n/g, "<br>");
}
console.log( item,' item item item')
return item.type == 0;
});
let fzfxList = responfx.data.records.filter((item) => {
......@@ -241,26 +239,31 @@ export default {
this.$set(item, "znfxList", []);
this.$set(item, "fzfxList", []);
}
this.$set(item, "Id", 0);
});
}
console.log(this.questionList, "this.questionList ");
// this.iframeUrl = this.urlList[0].url;
// this.iframeUrl=this.iframeUrl.replace('http://127.0.0.1:19090','http://192.168.50.1:19090')
// let prefixUrl = 'pdf/web/viewer.html?file=';
// this.iframeUrl= prefixUrl+this.iframeUrl
let paramsUrl = {
fileId: this.urlList[0].id,
url:this.urlList[0].url,
};
let resUrl = await presignedUrl(paramsUrl);
console.log(resUrl, "this.questionList ");
// let prefixUrl = 'pdf/web/viewer.html?file=';
// this.iframeUrl = prefixUrl+resUrl.msg;
// console.log(this.iframeUrl,'this.iframeUrl')
this.iframeUrl = resUrl.msg;
});
},
async handleClick(tab) {
console.log("切换", tab.name, this.urlList);
this.urlList.forEach(async (item) => {
if (item.typeCode == tab.name) {
console.log("来几次", item.typeCode);
this.iframeUrl = item.url;
// console.log("来几次", item.typeCode);
// let prefixUrl = 'pdf/web/viewer.html?file=';
// this.iframeUrl = prefixUrl+item.url;
// console.log(this.iframeUrl,'this.iframeUrl')
}
});
......@@ -282,20 +285,19 @@ export default {
}
item.evalList.splice(index, 1);
},
adopt(item, index,items){
console.log(items,'items')
adopt(item, index, items) {
console.log(items, "items");
item.evalList.push({
id: "id" + item.Id++,
evalQues:items.checkDesc,
evalQues: items.checkDesc,
});
},
addInput(item) {
console.log(item.Id, "22");
item.evalList.push({
id: "id" + item.Id++,
data: "",
evalQues:"",
evalQues: "",
});
console.log(item.evalList, "item.evalList");
},
......@@ -561,8 +563,8 @@ export default {
padding: 5px;
margin-bottom: 10px;
.el-textarea {
width: 65%;
vertical-align: top;
}
width: 65%;
vertical-align: top;
}
}
</style>
\ No newline at end of file
src/views/assessChecks/checkComplianceFZ.vue
......@@ -18,7 +18,7 @@
>
<el-table-column label="项目环节" prop="projectStagetext" width="150">
</el-table-column>
<el-table-column label="序号" width="100" prop="index">
<el-table-column label="序号" width="100" type="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......
src/views/assessChecks/checkComplianceXF.vue
......@@ -20,7 +20,7 @@
>
<el-table-column label="项目环节" prop="projectStagetext" width="150">
</el-table-column>
<el-table-column label="序号" width="100" prop="index">
<el-table-column label="序号" width="100" type="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......
src/views/assessChecks/confirmChanges.vue
......@@ -64,7 +64,9 @@
>
<el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> <template slot-scope="scope">
{{scope.row.batchYear}}年
</template></el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
......@@ -151,7 +153,9 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column label="材料类别" prop="batchYear"> </el-table-column>
<el-table-column label="材料类别" prop="batchYear"><template slot-scope="scope">
{{scope.row.batchYear}}年
</template> </el-table-column>
<el-table-column prop="batchName" label="资料类型"> </el-table-column>
<el-table-column prop="projectName" label="资料名称">
</el-table-column>
......
src/views/assessChecks/confirmRelease.vue
<!-- 辅助核验 -->
<template>
<div class="main">
<el-form :model="ruleForm" label-width="100px" class="demo-ruleForm" ref="formName">
<el-form
:model="ruleForm"
label-width="100px"
class="demo-ruleForm"
ref="formName"
>
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择" clearable>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item+'年'"
:value="item"/>
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleForm.batchName" placeholder="请输入" clearable></el-input>
<el-input
v-model="ruleForm.batchName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-select
v-model="ruleForm.postEvalState"
placeholder="请选择"
clearable
>
<el-option label="已确认" value="3"></el-option>
<el-option label="未确认" value="1"></el-option>
<el-option label="已撤回" value="4"></el-option>
......@@ -40,24 +54,29 @@
</el-form-item>
</el-form>
<div class="setscroll">
<el-table
@selection-change="handleSelectionChange"
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
<el-table
@selection-change="handleSelectionChange"
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear">
<template slot-scope="scope">
{{ scope.row.batchYear }}年
</template></el-table-column
>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
<el-table-column
<el-table-column
prop="planReviewDate"
label="计划评估日期"
width="auto"
......@@ -65,14 +84,18 @@
</el-table-column>
<el-table-column prop="expertName" label="评审专家" width="auto">
</el-table-column>
<el-table-column prop="postEvalStateText" label="批次确认状态" width="auto">
<el-table-column
prop="postEvalStateText"
label="批次确认状态"
width="auto"
>
</el-table-column>
<el-table-column prop="batchName" label="评估项目" width="auto">
</el-table-column>
<!-- <el-table-column prop="prjsOfExpert" label="已选择数量" width="auto">
</el-table-column> -->
</el-table>
</div>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......@@ -86,12 +109,12 @@
</el-pagination>
<!-- 详情弹窗 -->
<el-dialog
title="提交评估材料"
title="提交评估材料"
:visible.sync="dialogXQ"
width="90%"
width="90%"
:modal-append-to-body="false"
:append-to-body="false"
close="closeXQ"
close="closeXQ"
>
<div class="dialog">
<el-form
......@@ -100,10 +123,14 @@
label-width="100px"
class="demo-ruleForm"
>
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-input v-model="ruleFormdialogBJ.batchYear" disabled></el-input>
</el-form-item>
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
<el-form-item
label="后评估批次名称:"
prop="batchName"
class="fromItem"
>
<el-input v-model="ruleFormdialogBJ.batchName" disabled></el-input>
</el-form-item>
<el-form-item
......@@ -112,7 +139,8 @@
class="fromItem"
>
<el-input
v-model="ruleFormdialogBJ.planReviewDate" disabled
v-model="ruleFormdialogBJ.planReviewDate"
disabled
></el-input>
</el-form-item>
<!-- <el-form-item label="每位专家可评估项目数:" prop="prjsOfExpert" class="fromItem">
......@@ -127,50 +155,59 @@
disabled
></el-input>
</el-form-item>
</el-form>
<p class="zjBtn">
待评估项目
</p>
<p class="zjBtn">待评估项目</p>
<div class="setscrolldialog">
<el-table
@selection-change="handleSelectionChange"
:data="addtableData"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table
@selection-change="handleSelectionChange"
:data="addtableData"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column label="项目编码" width="auto" prop="projectId">
</el-table-column>
<el-table-column prop="projectYear" label="项目下达年度" width="auto">
</el-table-column>
<el-table-column prop="projectName" label="项目名称" width="auto" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="projectCategory" label="建设形式" width="auto">
</el-table-column>
<el-table-column prop="projectStatus" label="项目建设阶段" width="auto">
</el-table-column>
<!-- <el-table-column prop="哪个字段" label="历史核查状态" width="auto">
</el-table-column> -->
<el-table-column prop="email" label="部门" width="auto">
</el-table-column>
<!-- <el-table-column fixed="right" label="操作" width="auto">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">删除</el-button>
</template>
<el-table-column label="项目编码" width="auto" prop="projectId">
</el-table-column>
<el-table-column
prop="projectYear"
label="项目下达年度"
width="auto"
>
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="projectCategory"
label="建设形式"
width="auto"
>
</el-table-column>
<el-table-column
prop="projectStatus"
label="项目建设阶段"
width="auto"
>
</el-table-column>
<!-- <el-table-column prop="哪个字段" label="历史核查状态" width="auto">
</el-table-column> -->
</el-table>
</div>
<el-table-column prop="department" label="部门" width="auto">
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChangeAdd"
@current-change="handleCurrentChangeAdd"
......@@ -199,10 +236,14 @@
label-width="150px"
class="demo-ruleForm"
>
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-input v-model="ruleFormdialogBJ.batchYear" disabled></el-input>
</el-form-item>
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
<el-form-item
label="后评估批次名称:"
prop="batchName"
class="fromItem"
>
<el-input v-model="ruleFormdialogBJ.batchName" disabled></el-input>
</el-form-item>
<el-form-item
......@@ -211,7 +252,8 @@
class="fromItem"
>
<el-input
v-model="ruleFormdialogBJ.planReviewDate" disabled
v-model="ruleFormdialogBJ.planReviewDate"
disabled
></el-input>
</el-form-item>
<!-- <el-form-item label="每位专家可评估项目数:" prop="prjsOfExpert" class="fromItem">
......@@ -233,49 +275,71 @@
disabled
></el-input>
</el-form-item>
</el-form>
<p class="zjBtn">
待评估项目 <span @click="xzExperts()">手动选择待评估项目</span>
</p>
<div class="setscrolldialog">
<el-table
@selection-change="handleSelectionChange"
:data="addtableData"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table
@selection-change="handleSelectionChange"
:data="addtableData"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column label="项目编码" width="auto" prop="projectId">
</el-table-column>
<el-table-column prop="projectYear" label="项目下达年度" width="auto">
</el-table-column>
<el-table-column prop="projectName" label="项目名称" width="auto" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="projectCategory" label="建设形式" width="auto">
</el-table-column>
<el-table-column prop="projectStatus" label="项目建设阶段" width="auto">
</el-table-column>
<!-- <el-table-column prop="哪个字段" label="历史核查状态" width="auto">
<el-table-column label="项目编码" width="auto" prop="projectId">
</el-table-column>
<el-table-column
prop="projectYear"
label="项目下达年度"
width="auto"
>
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template></el-table-column
>
<el-table-column
prop="projectName"
label="项目名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="projectCategory"
label="建设形式"
width="auto"
>
</el-table-column>
<el-table-column
prop="projectStatus"
label="项目建设阶段"
width="auto"
>
</el-table-column>
<!-- <el-table-column prop="哪个字段" label="历史核查状态" width="auto">
</el-table-column> -->
<el-table-column prop="department" label="部门" width="auto">
</el-table-column>
<el-table-column label="操作" width="130">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row,scope.$index,addtableData)" type="text" size="small">删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<el-table-column prop="department" label="部门" width="auto">
</el-table-column>
<el-table-column label="操作" width="130">
<template slot-scope="scope">
<el-button
@click="handleClick(scope.row, scope.$index, addtableData)"
type="text"
size="small"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChangeAdd"
@current-change="handleCurrentChangeAdd"
......@@ -300,17 +364,25 @@
width="90%"
:modal-append-to-body="false"
:append-to-body="false"
>
<div class="adzjdialog">
<el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm">
<el-form-item label="项目下达年度:" prop="projectYear" class="fromItem">
<el-select v-model="ruleFormZJ.projectYear" placeholder="请选择" clearable>
<el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option>
<el-option label="2021年" value="2021"></el-option>
<el-form-item
label="项目下达年度:"
prop="projectYear"
class="fromItem"
>
<el-select
v-model="ruleFormZJ.projectYear"
placeholder="请选择"
clearable
>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem">
......@@ -320,7 +392,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem" >
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input
v-model="ruleFormZJ.projectName"
placeholder="请输入"
......@@ -346,90 +418,142 @@
placeholder="请输入"
></el-input>
</el-form-item> -->
<el-form-item label="建设形式:" prop="projectCategory" class="fromItem">
<el-select v-model="ruleFormZJ.projectCategory" placeholder="请选择" clearable>
<!-- <el-form-item
label="建设形式:"
prop="projectCategory"
class="fromItem"
>
<el-select
v-model="ruleFormZJ.projectCategory"
placeholder="请选择"
clearable
>
<el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option>
<el-option label="2021年" value="2021"></el-option>
</el-select>
</el-form-item>
<el-form-item label="部门:" prop="department" class="fromItem">
<el-select v-model="ruleFormZJ.department" placeholder="请选择" clearable>
</el-form-item> -->
<!-- <el-form-item label="部门:" prop="department" class="fromItem">
<el-select
v-model="ruleFormZJ.department"
placeholder="请选择"
clearable
>
<el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option>
<el-option label="2021年" value="2021"></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item class="cxItem">
<span class="zjquery" @click="xzExperts()"> 查询 </span>
</el-form-item>
</el-form>
<div class="setscrolldialogx">
<el-table
@selection-change="handleSelectionChangeZJ"
ref="multipleTableZJ"
:data="zjtableData"
tooltip-effect="dark"
style="width: 100% "
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border >
<el-table-column type="selection">
</el-table-column>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
@selection-change="handleSelectionChangeZJ"
ref="multipleTableZJ"
:data="zjtableData"
tooltip-effect="dark"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column label="项目编码" width="200" prop="projectId">
</el-table-column>
<el-table-column prop="projectYear" label="项目下达年度" width="200">
</el-table-column>
<el-table-column prop="projectName" label="项目名称" width="auto" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="projectCategory" label="建设形式" width="200">
</el-table-column>
<el-table-column prop="projectStatus" label="项目建设阶段" width="200">
</el-table-column>
<!-- <el-table-column prop="字段待确认" label="历史核查状态" width="200">
<el-table-column label="项目编码" width="200" prop="projectId">
</el-table-column>
<el-table-column
prop="projectYear"
label="项目下达年度"
width="200"
>
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="projectCategory"
label="建设形式"
width="200"
>
</el-table-column>
<el-table-column
prop="projectStatus"
label="项目建设阶段"
width="200"
>
</el-table-column>
<!-- <el-table-column prop="字段待确认" label="历史核查状态" width="200">
</el-table-column>
<el-table-column prop="字段待确认" label="是否处于正在执行批次" width="200">
</el-table-column> -->
<!-- <el-table-column prop="字段待确认" label="计划文号" width="300">
<!-- <el-table-column prop="字段待确认" label="计划文号" width="300">
<el-table-column prop="expertLevel" label="省公司" width="auto">
</el-table-column>
<el-table-column prop="expertLevel" label="信通公司" width="auto">
</el-table-column>
</el-table-column> -->
<el-table-column label="总投资计划（万元）" width="300">
<el-table-column prop=" costAmountTotal" label="成本金" width="auto">
</el-table-column>
<el-table-column prop="capitalAmountTotal" label="资本金" width="auto">
</el-table-column>
</el-table-column>
<el-table-column label="当年投资计划（万元）" width="300">
<el-table-column prop="costAmountCurrentMfdel" label="成本金" width="auto">
</el-table-column>
<el-table-column prop="capitalAmountCurrentMfdel" label="资本金" width="200">
</el-table-column>
</el-table-column>
<el-table-column prop="department" label="部门" width="200">
</el-table-column>
<el-table-column prop="department" label="承建单位" width="200">
</el-table-column>
<el-table-column prop="personCharge" label="项目经理" width="200">
</el-table-column>
<el-table-column prop="projectInfo" label="项目内容" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="inputuser" label="创建人" width="200">
</el-table-column>
<el-table-column prop="inputtime" label="创建时间" width="200">
</el-table-column>
</el-table>
<el-table-column label="总投资计划（万元）" width="300">
<el-table-column
prop=" costAmountTotal"
label="成本金"
width="auto"
>
</el-table-column>
<el-table-column
prop="capitalAmountTotal"
label="资本金"
width="auto"
>
</el-table-column>
</el-table-column>
<el-table-column label="当年投资计划（万元）" width="300">
<el-table-column
prop="costAmountCurrentMfdel"
label="成本金"
width="auto"
>
</el-table-column>
<el-table-column
prop="capitalAmountCurrentMfdel"
label="资本金"
width="200"
>
</el-table-column>
</el-table-column>
<el-table-column prop="department" label="部门" width="200">
</el-table-column>
<el-table-column prop="department" label="承建单位" width="200">
</el-table-column>
<el-table-column prop="personCharge" label="项目经理" width="200">
</el-table-column>
<el-table-column
prop="projectInfo"
label="项目内容"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="inputuser" label="创建人" width="200">
</el-table-column>
<el-table-column prop="inputtime" label="创建时间" width="200">
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChangeZJ"
@current-change="handleCurrentChangeZJ"
......@@ -458,15 +582,14 @@ import {
delProjectInfo,
joinProjectInfo,
getProjectInfo,
chProjectInfo
chProjectInfo,
} from "@/api/index";
import { generateYearOptions } from "@/utils/cache";
export default {
data() {
return {
yearsList:generateYearOptions(),
oldid:"",
yearsList: generateYearOptions(),
oldid: "",
ruleForm: {
batchYear: "",
batchName: "",
......@@ -494,7 +617,7 @@ export default {
batchYear: "",
batchName: "",
planReviewDate: "",
prjsOfExpert:"",
prjsOfExpert: "",
description: "",
},
// rules: {
......@@ -505,7 +628,7 @@ export default {
// trigger: "change",
// },
// ]
// },
tableData: [],
tableDataQD: [], //清单列表
......@@ -520,17 +643,17 @@ export default {
dialogAddzj: false,
pageSize: 10,
current: 1,
pageSizeZJ:5,
pageSizeZJ: 5,
currentZJ: 1,
addtotal: 0,
currentAdd: 1,
pageSizeAdd: 5,
currentedit: 1,
pageSizeedit:5,
pageSizeedit: 5,
xfParam: "",
dialogedit: false,
expertIdList: [],
totalBJ:0,
totalBJ: 0,
addZJList: [],
expertState: "",
fields: "",
......@@ -542,23 +665,23 @@ export default {
message: {},
};
},
watch:{
watch: {
// 监听路由对象中的参数部分
'$route.params': {
"$route.params": {
immediate: true,
handler(newParams, oldParams) {
//现在配合demo路由变化掉了两次接口等线上去掉这块时候mounted要调用
this.submitForm();
}
}
},
},
},
mounted() {
console.log('author')
console.log("author");
// this.submitForm();
},
methods: {
async submitForm() {
console.log('来了几次')
console.log("来了几次");
let params = {
current: this.currentPage,
pageSize: this.pageSize,
......@@ -568,15 +691,15 @@ export default {
let res = await projectInfo(params);
if (res.code == "200") {
this.tableData = res.data.records;
this.tableData.forEach(item=>{
if (item.postEvalState=='3'){
this.$set( item,'postEvalStateText','已确认')
}else if(item.postEvalState=='4'){
this.$set( item,'postEvalStateText','已撤回')
}else{
this.$set( item,'postEvalStateText','未确认')
this.tableData.forEach((item) => {
if (item.postEvalState == "3") {
this.$set(item, "postEvalStateText", "已确认");
} else if (item.postEvalState == "4") {
this.$set(item, "postEvalStateText", "已撤回");
} else {
this.$set(item, "postEvalStateText", "未确认");
}
})
});
this.total = res.data.total * 1;
}
},
......@@ -587,64 +710,62 @@ export default {
this.submitForm();
},
//详情
async detailsForm() {
async detailsForm() {
if (this.checkedList.length != 1) {
this.$message("请选择");
return;
}
console.log("222",this.checkedList);
console.log("222", this.checkedList);
this.dialogXQ = true;
this.ruleFormdialogBJ=this.checkedList[0]
let params={
current:this.addcurrentPage,
pageSize:this.pageSizeAdd,
batchId:this.checkedList[0].batchId
}
this.ruleFormdialogBJ = this.checkedList[0];
let params = {
current: this.addcurrentPage,
pageSize: this.pageSizeAdd,
batchId: this.checkedList[0].batchId,
};
Object.assign(params, this.ruleFormdialogAdd);
this.addtableData=[]
let res=await joinProjectInfo(params)
this.addtableData = [];
let res = await joinProjectInfo(params);
if (res.code == "200") {
this.addtableData = res.data.records;
this.addtotal = res.data.total * 1;
}
},
//确认评估项目
async configs(){
async configs() {
// 只能选中状态待评估的
if (this.checkedList.length != 1) {
this.$message("请选择");
return;
}
if(this.checkedList[0].postEvalStateText=='已确认'){
if (this.checkedList[0].postEvalStateText == "已确认") {
this.$message("该项目已确认");
return;
}
this.ruleFormdialogBJ=this.checkedList[0]
this.dialogAdd=true
this.addtableData=[]
let params={
current:this.addcurrentPage,
pageSize:this.pageSizeAdd,
batchId:this.checkedList[0].batchId
}
this.ruleFormdialogBJ = this.checkedList[0];
this.dialogAdd = true;
this.addtableData = [];
let params = {
current: this.addcurrentPage,
pageSize: this.pageSizeAdd,
batchId: this.checkedList[0].batchId,
};
Object.assign(params, this.ruleFormdialogAdd);
let res=await joinProjectInfo(params)
let res = await joinProjectInfo(params);
if (res.code == "200") {
this.addtableData = res.data.records;
this.addtotal = res.data.total * 1;
this.oldid ="";
if(this.addtableData.length>0){
this.addtableData.forEach((item) => {
this.oldid= this.oldid.concat(item.projectId+',')
});
}
this.oldid = "";
if (this.addtableData.length > 0) {
this.addtableData.forEach((item) => {
this.oldid = this.oldid.concat(item.projectId + ",");
});
}
}
},
closeXQ(){
console.log('关闭详情')
closeXQ() {
console.log("关闭详情");
},
//表格颜色
tableRowClassName({ row, rowIndex }) {
......@@ -676,20 +797,20 @@ export default {
handleSizeChangeZJ(val) {
console.log(`每页 ${val} 条`);
this.pageSizeZJ = val;
this.xzExperts()
this.xzExperts();
},
handleCurrentChangeZJ(val) {
console.log(`当前页: ${val}`);
this.currentZJ = val;
this.xzExperts()
this.xzExperts();
},
handleSizeChangeAdd(val) {
this.pageSizeAdd = val;
this.detailsForm()
this.detailsForm();
},
handleCurrentChangeAdd(val) {
this.currentAdd = val;
this.detailsForm()
this.detailsForm();
},
//选择项目
......@@ -698,13 +819,12 @@ export default {
this.$message("请选择项目");
return;
}
console.log(this.addtableData,this.addZJList,'55555')
this.addtableData=[...this.addtableData,...this.addZJList]
this.addtableData = this.addtableData.filter((obj, index, self)=>{
return index == self.findIndex(t =>t.projectId == obj.projectId)
})
console.log(this.addtableData, this.addZJList, "55555");
this.addtableData = [...this.addtableData, ...this.addZJList];
this.addtableData = this.addtableData.filter((obj, index, self) => {
return index == self.findIndex((t) => t.projectId == obj.projectId);
});
console.log(this.addtableData, "addtableData");
this.addtotal = this.addtableData.length;
this.dialogAddzj = false;
......@@ -718,11 +838,11 @@ export default {
let params = {
current: this.currentZJ,
pageSize: this.pageSizeZJ,
prjStr:this.oldid
prjStr: this.oldid,
};
Object.assign(params, this.ruleFormZJ);
let res = await getProjectInfo(params);
console.log(res.data.records,'res.data.recordsres.data.records')
console.log(res.data.records, "res.data.recordsres.data.records");
this.zjtableData = res.data.records;
this.zjtotal = res.data.total * 1;
console.log(res, "xxx");
......@@ -740,31 +860,28 @@ export default {
}
console.log(this.addZJList, "this.addZJList");
// 确认发布入参
let expertIdList ="";
if(this.addZJList.length>0){
let expertIdList = "";
if (this.addZJList.length > 0) {
this.addZJList.forEach((item) => {
expertIdList= expertIdList.concat(item.projectId+',')
expertIdList = expertIdList.concat(item.projectId + ",");
});
}
let params = {
expertStr:expertIdList,
expertStr: expertIdList,
};
params.batchId=this.ruleFormdialogBJ.batchId
params.prjsOfExpert=this.ruleFormdialogBJ.prjsOfExpert
params.batchId = this.ruleFormdialogBJ.batchId;
params.prjsOfExpert = this.ruleFormdialogBJ.prjsOfExpert;
console.log(params, "222");
fbProjectInfo(params).then((res) => {
this.dialogAdd = false;
this.expertIdList=expertIdList
this.expertIdList = expertIdList;
this.resetForm();
});
}
});
// this.$emit("listenToChildEvent", "reset");
// }
},
......@@ -778,35 +895,34 @@ export default {
console.log(this.$refs.multipleTableZJ.selection, "2222");
},
//点击删除
async handleClick(row,index,rows) {
console.log("删除",row)
async handleClick(row, index, rows) {
console.log("删除", row);
rows.splice(index, 1);
let params={
projectId:row.projectId,
batchId:this.checkedList[0].batchId
}
let params = {
projectId: row.projectId,
batchId: this.checkedList[0].batchId,
};
let res = await delProjectInfo(params);
// this.configs()
// this.configs()
},
//点击撤回
async withdraw(){
async withdraw() {
if (this.checkedList.length != 1) {
this.$message("请选择");
return;
}
if(this.checkedList[0].postEvalStateText=='已撤回'){
if (this.checkedList[0].postEvalStateText == "已撤回") {
this.$message("该项目已撤回");
return;
}
if(this.checkedList[0].postEvalStateText=='未确认'){
if (this.checkedList[0].postEvalStateText == "未确认") {
this.$message("该项目还未确认");
return;
}
let res= await chProjectInfo({batchId:this.checkedList[0].batchId})
if(res.code='200'){
this.resetForm()
}
let res = await chProjectInfo({ batchId: this.checkedList[0].batchId });
if ((res.code = "200")) {
this.resetForm();
}
},
},
};
......@@ -829,7 +945,7 @@ export default {
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin: 0;
margin: 0;
.fromItem {
min-width: 24%;
margin: 0 0.5%;
......@@ -891,8 +1007,9 @@ export default {
margin-top: 3vh !important;
margin-left: 3vw !important;
}
/deep/.el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell{
text-align: center;
/deep/.el-table th.el-table__cell.is-leaf,
.el-table td.el-table__cell {
text-align: center;
}
/deep/ .el-dialog__wrapper {
position: absolute;
......@@ -947,7 +1064,7 @@ text-align: center;
}
.textarea {
width: 100%;
/deep/ .el-form-item__content{
/deep/ .el-form-item__content {
display: flex;
}
.el-textarea {
......@@ -979,12 +1096,12 @@ text-align: center;
color: #fff;
}
.zjBtn {
width:400px;
width: 400px;
text-align: left;
vertical-align: middle;
span {
display: inline-block;
width:140px;
width: 140px;
height: 25px;
line-height: 25px;
text-align: center;
......@@ -1037,17 +1154,17 @@ text-align: center;
color: #fff;
}
}
/deep/.el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell{
text-align: center;
/deep/.el-table th.el-table__cell.is-leaf,
.el-table td.el-table__cell {
text-align: center;
}
/deep/ .el-table__cell{
/deep/ .el-table__cell {
text-align: center;
}
.dialogHeigth{
height: 300px;
box-sizing: border-box;
overflow-y: auto;
.dialogHeigth {
height: 300px;
box-sizing: border-box;
overflow-y: auto;
}
.setscroll {
width: 100%;
......@@ -1065,12 +1182,10 @@ overflow-y: auto;
height: 300px;
overflow: auto;
position: absolute;
min-width:100% ;
min-width: 100%;
}
}
.setscrolldialogx{
.setscrolldialogx {
width: 100%;
height: 300px;
position: relative;
......@@ -1078,13 +1193,11 @@ overflow-y: auto;
box-sizing: border-box;
/deep/ .el-table {
position: absolute;
width: auto !important;
max-width: none;
width: auto !important;
max-width: none;
}
}
::v-deep.el-table::before {
display: none !important;
}
</style>
\ No newline at end of file
src/views/assessChecks/correctiveAssistanceVerification.vue
......@@ -89,7 +89,9 @@
>
<el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" width="auto" prop="batchYear">
<el-table-column label="批次年度" width="auto" prop="batchYear"><template slot-scope="scope">
{{scope.row.batchYear}}年
</template>
</el-table-column>
<el-table-column prop="batchName" label="后评估批次名称" width="auto">
</el-table-column>
......@@ -182,7 +184,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="index">
<el-table-column label="序号" width="100" type="index">
</el-table-column>
<el-table-column
......@@ -331,7 +333,7 @@
width="150"
>
</el-table-column>
<el-table-column label="序号" width="100" prop="index">
<el-table-column label="序号" width="100" type="index">
</el-table-column>
<el-table-column
......
src/views/assessChecks/materialAcquisition.vue
......@@ -21,9 +21,9 @@
</el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="未下发" value="0"></el-option>
<el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option>
<el-option label="未上传" value="0"></el-option>
<el-option label="已上传" value="1"></el-option>
<!-- <el-option label="已撤回" value="2"></el-option> -->
</el-select>
</el-form-item>
......@@ -68,7 +68,9 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> <template slot-scope="scope">
{{scope.row.batchYear}}年
</template></el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
......@@ -78,7 +80,7 @@
</el-table-column>
<el-table-column prop="projectStatus" label="项目建设阶段">
</el-table-column>
<el-table-column prop="待确认" label="历史审核状态"> </el-table-column>
<!-- <el-table-column prop="待确认" label="历史审核状态"> </el-table-column> -->
<el-table-column prop="planReviewDate" label="计划评估日期">
</el-table-column>
<el-table-column prop="expertName" label="评审专家名单">
......
src/views/assessChecks/materialAnalysis.vue
......@@ -65,7 +65,9 @@
>
<el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear"><template slot-scope="scope">
{{scope.row.batchYear}}年
</template> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
</el-table-column>
......@@ -149,7 +151,9 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column label="材料类别" prop="batchYear"> </el-table-column>
<el-table-column label="材料类别" prop="batchYear"><template slot-scope="scope">
{{scope.row.batchYear}}年
</template> </el-table-column>
<el-table-column prop="batchName" label="资料类型"> </el-table-column>
<el-table-column prop="projectName" label="资料名称">
</el-table-column>
......
src/views/assessChecks/qrCompliance.vue
......@@ -20,7 +20,7 @@
>
<el-table-column label="项目环节" prop="projectStagetext" width="150">
</el-table-column>
<el-table-column label="序号" width="100" prop="index">
<el-table-column label="序号" width="100" type="index">
</el-table-column>
<el-table-column label="问题检查项" prop="quesCheckItem">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!