Skip to content

Administrator / project_progress

Go to a project
Commit 7ff7d221 by liangzhen
Options

暂存一下

1 parent 80dd09a5
Inline Side-by-side
Showing with 50 additions and 21 deletions
src/views/assessChecks/assistedRect.vue
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
<el-table-column label="上传整改材料" prop="zgFileId" width="400"> <el-table-column label="上传整改材料" prop="zgFileId" width="400">
<template <template
slot-scope="scope" slot-scope="scope"
v-if="scope.row.confirmStatus == '1'"
> >
<input <input
type="file" type="file"
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
<el-table-column label="情况说明" prop="zgqkFileId" width="400"> <el-table-column label="情况说明" prop="zgqkFileId" width="400">
<template <template
slot-scope="scope" slot-scope="scope"
v-if="scope.row.confirmStatus == '1'"
> >
<input <input
type="file" type="file"
......
src/views/assessChecks/correctiveAssistanceVerification.vue
...@@ -521,6 +521,9 @@ export default { ...@@ -521,6 +521,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.可研");
...@@ -684,6 +687,7 @@ export default { ...@@ -684,6 +687,7 @@ 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) => {
console.log(item.confirmStatus,'item.confirmStatusitem.confirmStatus')
if(!item.confirmStatus){ if(!item.confirmStatus){
this.$set(item, "confirmStatus", "2") this.$set(item, "confirmStatus", "2")
} }
......
src/views/checkCompliance/automaticCheck.vue
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<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="ruleName" prop="projectId"> <el-table-column label="规则名称" width="auto" prop="ruleName">
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="规则类型" width="auto"> <el-table-column prop="ruleType" label="规则类型" width="auto">
</el-table-column> </el-table-column>
......
src/views/projectCheck/checkResault.vue
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscrollOut">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<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="ruleName" prop="projectId"> <el-table-column label="规则名称" width="auto" prop="ruleName">
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="规则类型" width="auto"> <el-table-column prop="ruleType" label="规则类型" width="auto">
</el-table-column> </el-table-column>
...@@ -592,9 +592,9 @@ h3 { ...@@ -592,9 +592,9 @@ h3 {
border-radius: 5px; border-radius: 5px;
} }
} }
.setscroll { .setscrollOut {
width: 100%; width: 100%;
height: 650px; height: 585px;
position: relative; position: relative;
overflow: auto; overflow: auto;
} }
...@@ -655,7 +655,7 @@ h3 { ...@@ -655,7 +655,7 @@ h3 {
} }
.setscroll { .setscroll {
width: 100%; width: 100%;
height: 600px; height: 400px;
position: relative; position: relative;
overflow: auto; overflow: auto;
} }
......
src/views/projectCheck/confirmResault.vue
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscrollOut">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -190,7 +190,8 @@ ...@@ -190,7 +190,8 @@
<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="ruleName" prop="projectId">
<el-table-column label="规则名称" width="auto" prop="ruleName">
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="规则类型" width="auto"> <el-table-column prop="ruleType" label="规则类型" width="auto">
</el-table-column> </el-table-column>
...@@ -283,7 +284,8 @@ ...@@ -283,7 +284,8 @@
<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="ruleName" prop="projectId">
<el-table-column label="规则名称" width="auto" prop="ruleName">
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="规则类型" width="auto"> <el-table-column prop="ruleType" label="规则类型" width="auto">
</el-table-column> </el-table-column>
...@@ -435,6 +437,10 @@ export default { ...@@ -435,6 +437,10 @@ export default {
if(type=='xq'){ if(type=='xq'){
this.dialog = true; this.dialog = true;
}else{ }else{
if (this.checkedList[0].confirmStatusText == '已下发') {
this.$message("已完成下发");
return;
}
this.dialogXF = true; this.dialogXF = true;
} }
...@@ -489,6 +495,9 @@ export default { ...@@ -489,6 +495,9 @@ export default {
auditId: this.checkedList[0].auditId, auditId: this.checkedList[0].auditId,
} }
let res= await jgxqResults(params) let res= await jgxqResults(params)
if(res.code==200){
this.$message('确认完成')
}
}, },
//结果下发 //结果下发
async resaultXF(){ async resaultXF(){
...@@ -497,6 +506,7 @@ export default { ...@@ -497,6 +506,7 @@ export default {
} }
let res= await wtxfResults(params) let res= await wtxfResults(params)
if(res.code==200){ if(res.code==200){
this.$message('下发成功')
this.dialogXF=false; this.dialogXF=false;
this.resetForm(); this.resetForm();
} }
...@@ -798,7 +808,7 @@ h3 { ...@@ -798,7 +808,7 @@ h3 {
} }
} }
.setscroll { .setscrollOut {
width: 100%; width: 100%;
height: 585px; height: 585px;
position: relative; position: relative;
...@@ -813,4 +823,10 @@ h3 { ...@@ -813,4 +823,10 @@ h3 {
border-bottom: none; border-bottom: none;
} }
} }
.setscroll {
width: 100%;
height: 400px;
position: relative;
overflow: auto;
}
</style> </style>
\ No newline at end of file
src/views/projectCheck/problemRectify.vue
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscrollOut">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
...@@ -165,7 +165,8 @@ ...@@ -165,7 +165,8 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="规则名称" width="ruleName" prop="projectId">
<el-table-column label="规则名称" width="auto" prop="ruleName">
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="规则类型" width="auto"> <el-table-column prop="ruleType" label="规则类型" width="auto">
</el-table-column> </el-table-column>
...@@ -275,7 +276,8 @@ ...@@ -275,7 +276,8 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="规则名称" width="ruleName" prop="projectId">
<el-table-column label="规则名称" width="auto" prop="ruleName">
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="规则类型" width="auto"> <el-table-column prop="ruleType" label="规则类型" width="auto">
</el-table-column> </el-table-column>
...@@ -511,11 +513,15 @@ export default { ...@@ -511,11 +513,15 @@ export default {
async saveXF() { async saveXF() {
console.log(this.XQtableData,'this.XQtableData') console.log(this.XQtableData,'this.XQtableData')
let res = await savaauditRuleProjectLink(this.XQtableData); let res = await savaauditRuleProjectLink(this.XQtableData);
if(res.code==200){
this.$message('保存完成')
}
}, },
//结果下发 //结果下发
async resaultXF() { async resaultXF() {
let res = await tjTasksRuleProjectLink(this.XQtableData); let res = await tjTasksRuleProjectLink(this.XQtableData);
if (res.code == 200) { if (res.code == 200) {
this.$message('提交成功')
this.dialogXF = false; this.dialogXF = false;
this.resetForm(); this.resetForm();
} }
...@@ -843,7 +849,7 @@ h3 { ...@@ -843,7 +849,7 @@ h3 {
color: #333; color: #333;
} }
} }
.setscroll { .setscrollOut {
width: 100%; width: 100%;
height: 585px; height: 585px;
position: relative; position: relative;
...@@ -918,7 +924,7 @@ h3 { ...@@ -918,7 +924,7 @@ h3 {
} }
.setscroll { .setscroll {
width: 100%; width: 100%;
height: 650px; height: 400px;
position: relative; position: relative;
overflow: auto; overflow: auto;
} }
......
src/views/projectCheck/verificationRectify.vue
...@@ -168,7 +168,8 @@ ...@@ -168,7 +168,8 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="规则名称" width="ruleName" prop="projectId">
<el-table-column label="规则名称" width="auto" prop="ruleName">
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="规则类型" width="auto"> <el-table-column prop="ruleType" label="规则类型" width="auto">
</el-table-column> </el-table-column>
...@@ -295,7 +296,8 @@ ...@@ -295,7 +296,8 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="规则名称" width="ruleName" prop="projectId">
<el-table-column label="规则名称" width="auto" prop="ruleName">
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="规则类型" width="auto"> <el-table-column prop="ruleType" label="规则类型" width="auto">
</el-table-column> </el-table-column>
...@@ -454,7 +456,7 @@ export default { ...@@ -454,7 +456,7 @@ export default {
this.$set(item, "rectificationStatusText", "已提交"); this.$set(item, "rectificationStatusText", "已提交");
} else if (item.rectificationStatus == 3) { } else if (item.rectificationStatus == 3) {
this.$set(item, "rectificationStatusText", "被退回"); this.$set(item, "rectificationStatusText", "被退回");
} else if (item.rectificationStatus == 2) { } else if (item.rectificationStatus == 4) {
this.$set(item, "rectificationStatusText", "整改完成"); this.$set(item, "rectificationStatusText", "整改完成");
} }
}); });
...@@ -966,7 +968,7 @@ h3 { ...@@ -966,7 +968,7 @@ h3 {
} }
.setscroll { .setscroll {
width: 100%; width: 100%;
height: 650px; height: 585px;
position: relative; position: relative;
overflow: auto; overflow: auto;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!