Commit 52a0c080 by liangzhen

暂存一下调试pdf

1 parent 440d2be5
...@@ -81,6 +81,10 @@ export function evaluationMaterials(params) { ...@@ -81,6 +81,10 @@ export function evaluationMaterials(params) {
export function ossupload(params) { export function ossupload(params) {
return post(`${ARCH_EVALUATION}/oss/upload`, params) return post(`${ARCH_EVALUATION}/oss/upload`, params)
} }
//浏览
export function presignedUrl(params) {
return post(`${ARCH_EVALUATION}/oss/presignedUrl`, params)
}
//查询材料清单 //查询材料清单
export function clqdevaluationMaterials(params) { export function clqdevaluationMaterials(params) {
......
...@@ -227,7 +227,7 @@ export const routes = [ ...@@ -227,7 +227,7 @@ export const routes = [
}, },
//暂用模块
{ {
path:'/analysisCore', path:'/analysisCore',
......
...@@ -65,7 +65,11 @@ ...@@ -65,7 +65,11 @@
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </el-table-column>
<el-table-column type="selection"> </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 prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
...@@ -269,7 +273,7 @@ ...@@ -269,7 +273,7 @@
</el-table-column> </el-table-column>
<el-table-column label="解释批注"> <el-table-column label="解释批注">
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'" > <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> </template>
</el-table-column> </el-table-column>
<el-table-column label="附加解释材料" width="400"> <el-table-column label="附加解释材料" width="400">
......
...@@ -12,8 +12,9 @@ ...@@ -12,8 +12,9 @@
<el-option <el-option
v-for="(item, index) in yearsList" v-for="(item, index) in yearsList"
:key="index" :key="index"
:label="item+'年'" :label="item + '年'"
:value="item"/> :value="item"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
...@@ -66,7 +67,9 @@ ...@@ -66,7 +67,9 @@
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </el-table-column>
<el-table-column type="selection"> </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 prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
...@@ -137,7 +140,7 @@ ...@@ -137,7 +140,7 @@
width="150" width="150"
> >
</el-table-column> </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>
<el-table-column label="问题检查项" prop="quesCheckItem"> <el-table-column label="问题检查项" prop="quesCheckItem">
...@@ -209,7 +212,7 @@ ...@@ -209,7 +212,7 @@
width="150" width="150"
> >
</el-table-column> </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>
<el-table-column label="问题检查项" prop="quesCheckItem"> <el-table-column label="问题检查项" prop="quesCheckItem">
...@@ -256,7 +259,7 @@ ...@@ -256,7 +259,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<input <input
type="file" type="file"
@change="handleFileUpload($event,scope.row)" @change="handleFileUpload($event, scope.row)"
v-if="scope.row.confirmStatus == '1'" v-if="scope.row.confirmStatus == '1'"
/> />
</template> </template>
...@@ -283,7 +286,7 @@ import { generateYearOptions } from "@/utils/cache"; ...@@ -283,7 +286,7 @@ import { generateYearOptions } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
yearsList:generateYearOptions(), yearsList: generateYearOptions(),
dialogSS: false, dialogSS: false,
ruleForm: { ruleForm: {
batchYear: "", batchYear: "",
...@@ -586,10 +589,10 @@ export default { ...@@ -586,10 +589,10 @@ export default {
this.dataPretreatmentSS(); this.dataPretreatmentSS();
} }
}, },
handleFileUpload(event,row) { handleFileUpload(event, row) {
console.log("来了么"); console.log("来了么");
this.file = event.target.files[0]; this.file = event.target.files[0];
this.submitFile(row) this.submitFile(row);
}, },
submitFile(row) { submitFile(row) {
if (this.file) { if (this.file) {
......
...@@ -65,7 +65,9 @@ ...@@ -65,7 +65,9 @@
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </el-table-column>
<el-table-column type="selection"> </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 prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
...@@ -137,7 +139,7 @@ ...@@ -137,7 +139,7 @@
width="150" width="150"
> >
</el-table-column> </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>
<el-table-column <el-table-column
...@@ -264,7 +266,7 @@ ...@@ -264,7 +266,7 @@
width="150" width="150"
> >
</el-table-column> </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>
<el-table-column <el-table-column
...@@ -461,6 +463,9 @@ export default { ...@@ -461,6 +463,9 @@ export default {
if (res.code == "200") { if (res.code == "200") {
this.tableDataQR = res.data.records; this.tableDataQR = res.data.records;
this.tableDataQR.forEach((item) => { this.tableDataQR.forEach((item) => {
if (!item.confirmStatus) {
this.$set(item, "confirmStatus", "2");
}
switch (item.projectStage) { switch (item.projectStage) {
case "1": case "1":
this.$set(item, "projectStagetext", "1.可研"); this.$set(item, "projectStagetext", "1.可研");
...@@ -655,7 +660,7 @@ export default { ...@@ -655,7 +660,7 @@ export default {
break; break;
} }
}); });
console.log(this.tableDataSS); console.log(this.tableDataSS,'状态是什么');
this.dataPretreatmentSS(); this.dataPretreatmentSS();
} }
}, },
......
...@@ -52,7 +52,9 @@ ...@@ -52,7 +52,9 @@
> >
<el-table-column label="序号" width="55" type="index"> </el-table-column> <el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </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 prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
......
...@@ -12,8 +12,9 @@ ...@@ -12,8 +12,9 @@
<el-option <el-option
v-for="(item, index) in yearsList" v-for="(item, index) in yearsList"
:key="index" :key="index"
:label="item+'年'" :label="item + '年'"
:value="item"/> :value="item"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="后评估名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估名称:" prop="batchName" class="fromItem">
...@@ -23,7 +24,7 @@ ...@@ -23,7 +24,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem"> <!-- <el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select <el-select
v-model="ruleForm.postEvalState" v-model="ruleForm.postEvalState"
placeholder="请选择" placeholder="请选择"
...@@ -33,7 +34,7 @@ ...@@ -33,7 +34,7 @@
<el-option label="已下发" value="1"></el-option> <el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option> <el-option label="已撤回" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="项目名称:" prop="projectName" class="fromItem"> <el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input <el-input
...@@ -77,7 +78,11 @@ ...@@ -77,7 +78,11 @@
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </el-table-column>
<el-table-column type="selection"> </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 prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
...@@ -230,7 +235,7 @@ ...@@ -230,7 +235,7 @@
width="150" width="150"
> >
</el-table-column> </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>
<el-table-column label="问题检查项" prop="quesCheckItem"> <el-table-column label="问题检查项" prop="quesCheckItem">
...@@ -282,12 +287,13 @@ import { ...@@ -282,12 +287,13 @@ import {
wtqdqselect, wtqdqselect,
clqdselect, clqdselect,
selLcb, selLcb,
downloadObject
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions } from "@/utils/cache"; import { generateYearOptions } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
yearsList:generateYearOptions(), yearsList: generateYearOptions(),
listData: {}, listData: {},
qdtableData: [], qdtableData: [],
tableDataNew: MaterialsList(), tableDataNew: MaterialsList(),
...@@ -497,6 +503,23 @@ export default { ...@@ -497,6 +503,23 @@ export default {
cancel() { cancel() {
this.dialog = false; 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> </script>
......
...@@ -14,12 +14,26 @@ ...@@ -14,12 +14,26 @@
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem"> <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>
<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-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="未下发" value="0"></el-option> <el-option label="未下发" value="0"></el-option>
<el-option label="已下发" value="1"></el-option> <el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option> <el-option label="已撤回" value="2"></el-option>
</el-select> </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>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm()">
...@@ -54,7 +68,9 @@ ...@@ -54,7 +68,9 @@
> >
<el-table-column label="序号" width="55" type="index"> </el-table-column> <el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </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 prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
......
...@@ -99,7 +99,9 @@ ...@@ -99,7 +99,9 @@
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </el-table-column>
<el-table-column type="selection"> </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>
<el-table-column prop="batchName" label="后评估批次名称" width="auto"> <el-table-column prop="batchName" label="后评估批次名称" width="auto">
</el-table-column> </el-table-column>
...@@ -254,7 +256,7 @@ ...@@ -254,7 +256,7 @@
width="150" width="150"
> >
</el-table-column> </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>
<el-table-column label="问题检查项" prop="quesCheckItem"> <el-table-column label="问题检查项" prop="quesCheckItem">
......
...@@ -21,9 +21,10 @@ ...@@ -21,9 +21,10 @@
</el-form-item> </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-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="未下发" value="0"></el-option> <el-option label="待提交" value="2"></el-option>
<el-option label="已下发" value="1"></el-option> <el-option label="已撤回" value="4"></el-option>
<el-option label="已撤回" value="2"></el-option> <el-option label="已提交" value="13"></el-option>
<!-- <el-option label="待评估" value="1"></el-option> -->
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -73,7 +74,9 @@ ...@@ -73,7 +74,9 @@
> >
<el-table-column label="序号" width="55" type="index"> </el-table-column> <el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </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 prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
......
...@@ -51,7 +51,9 @@ ...@@ -51,7 +51,9 @@
> >
<el-table-column label="序号" width="55" type="index"> </el-table-column> <el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </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 prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
......
...@@ -12,15 +12,24 @@ ...@@ -12,15 +12,24 @@
<el-option <el-option
v-for="(item, index) in yearsList" v-for="(item, index) in yearsList"
:key="index" :key="index"
:label="item+'年'" :label="item + '年'"
:value="item"/> :value="item"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem"> <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>
<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-select
v-model="ruleForm.postEvalState"
placeholder="请选择"
clearable
>
<el-option label="未下发" value="0"></el-option> <el-option label="未下发" value="0"></el-option>
<el-option label="已下发" value="1"></el-option> <el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option> <el-option label="已撤回" value="2"></el-option>
...@@ -69,6 +78,7 @@ ...@@ -69,6 +78,7 @@
</el-table-column> </el-table-column>
<el-table-column type="selection"> </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>
<el-table-column prop="batchName" label="后评估批次名称" width="auto"> <el-table-column prop="batchName" label="后评估批次名称" width="auto">
</el-table-column> </el-table-column>
...@@ -80,7 +90,11 @@ ...@@ -80,7 +90,11 @@
</el-table-column> </el-table-column>
<el-table-column prop="expertName" label="后评估专家" width="auto"> <el-table-column prop="expertName" label="后评估专家" width="auto">
</el-table-column> </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>
<!-- <el-table-column prop="postEvalState" label="后评估状态" width="auto"> <!-- <el-table-column prop="postEvalState" label="后评估状态" width="auto">
</el-table-column> --> </el-table-column> -->
...@@ -226,8 +240,9 @@ ...@@ -226,8 +240,9 @@
<el-option <el-option
v-for="(item, index) in yearsList" v-for="(item, index) in yearsList"
:key="index" :key="index"
:label="item+'年'" :label="item + '年'"
:value="item"/> :value="item"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
...@@ -235,7 +250,10 @@ ...@@ -235,7 +250,10 @@
prop="batchName" prop="batchName"
class="fromItem" 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>
<el-form-item <el-form-item
label="计划评审日期:" label="计划评审日期:"
...@@ -348,7 +366,11 @@ ...@@ -348,7 +366,11 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="专业领域:" prop="fields" class="fromItem"> <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="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option> <el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option> <el-option label="2022年" value="2022"></el-option>
...@@ -356,7 +378,11 @@ ...@@ -356,7 +378,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="专家状态:" prop="expertState" class="fromItem"> <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="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option> <el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option> <el-option label="2022年" value="2022"></el-option>
...@@ -457,8 +483,9 @@ ...@@ -457,8 +483,9 @@
<el-option <el-option
v-for="(item, index) in yearsList" v-for="(item, index) in yearsList"
:key="index" :key="index"
:label="item+'年'" :label="item + '年'"
:value="item"/> :value="item"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
...@@ -570,12 +597,12 @@ import { ...@@ -570,12 +597,12 @@ import {
delEvalBatchInfo, delEvalBatchInfo,
chEvalBatchInfo, chEvalBatchInfo,
} from "@/api/index"; } from "@/api/index";
import { getCurrentDate } from '@/utils/format' import { getCurrentDate } from "@/utils/format";
import { generateYearOptions } from "@/utils/cache"; import { generateYearOptions } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
yearsList:generateYearOptions(), yearsList: generateYearOptions(),
totalXQ: 0, totalXQ: 0,
XQtableData: [], XQtableData: [],
currentPageXQ: 1, currentPageXQ: 1,
...@@ -668,9 +695,8 @@ export default { ...@@ -668,9 +695,8 @@ export default {
}; };
}, },
mounted() { mounted() {
console.log(getCurrentDate(),'222222') console.log(getCurrentDate(), "222222");
this.submitForm(); this.submitForm();
}, },
methods: { methods: {
...@@ -679,7 +705,7 @@ export default { ...@@ -679,7 +705,7 @@ export default {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
}; };
console.log( this.ruleForm,' this.ruleForm') console.log(this.ruleForm, " this.ruleForm");
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
let res = await evalBatchInfo(params); let res = await evalBatchInfo(params);
...@@ -868,8 +894,8 @@ export default { ...@@ -868,8 +894,8 @@ export default {
}); });
let params = { let params = {
expertStr: expertStr, expertStr: expertStr,
creator:sessionStorage.getItem('author'), creator: sessionStorage.getItem("author"),
createTime:getCurrentDate(), createTime: getCurrentDate(),
}; };
Object.assign(params, this.ruleFormdialogAdd); Object.assign(params, this.ruleFormdialogAdd);
this.xfParams = JSON.parse(JSON.stringify(params)); this.xfParams = JSON.parse(JSON.stringify(params));
...@@ -1165,12 +1191,11 @@ export default { ...@@ -1165,12 +1191,11 @@ export default {
} }
.textarea { .textarea {
width: 100%; width: 100%;
/deep/ .el-form-item__content{ /deep/ .el-form-item__content {
display: flex; display: flex;
} }
.el-textarea { .el-textarea {
width: 60%; width: 60%;
} }
} }
.Btn { .Btn {
......
...@@ -49,9 +49,7 @@ ...@@ -49,9 +49,7 @@
:key="index" :key="index"
class="inputDiv" class="inputDiv"
v-html="itemzn.checkDesc" v-html="itemzn.checkDesc"
> ></div>
</div>
</div> </div>
<div class="quesznfx"> <div class="quesznfx">
<p class="tips">辅助分析:</p> <p class="tips">辅助分析:</p>
...@@ -66,7 +64,7 @@ ...@@ -66,7 +64,7 @@
v-model="itemfz.checkDesc" v-model="itemfz.checkDesc"
> >
</el-input </el-input
><el-button @click="adopt(item, index,itemfz)" type="primary" ><el-button @click="adopt(item, index, itemfz)" type="primary"
>采纳</el-button >采纳</el-button
> >
</div> </div>
...@@ -150,6 +148,7 @@ import { ...@@ -150,6 +148,7 @@ import {
selZnfx, selZnfx,
bcevalQuesInfo, bcevalQuesInfo,
ossupload, ossupload,
presignedUrl,
} from "@/api/index"; } from "@/api/index";
import { MaterialsListKY } from "@/utils/cache"; import { MaterialsListKY } from "@/utils/cache";
export default { export default {
...@@ -193,21 +192,22 @@ export default { ...@@ -193,21 +192,22 @@ export default {
projectStage: this.active * 1 + 1, projectStage: this.active * 1 + 1,
...type, ...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"); console.log(res[0], res[1], "777777");
this.urlList = res[0].data; this.urlList = res[0].data;
if (res[1].data) { if (res[1].data) {
this.questionList = res[1].data.records; this.questionList = res[1].data.records;
this.questionList.forEach(async (item) => { this.questionList.forEach(async (item) => {
let respon = await selWtmx({ qid: item.qid }); let respon = await selWtmx({ qid: item.qid });
let paramsFX = { let paramsFX = {
// batchId: this.clqparams.batchId, batchId: this.clqparams.batchId,
// projectId:this.clqparams.projectId, projectId:this.clqparams.projectId,
// projectStage: item.questionId, projectStage: item.questionId,
batchId: 46, // batchId: 46,
projectId: "B122XT230004", // projectId: "B122XT230004",
projectStage: 4, // projectStage: 4,
}; };
let responfx = await selZnfx(paramsFX); let responfx = await selZnfx(paramsFX);
if (respon.data.records && respon.data.records.length > 0) { if (respon.data.records && respon.data.records.length > 0) {
...@@ -225,11 +225,9 @@ export default { ...@@ -225,11 +225,9 @@ export default {
} }
if (responfx.data.records && responfx.data.records.length > 0) { if (responfx.data.records && responfx.data.records.length > 0) {
let znfxList = responfx.data.records.filter((item) => { let znfxList = responfx.data.records.filter((item) => {
if(item.checkDesc){ if (item.checkDesc) {
console.log('来了啊') item.checkDesc = item.checkDesc.replace(/\n/g, "<br>");
item.checkDesc=item.checkDesc.replace(/\n/g, '<br>')
} }
console.log( item,' item item item')
return item.type == 0; return item.type == 0;
}); });
let fzfxList = responfx.data.records.filter((item) => { let fzfxList = responfx.data.records.filter((item) => {
...@@ -241,26 +239,31 @@ export default { ...@@ -241,26 +239,31 @@ export default {
this.$set(item, "znfxList", []); this.$set(item, "znfxList", []);
this.$set(item, "fzfxList", []); this.$set(item, "fzfxList", []);
} }
this.$set(item, "Id", 0); this.$set(item, "Id", 0);
}); });
} }
let paramsUrl = {
fileId: this.urlList[0].id,
url:this.urlList[0].url,
};
console.log(this.questionList, "this.questionList "); let resUrl = await presignedUrl(paramsUrl);
console.log(resUrl, "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='; // let prefixUrl = 'pdf/web/viewer.html?file=';
// this.iframeUrl= prefixUrl+this.iframeUrl // this.iframeUrl = prefixUrl+resUrl.msg;
// console.log(this.iframeUrl,'this.iframeUrl')
this.iframeUrl = resUrl.msg;
}); });
}, },
async handleClick(tab) { async handleClick(tab) {
console.log("切换", tab.name, this.urlList); console.log("切换", tab.name, this.urlList);
this.urlList.forEach(async (item) => { this.urlList.forEach(async (item) => {
if (item.typeCode == tab.name) { if (item.typeCode == tab.name) {
console.log("来几次", item.typeCode); // console.log("来几次", item.typeCode);
this.iframeUrl = item.url; // let prefixUrl = 'pdf/web/viewer.html?file=';
// this.iframeUrl = prefixUrl+item.url;
// console.log(this.iframeUrl,'this.iframeUrl')
} }
}); });
...@@ -282,20 +285,19 @@ export default { ...@@ -282,20 +285,19 @@ export default {
} }
item.evalList.splice(index, 1); item.evalList.splice(index, 1);
}, },
adopt(item, index,items){ adopt(item, index, items) {
console.log(items,'items') console.log(items, "items");
item.evalList.push({ item.evalList.push({
id: "id" + item.Id++, id: "id" + item.Id++,
evalQues:items.checkDesc, evalQues: items.checkDesc,
}); });
}, },
addInput(item) { addInput(item) {
console.log(item.Id, "22"); console.log(item.Id, "22");
item.evalList.push({ item.evalList.push({
id: "id" + item.Id++, id: "id" + item.Id++,
data: "", data: "",
evalQues:"", evalQues: "",
}); });
console.log(item.evalList, "item.evalList"); console.log(item.evalList, "item.evalList");
}, },
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
> >
<el-table-column label="项目环节" prop="projectStagetext" width="150"> <el-table-column label="项目环节" prop="projectStagetext" width="150">
</el-table-column> </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>
<el-table-column label="问题检查项" prop="quesCheckItem"> <el-table-column label="问题检查项" prop="quesCheckItem">
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
> >
<el-table-column label="项目环节" prop="projectStagetext" width="150"> <el-table-column label="项目环节" prop="projectStagetext" width="150">
</el-table-column> </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>
<el-table-column label="问题检查项" prop="quesCheckItem"> <el-table-column label="问题检查项" prop="quesCheckItem">
......
...@@ -64,7 +64,9 @@ ...@@ -64,7 +64,9 @@
> >
<el-table-column label="序号" width="55" type="index"> </el-table-column> <el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </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 prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
...@@ -151,7 +153,9 @@ ...@@ -151,7 +153,9 @@
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </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="batchName" label="资料类型"> </el-table-column>
<el-table-column prop="projectName" label="资料名称"> <el-table-column prop="projectName" label="资料名称">
</el-table-column> </el-table-column>
......
<!-- 辅助核验 --> <!-- 辅助核验 -->
<template> <template>
<div class="main"> <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-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择" clearable> <el-select v-model="ruleForm.batchYear" placeholder="请选择" clearable>
<el-option <el-option
v-for="(item, index) in yearsList" v-for="(item, index) in yearsList"
:key="index" :key="index"
:label="item+'年'" :label="item + '年'"
:value="item"/> :value="item"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem"> <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>
<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-select
v-model="ruleForm.postEvalState"
placeholder="请选择"
clearable
>
<el-option label="已确认" value="3"></el-option> <el-option label="已确认" value="3"></el-option>
<el-option label="未确认" value="1"></el-option> <el-option label="未确认" value="1"></el-option>
<el-option label="已撤回" value="4"></el-option> <el-option label="已撤回" value="4"></el-option>
...@@ -51,9 +65,14 @@ ...@@ -51,9 +65,14 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<el-table-column label="序号" width="55" type="index"> </el-table-column> <el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </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 prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
...@@ -65,7 +84,11 @@ ...@@ -65,7 +84,11 @@
</el-table-column> </el-table-column>
<el-table-column prop="expertName" label="评审专家" width="auto"> <el-table-column prop="expertName" label="评审专家" width="auto">
</el-table-column> </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>
<el-table-column prop="batchName" label="评估项目" width="auto"> <el-table-column prop="batchName" label="评估项目" width="auto">
</el-table-column> </el-table-column>
...@@ -103,7 +126,11 @@ ...@@ -103,7 +126,11 @@
<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-input v-model="ruleFormdialogBJ.batchYear" disabled></el-input>
</el-form-item> </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-input v-model="ruleFormdialogBJ.batchName" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
...@@ -112,7 +139,8 @@ ...@@ -112,7 +139,8 @@
class="fromItem" class="fromItem"
> >
<el-input <el-input
v-model="ruleFormdialogBJ.planReviewDate" disabled v-model="ruleFormdialogBJ.planReviewDate"
disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="每位专家可评估项目数:" prop="prjsOfExpert" class="fromItem"> <!-- <el-form-item label="每位专家可评估项目数:" prop="prjsOfExpert" class="fromItem">
...@@ -127,12 +155,9 @@ ...@@ -127,12 +155,9 @@
disabled disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<p class="zjBtn"> <p class="zjBtn">待评估项目</p>
待评估项目
</p>
<div class="setscrolldialog"> <div class="setscrolldialog">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
...@@ -143,32 +168,44 @@ ...@@ -143,32 +168,44 @@
class="eltable" class="eltable"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </el-table-column>
<el-table-column label="项目编码" width="auto" prop="projectId"> <el-table-column label="项目编码" width="auto" prop="projectId">
</el-table-column> </el-table-column>
<el-table-column prop="projectYear" label="项目下达年度" width="auto"> <el-table-column
prop="projectYear"
label="项目下达年度"
width="auto"
>
<template slot-scope="scope">
{{ scope.row.projectYear }}
</template>
</el-table-column> </el-table-column>
<el-table-column prop="projectName" label="项目名称" width="auto" show-overflow-tooltip> <el-table-column
prop="projectName"
label="项目名称"
width="auto"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column prop="projectCategory" label="建设形式" width="auto"> <el-table-column
prop="projectCategory"
label="建设形式"
width="auto"
>
</el-table-column> </el-table-column>
<el-table-column prop="projectStatus" label="项目建设阶段" width="auto"> <el-table-column
prop="projectStatus"
label="项目建设阶段"
width="auto"
>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="哪个字段" label="历史核查状态" width="auto"> <!-- <el-table-column prop="哪个字段" label="历史核查状态" width="auto">
</el-table-column> --> </el-table-column> -->
<el-table-column prop="email" label="部门" width="auto"> <el-table-column prop="department" label="部门" width="auto">
</el-table-column> </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> -->
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
...@@ -202,7 +239,11 @@ ...@@ -202,7 +239,11 @@
<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-input v-model="ruleFormdialogBJ.batchYear" disabled></el-input>
</el-form-item> </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-input v-model="ruleFormdialogBJ.batchName" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
...@@ -211,7 +252,8 @@ ...@@ -211,7 +252,8 @@
class="fromItem" class="fromItem"
> >
<el-input <el-input
v-model="ruleFormdialogBJ.planReviewDate" disabled v-model="ruleFormdialogBJ.planReviewDate"
disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="每位专家可评估项目数:" prop="prjsOfExpert" class="fromItem"> <!-- <el-form-item label="每位专家可评估项目数:" prop="prjsOfExpert" class="fromItem">
...@@ -233,7 +275,6 @@ ...@@ -233,7 +275,6 @@
disabled disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<p class="zjBtn"> <p class="zjBtn">
...@@ -255,13 +296,33 @@ ...@@ -255,13 +296,33 @@
<el-table-column label="项目编码" width="auto" prop="projectId"> <el-table-column label="项目编码" width="auto" prop="projectId">
</el-table-column> </el-table-column>
<el-table-column prop="projectYear" label="项目下达年度" width="auto"> <el-table-column
</el-table-column> prop="projectYear"
<el-table-column prop="projectName" label="项目名称" width="auto" show-overflow-tooltip> 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>
<el-table-column prop="projectCategory" label="建设形式" width="auto"> <el-table-column
prop="projectCategory"
label="建设形式"
width="auto"
>
</el-table-column> </el-table-column>
<el-table-column prop="projectStatus" label="项目建设阶段" width="auto"> <el-table-column
prop="projectStatus"
label="项目建设阶段"
width="auto"
>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="哪个字段" label="历史核查状态" width="auto"> <!-- <el-table-column prop="哪个字段" label="历史核查状态" width="auto">
</el-table-column> --> </el-table-column> -->
...@@ -269,11 +330,14 @@ ...@@ -269,11 +330,14 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="130"> <el-table-column label="操作" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="handleClick(scope.row,scope.$index,addtableData)" type="text" size="small">删除</el-button> <el-button
@click="handleClick(scope.row, scope.$index, addtableData)"
type="text"
size="small"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
...@@ -300,17 +364,25 @@ ...@@ -300,17 +364,25 @@
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
<el-form-item label="项目下达年度:" prop="projectYear" class="fromItem"> label="项目下达年度:"
<el-select v-model="ruleFormZJ.projectYear" placeholder="请选择" clearable> prop="projectYear"
<el-option label="2024年" value="2024"></el-option> class="fromItem"
<el-option label="2023年" value="2023"></el-option> >
<el-option label="2022年" value="2022"></el-option> <el-select
<el-option label="2021年" value="2021"></el-option> v-model="ruleFormZJ.projectYear"
placeholder="请选择"
clearable
>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem"> <el-form-item label="项目编码:" prop="projectId" class="fromItem">
...@@ -320,7 +392,7 @@ ...@@ -320,7 +392,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem" > <el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input <el-input
v-model="ruleFormZJ.projectName" v-model="ruleFormZJ.projectName"
placeholder="请输入" placeholder="请输入"
...@@ -346,22 +418,34 @@ ...@@ -346,22 +418,34 @@
placeholder="请输入" placeholder="请输入"
></el-input> ></el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item label="建设形式:" prop="projectCategory" class="fromItem"> <!-- <el-form-item
<el-select v-model="ruleFormZJ.projectCategory" placeholder="请选择" clearable> label="建设形式:"
prop="projectCategory"
class="fromItem"
>
<el-select
v-model="ruleFormZJ.projectCategory"
placeholder="请选择"
clearable
>
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option> <el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option> <el-option label="2022年" value="2022"></el-option>
<el-option label="2021年" value="2021"></el-option> <el-option label="2021年" value="2021"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="部门:" prop="department" class="fromItem"> <!-- <el-form-item label="部门:" prop="department" class="fromItem">
<el-select v-model="ruleFormZJ.department" placeholder="请选择" clearable> <el-select
v-model="ruleFormZJ.department"
placeholder="请选择"
clearable
>
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option> <el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option> <el-option label="2022年" value="2022"></el-option>
<el-option label="2021年" value="2021"></el-option> <el-option label="2021年" value="2021"></el-option>
</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()"> 查询 </span>
</el-form-item> </el-form-item>
...@@ -372,25 +456,45 @@ ...@@ -372,25 +456,45 @@
ref="multipleTableZJ" ref="multipleTableZJ"
:data="zjtableData" :data="zjtableData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100% " style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border > border
<el-table-column type="selection"> >
</el-table-column> <el-table-column type="selection"> </el-table-column>
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </el-table-column>
<el-table-column label="项目编码" width="200" prop="projectId"> <el-table-column label="项目编码" width="200" prop="projectId">
</el-table-column> </el-table-column>
<el-table-column prop="projectYear" label="项目下达年度" width="200"> <el-table-column
prop="projectYear"
label="项目下达年度"
width="200"
>
<template slot-scope="scope">
{{ scope.row.projectYear }}
</template>
</el-table-column> </el-table-column>
<el-table-column prop="projectName" label="项目名称" width="auto" show-overflow-tooltip> <el-table-column
prop="projectName"
label="项目名称"
width="auto"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column prop="projectCategory" label="建设形式" width="200"> <el-table-column
prop="projectCategory"
label="建设形式"
width="200"
>
</el-table-column> </el-table-column>
<el-table-column prop="projectStatus" label="项目建设阶段" width="200"> <el-table-column
prop="projectStatus"
label="项目建设阶段"
width="200"
>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="字段待确认" label="历史核查状态" width="200"> <!-- <el-table-column prop="字段待确认" label="历史核查状态" width="200">
</el-table-column> </el-table-column>
...@@ -403,15 +507,31 @@ ...@@ -403,15 +507,31 @@
</el-table-column> </el-table-column>
</el-table-column> --> </el-table-column> -->
<el-table-column label="总投资计划(万元)" width="300"> <el-table-column label="总投资计划(万元)" width="300">
<el-table-column prop=" costAmountTotal" label="成本金" width="auto"> <el-table-column
prop=" costAmountTotal"
label="成本金"
width="auto"
>
</el-table-column> </el-table-column>
<el-table-column prop="capitalAmountTotal" label="资本金" width="auto"> <el-table-column
prop="capitalAmountTotal"
label="资本金"
width="auto"
>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="当年投资计划(万元)" width="300"> <el-table-column label="当年投资计划(万元)" width="300">
<el-table-column prop="costAmountCurrentMfdel" label="成本金" width="auto"> <el-table-column
prop="costAmountCurrentMfdel"
label="成本金"
width="auto"
>
</el-table-column> </el-table-column>
<el-table-column prop="capitalAmountCurrentMfdel" label="资本金" width="200"> <el-table-column
prop="capitalAmountCurrentMfdel"
label="资本金"
width="200"
>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
...@@ -421,7 +541,11 @@ ...@@ -421,7 +541,11 @@
</el-table-column> </el-table-column>
<el-table-column prop="personCharge" label="项目经理" width="200"> <el-table-column prop="personCharge" label="项目经理" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="projectInfo" label="项目内容" show-overflow-tooltip> <el-table-column
prop="projectInfo"
label="项目内容"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column prop="inputuser" label="创建人" width="200"> <el-table-column prop="inputuser" label="创建人" width="200">
</el-table-column> </el-table-column>
...@@ -458,15 +582,14 @@ import { ...@@ -458,15 +582,14 @@ import {
delProjectInfo, delProjectInfo,
joinProjectInfo, joinProjectInfo,
getProjectInfo, getProjectInfo,
chProjectInfo chProjectInfo,
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions } from "@/utils/cache"; import { generateYearOptions } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
yearsList:generateYearOptions(), yearsList: generateYearOptions(),
oldid:"", oldid: "",
ruleForm: { ruleForm: {
batchYear: "", batchYear: "",
batchName: "", batchName: "",
...@@ -494,7 +617,7 @@ export default { ...@@ -494,7 +617,7 @@ export default {
batchYear: "", batchYear: "",
batchName: "", batchName: "",
planReviewDate: "", planReviewDate: "",
prjsOfExpert:"", prjsOfExpert: "",
description: "", description: "",
}, },
// rules: { // rules: {
...@@ -520,17 +643,17 @@ export default { ...@@ -520,17 +643,17 @@ export default {
dialogAddzj: false, dialogAddzj: false,
pageSize: 10, pageSize: 10,
current: 1, current: 1,
pageSizeZJ:5, pageSizeZJ: 5,
currentZJ: 1, currentZJ: 1,
addtotal: 0, addtotal: 0,
currentAdd: 1, currentAdd: 1,
pageSizeAdd: 5, pageSizeAdd: 5,
currentedit: 1, currentedit: 1,
pageSizeedit:5, pageSizeedit: 5,
xfParam: "", xfParam: "",
dialogedit: false, dialogedit: false,
expertIdList: [], expertIdList: [],
totalBJ:0, totalBJ: 0,
addZJList: [], addZJList: [],
expertState: "", expertState: "",
fields: "", fields: "",
...@@ -542,23 +665,23 @@ export default { ...@@ -542,23 +665,23 @@ export default {
message: {}, message: {},
}; };
}, },
watch:{ watch: {
// 监听路由对象中的参数部分 // 监听路由对象中的参数部分
'$route.params': { "$route.params": {
immediate: true, immediate: true,
handler(newParams, oldParams) { handler(newParams, oldParams) {
//现在配合demo路由变化掉了两次接口等线上去掉这块时候mounted要调用 //现在配合demo路由变化掉了两次接口等线上去掉这块时候mounted要调用
this.submitForm(); this.submitForm();
} },
} },
}, },
mounted() { mounted() {
console.log('author') console.log("author");
// this.submitForm(); // this.submitForm();
}, },
methods: { methods: {
async submitForm() { async submitForm() {
console.log('来了几次') console.log("来了几次");
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
...@@ -568,15 +691,15 @@ export default { ...@@ -568,15 +691,15 @@ export default {
let res = await projectInfo(params); let res = await projectInfo(params);
if (res.code == "200") { if (res.code == "200") {
this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData.forEach(item=>{ this.tableData.forEach((item) => {
if (item.postEvalState=='3'){ if (item.postEvalState == "3") {
this.$set( item,'postEvalStateText','已确认') this.$set(item, "postEvalStateText", "已确认");
}else if(item.postEvalState=='4'){ } else if (item.postEvalState == "4") {
this.$set( item,'postEvalStateText','已撤回') this.$set(item, "postEvalStateText", "已撤回");
}else{ } else {
this.$set( item,'postEvalStateText','未确认') this.$set(item, "postEvalStateText", "未确认");
} }
}) });
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
}, },
...@@ -592,59 +715,57 @@ export default { ...@@ -592,59 +715,57 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
console.log("222",this.checkedList); console.log("222", this.checkedList);
this.dialogXQ = true; this.dialogXQ = true;
this.ruleFormdialogBJ=this.checkedList[0] this.ruleFormdialogBJ = this.checkedList[0];
let params={ let params = {
current:this.addcurrentPage, current: this.addcurrentPage,
pageSize:this.pageSizeAdd, pageSize: this.pageSizeAdd,
batchId:this.checkedList[0].batchId batchId: this.checkedList[0].batchId,
} };
Object.assign(params, this.ruleFormdialogAdd); Object.assign(params, this.ruleFormdialogAdd);
this.addtableData=[] this.addtableData = [];
let res=await joinProjectInfo(params) let res = await joinProjectInfo(params);
if (res.code == "200") { if (res.code == "200") {
this.addtableData = res.data.records; this.addtableData = res.data.records;
this.addtotal = res.data.total * 1; this.addtotal = res.data.total * 1;
} }
}, },
//确认评估项目 //确认评估项目
async configs(){ async configs() {
// 只能选中状态待评估的 // 只能选中状态待评估的
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if(this.checkedList[0].postEvalStateText=='已确认'){ if (this.checkedList[0].postEvalStateText == "已确认") {
this.$message("该项目已确认"); this.$message("该项目已确认");
return; return;
} }
this.ruleFormdialogBJ=this.checkedList[0] this.ruleFormdialogBJ = this.checkedList[0];
this.dialogAdd=true this.dialogAdd = true;
this.addtableData=[] this.addtableData = [];
let params={ let params = {
current:this.addcurrentPage, current: this.addcurrentPage,
pageSize:this.pageSizeAdd, pageSize: this.pageSizeAdd,
batchId:this.checkedList[0].batchId batchId: this.checkedList[0].batchId,
} };
Object.assign(params, this.ruleFormdialogAdd); Object.assign(params, this.ruleFormdialogAdd);
let res=await joinProjectInfo(params) let res = await joinProjectInfo(params);
if (res.code == "200") { if (res.code == "200") {
this.addtableData = res.data.records; this.addtableData = res.data.records;
this.addtotal = res.data.total * 1; this.addtotal = res.data.total * 1;
this.oldid =""; this.oldid = "";
if(this.addtableData.length>0){ if (this.addtableData.length > 0) {
this.addtableData.forEach((item) => { this.addtableData.forEach((item) => {
this.oldid= this.oldid.concat(item.projectId+',') this.oldid = this.oldid.concat(item.projectId + ",");
}); });
} }
} }
}, },
closeXQ(){ closeXQ() {
console.log('关闭详情') console.log("关闭详情");
}, },
//表格颜色 //表格颜色
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
...@@ -676,20 +797,20 @@ export default { ...@@ -676,20 +797,20 @@ export default {
handleSizeChangeZJ(val) { handleSizeChangeZJ(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSizeZJ = val; this.pageSizeZJ = val;
this.xzExperts() this.xzExperts();
}, },
handleCurrentChangeZJ(val) { handleCurrentChangeZJ(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.currentZJ = val; this.currentZJ = val;
this.xzExperts() this.xzExperts();
}, },
handleSizeChangeAdd(val) { handleSizeChangeAdd(val) {
this.pageSizeAdd = val; this.pageSizeAdd = val;
this.detailsForm() this.detailsForm();
}, },
handleCurrentChangeAdd(val) { handleCurrentChangeAdd(val) {
this.currentAdd = val; this.currentAdd = val;
this.detailsForm() this.detailsForm();
}, },
//选择项目 //选择项目
...@@ -698,13 +819,12 @@ export default { ...@@ -698,13 +819,12 @@ export default {
this.$message("请选择项目"); this.$message("请选择项目");
return; return;
} }
console.log(this.addtableData,this.addZJList,'55555') console.log(this.addtableData, this.addZJList, "55555");
this.addtableData=[...this.addtableData,...this.addZJList] this.addtableData = [...this.addtableData, ...this.addZJList];
this.addtableData = this.addtableData.filter((obj, index, self)=>{
return index == self.findIndex(t =>t.projectId == obj.projectId)
}) this.addtableData = this.addtableData.filter((obj, index, self) => {
return index == self.findIndex((t) => t.projectId == obj.projectId);
});
console.log(this.addtableData, "addtableData"); console.log(this.addtableData, "addtableData");
this.addtotal = this.addtableData.length; this.addtotal = this.addtableData.length;
this.dialogAddzj = false; this.dialogAddzj = false;
...@@ -718,11 +838,11 @@ export default { ...@@ -718,11 +838,11 @@ export default {
let params = { let params = {
current: this.currentZJ, current: this.currentZJ,
pageSize: this.pageSizeZJ, pageSize: this.pageSizeZJ,
prjStr:this.oldid prjStr: this.oldid,
}; };
Object.assign(params, this.ruleFormZJ); Object.assign(params, this.ruleFormZJ);
let res = await getProjectInfo(params); 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.zjtableData = res.data.records;
this.zjtotal = res.data.total * 1; this.zjtotal = res.data.total * 1;
console.log(res, "xxx"); console.log(res, "xxx");
...@@ -740,24 +860,22 @@ export default { ...@@ -740,24 +860,22 @@ export default {
} }
console.log(this.addZJList, "this.addZJList"); console.log(this.addZJList, "this.addZJList");
// 确认发布入参 // 确认发布入参
let expertIdList =""; let expertIdList = "";
if(this.addZJList.length>0){ if (this.addZJList.length > 0) {
this.addZJList.forEach((item) => { this.addZJList.forEach((item) => {
expertIdList= expertIdList.concat(item.projectId+',') expertIdList = expertIdList.concat(item.projectId + ",");
}); });
} }
let params = { let params = {
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");
fbProjectInfo(params).then((res) => { fbProjectInfo(params).then((res) => {
this.dialogAdd = false; this.dialogAdd = false;
this.expertIdList=expertIdList this.expertIdList = expertIdList;
this.resetForm(); this.resetForm();
}); });
} }
...@@ -765,7 +883,6 @@ export default { ...@@ -765,7 +883,6 @@ export default {
// this.$emit("listenToChildEvent", "reset"); // this.$emit("listenToChildEvent", "reset");
// } // }
}, },
cancelXZ() { cancelXZ() {
...@@ -778,35 +895,34 @@ export default { ...@@ -778,35 +895,34 @@ export default {
console.log(this.$refs.multipleTableZJ.selection, "2222"); console.log(this.$refs.multipleTableZJ.selection, "2222");
}, },
//点击删除 //点击删除
async handleClick(row,index,rows) { async handleClick(row, index, rows) {
console.log("删除",row) console.log("删除", row);
rows.splice(index, 1); rows.splice(index, 1);
let params={ let params = {
projectId:row.projectId, projectId: row.projectId,
batchId:this.checkedList[0].batchId batchId: this.checkedList[0].batchId,
} };
let res = await delProjectInfo(params); let res = await delProjectInfo(params);
// this.configs() // this.configs()
}, },
//点击撤回 //点击撤回
async withdraw(){ async withdraw() {
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if(this.checkedList[0].postEvalStateText=='已撤回'){ if (this.checkedList[0].postEvalStateText == "已撤回") {
this.$message("该项目已撤回"); this.$message("该项目已撤回");
return; return;
} }
if(this.checkedList[0].postEvalStateText=='未确认'){ if (this.checkedList[0].postEvalStateText == "未确认") {
this.$message("该项目还未确认"); this.$message("该项目还未确认");
return; return;
} }
let res= await chProjectInfo({batchId:this.checkedList[0].batchId}) let res = await chProjectInfo({ batchId: this.checkedList[0].batchId });
if(res.code='200'){ if ((res.code = "200")) {
this.resetForm() this.resetForm();
} }
}, },
}, },
}; };
...@@ -891,8 +1007,9 @@ export default { ...@@ -891,8 +1007,9 @@ export default {
margin-top: 3vh !important; margin-top: 3vh !important;
margin-left: 3vw !important; margin-left: 3vw !important;
} }
/deep/.el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell{ /deep/.el-table th.el-table__cell.is-leaf,
text-align: center; .el-table td.el-table__cell {
text-align: center;
} }
/deep/ .el-dialog__wrapper { /deep/ .el-dialog__wrapper {
position: absolute; position: absolute;
...@@ -947,7 +1064,7 @@ text-align: center; ...@@ -947,7 +1064,7 @@ text-align: center;
} }
.textarea { .textarea {
width: 100%; width: 100%;
/deep/ .el-form-item__content{ /deep/ .el-form-item__content {
display: flex; display: flex;
} }
.el-textarea { .el-textarea {
...@@ -979,12 +1096,12 @@ text-align: center; ...@@ -979,12 +1096,12 @@ text-align: center;
color: #fff; color: #fff;
} }
.zjBtn { .zjBtn {
width:400px; width: 400px;
text-align: left; text-align: left;
vertical-align: middle; vertical-align: middle;
span { span {
display: inline-block; display: inline-block;
width:140px; width: 140px;
height: 25px; height: 25px;
line-height: 25px; line-height: 25px;
text-align: center; text-align: center;
...@@ -1037,17 +1154,17 @@ text-align: center; ...@@ -1037,17 +1154,17 @@ text-align: center;
color: #fff; color: #fff;
} }
} }
/deep/.el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell{ /deep/.el-table th.el-table__cell.is-leaf,
text-align: center; .el-table td.el-table__cell {
text-align: center;
} }
/deep/ .el-table__cell{ /deep/ .el-table__cell {
text-align: center; text-align: center;
} }
.dialogHeigth{ .dialogHeigth {
height: 300px; height: 300px;
box-sizing: border-box; box-sizing: border-box;
overflow-y: auto; overflow-y: auto;
} }
.setscroll { .setscroll {
width: 100%; width: 100%;
...@@ -1065,12 +1182,10 @@ overflow-y: auto; ...@@ -1065,12 +1182,10 @@ overflow-y: auto;
height: 300px; height: 300px;
overflow: auto; overflow: auto;
position: absolute; position: absolute;
min-width:100% ; min-width: 100%;
} }
} }
.setscrolldialogx{ .setscrolldialogx {
width: 100%; width: 100%;
height: 300px; height: 300px;
position: relative; position: relative;
...@@ -1080,11 +1195,9 @@ overflow-y: auto; ...@@ -1080,11 +1195,9 @@ overflow-y: auto;
position: absolute; position: absolute;
width: auto !important; width: auto !important;
max-width: none; max-width: none;
} }
} }
::v-deep.el-table::before { ::v-deep.el-table::before {
display: none !important; display: none !important;
} }
</style> </style>
\ No newline at end of file
...@@ -89,7 +89,9 @@ ...@@ -89,7 +89,9 @@
> >
<el-table-column label="序号" width="55" type="index"> </el-table-column> <el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </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>
<el-table-column prop="batchName" label="后评估批次名称" width="auto"> <el-table-column prop="batchName" label="后评估批次名称" width="auto">
</el-table-column> </el-table-column>
...@@ -182,7 +184,7 @@ ...@@ -182,7 +184,7 @@
width="150" width="150"
> >
</el-table-column> </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>
<el-table-column <el-table-column
...@@ -331,7 +333,7 @@ ...@@ -331,7 +333,7 @@
width="150" width="150"
> >
</el-table-column> </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>
<el-table-column <el-table-column
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
</el-form-item> </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-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="未下发" value="0"></el-option> <el-option label="未上传" value="0"></el-option>
<el-option label="已下发" value="1"></el-option> <el-option label="已上传" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option> <!-- <el-option label="已撤回" value="2"></el-option> -->
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -68,7 +68,9 @@ ...@@ -68,7 +68,9 @@
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </el-table-column>
<el-table-column type="selection"> </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 prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
...@@ -78,7 +80,7 @@ ...@@ -78,7 +80,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="projectStatus" label="项目建设阶段"> <el-table-column prop="projectStatus" label="项目建设阶段">
</el-table-column> </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 prop="planReviewDate" label="计划评估日期">
</el-table-column> </el-table-column>
<el-table-column prop="expertName" label="评审专家名单"> <el-table-column prop="expertName" label="评审专家名单">
......
...@@ -65,7 +65,9 @@ ...@@ -65,7 +65,9 @@
> >
<el-table-column label="序号" width="55" type="index"> </el-table-column> <el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column type="selection"> </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 prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
...@@ -149,7 +151,9 @@ ...@@ -149,7 +151,9 @@
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </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="batchName" label="资料类型"> </el-table-column>
<el-table-column prop="projectName" label="资料名称"> <el-table-column prop="projectName" label="资料名称">
</el-table-column> </el-table-column>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
> >
<el-table-column label="项目环节" prop="projectStagetext" width="150"> <el-table-column label="项目环节" prop="projectStagetext" width="150">
</el-table-column> </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>
<el-table-column label="问题检查项" prop="quesCheckItem"> <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!