Skip to content

Administrator / project_progress

Go to a project
Commit e0e02e07 by liangzhen
Options

暂存

1 parent 783f4652
Expand all
Inline Side-by-side
Showing with 83 additions and 101 deletions
src/api/index.js
...@@ -492,3 +492,8 @@ export function postEvalQuesInfoTh(params) { ...@@ -492,3 +492,8 @@ export function postEvalQuesInfoTh(params) {
export function postEvalQuesInfocxtj(params) { export function postEvalQuesInfocxtj(params) {
return post(`${ARCH_EVALUATION}/postEvalQuesInfo/cxtj`, params) return post(`${ARCH_EVALUATION}/postEvalQuesInfo/cxtj`, params)
} }
//整改确认接口
export function zgqdauditTasks(params) {
return post(`${ARCH_EVALUATION}/auditTasksRuleProjectLink/zgqd`, params)
}
\ No newline at end of file
src/views/assessZC/confirmRelease.vue
...@@ -82,9 +82,6 @@ ...@@ -82,9 +82,6 @@
</el-table-column> --> </el-table-column> -->
<el-table-column label="后评估批次状态" prop="link"> <el-table-column label="后评估批次状态" prop="link">
<template v-slot="scope"> <template v-slot="scope">
<!-- <router-link :to="`/mainLayout/assistedViewing/${scope.row.id}`">
<el-button type="text" size="small">{{scope.row.postEvalStateText}}</el-button>
</router-link> -->
<router-link <router-link
:to="{ :to="{
path: '/assesszc/auxiliaryInspection', path: '/assesszc/auxiliaryInspection',
......
src/views/assessZC/projectView.vue
...@@ -385,6 +385,9 @@ export default { ...@@ -385,6 +385,9 @@ export default {
if (this.$route.query.projectId) { if (this.$route.query.projectId) {
this.ruleForm.projectCode = this.$route.query.projectId this.ruleForm.projectCode = this.$route.query.projectId
} }
if (this.$route.query.contractNumber) {
this.ruleForm.contractNumber = this.$route.query.contractNumber
}
this.submitForm() this.submitForm()
this.processenv = process.env.VUE_APP_BASE_URL this.processenv = process.env.VUE_APP_BASE_URL
......
src/views/compliance/checkRules.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
v-model="ruleForm.ruleName" v-model="ruleForm.ruleName"
placeholder="请输入" placeholder="请输入"
clearable clearable
@input="numberVal" @change="numberVal"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="规则状态:" prop="ruleStatus" class="fromItem"> <el-form-item label="规则状态:" prop="ruleStatus" class="fromItem">
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
v-model="ruleForm.ruleStatus" v-model="ruleForm.ruleStatus"
placeholder="请选择" placeholder="请选择"
clearable clearable
@input="numberVal" @change="numberVal"
> >
<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>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
v-model="ruleForm.creator" v-model="ruleForm.creator"
placeholder="请输入" placeholder="请输入"
clearable clearable
@input="numberVal" @change="numberVal"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="创建时间:" prop="createTime" class="fromItem"> <!-- <el-form-item label="创建时间:" prop="createTime" class="fromItem">
......
src/views/compliance/taskConfigure.vue
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
> >
<div class="dialog"> <div class="dialog">
<el-form <el-form
:model="ruleForm" :model="ruleFormRule"
ref="ruleForm" ref="ruleForm"
label-width="100px" label-width="100px"
class="demo-ruleForm" class="demo-ruleForm"
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
v-model="ruleFormRule.ruleStatus" v-model="ruleFormRule.ruleStatus"
placeholder="请选择" placeholder="请选择"
clearable clearable
@input="numberVal" @change="numberVal"
> >
<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>
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
v-model="ruleFormRule.creator" v-model="ruleFormRule.creator"
placeholder="请输入" placeholder="请输入"
clearable clearable
@input="numberVal" @change="numberVal"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="RuleItem"> <el-form-item class="RuleItem">
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
v-model="ruleFormdialogBJ.creator" v-model="ruleFormdialogBJ.creator"
placeholder="请输入" placeholder="请输入"
clearable clearable
@input="numberVal" @change="numberVal"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="稽核时间:" class="fromItem" prop="dates"> <!-- <el-form-item label="稽核时间:" class="fromItem" prop="dates">
......
src/views/projectCheck/problemRectify.vue
...@@ -84,11 +84,11 @@ ...@@ -84,11 +84,11 @@
<el-button @click="detailsForm('xq')"> <el-button @click="detailsForm('xq')">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button <img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
> >
<el-button @click="detailsForm('xf')" <el-button @click="zgqdauditTasks('xf')"
:disabled="confirmdisabled" :disabled="confirmdisabled"
:class="confirmdisabled ? 'noclick' : ''"> :class="confirmdisabled ? 'noclick' : ''">
<i class="el-icon-document-remove"></i <i class="el-icon-document-remove"></i
>&nbsp;&nbsp;&nbsp;整改提交</el-button >&nbsp;&nbsp;&nbsp;整改确认</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -127,7 +127,21 @@ ...@@ -127,7 +127,21 @@
</el-table-column> </el-table-column>
<el-table-column prop="constructionForm" label="建设形式" width="200"> <el-table-column prop="constructionForm" label="建设形式" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="contractNumber" label="合同编码" width="200">
</el-table-column>
<el-table-column prop="rectificationStatusText" label="问题整改状态"> <el-table-column prop="rectificationStatusText" label="问题整改状态">
<template v-slot="scope">
<router-link
v-if="scope.row.rectificationStatusText == '去整改'"
:to="{
path: '/assesszc/projectView',
query: { projectId: scope.row.projectId,contractNumber: scope.row.contractNumber},
}"
>
<el-button type="text" size="small">{{ scope.row.rectificationStatusText }}</el-button>
</router-link>
<span v-else>{{ scope.row.rectificationStatusText }}</span>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -144,7 +158,7 @@ ...@@ -144,7 +158,7 @@
</el-pagination> </el-pagination>
<!-- 详情弹窗 --> <!-- 详情弹窗 -->
<el-dialog <el-dialog
title="稽核问题整改" title="详情"
:visible.sync="dialog" :visible.sync="dialog"
width="90%" width="90%"
:modal-append-to-body="false" :modal-append-to-body="false"
...@@ -159,16 +173,17 @@ ...@@ -159,16 +173,17 @@
<el-form-item label="稽核名称:" prop="auditName" class="fromItem"> <el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input v-model="ruleFormdialogXQ.auditName" disabled></el-input> <el-input v-model="ruleFormdialogXQ.auditName" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="稽核时间:" class="fromItem" prop="auditTime">
<el-form-item label="稽核时间:" class="fromItem" prop="dates"> <el-input v-model="ruleFormdialogXQ.auditTime" disabled></el-input>
<el-date-picker </el-form-item>
v-model="ruleFormdialogXQ.auditTime" <!-- <el-form-item label="项目编码:" class="fromItem" prop="projectId">
value-format="yyyy-MM-dd hh:mm:ss" <el-input v-model="ruleFormdialogXQ.projectId" disabled></el-input>
disabled </el-form-item> -->
></el-date-picker> <el-form-item label="项目名称:" class="fromItem" prop="projectName">
<el-input v-model="ruleFormdialogXQ.projectName" type="textarea" disabled></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<p class="zjBtn">稽核结果</p> <p class="zjBtn">稽核异常项目清单</p>
<div class="setscroll"> <div class="setscroll">
<el-table <el-table
:data="XQtableData" :data="XQtableData"
...@@ -181,59 +196,24 @@ ...@@ -181,59 +196,24 @@
> >
<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 <el-table-column
label="项目名称" label="问题检查项"
width="auto" prop="quesCheckItem"
prop="projectName"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column
<el-table-column label="规则名称" width="auto" prop="ruleName"> prop="questionValue"
</el-table-column> label="问题描述"
<!-- <el-table-column prop="ruleType" label="规则类型" width="auto"> width="auto"
</el-table-column> --> show-overflow-tooltip
<el-table-column label="问题申诉" width="auto">
<template slot-scope="scope">
<el-switch
v-model="scope.row.confirmStatus"
active-color="#C0C0C0"
inactive-color="#13ce66"
active-value="2"
inactive-value="1"
active-text="无异议"
inactive-text="有异议"
@change="controlSwitch($event, scope.row)"
disabled
>
<template v-slot:active>
<span>开启</span>
</template>
<template v-slot:inactive>
<span>关闭</span>
</template>
</el-switch>
</template>
</el-table-column>
<el-table-column prop="ruleType" label="申诉证明材料" width="auto">
<template
slot-scope="scope"
v-if="scope.row.confirmStatus == '1' && scope.row.sszmFileId"
> >
{{ scope.row.sszmFileName }}
<el-button @click="handleClickXZ(scope.row.sszmFileId,scope.row.sszmFileName)">下载</el-button>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="问题解决佐证材料" width="auto"> <el-table-column label="判断规则名称" width="auto" prop="ruleName">
<template
slot-scope="scope"
v-if="scope.row.sszzFileId"
>
{{ scope.row.sszzFileName}}
<el-button @click="handleClickXZ(scope.row.sszzFileId,scope.row.sszzFileName)">下载</el-button>
</template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="quesCheckItem" label="问题检查项" width="auto">
</el-table-column> -->
</el-table> </el-table>
</div> </div>
<!-- <el-pagination <!-- <el-pagination
...@@ -378,7 +358,9 @@ import { ...@@ -378,7 +358,9 @@ import {
savaauditRuleProjectLink, savaauditRuleProjectLink,
tjTasksRuleProjectLink, tjTasksRuleProjectLink,
ossupload, ossupload,
downloadObject downloadObject,
zgqdauditTasks,
xqauditTasksResults
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions,constructionFormText,ruleType } from "@/utils/cache"; import { generateYearOptions,constructionFormText,ruleType } from "@/utils/cache";
import tableMixin from '@/mixins/table.mixin.js' import tableMixin from '@/mixins/table.mixin.js'
...@@ -445,18 +427,12 @@ export default { ...@@ -445,18 +427,12 @@ 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.rectificationStatus ==0||!item.rectificationStatus){ if(item.confirmStatus ==1||!item.confirmStatus){
this.$set(item, "rectificationStatusText", "未下发"); this.$set(item, "rectificationStatusText", "未下发");
}else if (item.rectificationStatus == 1 ) { }else if (item.confirmStatus == 2 ) {
this.$set(item, "rectificationStatusText", "待整改"); this.$set(item, "rectificationStatusText", "去整改");
} else if (item.rectificationStatus == 2) { } else if (item.confirmStatus == 3) {
this.$set(item, "rectificationStatusText", "待提交"); this.$set(item, "rectificationStatusText", "已整改");
} else if (item.rectificationStatus == 3) {
this.$set(item, "rectificationStatusText", "已提交");
} else if (item.rectificationStatus == 4) {
this.$set(item, "rectificationStatusText", "被退回");
} else if (item.rectificationStatus == 5) {
this.$set(item, "rectificationStatusText", "整改完成");
} }
this.$set( this.$set(
item, item,
...@@ -476,38 +452,38 @@ export default { ...@@ -476,38 +452,38 @@ export default {
this.ruleForm.dates=[] this.ruleForm.dates=[]
this.submitForm(); this.submitForm();
}, },
async zgqdauditTasks(){
let res = await zgqdauditTasks(this.checkedList[0]);
if(res.code==200){
this.$message('整改完成')
}else{
this.$message('整改失败')
}
this.resetForm()()
},
//详情 //详情
async detailsForm(type) { async detailsForm(info) {
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
console.log(this.checkedList[0],'22222334')
this.ruleFormdialogXQ = this.checkedList[0];
let params = { let params = {
// current: this.currentPageXQ,
// pageSize: this.pageSizeXQ,
projectId: this.checkedList[0].projectId,
auditId: this.checkedList[0].auditId, auditId: this.checkedList[0].auditId,
contractNumber: this.checkedList[0].contractNumber,
projectId:this.checkedList[0].projectId
}; };
let res = await xqRuleProjectLink(params); let res = await xqauditTasksResults(params);
if (res.code == 200) { if (res.code == 200) {
this.ruleFormdialogXQ = this.checkedList[0];
this.XQtableData = res.data.records;
this.XQtableData.forEach((item) => {
if (
item.confirmStatus == 0 ||
item.confirmStatus == null ||
!item.confirmStatus
) {
this.$set(item, "confirmStatus", "2");
}
});
console.log(this.XQtableData, "XQtableDataXQtableData"); this.XQtableData = res.data.records;
if (type == "xq") { console.log(this.XQtableData,'XQtableDataXQtableData')
this.dialog = true; this.dialog = true;
} else {
this.dialogXF = true;
}
} }
}, },
...@@ -528,7 +504,7 @@ export default { ...@@ -528,7 +504,7 @@ export default {
this.checkedList = this.$refs.multipleTable.selection; this.checkedList = this.$refs.multipleTable.selection;
if (this.checkedList[0]) { if (this.checkedList[0]) {
this.ruleFormdialog = this.checkedList[0]; this.ruleFormdialog = this.checkedList[0];
if (this.checkedList[0].rectificationStatusText != "待整改"&&this.checkedList[0].rectificationStatusText != "被退回"&&this.checkedList[0].rectificationStatusText != "待提交") { if (this.checkedList[0].rectificationStatusText != "去整改") {
this.confirmdisabled = true; this.confirmdisabled = true;
} }
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!