Skip to content

Administrator / project_progress

Go to a project
Commit d53bf7b8 by liangzhen
Options

暂存修改

1 parent 465ab405
Expand all
Inline Side-by-side
Showing with 155 additions and 52 deletions
src/views/assessChecks/assistedConfirm.vue
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
}} <el-button @click="handleClickXZ(scope.row)">下载</el-button> }} <el-button @click="handleClickXZ(scope.row)">下载</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="复核情况" prop="rectificationStatus"> <el-table-column label="复核情况" prop="appealStatus">
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'"> <template slot-scope="scope" v-if="scope.row.confirmStatus == '1'">
<el-select <el-select
v-model="scope.row.appealStatus" v-model="scope.row.appealStatus"
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
}} <el-button @click="handleClickXZ(scope.row)">下载</el-button> }} <el-button @click="handleClickXZ(scope.row)">下载</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="复核情况" prop="rectificationStatus"> <el-table-column label="复核情况" prop="appealStatus">
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'"> <template slot-scope="scope" v-if="scope.row.confirmStatus == '1'">
<el-select <el-select
v-model="scope.row.appealStatus" v-model="scope.row.appealStatus"
...@@ -382,7 +382,9 @@ export default { ...@@ -382,7 +382,9 @@ export default {
} else { } else {
this.$set(item, "postEvalStateText", "复核未下发"); this.$set(item, "postEvalStateText", "复核未下发");
} }
}); });
console.log(this.tableData,'tableDatatableData')
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
}, },
...@@ -589,6 +591,11 @@ export default { ...@@ -589,6 +591,11 @@ export default {
if (res.code == "200") { if (res.code == "200") {
this.tableDataSS = res.data.records; this.tableDataSS = res.data.records;
this.tableDataSS.forEach((item) => { this.tableDataSS.forEach((item) => {
if(item.appealStatus< 2){
item.appealStatus=null
// this.$set(item, "appealStatus", "");
}
if (!item.confirmStatus) { if (!item.confirmStatus) {
this.$set(item, "confirmStatus", "2"); this.$set(item, "confirmStatus", "2");
} }
......
src/views/assessChecks/assistedRect.vue
...@@ -10,10 +10,11 @@ ...@@ -10,10 +10,11 @@
<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">
...@@ -65,9 +66,9 @@ ...@@ -65,9 +66,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"><template slot-scope="scope"> <el-table-column label="批次年度" prop="batchYear"
{{scope.row.batchYear}}年 ><template slot-scope="scope"> {{ scope.row.batchYear }}年 </template>
</template> </el-table-column> </el-table-column>
<el-table-column prop="batchName" label="后评估批次名称"> <el-table-column prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
...@@ -191,8 +192,14 @@ ...@@ -191,8 +192,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附加解释材料" prop="fileId" width="400"> <el-table-column label="附加解释材料" prop="fileId" width="400">
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'"> <template
<input type="file" @change="handleFileUpload($event,scope.row, 'fileId')" /> slot-scope="scope"
v-if="scope.row.confirmStatus == '1'"
>
<input
type="file"
@change="handleFileUpload($event, scope.row, 'fileId')"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -218,13 +225,25 @@ ...@@ -218,13 +225,25 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="上传整改材料" prop="zgFileId" width="400"> <el-table-column label="上传整改材料" prop="zgFileId" width="400">
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'"> <template
<input type="file" @change="handleFileUpload($event,scope.row, 'zgFileId')" /> slot-scope="scope"
v-if="scope.row.confirmStatus == '1'"
>
<input
type="file"
@change="handleFileUpload($event, scope.row, 'zgFileId')"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="情况说明" prop="zgqkFileId" width="400"> <el-table-column label="情况说明" prop="zgqkFileId" width="400">
<template slot-scope="scope" v-if="scope.row.confirmStatus == '1'"> <template
<input type="file" @change="handleFileUpload($event,scope.row, 'zgqkFileId')" /> slot-scope="scope"
v-if="scope.row.confirmStatus == '1'"
>
<input
type="file"
@change="handleFileUpload($event, scope.row, 'zgqkFileId')"
/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -232,7 +251,8 @@ ...@@ -232,7 +251,8 @@
</div> </div>
</div> </div>
<p class="midBtn"> <p class="midBtn">
<span @click="cancelSS()">取消</span><span @click="saveSS()">保存</span><span @click="save()">提交</span> <span @click="cancelSS()">取消</span><span @click="saveSS()">保存</span
><span @click="save()">提交</span>
</p> </p>
</el-dialog> </el-dialog>
<!-- 复核下发 --> <!-- 复核下发 -->
...@@ -391,7 +411,7 @@ import { generateYearOptions } from "@/utils/cache"; ...@@ -391,7 +411,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: "",
...@@ -428,12 +448,14 @@ export default { ...@@ -428,12 +448,14 @@ export default {
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.reviewStatus == "6") { if (item.reviewStatus == "4") {
this.$set(item, "postEvalState", "未整改");
} else if (item.reviewStatus == "5") {
this.$set(item, "postEvalState", "整改提交");
} else if (item.reviewStatus == "6") {
this.$set(item, "postEvalState", "整改未完成"); this.$set(item, "postEvalState", "整改未完成");
} else if (item.reviewStatus == "7") { } else if (item.reviewStatus == "7") {
this.$set(item, "postEvalState", "整改已完成"); this.$set(item, "postEvalState", "整改已完成");
} else {
this.$set(item, "postEvalState", "整改提交");
} }
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
...@@ -453,6 +475,10 @@ export default { ...@@ -453,6 +475,10 @@ export default {
this.$message("请选择一条数据进行整改"); this.$message("请选择一条数据进行整改");
return; return;
} }
if (this.checkedList.postEvalState == '整改提交') {
this.$message("整改已经提交");
return;
}
this.dialogQR = true; this.dialogQR = true;
let params = { let params = {
projectId: this.checkedList[0].projectId, projectId: this.checkedList[0].projectId,
...@@ -592,7 +618,7 @@ export default { ...@@ -592,7 +618,7 @@ export default {
this.dialogQR = false; this.dialogQR = false;
}, },
async save() { async save() {
let res = await wtzgxfProblemRectification(this.tableDataSS); let res = await wtzgxfProblemRectification(this.tableDataQR);
if (res.code == "200") { if (res.code == "200") {
this.dialogQR = false; this.dialogQR = false;
this.resetForm(); this.resetForm();
...@@ -614,7 +640,6 @@ export default { ...@@ -614,7 +640,6 @@ export default {
}); });
let res = await wtzgProblemRectification(this.tableDataQR); let res = await wtzgProblemRectification(this.tableDataQR);
if (res.code == "200") { if (res.code == "200") {
this.resetForm(); this.resetForm();
} }
}, },
...@@ -660,30 +685,30 @@ export default { ...@@ -660,30 +685,30 @@ export default {
break; break;
} }
}); });
console.log(this.tableDataSS,'状态是什么'); console.log(this.tableDataSS, "状态是什么");
this.dataPretreatmentSS(); this.dataPretreatmentSS();
} }
}, },
handleFileUpload(event,row,type) { handleFileUpload(event, row, type) {
console.log("来了么"); console.log("来了么");
this.file = event.target.files[0]; this.file = event.target.files[0];
this.submitFile(row,type) this.submitFile(row, type);
}, },
submitFile(row,type) { submitFile(row, type) {
if (this.file) { if (this.file) {
const formData = new FormData(); const formData = new FormData();
formData.append("file", this.file); formData.append("file", this.file);
ossupload(formData) ossupload(formData)
.then((response) => { .then((response) => {
console.log(response); console.log(response);
this.file =[] this.file = [];
this.$set(row, type, response.data.fileId); this.$set(row, type, response.data.fileId);
}) })
.catch((error) => { .catch((error) => {
console.error(error); console.error(error);
}); });
}else{ } else {
this.$message('请先选择文件') this.$message("请先选择文件");
} }
}, },
closed() { closed() {
......
src/views/assessChecks/assistedViewing.vue
...@@ -383,14 +383,10 @@ export default { ...@@ -383,14 +383,10 @@ export default {
return accumulator; return accumulator;
}, []); }, []);
console.log(this.tableDataQD, " mergedArray mergedArray mergedArray"); console.log(this.tableDataQD, " mergedArray mergedArray mergedArray");
// this.tableDataQD.forEach((item) => {
// // this.$set(item, "batchtype", "开发、实施类");
// });
} }
}); });
}, },
//表格颜色 //表格颜色
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) { if (rowIndex % 2 == 1) {
......
src/views/assessChecks/assitedDistribution.vue
...@@ -224,12 +224,14 @@ export default { ...@@ -224,12 +224,14 @@ export default {
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.reviewStatus == "1") { if (item.reviewStatus == "0"||item.reviewStatus ==null||item.reviewStatus ==""){
this.$set(item, "postEvalState", "未下发");
}else if (item.reviewStatus == "1") {
this.$set(item, "postEvalState", "已下发"); this.$set(item, "postEvalState", "已下发");
} else if (item.reviewStatus == "2") { } else if (item.reviewStatus == "2") {
this.$set(item, "postEvalState", "已撤回"); this.$set(item, "postEvalState", "已撤回");
} else { } else {
this.$set(item, "postEvalState", "未下发"); this.$set(item, "postEvalState", "已下发");
} }
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
...@@ -248,7 +250,7 @@ export default { ...@@ -248,7 +250,7 @@ export default {
this.$message("请选择一条数据进行下发"); this.$message("请选择一条数据进行下发");
return; return;
} else { } else {
if (this.checkedList[0].reviewStatus == 1) { if (this.checkedList[0].postEvalState == "已下发") {
this.$message("该项目已下发"); this.$message("该项目已下发");
return; return;
} }
...@@ -272,7 +274,7 @@ export default { ...@@ -272,7 +274,7 @@ export default {
} }
try { try {
this.checkedList.forEach((item) => { this.checkedList.forEach((item) => {
if (item.reviewStatus == 1) { if (item.postEvalState == "已下发") {
this.$message("请选择未下发的项目"); this.$message("请选择未下发的项目");
throw new Error("退出forEach循环！"); throw new Error("退出forEach循环！");
} }
...@@ -349,7 +351,7 @@ export default { ...@@ -349,7 +351,7 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].postEvalState == "未下发") { if (this.checkedList[0].postEvalState == "已下发") {
this.$message("该项目未下发"); this.$message("该项目未下发");
return; return;
} }
......
src/views/assessChecks/attachSynchronousArchiving.vue
...@@ -79,9 +79,9 @@ ...@@ -79,9 +79,9 @@
<el-button @click="detailsForm()"> <el-button @click="detailsForm()">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button <img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
> >
<el-button @click="attach('ruleForm')"> <!-- <el-button @click="attach('ruleForm')">
<i class="el-icon-receiving"></i>&nbsp;&nbsp;&nbsp;材料归档</el-button <i class="el-icon-receiving"></i>&nbsp;&nbsp;&nbsp;材料归档</el-button
> > -->
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscroll">
...@@ -308,12 +308,14 @@ import { ...@@ -308,12 +308,14 @@ import {
selLcb selLcb
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions } from "@/utils/cache"; import { generateYearOptions } from "@/utils/cache";
import { MaterialsList } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
yearsList:generateYearOptions(), yearsList:generateYearOptions(),
xxtableData:[], xxtableData:[],
qdtableData: [], qdtableData: [],
tableDataNew: MaterialsList(),
listData: {}, listData: {},
ruleForm: { ruleForm: {
projectId: "", projectId: "",
...@@ -364,7 +366,6 @@ export default { ...@@ -364,7 +366,6 @@ export default {
}, },
//详情 //详情
detailsForm() { detailsForm() {
console.log(this.checkedList, "this.checkedList");
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择");
return; return;
...@@ -377,10 +378,26 @@ export default { ...@@ -377,10 +378,26 @@ export default {
Promise.all([fzcxXqselect(params), clqdselect(params)]).then((res) => { Promise.all([fzcxXqselect(params), clqdselect(params)]).then((res) => {
console.log(res[0], res[1], "2222222"); console.log(res[0], res[1], "2222222");
this.listData = res[0].data.records[0]; this.listData = res[0].data.records[0];
this.qdtableData = res[1].data.records;
this.qdtableData.forEach((item) => { this.qdtableData = JSON.parse(JSON.stringify(this.tableDataNew));
this.$set(item, "batchtype", "开发、实施类"); if (res[1].data.records.length > 0) {
}); // this.qdtableData = res[1].data.records;
this.qdtableData = this.qdtableData
.concat(res[1].data.records)
.reduce((accumulator, currentObj) => {
const existingObj = accumulator.find(
(obj) => obj.typeCode == currentObj.typeCode
);
if (existingObj) {
Object.assign(existingObj, currentObj);
} else {
accumulator.push(currentObj);
}
return accumulator;
}, []);
console.log(this.tableDataQD, " mergedArray mergedArray mergedArray");
}
}); });
}, },
attach() { attach() {
......
src/views/assessChecks/checkComplianceFZ.vue
...@@ -21,14 +21,26 @@ ...@@ -21,14 +21,26 @@
<el-table-column label="序号" width="100" type="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" width="auto">
</el-table-column> </el-table-column>
<el-table-column label="检查说明" prop="checkDesc" show-overflow-tooltip> </el-table-column> <el-table-column label="检查说明" prop="checkDesc" show-overflow-tooltip width="auto"> </el-table-column>
<el-table-column label="评估问题" > <el-table-column label="评估问题" width="auto" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.evalQues" :disabled="ishow"></el-input> <el-input v-model="scope.row.evalQues" :disabled="ishow"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="问题截图" width="auto">
<template slot-scope="scope">
<el-image
class="imgList"
v-for="(img, index) in scope.row.images"
:key="index"
:src="img"
:preview-src-list="scope.row.images"
@click="handleImageClick(scope.row.images)"
></el-image>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -41,7 +53,7 @@ ...@@ -41,7 +53,7 @@
</template> </template>
<script> <script>
import { selWtqdpostEvalQuesInfo ,bcpostEvalQuesInfo,tjpostEvalQuesInfo} from "@/api/index"; import { selWtqdpostEvalQuesInfo ,bcpostEvalQuesInfo,tjpostEvalQuesInfo,presignedUrl} from "@/api/index";
export default { export default {
data() { data() {
return { return {
...@@ -89,6 +101,40 @@ export default { ...@@ -89,6 +101,40 @@ export default {
break; break;
} }
let urlStr=item.url
let arrUrl = [];
let showUrlList=[]
// 有url拆分调接口换预览
if(urlStr){
console.log(urlStr,'urlStr')
if(urlStr.includes(',')){
arrUrl = item.url.split(',')
}else{
arrUrl.push(urlStr)
}
console.log(arrUrl,'arrUrlarrUrl')
arrUrl.forEach(async showUrl=>{
let paramsUrl = {
url: showUrl,
};
let resUrl = await presignedUrl(paramsUrl);
showUrlList.push(resUrl.msg)
})
console.log(showUrlList,'showUrlList')
// showUrlList=['/nopdf.png','/nopdf.png','/nopdf.png','/nopdf.png']
this.$set(item,'images',showUrlList)
}
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
this.dataPretreatment(); this.dataPretreatment();
...@@ -136,6 +182,9 @@ export default { ...@@ -136,6 +182,9 @@ export default {
cancel(){ cancel(){
this.$router.go(-1) this.$router.go(-1)
}, },
handleImageClick(){
},
//保存 //保存
async save(type){ async save(type){
console.log(this.clqparams,'this.clqparams') console.log(this.clqparams,'this.clqparams')
...@@ -308,5 +357,11 @@ export default { ...@@ -308,5 +357,11 @@ export default {
vertical-align: middle; vertical-align: middle;
} }
} }
.imgList{
/deep/ .el-image__inner{
width:60px;
height:60px;
}
}
</style> </style>
\ No newline at end of file
src/views/assessChecks/correctiveAssistanceVerification.vue
...@@ -647,7 +647,7 @@ export default { ...@@ -647,7 +647,7 @@ export default {
this.dialogQR = false; this.dialogQR = false;
}, },
async save() { async save() {
let res = await tjrectificationVerification(this.tableDataSS); let res = await tjrectificationVerification(this.tableDataQR);
if (res.code == "200") { if (res.code == "200") {
this.dialogQR = false; this.dialogQR = false;
this.resetForm(); this.resetForm();
......
src/views/assessChecks/materialAcquisition.vue
...@@ -321,7 +321,7 @@ export default { ...@@ -321,7 +321,7 @@ export default {
this.$set(item, "postEvalStateText", "未上传"); this.$set(item, "postEvalStateText", "未上传");
} else if (item.postEvalState == "0") { } else if (item.postEvalState == "0") {
this.$set(item, "postEvalStateText", "未上传"); this.$set(item, "postEvalStateText", "未上传");
} else if (item.postEvalState == "1") { } else if (item.postEvalState >=1) {
this.$set(item, "postEvalStateText", "已上传"); this.$set(item, "postEvalStateText", "已上传");
} }
}); });
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!