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>
......
...@@ -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!