Skip to content

Administrator / project_progress

Go to a project
Commit 2178cfdc by liangzhen
Options

区分自查和互查

1 parent 765ab9d7
Inline Side-by-side
Showing with 73 additions and 131 deletions
src/views/assessChecks/assistedViewing.vue
...@@ -401,6 +401,7 @@ export default { ...@@ -401,6 +401,7 @@ export default {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
module:0,
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
let res = await fzcxselect(params); let res = await fzcxselect(params);
......
src/views/assessChecks/auxiliaryInspection.vue
...@@ -556,6 +556,7 @@ export default { ...@@ -556,6 +556,7 @@ export default {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
module:0,
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
......
src/views/assessChecks/auxiliarySelection.vue
...@@ -869,6 +869,7 @@ export default { ...@@ -869,6 +869,7 @@ export default {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
module:0,
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
...@@ -1072,6 +1073,7 @@ export default { ...@@ -1072,6 +1073,7 @@ export default {
expertStr: expertStr, expertStr: expertStr,
creator: sessionStorage.getItem("author"), creator: sessionStorage.getItem("author"),
createTime: getCurrentDate(), createTime: getCurrentDate(),
module:0,
}; };
Object.assign(params, this.ruleFormdialogAdd); Object.assign(params, this.ruleFormdialogAdd);
this.xfParams = JSON.parse(JSON.stringify(params)); this.xfParams = JSON.parse(JSON.stringify(params));
......
src/views/assessChecks/confirmRelease.vue
...@@ -692,6 +692,7 @@ export default { ...@@ -692,6 +692,7 @@ export default {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
module:0,
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
......
src/views/assessChecks/materialAcquisition.vue
...@@ -661,6 +661,7 @@ export default { ...@@ -661,6 +661,7 @@ export default {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
module:0,
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
......
src/views/assessZC/assistedViewing.vue
...@@ -401,6 +401,7 @@ export default { ...@@ -401,6 +401,7 @@ export default {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
module:1
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
......
src/views/assessZC/auxiliaryInspection.vue
...@@ -98,9 +98,6 @@ ...@@ -98,9 +98,6 @@
:class="inspectdisabled ? 'noclick' : ''" :class="inspectdisabled ? 'noclick' : ''"
><i class="el-icon-tickets"></i> &nbsp;&nbsp;合规性检查评估</el-button ><i class="el-icon-tickets"></i> &nbsp;&nbsp;合规性检查评估</el-button
> >
<!-- <el-button @click="submitNexts()"
><i class="el-icon-finished"></i> &nbsp;&nbsp;提交问题清单</el-button
> -->
<el-button <el-button
@click="rectificationReview('ruleForm')" @click="rectificationReview('ruleForm')"
:disabled="confirmdisabled" :disabled="confirmdisabled"
...@@ -109,13 +106,6 @@ ...@@ -109,13 +106,6 @@
<i class="el-icon-chat-dot-square"></i <i class="el-icon-chat-dot-square"></i
>&nbsp;&nbsp;&nbsp;整改复核</el-button >&nbsp;&nbsp;&nbsp;整改复核</el-button
> >
<!-- <el-button @click="subfinished()">
<i class="el-icon-finished"></i
>&nbsp;&nbsp;&nbsp;归档</el-button
> -->
<!-- <el-button @click="withdraw()">
<i class="el-icon-folder-delete"></i>撤回
</el-button> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscroll">
...@@ -377,12 +367,10 @@ ...@@ -377,12 +367,10 @@
import { import {
postEvalQuesInfo, postEvalQuesInfo,
chpostEvalQuesInfo, chpostEvalQuesInfo,
qrscevaluationMaterials,
wtssSelectificationVerification, wtssSelectificationVerification,
bcrectificationVerification, bcrectificationVerification,
tjrectificationVerification,
gdrectificationVerification,
downloadObject, downloadObject,
tjrectificationVerification
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache"; import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default { export default {
...@@ -489,7 +477,7 @@ export default { ...@@ -489,7 +477,7 @@ export default {
this.$set(item, "tagId", arrID); this.$set(item, "tagId", arrID);
} }
}); });
console.log(this.tableDataQR, "加不进去？");
this.dataPretreatment(); this.dataPretreatment();
} }
}, },
...@@ -548,38 +536,27 @@ export default { ...@@ -548,38 +536,27 @@ export default {
} }
}, },
async savetj() { async savetj() {
console.log("提交"); this.$confirm("若所有整改复核状态均为整改完成即为完成归档, 是否继续?", "提示", {
let res = await tjrectificationVerification(this.tableDataQR); confirmButtonText: "确定",
if (res.code == "200") { cancelButtonText: "取消",
this.dialogQR = false; type: "warning",
this.$message("整改复核提交成功"); })
this.resetForm(); .then(async () => {
} else { let res = await tjrectificationVerification(this.tableDataQR);
this.$message("整改复核提交失败"); if (res.code == "200") {
} this.dialogQR = false;
}, this.$message("提交成功");
//提交归档 this.resetForm();
async subfinished() { } else {
if (sessionStorage.getItem("authorName") == 3) { this.$message("提交失败");
this.$message("只有专家可以操作归档"); }
} })
console.log("只有专家可以操作归档");
let params = {
projectId: this.checkedList[0].projectId,
batchId: this.checkedList[0].batchId,
};
let res = await gdrectificationVerification(params);
if (res.code == "200") {
this.$message("归档成功");
} else {
this.$message("归档失败");
}
}, },
async submitForm() { async submitForm() {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
module:1
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
...@@ -636,7 +613,7 @@ export default { ...@@ -636,7 +613,7 @@ export default {
batchId: this.checkedList[0].batchId, batchId: this.checkedList[0].batchId,
}; };
this.$router.push({ this.$router.push({
path: "/mainLayout/Compliance", path: "/assesszc/Compliance",
query: { query: {
clqparams: JSON.stringify(params), clqparams: JSON.stringify(params),
}, },
...@@ -653,7 +630,7 @@ export default { ...@@ -653,7 +630,7 @@ export default {
batchId: this.checkedList[0].batchId, batchId: this.checkedList[0].batchId,
}; };
this.$router.push({ this.$router.push({
path: "/mainLayout/Compliancefz", path: "/assesszc/Compliancefz",
query: { query: {
clqparams: JSON.stringify(params), clqparams: JSON.stringify(params),
ishow: false, ishow: false,
...@@ -682,7 +659,7 @@ export default { ...@@ -682,7 +659,7 @@ export default {
batchId: this.checkedList[0].batchId, batchId: this.checkedList[0].batchId,
}; };
this.$router.push({ this.$router.push({
path: "/mainLayout/Compliancefz", path: "/assesszc/Compliancefz",
query: { query: {
clqparams: JSON.stringify(params), clqparams: JSON.stringify(params),
}, },
...@@ -698,8 +675,6 @@ export default { ...@@ -698,8 +675,6 @@ export default {
this.$message("该项目还未提交"); this.$message("该项目还未提交");
return; return;
} }
console.log("222");
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
...@@ -719,7 +694,7 @@ export default { ...@@ -719,7 +694,7 @@ export default {
return ""; return "";
}, },
async handleClickXZ(fileId, fileName) { async handleClickXZ(fileId, fileName) {
console.log(fileId, "22222");
let response = await downloadObject({ let response = await downloadObject({
fileId: fileId * 1, fileId: fileId * 1,
}); });
...@@ -754,15 +729,15 @@ export default { ...@@ -754,15 +729,15 @@ export default {
} }
} }
this.ruleFormdialog = this.checkedList[0]; this.ruleFormdialog = this.checkedList[0];
console.log(this.checkedList, "2222");
}, },
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize = val; this.pageSize = val;
this.submitForm(); this.submitForm();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.currentPage = val; this.currentPage = val;
this.submitForm(); this.submitForm();
}, },
...@@ -774,7 +749,7 @@ export default { ...@@ -774,7 +749,7 @@ export default {
this.dialogQR = false; this.dialogQR = false;
}, },
closeDialog() { closeDialog() {
console.log("guanbi");
this.showButton = true; this.showButton = true;
}, },
}, },
...@@ -790,7 +765,7 @@ export default { ...@@ -790,7 +765,7 @@ export default {
} }
.el-form { .el-form {
display: flex; display: flex;
width: 100%; width:99%;
flex-wrap: wrap; flex-wrap: wrap;
border-top: 2px solid #23c6c8; border-top: 2px solid #23c6c8;
border-left: 1px solid #dee5e7; border-left: 1px solid #dee5e7;
......
src/views/assessZC/auxiliarySelection.vue
...@@ -862,6 +862,7 @@ export default { ...@@ -862,6 +862,7 @@ export default {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
module:1
}; };
console.log(this.ruleForm, " this.ruleForm"); console.log(this.ruleForm, " this.ruleForm");
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
...@@ -1045,7 +1046,6 @@ export default { ...@@ -1045,7 +1046,6 @@ export default {
this.dialogedit = false; this.dialogedit = false;
}, },
saveXZ() { saveXZ() {
console.log("保存验证", this.$refs);
this.$refs.formName.validate((valid) => { this.$refs.formName.validate((valid) => {
if (!valid) { if (!valid) {
console.log("error submit!!"); console.log("error submit!!");
...@@ -1065,6 +1065,7 @@ export default { ...@@ -1065,6 +1065,7 @@ export default {
expertStr: expertStr, expertStr: expertStr,
creator: sessionStorage.getItem("author"), creator: sessionStorage.getItem("author"),
createTime: getCurrentDate(), createTime: getCurrentDate(),
module:1
}; };
Object.assign(params, this.ruleFormdialogAdd); Object.assign(params, this.ruleFormdialogAdd);
this.xfParams = JSON.parse(JSON.stringify(params)); this.xfParams = JSON.parse(JSON.stringify(params));
......
src/views/assessZC/checkCompliance.vue
...@@ -78,13 +78,13 @@ ...@@ -78,13 +78,13 @@
<el-input <el-input
type="textarea" type="textarea"
:autosize="{ minRows: 1, maxRows: 4 }" :autosize="{ minRows: 1, maxRows: 4 }"
v-model="itemfz.checkDesc" v-model="item.fzfxList[index]"
> >
</el-input </el-input
><el-button ><el-button
@click="adopt(item, index, itemfz)" @click="adopt(item, index, itemfz)"
type="primary" type="primary"
v-if="itemfz.type != '1'" v-if="itemfz.type != '1'&&!item.checked"
>采纳</el-button >采纳</el-button
> >
<el-button type="info" v-else>采纳</el-button> <el-button type="info" v-else>采纳</el-button>
...@@ -245,7 +245,6 @@ export default { ...@@ -245,7 +245,6 @@ export default {
}; };
}, },
mounted() { mounted() {
console.log(MaterialsListKY(1), "wwwww");
this.clqparams = JSON.parse(this.$route.query.clqparams); this.clqparams = JSON.parse(this.$route.query.clqparams);
this.init(this.clqparams); this.init(this.clqparams);
}, },
...@@ -307,8 +306,6 @@ export default { ...@@ -307,8 +306,6 @@ export default {
// on-change添加文件，上传成功和上传失败时都会被调用 // on-change添加文件，上传成功和上传失败时都会被调用
handleEditChange(file, fileList) { handleEditChange(file, fileList) {
this.hideUploadEdit = fileList.length >= this.limitNum; this.hideUploadEdit = fileList.length >= this.limitNum;
// this.fileList.push({ name: items.name, url: items.url });
console.log(fileList, " this.fileList");
}, },
// http-request自定义上传 // http-request自定义上传
...@@ -356,7 +353,6 @@ export default { ...@@ -356,7 +353,6 @@ export default {
...type, ...type,
}; };
Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => { Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => {
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) {
...@@ -364,7 +360,7 @@ export default { ...@@ -364,7 +360,7 @@ export default {
let counterNum = 0; let counterNum = 0;
this.questionList.forEach(async (item) => { this.questionList.forEach(async (item) => {
if (item.isProblem == 0) { if (item.isProblem == 0) {
console.log("未发现问题");
this.$set(item, "checked", true); this.$set(item, "checked", true);
this.changeChecked(item); this.changeChecked(item);
} }
...@@ -395,7 +391,6 @@ export default { ...@@ -395,7 +391,6 @@ export default {
} }
}); });
this.$set(item, "evalList", [...respon.data.records]); this.$set(item, "evalList", [...respon.data.records]);
console.log(item, "itemitemitem");
} else { } else {
this.$set(item, "evalList", [ this.$set(item, "evalList", [
{ {
...@@ -407,16 +402,21 @@ export default { ...@@ -407,16 +402,21 @@ 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&&item.type==0) {
item.checkDesc = item.checkDesc.replace(/\n/g, "<br>"); item.checkDesc = item.checkDesc.replace(/\n/g, "<br>");
} }
return item.type == 0; return item.checkDesc&&item.type==0;
}); });
let fzfxList = responfx.data.records.filter((item) => { this.$set(item, "znfxList", [...znfxList]);
let resfxList = responfx.data.records.filter((item) => {
return item.type == 1 || item.type == 2; return item.type == 1 || item.type == 2;
}); });
this.$set(item, "znfxList", [...znfxList]); if(resfxList&&resfxList.length>0){
this.$set(item, "fzfxList", [...fzfxList]); let fzfxList=resfxList[0].checkDesc.split("\n");
this.$set(item, "fzfxList", [...fzfxList]);
}
} else { } else {
this.$set(item, "znfxList", []); this.$set(item, "znfxList", []);
this.$set(item, "fzfxList", []); this.$set(item, "fzfxList", []);
...@@ -424,22 +424,16 @@ export default { ...@@ -424,22 +424,16 @@ export default {
if(counterNum==this.questionList.length){ if(counterNum==this.questionList.length){
setTimeout(() => { setTimeout(() => {
this.oldQuestionList = JSON.parse(JSON.stringify(this.questionList)); this.oldQuestionList = JSON.parse(JSON.stringify(this.questionList));
console.log(this.questionList, this.oldQuestionList, "总列表");
}, 300); }, 300);
} }
}) })
} }
console.log(this.questionList,'2')
if (this.urlList.length <= 0) { if (this.urlList.length <= 0) {
this.iframeUrl = "/nopdf.png"; this.iframeUrl = "/nopdf.png";
} else { } else {
// let paramsUrl = {
// fileId: this.urlList[0].id,
// url: this.urlList[0].url,
// };
// let resUrl = await presignedUrl(paramsUrl);
// this.iframeUrl = "/pdf/web/viewer.html?file=" + resUrl.msg;
let resUrl = await downloadObject({fileId: this.urlList[0].id}); let resUrl = await downloadObject({fileId: this.urlList[0].id});
this.blobType=this.urlList[0].fileType this.blobType=this.urlList[0].fileType
...@@ -455,24 +449,14 @@ export default { ...@@ -455,24 +449,14 @@ export default {
}) })
} }
} }
// setTimeout(() => {
// this.oldQuestionList = JSON.parse(JSON.stringify(this.questionList));
// console.log(this.questionList, this.oldQuestionList, "总列表");
// }, 1000);
}); });
}, },
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) {
// let paramsUrl = {
// fileId: item.id,
// url: item.url,
// };
// let resUrl = await presignedUrl(paramsUrl);
let resUrl = await downloadObject({fileId:item.id}); let resUrl = await downloadObject({fileId:item.id});
this.blobType=item.fileType this.blobType=item.fileType
console.log(item.fileType,'item.fileType')
const binaryData = [] const binaryData = []
binaryData.push(resUrl) binaryData.push(resUrl)
let URL = window.URL.createObjectURL(new Blob(binaryData, { type:item.contentType})) let URL = window.URL.createObjectURL(new Blob(binaryData, { type:item.contentType}))
...@@ -544,17 +528,11 @@ export default { ...@@ -544,17 +528,11 @@ export default {
item.evalList.splice(index, 1); item.evalList.splice(index, 1);
}, },
adopt(item, index, items) { adopt(item, index, items) {
console.log(item, "item");
console.log(items, "items");
if (item.evalList.length == 1 && !item.evalList[0].evalQues) { if (item.evalList.length == 1 && !item.evalList[0].evalQues) {
item.evalList[0].evalQues = items.checkDesc; item.evalList[0].evalQues = items;
// this.$set(item,evalList,{
// evalQues: items.checkDesc,
// })
} else { } else {
item.evalList.push({ item.evalList.push({
evalQues: items.checkDesc, evalQues: items,
hideUploadEdit: false, hideUploadEdit: false,
}); });
} }
...@@ -564,14 +542,14 @@ export default { ...@@ -564,14 +542,14 @@ export default {
console.log("选择了未发现问题"); console.log("选择了未发现问题");
return; return;
} }
console.log(item, "22");
item.evalList.push({ item.evalList.push({
data: "", data: "",
evalQues: "", evalQues: "",
}); });
}, },
changeChecked(item) { changeChecked(item) {
console.log(item, "2222");
if (item.checked) { if (item.checked) {
this.$set(item, "evalList", [ this.$set(item, "evalList", [
{ {
...@@ -651,41 +629,9 @@ export default { ...@@ -651,41 +629,9 @@ export default {
}); });
} }
}, },
// successHandler(items) {
// this.fileList.push({ name: items.name, url: items.url });
// console.log("来了么222222", this.fileList);
// },
}, },
// beforeRouteLeave(to,from,next){
// if(JSON.stringify(this.questionList) ==JSON.stringify(this.oldQuestionList)){
// console.log('相同么')
// next({replace: true,redirect: '/mainLayout/auxiliaryInspection'})
// }else{
// console.log('不同么')
// setTimeout(() => {
// this.$confirm("是否保存?", "提示", {
// confirmButtonText: "是",
// cancelButtonText: "否",
// distinguishCancelAndClose: true,
// type: "warning",
// }).then(() => {
// this.save('leave');
// next({replace: true,redirect: '/mainLayout/auxiliaryInspection'})
// })
// .catch((action) => {
// console.log(action, "actionaction");
// if (action === "cancel") {
// next({replace: true,redirect: '/mainLayout/auxiliaryInspection'})
// } else {
// // next()
// }
// });
// },16)
// }
// }
}; };
</script> </script>
...@@ -834,6 +780,15 @@ export default { ...@@ -834,6 +780,15 @@ export default {
margin-left: 10px; margin-left: 10px;
vertical-align: top; vertical-align: top;
} }
.el-button--info {
color: #ffffff;
// background-color: #0d867f;
// border-color: #0d867f;
height: 35px;
line-height: 0.6;
margin-left: 10px;
vertical-align: top;
}
.el-icon-circle-plus { .el-icon-circle-plus {
font-size: 45px; font-size: 45px;
vertical-align: middle; vertical-align: middle;
......
src/views/assessZC/confirmRelease.vue
...@@ -692,6 +692,7 @@ export default { ...@@ -692,6 +692,7 @@ export default {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
module:1
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
......
src/views/assessZC/materialAcquisition.vue
...@@ -661,6 +661,7 @@ export default { ...@@ -661,6 +661,7 @@ export default {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
module:1
}; };
Object.assign(params, this.ruleForm); Object.assign(params, this.ruleForm);
console.log(params); console.log(params);
......
src/views/layout/leftBar.vue
...@@ -70,20 +70,23 @@ export default { ...@@ -70,20 +70,23 @@ export default {
watch: { watch: {
$route: { $route: {
immediate: true, immediate: true,
handler(newParams, oldParams) { handler(n,o) {
console.log("路又变了", newParams);
if ( if (
this.$route.path == "/mainLayout/Compliancefz" || this.$route.path == "/mainLayout/Compliancefz" ||
this.$route.path == "/mainLayout/Compliance" this.$route.path == "/mainLayout/Compliance"
) { ) {
this.activeIndex = "/mainLayout/auxiliaryInspection"; this.activeIndex = "/mainLayout/auxiliaryInspection";
} else if (
this.$route.path == "/assesszc/Compliancefz" ||
this.$route.path == "/assesszc/Compliance"
) {
this.activeIndex = "/assesszc/auxiliaryInspection";
} else { } else {
this.activeIndex = this.$route.path; this.activeIndex = this.$route.path;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.kzMenu.activeIndex = this.$route.path; this.$refs.kzMenu.activeIndex = this.$route.path;
}); });
} }
console.log(this.$route.meta.title, "路由名字");
if (!this.routerTabs.includes(this.$route.meta.title)) { if (!this.routerTabs.includes(this.$route.meta.title)) {
this.routerTabs.push(this.$route.meta.title); this.routerTabs.push(this.$route.meta.title);
} }
...@@ -166,7 +169,6 @@ export default { ...@@ -166,7 +169,6 @@ export default {
"获取父元素的local数据", "获取父元素的local数据",
JSON.parse(localStorage.getItem("user")) JSON.parse(localStorage.getItem("user"))
); );
console.log("本页面路由是什么", this.$route.path);
this.handleOpen(0, ["0"]); this.handleOpen(0, ["0"]);
if ( if (
this.$route.path == "/mainLayout/Compliancefz" || this.$route.path == "/mainLayout/Compliancefz" ||
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!