Skip to content

Administrator / project_progress

Go to a project
Commit cbe441f8 by liangzhen
Options

暂存一下

1 parent b495441d
Inline Side-by-side
Showing with 144 additions and 74 deletions
src/views/assessChecks/assistedFeedback.vue
...@@ -722,7 +722,7 @@ export default { ...@@ -722,7 +722,7 @@ export default {
this.dataPretreatmentSS(); this.dataPretreatmentSS();
} }
}, },
handleFileUploadZG(event, row, id) { handleFileUpload(event, row, id) {
console.log("来了么"); console.log("来了么");
this.file = event.target.files[0]; this.file = event.target.files[0];
this.submitFile(row, id); this.submitFile(row, id);
......
src/views/assessChecks/auxiliaryInspection.vue
...@@ -52,16 +52,17 @@ ...@@ -52,16 +52,17 @@
/> />
</el-select> </el-select>
</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="请选择"
clearable clearable
> >
<el-option label="待提交" value="2"></el-option> <el-option label="材料未上传" value="0"></el-option>
<el-option label="已撤回" value="4"></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="2"></el-option>
<el-option label="已整改" value="3"></el-option>
<el-option label="已归档" value="4"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
...@@ -94,17 +95,17 @@ ...@@ -94,17 +95,17 @@
<el-button @click="inspectNexts()" <el-button @click="inspectNexts()"
><i class="el-icon-tickets"></i> &nbsp;&nbsp;合规性检查评估</el-button ><i class="el-icon-tickets"></i> &nbsp;&nbsp;合规性检查评估</el-button
> >
<el-button @click="submitNexts()" <!-- <el-button @click="submitNexts()"
><i class="el-icon-finished"></i> &nbsp;&nbsp;提交问题清单</el-button ><i class="el-icon-finished"></i> &nbsp;&nbsp;提交问题清单</el-button
> > -->
<el-button @click="rectificationReview('ruleForm')"> <el-button @click="rectificationReview('ruleForm')">
<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()"> <!-- <el-button @click="subfinished()">
<i class="el-icon-finished"></i <i class="el-icon-finished"></i
>&nbsp;&nbsp;&nbsp;归档</el-button >&nbsp;&nbsp;&nbsp;归档</el-button
> > -->
<!-- <el-button @click="withdraw()"> <!-- <el-button @click="withdraw()">
<i class="el-icon-folder-delete"></i>撤回 <i class="el-icon-folder-delete"></i>撤回
</el-button> --> </el-button> -->
...@@ -548,16 +549,17 @@ export default { ...@@ -548,16 +549,17 @@ export default {
} else if (item.postEvalState == 1) { } else if (item.postEvalState == 1) {
this.$set(item, "postEvalStateText", "待评估"); this.$set(item, "postEvalStateText", "待评估");
} else if (item.postEvalState == 2) { } else if (item.postEvalState == 2) {
this.$set(item, "postEvalStateText", "已评估");
}else if (item.postEvalState == 3) {
this.$set(item, "postEvalStateText", "无需整改");
}else if (item.postEvalState == 4) {
this.$set(item, "postEvalStateText", "需整改"); this.$set(item, "postEvalStateText", "需整改");
}else if (item.postEvalState == 5) { }else if (item.postEvalState == 3) {
this.$set(item, "postEvalStateText", "已整改"); this.$set(item, "postEvalStateText", "已整改");
}else if (item.postEvalState == 6) { }else if (item.postEvalState == 4) {
this.$set(item, "postEvalStateText", "已归档"); this.$set(item, "postEvalStateText", "已归档");
} }
// else if (item.postEvalState == 5) {
// this.$set(item, "postEvalStateText", "已整改");
// }else if (item.postEvalState == 6) {
// this.$set(item, "postEvalStateText", "已归档");
// }
this.$set( this.$set(
item, item,
...@@ -979,8 +981,8 @@ h3 { ...@@ -979,8 +981,8 @@ h3 {
.eltable { .eltable {
box-sizing: border-box; box-sizing: border-box;
text-align: center; text-align: center;
width: 150%; width: 190%;
min-width: 150%; min-width: 190%;
} }
/deep/.el-table__fixed-body-wrapper .el-table__body { /deep/.el-table__fixed-body-wrapper .el-table__body {
padding-bottom: 6px; // 6px为横向滚动条高度 padding-bottom: 6px; // 6px为横向滚动条高度
......
src/views/assessChecks/checkCompliance.vue
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
</div> </div>
</div> </div>
<p class="Btn"> <p class="Btn">
<span @click="cancel()">取消</span><span @click="save()">保存</span> <span @click="cancel()">取消</span><span @click="save()">保存</span> <span @click="submitNexts()">提交</span>
</p> </p>
</div> </div>
</template> </template>
...@@ -250,6 +250,42 @@ export default { ...@@ -250,6 +250,42 @@ export default {
this.init(this.clqparams); this.init(this.clqparams);
}, },
methods: { methods: {
//提交问题清单
async submitNexts() {
// this.$router.push({
// path: "/mainLayout/Compliancefz",
// query: {
// clqparams: JSON.stringify(this.clqparams),
// },
// });
this.$confirm("您确定检查完所有流程并去提交?", "提示", {
confirmButtonText: "是",
cancelButtonText: "继续检查",
distinguishCancelAndClose: true,
type: "warning",
})
.then(() => {
this.save();
this.$router.push({
path: "/mainLayout/Compliancefz",
query: {
clqparams: JSON.stringify(this.clqparams),
},
});
})
.catch((action) => {
});
},
// 放大图片 // 放大图片
handlePictureCardPreview(file) { handlePictureCardPreview(file) {
console.log("点击放大"); console.log("点击放大");
...@@ -621,35 +657,35 @@ export default { ...@@ -621,35 +657,35 @@ export default {
// console.log("来了么222222", this.fileList); // console.log("来了么222222", this.fileList);
// }, // },
}, },
beforeRouteLeave(to,from,next){ // beforeRouteLeave(to,from,next){
if(JSON.stringify(this.questionList) ==JSON.stringify(this.oldQuestionList)){ // if(JSON.stringify(this.questionList) ==JSON.stringify(this.oldQuestionList)){
console.log('相同么') // console.log('相同么')
next({replace: true,redirect: '/mainLayout/auxiliaryInspection'}) // next({replace: true,redirect: '/mainLayout/auxiliaryInspection'})
}else{ // }else{
console.log('不同么') // console.log('不同么')
setTimeout(() => { // setTimeout(() => {
this.$confirm("是否保存?", "提示", { // this.$confirm("是否保存?", "提示", {
confirmButtonText: "是", // confirmButtonText: "是",
cancelButtonText: "否", // cancelButtonText: "否",
distinguishCancelAndClose: true, // distinguishCancelAndClose: true,
type: "warning", // type: "warning",
}).then(() => { // }).then(() => {
this.save('leave'); // this.save('leave');
next({replace: true,redirect: '/mainLayout/auxiliaryInspection'}) // next({replace: true,redirect: '/mainLayout/auxiliaryInspection'})
}) // })
.catch((action) => { // .catch((action) => {
console.log(action, "actionaction"); // console.log(action, "actionaction");
if (action === "cancel") { // if (action === "cancel") {
next({replace: true,redirect: '/mainLayout/auxiliaryInspection'}) // next({replace: true,redirect: '/mainLayout/auxiliaryInspection'})
} else { // } else {
// next() // // next()
} // }
}); // });
},16) // },16)
} // }
} // }
}; };
</script> </script>
......
src/views/assessChecks/checkComplianceFZ.vue
...@@ -52,7 +52,8 @@ ...@@ -52,7 +52,8 @@
</el-table> </el-table>
</div> </div>
<p class="Btn" v-if="!ishow"> <p class="Btn" v-if="!ishow">
<span @click="cancel()">取消</span><span @click="save('add')">确定</span> <span @click="cancel()">取消</span>
<!-- <span @click="save('add')">确定</span> -->
<span @click="save('upLoad')">提交</span> <span @click="save('upLoad')">提交</span>
</p> </p>
</div> </div>
...@@ -197,23 +198,28 @@ export default { ...@@ -197,23 +198,28 @@ export default {
console.log(params, "this.clqparams"); console.log(params, "this.clqparams");
// return // return
if (type == "add") { // if (type == "add") {
console.log(params, "this.zjtableDatathis.zjtableData"); // console.log(params, "this.zjtableDatathis.zjtableData");
let res = await bcpostEvalQuesInfo(params); // let res = await bcpostEvalQuesInfo(params);
if (res.code == "200") { // if (res.code == "200") {
this.$router.go(-1); // // this.$router.go(-1);
} else { // this.$message("保存成功");
this.$message("保存失败"); // } else {
} // this.$message("保存失败");
} else { // }
// } else {
let res = await tjpostEvalQuesInfo(params); let res = await tjpostEvalQuesInfo(params);
if (res.code == "200") { if (res.code == "200") {
this.$router.go(-1); // this.$router.go(-1);
this.$router.push({
path: "/mainLayout/auxiliaryInspection",
});
} else { } else {
this.$message("上传失败"); this.$message("提交失败");
} }
} }
}, // },
}, },
}; };
</script> </script>
......
src/views/assessChecks/confirmRelease.vue
...@@ -452,6 +452,7 @@ ...@@ -452,6 +452,7 @@
v-model="ruleFormZJ.projectYear" v-model="ruleFormZJ.projectYear"
placeholder="请选择" placeholder="请选择"
clearable clearable
multiple
> >
<el-option <el-option
v-for="(item, index) in yearsList" v-for="(item, index) in yearsList"
......
src/views/assessChecks/materialAcquisition.vue
...@@ -75,13 +75,10 @@ ...@@ -75,13 +75,10 @@
clearable 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-option label="已评估" value="3"></el-option> --> <el-option label="已整改" value="3"></el-option>
<el-option label="无需整改" value="3"></el-option> <el-option label="已归档" value="4"></el-option>
<el-option label="需整改" value="4"></el-option>
<el-option label="已整改" value="5"></el-option>
<el-option label="已归档" value="6"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -681,14 +678,12 @@ export default { ...@@ -681,14 +678,12 @@ export default {
} 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", "待评估");
}else if (item.postEvalState == 3) { } else if (item.postEvalState == 2) {
this.$set(item, "postEvalStateText", "无需整改");
}else if (item.postEvalState == 4) {
this.$set(item, "postEvalStateText", "需整改"); this.$set(item, "postEvalStateText", "需整改");
}else if (item.postEvalState == 5) { }else if (item.postEvalState == 3) {
this.$set(item, "postEvalStateText", "已整改"); this.$set(item, "postEvalStateText", "已整改");
}else if (item.postEvalState == 6) { }else if (item.postEvalState == 4) {
this.$set(item, "postEvalStateText", "已归档"); this.$set(item, "postEvalStateText", "已归档");
} }
// if (item.batchState == "3") { // if (item.batchState == "3") {
...@@ -1249,8 +1244,8 @@ h3 { ...@@ -1249,8 +1244,8 @@ h3 {
.eltable { .eltable {
box-sizing: border-box; box-sizing: border-box;
text-align: center; text-align: center;
width: 150%; width: 190%;
min-width: 150%; min-width: 190%;
} }
/deep/.el-table--scrollable-x .el-table__body-wrapper { /deep/.el-table--scrollable-x .el-table__body-wrapper {
overflow-x: hidden !important; overflow-x: hidden !important;
......
src/views/layout/leftBar.vue
...@@ -71,6 +71,24 @@ export default { ...@@ -71,6 +71,24 @@ export default {
immediate: true, immediate: true,
handler(newParams, oldParams) { handler(newParams, oldParams) {
console.log('路又变了',newParams) console.log('路又变了',newParams)
if (
this.$route.path == "/mainLayout/Compliancefz" ||
this.$route.path == "/mainLayout/Compliance"
) {
this.activeIndex = "/mainLayout/auxiliaryInspection";
} else if (this.$route.path == "/mainLayout/qrCompliance") {
this.activeIndex = "/mainLayout/confirmChanges";
} else if (this.$route.path == "/mainLayout/Compliancexf") {
if (this.$route.query.fromType == "fzcx") {
this.activeIndex = "/mainLayout/auxiliaryQuery";
} else {
this.activeIndex = "/mainLayout/assitedDistribution";
}
} else {
this.activeIndex = this.$route.path;
}
// this.$refs.kzMenu.activeIndex = this.$route.path;
// this.activeIndex = this.$route.path;
}, },
}, },
autho(newVal, oldVal) { autho(newVal, oldVal) {
......
src/views/projectCheck/checkResault.vue
...@@ -96,6 +96,9 @@ ...@@ -96,6 +96,9 @@
> >
</el-table-column> </el-table-column>
<el-table-column prop="abnormalResults" label="检查异常结果"> <el-table-column prop="abnormalResults" label="检查异常结果">
<template v-slot="scope">
<el-button type="text" size="small" @click="detailsForm(scope.row)">{{scope.row.abnormalResults}}</el-button>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -271,11 +274,16 @@ export default { ...@@ -271,11 +274,16 @@ export default {
this.submitForm(); this.submitForm();
}, },
//详情 //详情
async detailsForm() { async detailsForm(info) {
if(info){
this.checkedList[0]=info
}else{
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
}
let params = { let params = {
current: this.currentPageXQ, current: this.currentPageXQ,
pageSize: this.pageSizeXQ, pageSize: this.pageSizeXQ,
...@@ -651,4 +659,7 @@ h3 { ...@@ -651,4 +659,7 @@ h3 {
position: relative; position: relative;
overflow: auto; overflow: auto;
} }
/deep/.el-button--small{
font-size: 14px;
}
</style> </style>
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!