Skip to content

Administrator / project_progress

Go to a project
Commit 2ebe0e18 by liangzhen
Options

暂存

1 parent 45c15e59
Inline Side-by-side
Showing with 1053 additions and 768 deletions
src/api/index.js
...@@ -281,7 +281,11 @@ export function RectificationFeedbackQuery(params) { ...@@ -281,7 +281,11 @@ export function RectificationFeedbackQuery(params) {
//检查规则编制 //检查规则编制
//分页 //分页
export function ruleFormulation(params) { export function ruleFormulation(params) {
return post(`${ARCH_EVALUATION}/ruleFormulation/`, params) return post(`${ARCH_EVALUATION}/ruleFormulation/ipage`, params)
}
//详情
export function iPageRorm(params) {
return post(`${ARCH_EVALUATION}/ruleFormulation/iPageRorm`, params)
} }
//自动稽核任务配置 分页 //自动稽核任务配置 分页
export function auditTasks(params) { export function auditTasks(params) {
......
src/views/checkCompliance/automaticCheck.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
label-width="100px" label-width="100px"
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="稽核名称:" prop="auditName" class="fromItem"> <el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input <el-input
v-model="ruleForm.auditName" v-model="ruleForm.auditName"
placeholder="请输入" placeholder="请输入"
...@@ -15,47 +15,47 @@ ...@@ -15,47 +15,47 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="稽核开始时间:" label="稽核时间:"
prop="auditStartTime" prop="auditTime"
class="fromItem" class="fromItem"
> >
<el-date-picker <el-date-picker
v-model="ruleForm.auditStartTime" @change="timeChange"
type="date" v-model="ruleForm.dates"
placeholder="选择日期" style="width: 240px"
> value-format="yyyy-MM-dd"
</el-date-picker> type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="稽核结束时间:" prop="auditEndTime" class="fromItem"> <el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-date-picker <el-input
v-model="ruleForm.auditEndTime" v-model="ruleForm.projectId"
type="date" placeholder="请输入"
placeholder="选择日期" clearable
> ></el-input>
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="稽核频率:" prop="auditFrequency" class="fromItem"> <el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-select <el-input
v-model="ruleForm.auditFrequency" v-model="ruleForm.projectName"
placeholder="请选择" placeholder="请输入"
clearable clearable
> ></el-input>
<el-option label="仅一次" value="0"></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-form-item> </el-form-item>
<el-form-item label="稽核状态:" prop="confirmStatus" class="fromItem"> <el-form-item label="项目年度:" prop="projectYear" class="fromItem">
<el-select <el-select
v-model="ruleForm.confirmStatus" v-model="ruleForm.projectYear"
placeholder="请选择" placeholder="请选择"
clearable clearable
> >
<el-option label="未确认" value="0"></el-option> <el-option
<el-option label="未下发" value="1"></el-option> v-for="(item, index) in yearsList"
<el-option label="已下发" value="2"></el-option> :key="index"
:label="item + '年'"
:value="item"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
...@@ -82,26 +82,27 @@ ...@@ -82,26 +82,27 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<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="auditName"> </el-table-column> <el-table-column label="稽核名称" prop="auditName" width="320"> </el-table-column>
<el-table-column prop="auditStartTime" label="稽核开始时间"> <el-table-column prop="auditStartTime" label="稽核时间" width="250">
</el-table-column>
<el-table-column prop="projectId" label="项目编码" width="220">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="auditEndTime" prop="projectName"
label="稽核结束时间" label="项目名称"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<!-- <el-table-column prop="confirmStatus" label="稽核状态"> <el-table-column prop="projectYear" label="项目年度" width="200">
</el-table-column> --> <template slot-scope="scope">
<el-table-column prop="auditFrequencyText" label="稽核频率"> {{ scope.row.projectYear }}年
</el-table-column> </template>
<el-table-column prop="abnormalResults" label="检查异常结果">
</el-table-column> </el-table-column>
<el-table-column prop="auditEndTime" label="稽核时间"> <el-table-column prop="projectCategory" label="建设形式" width="200">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -133,35 +134,8 @@ ...@@ -133,35 +134,8 @@
<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="dates"> <el-form-item label="稽核时间:" class="fromItem" prop="auditStartTime">
<el-date-picker <el-input v-model="ruleFormdialogXQ.auditStartTime" disabled></el-input>
@change="timeChange"
v-model="ruleFormdialogXQ.dates"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
disabled
></el-date-picker>
</el-form-item>
<el-form-item
label="稽核频率:"
prop="auditFrequency"
class="fromItem"
>
<el-select
v-model="ruleFormdialogXQ.auditFrequency"
placeholder="请选择"
disabled
>
<el-option label="仅一次" value="0"></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-form-item> </el-form-item>
</el-form> </el-form>
<p class="zjBtn">稽核规则配置</p> <p class="zjBtn">稽核规则配置</p>
...@@ -213,9 +187,11 @@ ...@@ -213,9 +187,11 @@
<script> <script>
import { auditTasksResults, xqauditTasksResults } from "@/api/index"; import { auditTasksResults, xqauditTasksResults } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
yearsList: generateYearOptions(),
listData: {}, listData: {},
showButton: true, showButton: true,
ruleForm: { ruleForm: {
...@@ -241,8 +217,11 @@ export default { ...@@ -241,8 +217,11 @@ export default {
timeChange(time) { timeChange(time) {
if (time) { if (time) {
//给后端的参数 //给后端的参数
this.ruleFormdialogAdd.auditStartTime = time[0]; this.ruleForm.auditStartTime = time[0];
this.ruleFormdialogAdd.auditEndTime = time[1]; this.ruleForm.auditEndTime = time[1];
}else{
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
} }
}, },
async submitForm() { async submitForm() {
...@@ -276,6 +255,9 @@ export default { ...@@ -276,6 +255,9 @@ export default {
this.$refs.formName.resetFields(); this.$refs.formName.resetFields();
this.currentPage = 1; this.currentPage = 1;
this.pageSize = 10; this.pageSize = 10;
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
this.ruleForm.dates=[]
this.submitForm(); this.submitForm();
}, },
//详情 //详情
...@@ -415,7 +397,7 @@ export default { ...@@ -415,7 +397,7 @@ export default {
// color: #2785e6; // color: #2785e6;
} }
.elpagination { .elpagination {
text-align: right; text-align: center;
margin-right: 100px; margin-right: 100px;
} }
/deep/ .el-dialog { /deep/ .el-dialog {
......
src/views/compliance/checkRules.vue
...@@ -8,19 +8,20 @@ ...@@ -8,19 +8,20 @@
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="规则名称:" prop="ruleName" class="fromItem"> <el-form-item label="项目环节:" prop="projectStage" class="fromItem">
<el-input v-model="ruleForm.ruleName" placeholder="请输入" clearable></el-input> <el-select v-model="ruleForm.projectStage" placeholder="请选择" clearable>
<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-option label="执行" value="5"></el-option>
<el-option label="结决算及转资" value="6"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="规则类型:" prop="ruleType" class="fromItem"> <el-form-item label="问题检查项:" prop="quesCheckItem" class="fromItem">
<el-input v-model="ruleForm.ruleType" placeholder="请输入" clearable></el-input> <el-input v-model="ruleForm.quesCheckItem" placeholder="请输入" clearable></el-input>
<!-- <el-select v-model="ruleForm.ruleType" placeholder="请选择" clearable>
<el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option>
<el-option label="2021年" value="2021"></el-option>
</el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="规则状态:" prop="ruleStatus" class="fromItem"> <!-- <el-form-item label="规则状态:" prop="ruleStatus" class="fromItem">
<el-select v-model="ruleForm.ruleStatus" placeholder="请选择" clearable> <el-select v-model="ruleForm.ruleStatus" placeholder="请选择" 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>
...@@ -36,11 +37,16 @@ ...@@ -36,11 +37,16 @@
</el-form-item> </el-form-item>
<el-form-item label="创建时间:" prop="createTime" class="fromItem"> <el-form-item label="创建时间:" prop="createTime" class="fromItem">
<el-date-picker <el-date-picker
v-model="ruleForm.createTime" @change="timeChange"
type="date" v-model="ruleForm.dates"
placeholder="选择日期"> style="width: 240px"
</el-date-picker> value-format="yyyy-MM-dd"
</el-form-item> type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> -->
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm()">
...@@ -69,11 +75,12 @@ ...@@ -69,11 +75,12 @@
<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="ruleName"> </el-table-column> <el-table-column label="项目环节" prop="projectStagetext"> </el-table-column>
<el-table-column prop="ruleType" label="规则类型"> <el-table-column prop="quesCheckItem" label="问题检查项" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="检查说明" prop="checkDesc" show-overflow-tooltip> </el-table-column>
<el-table-column prop="ruleStatus" label="规则状态" show-overflow-tooltip> <!-- <el-table-column label="判断规则名称" prop="checkDesc" show-overflow-tooltip> </el-table-column> -->
<!-- <el-table-column prop="ruleStatus" label="规则状态" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.ruleStatus" v-model="scope.row.ruleStatus"
...@@ -84,6 +91,7 @@ ...@@ -84,6 +91,7 @@
active-text="" active-text=""
inactive-text="" inactive-text=""
disabled disabled
> >
<template v-slot:active> <template v-slot:active>
...@@ -98,7 +106,7 @@ ...@@ -98,7 +106,7 @@
<el-table-column prop="creator" label="创建人"> <el-table-column prop="creator" label="创建人">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间"> <el-table-column prop="createTime" label="创建时间">
</el-table-column> </el-table-column> -->
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
...@@ -126,18 +134,21 @@ ...@@ -126,18 +134,21 @@
label-width="100px" label-width="100px"
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="项目环节:" prop="projectStagetext" class="fromItem">
<el-input v-model="ruleFormdialog.projectStagetext" placeholder="请输入" disabled></el-input>
</el-form-item>
<el-form-item label="问题检查项:" prop="quesCheckItem" class="fromItem">
<el-input v-model="ruleFormdialog.quesCheckItem" placeholder="请输入" disabled></el-input>
</el-form-item>
<el-form-item label="检查说明:" prop="checkDesc" class="fromItem">
<el-input v-model="ruleFormdialog.checkDesc" placeholder="请输入" type="textarea" disabled></el-input>
</el-form-item>
<el-form-item label="规则名称:" prop="ruleName" class="fromItem"> <!-- <el-form-item label="规则名称:" prop="ruleName" class="fromItem">
<el-input v-model="ruleFormdialog.ruleName" placeholder="请输入" disabled></el-input> <el-input v-model="ruleFormdialog.ruleName" placeholder="请输入" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="规则类型:" prop="ruleType" class="fromItem"> <el-form-item label="规则类型:" prop="ruleType" class="fromItem">
<el-input v-model="ruleFormdialog.ruleType" placeholder="请输入" disabled></el-input> <el-input v-model="ruleFormdialog.ruleType" placeholder="请输入" disabled></el-input>
<!-- <el-select v-model="ruleForm.ruleType" placeholder="请选择" clearable>
<el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option>
<el-option label="2021年" value="2021"></el-option>
</el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="规则状态:" prop="ruleStatus" class="fromItem"> <el-form-item label="规则状态:" prop="ruleStatus" class="fromItem">
<el-select v-model="ruleFormdialog.ruleStatus" placeholder="请选择" disabled> <el-select v-model="ruleFormdialog.ruleStatus" placeholder="请选择" disabled>
...@@ -154,14 +165,72 @@ ...@@ -154,14 +165,72 @@
></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">
<el-date-picker <el-date-picker
v-model="ruleFormdialog.createTime" v-model="ruleFormdialog.createTime"
type="date" type="date"
disabled disabled
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<p class="zjBtn">判断规则名称</p>
<div class="setscrolldialogAdd">
<el-table
:data="tableDataXQ"
tooltip-effect="dark myTooltips"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="判断规则名称" prop="ruleName">
</el-table-column>
<el-table-column
prop="ruleStatus"
label="规则状态"
show-overflow-tooltip
>
<template slot-scope="scope">
<el-switch
v-model="scope.row.ruleStatus"
active-color="#13ce66"
inactive-color="#C0C0C0"
active-value="0"
inactive-value="1"
active-text=""
inactive-text=""
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="creator" label="创建人"> </el-table-column>
<el-table-column prop="createTime" label="创建时间">
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChangeXQ"
@current-change="handleCurrentChangeXQ"
:current-page="XQcurrentPage"
:page-sizes="[5, 10, 20, 50]"
:page-size="1000"
layout="total, sizes, prev, pager, next, jumper"
:total="totalXQ"
class="elpagination"
>
</el-pagination>
<p class="close"><span @click="cancel()">关闭</span></p> <p class="close"><span @click="cancel()">关闭</span></p>
</el-dialog> </el-dialog>
</div> </div>
...@@ -170,7 +239,7 @@ ...@@ -170,7 +239,7 @@
<script> <script>
import { MaterialsList } from '@/utils/cache' import { MaterialsList } from '@/utils/cache'
import { import {
ruleFormulation, ruleFormulation,iPageRorm
} from "@/api/index"; } from "@/api/index";
export default { export default {
...@@ -187,6 +256,7 @@ ...@@ -187,6 +256,7 @@
postEvalState: "", postEvalState: "",
projectName: "", projectName: "",
projectId: "", projectId: "",
dates:[]
}, },
ruleFormdialog: { ruleFormdialog: {
batchYear: "", batchYear: "",
...@@ -207,12 +277,26 @@ ...@@ -207,12 +277,26 @@
activeName: "first", activeName: "first",
mergingRows: [], mergingRows: [],
lctableData:[], lctableData:[],
tableDataXQ:[],
totalXQ:0,
pageSizeXQ: 5,
XQcurrentPage: 1,
}; };
}, },
mounted() { mounted() {
this.submitForm(); this.submitForm();
}, },
methods: { methods: {
timeChange(time) {
if (time) {
//给后端的参数
this.ruleForm.auditStartTime = time[0];
this.ruleForm.auditEndTime = time[1];
}else{
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
}
},
async submitForm() { async submitForm() {
let params = { let params = {
current: this.currentPage, current: this.currentPage,
...@@ -224,6 +308,28 @@ ...@@ -224,6 +308,28 @@
if (res.code == "200") { if (res.code == "200") {
this.tableData = res.data.records; this.tableData = res.data.records;
this.tableData.forEach(item=>{
switch (item.projectStage) {
case 1:
this.$set(item, "projectStagetext", "可研");
break;
case 2:
this.$set(item, "projectStagetext", "计划");
break;
case 3:
this.$set(item, "projectStagetext", "采购");
break;
case 4:
this.$set(item, "projectStagetext", "合同");
break;
case 5:
this.$set(item, "projectStagetext", "执行");
break;
case 6:
this.$set(item, "projectStagetext", "结决算及转资");
break;
}
})
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
}, },
...@@ -231,16 +337,27 @@ ...@@ -231,16 +337,27 @@
this.$refs.formName.resetFields(); this.$refs.formName.resetFields();
this.currentPage = 1; this.currentPage = 1;
this.pageSize = 10; this.pageSize = 10;
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
this.ruleForm.datas=[]
this.submitForm(); this.submitForm();
}, },
//详情 //详情
detailsForm() { async detailsForm() {
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
this.dialog=true this.dialog=true
this.ruleFormdialog=this.checkedList[0] this.ruleFormdialog=this.checkedList[0]
let params={
current: this.XQcurrentPage,
pageSize: this.pageSizeXQ,
projectStage:this.checkedList[0].questionId
}
let res= await iPageRorm(params )
this.tableDataXQ=res.data.records
this.totalXQ=res.data.total
}, },
...@@ -275,6 +392,14 @@ ...@@ -275,6 +392,14 @@
cancel() { cancel() {
this.dialog = false; this.dialog = false;
}, },
handleSizeChangeXQ(val) {
this.pageSizeXQ = val;
this.detailsForm()
},
handleCurrentChangeXQ(val) {
this.XQcurrentPage = val;
this.detailsForm()
},
}, },
}; };
</script> </script>
...@@ -348,7 +473,7 @@ ...@@ -348,7 +473,7 @@
// color: #2785e6; // color: #2785e6;
} }
.elpagination { .elpagination {
text-align: right; text-align: center;
margin-right: 100px; margin-right: 100px;
} }
/deep/ .el-dialog { /deep/ .el-dialog {
...@@ -497,4 +622,24 @@ ...@@ -497,4 +622,24 @@
border-bottom: none; border-bottom: none;
} }
} }
.zjBtn {
width: 400px;
text-align: left;
vertical-align: middle;
span {
display: inline-block;
width: 140px;
height: 25px;
line-height: 25px;
text-align: center;
border-radius: 5px;
vertical-align: middle;
}
span:last-of-type {
background-color: #4ca6a7;
color: #fff;
padding: 5px 10px;
margin-left: 10px;
}
}
</style> </style>
\ No newline at end of file
src/views/compliance/taskConfigure.vue
...@@ -14,39 +14,46 @@ ...@@ -14,39 +14,46 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="稽核时间:" prop="auditTime" class="fromItem">
label="稽核开始时间:"
prop="auditStartTime"
class="fromItem"
>
<el-date-picker <el-date-picker
v-model="ruleForm.auditStartTime" @change="timeChange"
type="date" v-model="ruleForm.dates"
placeholder="选择日期" style="width: 240px"
> value-format="yyyy-MM-dd"
</el-date-picker> type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="稽核结束时间:" prop="auditEndTime" class="fromItem"> <!-- <el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-date-picker <el-input
v-model="ruleForm.auditEndTime" v-model="ruleForm.projectId"
type="date" placeholder="请输入"
placeholder="选择日期" clearable
> ></el-input>
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="稽核频率:" prop="auditFrequency" class="fromItem"> <el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input
v-model="ruleForm.projectName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目年度:" prop="projectYear" class="fromItem">
<el-select <el-select
v-model="ruleForm.auditFrequency" v-model="ruleForm.projectYear"
placeholder="请选择" placeholder="请选择"
clearable clearable
> >
<el-option label="仅一次" value="0"></el-option> <el-option
<el-option label="每周" value="1"></el-option> v-for="(item, index) in yearsList"
<el-option label="每月" value="2"></el-option> :key="index"
<el-option label="每季度" value="3"></el-option> :label="item + '年'"
<el-option label="每年" value="4"></el-option> :value="item"
/>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm()">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
...@@ -73,7 +80,7 @@ ...@@ -73,7 +80,7 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable"
...@@ -83,31 +90,31 @@ ...@@ -83,31 +90,31 @@
<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="auditName"> </el-table-column> <el-table-column label="稽核名称" prop="auditName" width="320">
<el-table-column prop="auditStartTime" label="稽核开始时间"> </el-table-column>
<el-table-column prop="auditTime" label="稽核时间" width="250">
</el-table-column>
<el-table-column prop="fullId" label="项目编码" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="fullName" label="项目名称" show-overflow-tooltip>
prop="auditEndTime"
label="稽核结束时间"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="fullRule" label="规则名称" show-overflow-tooltip>
prop="auditFrequencyText" </el-table-column>
label="稽核频率" <!-- <el-table-column prop="projectYear" label="项目年度" width="200">
show-overflow-tooltip <template slot-scope="scope">
> {{ scope.row.projectYear }}年
</template>
</el-table-column> </el-table-column>
<el-table-column prop="creator" label="创建人"> </el-table-column> <el-table-column prop="projectCategory" label="建设形式" width="200">
<el-table-column prop="createTime" label="创建时间"> </el-table-column> </el-table-column> -->
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="currentPage" :current-page="currentPage"
:page-sizes="[10, 15, 20, 50,100]" :page-sizes="[10, 15, 20, 50, 100]"
:page-size="1000" :page-size="1000"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
...@@ -136,35 +143,34 @@ ...@@ -136,35 +143,34 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="稽核时间:" class="fromItem" prop="dates"> <el-form-item label="稽核方式:" prop="auditType" class="fromItem">
<el-date-picker
@change="timeChange"
v-model="ruleFormdialogAdd.dates"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item
label="稽核频率:"
prop="auditFrequency"
class="fromItem"
>
<el-select <el-select
v-model="ruleFormdialogAdd.auditFrequency" v-model="ruleFormdialogAdd.auditType"
placeholder="请选择" placeholder="请选择"
clearable clearable
> >
<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="4"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item
label="稽核时间:"
class="fromItem"
prop="auditTime"
v-if="showDate"
>
<el-date-picker
v-model="ruleFormdialogAdd.auditTime"
type="datetime"
value-format="yyyy-MM-dd hh:mm:ss"
placeholder="选择日期时间"
:picker-options="{
disabledDate: (time) =>
time.getTime() < new Date(new Date().setHours(0, 0, 0, 0)),
}"
>
</el-date-picker>
</el-form-item>
</el-form> </el-form>
<p class="zjBtn"> <p class="zjBtn">
稽核规则<span @click="checkRules()">选择稽核规则</span> 稽核规则<span @click="checkRules()">选择稽核规则</span>
...@@ -178,7 +184,7 @@ ...@@ -178,7 +184,7 @@
addcurrentPage * pageSizeAdd addcurrentPage * pageSizeAdd
) )
" "
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable"
...@@ -188,11 +194,24 @@ ...@@ -188,11 +194,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 type="selection"> </el-table-column> <el-table-column type="selection"> </el-table-column>
<el-table-column label="规则名称" prop="ruleName"> <el-table-column
label="规则名称"
prop="ruleName"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="规则类型"> <el-table-column
prop="quesCheckItem"
label="问题检查项"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="checkDesc"
label="检查说明"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ruleStatus" prop="ruleStatus"
label="规则状态" label="规则状态"
...@@ -257,20 +276,25 @@ ...@@ -257,20 +276,25 @@
addcurrentPageXM * pageSizeAddXM addcurrentPageXM * pageSizeAddXM
) )
" "
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<el-table-column type="selection"> </el-table-column> <el-table-column type="selection"> </el-table-column>
<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 prop="department" label="部门" width="150"> <el-table-column prop="department" label="部门" width="150">
</el-table-column> </el-table-column>
<el-table-column label="项目编码" width="150" prop="projectId"> <el-table-column label="项目编码" width="auto" prop="projectId">
</el-table-column>
<el-table-column prop="projectYear" label="项目年度" width="auto">
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -369,14 +393,29 @@ ...@@ -369,14 +393,29 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="规则类型:" prop="ruleType" class="fromItem">
<el-form-item
label="问题检查项:"
prop="quesCheckItem"
class="fromItem"
>
<el-input <el-input
v-model="ruleFormRule.ruleType" v-model="ruleFormRule.quesCheckItem"
placeholder="请输入" placeholder="请输入"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="规则状态:" prop="ruleStatus" class="fromItem"> <el-form-item class="RuleItem">
<span class="zjquery" @click="checkRules()"> 查询 </span>
</el-form-item>
<!-- <el-form-item label="检查说明:" prop="checkDesc" class="fromItem">
<el-input
v-model="ruleFormRule.checkDesc"
placeholder="请输入"
clearable
></el-input>
</el-form-item> -->
<!-- <el-form-item label="规则状态:" prop="ruleStatus" class="fromItem">
<el-select <el-select
v-model="ruleFormRule.ruleStatus" v-model="ruleFormRule.ruleStatus"
placeholder="请选择" placeholder="请选择"
...@@ -385,30 +424,30 @@ ...@@ -385,30 +424,30 @@
<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-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="创建人:" prop="creator" class="fromItem"> <!-- <el-form-item label="创建人:" prop="creator" class="fromItem">
<el-input <el-input
v-model="ruleFormRule.creator" v-model="ruleFormRule.creator"
placeholder="请输入" placeholder="请输入"
clearable clearable
></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">
<el-date-picker <el-date-picker
v-model="ruleFormRule.createTime" v-model="ruleFormRule.createTime"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div class="setscrolldialog"> <div class="setscrolldialog">
<el-table <el-table
@selection-change="handleSelectionChangeZJ" @selection-change="handleSelectionChangeZJ"
ref="multipleTableZJ" ref="multipleTableZJ"
:data="tableDataRule" :data="tableDataRule"
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable"
...@@ -418,15 +457,30 @@ ...@@ -418,15 +457,30 @@
<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="ruleName"> <el-table-column
label="规则名称"
prop="ruleName"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="quesCheckItem"
label="问题检查项"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="规则类型"> <el-table-column
prop="checkDesc"
label="检查说明"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ruleStatus" prop="ruleStatus"
label="规则状态" label="规则状态"
show-overflow-tooltip show-overflow-tooltip
width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
...@@ -448,8 +502,9 @@ ...@@ -448,8 +502,9 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="creator" label="创建人"> </el-table-column> <el-table-column prop="creator" label="创建人" width="150">
<el-table-column prop="createTime" label="创建时间"> </el-table-column>
<el-table-column prop="createTime" label="创建时间" width="200">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -460,7 +515,7 @@ ...@@ -460,7 +515,7 @@
:page-sizes="[5, 10, 15, 20]" :page-sizes="[5, 10, 15, 20]"
:page-size="1000" :page-size="1000"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="totalRule"
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination>
...@@ -480,23 +535,19 @@ ...@@ -480,23 +535,19 @@
> >
<div class="dialog"> <div class="dialog">
<el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm">
<el-form-item <el-form-item label="项目年度:" prop="projectYear" class="fromItem">
label="项目年度:" <el-select
prop="projectYear" v-model="ruleForm.projectYear"
class="fromItem" placeholder="请选择"
> clearable
<el-select >
v-model="ruleForm.projectYear" <el-option
placeholder="请选择" v-for="(item, index) in yearsList"
clearable :key="index"
> :label="item + '年'"
<el-option :value="item"
v-for="(item, index) in yearsList" />
:key="index" </el-select>
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem"> <el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input <el-input
...@@ -519,33 +570,7 @@ ...@@ -519,33 +570,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item
label="建设形式:"
prop="projectCategory"
class="fromItem"
>
<el-select
v-model="ruleFormZJ.projectCategory"
placeholder="请选择"
clearable
>
<el-option label="统推" value="01"></el-option>
<el-option label="自建" value="02"></el-option>
<el-option label="独立建设" value="03"></el-option>
</el-select>
</el-form-item>
<el-form-item label="部门:" prop="department" class="fromItem">
<el-select
v-model="ruleFormZJ.department"
placeholder="请选择"
clearable
>
<el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option>
<el-option label="2021年" value="2021"></el-option>
</el-select>
</el-form-item>
<el-form-item class="cxItem"> <el-form-item class="cxItem">
<span class="zjquery" @click="checkXM()"> 查询 </span> <span class="zjquery" @click="checkXM()"> 查询 </span>
</el-form-item> </el-form-item>
...@@ -555,20 +580,25 @@ ...@@ -555,20 +580,25 @@
@selection-change="handleSelectionChangeXM" @selection-change="handleSelectionChangeXM"
ref="multipleTableXM" ref="multipleTableXM"
:data="zjtableData" :data="zjtableData"
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<el-table-column type="selection"> </el-table-column> <el-table-column type="selection"> </el-table-column>
<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 prop="department" label="部门" width="150"> <el-table-column prop="department" label="部门" width="150">
</el-table-column> </el-table-column>
<el-table-column label="项目编码" width="150" prop="projectId"> <el-table-column label="项目编码" width="200" prop="projectId">
</el-table-column>
<el-table-column prop="projectYear" label="项目年度" width="200">
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -655,40 +685,20 @@ ...@@ -655,40 +685,20 @@
</el-form-item> </el-form-item>
<el-form-item label="稽核时间:" class="fromItem" prop="dates"> <el-form-item label="稽核时间:" class="fromItem" prop="dates">
<el-date-picker <el-date-picker
@change="timeChange" v-model="ruleFormdialogAdd.auditTime"
v-model="ruleFormdialogXQ.dates" type="datetime"
style="width: 240px" value-format="yyyy-MM-dd hh:mm:ss"
value-format="yyyy-MM-dd" placeholder="选择日期时间"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
disabled
></el-date-picker>
</el-form-item>
<el-form-item
label="稽核频率:"
prop="auditFrequency"
class="fromItem"
>
<el-select
v-model="ruleFormdialogXQ.auditFrequency"
placeholder="请选择"
disabled disabled
> >
<el-option label="仅一次" value="0"></el-option> </el-date-picker>
<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-form-item> </el-form-item>
</el-form> </el-form>
<p class="zjBtn">稽核规则</p> <p class="zjBtn">稽核规则</p>
<div class="setscrolldialogAdd"> <div class="setscrolldialogAdd">
<el-table <el-table
:data="XQtableData" :data="XQtableData"
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable"
...@@ -698,9 +708,23 @@ ...@@ -698,9 +708,23 @@
<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="ruleName"> <el-table-column
label="规则名称"
prop="ruleName"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="quesCheckItem"
label="问题检查项"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="规则类型"> <el-table-column
prop="checkDesc"
label="检查说明"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -748,20 +772,25 @@ ...@@ -748,20 +772,25 @@
<div class="setscrolldialogAdd"> <div class="setscrolldialogAdd">
<el-table <el-table
:data="XQtableDataXM" :data="XQtableDataXM"
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<el-table-column type="selection"> </el-table-column> <el-table-column type="selection"> </el-table-column>
<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 prop="department" label="部门" width="150"> <el-table-column prop="department" label="部门" width="150">
</el-table-column> </el-table-column>
<el-table-column label="项目编码" width="150" prop="projectId"> <el-table-column label="项目编码" width="auto" prop="projectId">
</el-table-column>
<el-table-column prop="projectYear" label="项目年度" width="auto">
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -844,40 +873,36 @@ ...@@ -844,40 +873,36 @@
:rules="rulesBJ" :rules="rulesBJ"
> >
<el-form-item label="稽核名称:" prop="auditName" class="fromItem"> <el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input <el-input v-model="ruleFormdialogBJ.auditName" clearable></el-input>
v-model="ruleFormdialogBJ.auditName"
clearable
></el-input>
</el-form-item>
<el-form-item label="稽核时间:" class="fromItem" prop="dates">
<el-date-picker
@change="timeChange"
v-model="ruleFormdialogBJ.dates"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="稽核方式:" prop="auditType" class="fromItem">
label="稽核频率:"
prop="auditFrequency"
class="fromItem"
>
<el-select <el-select
v-model="ruleFormdialogBJ.auditFrequency" v-model="ruleFormdialogBJ.auditType"
placeholder="请选择" placeholder="请选择"
clearable clearable
> >
<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="4"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item
label="稽核时间:"
class="fromItem"
prop="auditTime"
v-if="showDate"
>
<el-date-picker
v-model="ruleFormdialogBJ.auditTime"
type="datetime"
value-format="yyyy-MM-dd hh:mm:ss"
placeholder="选择日期时间"
:picker-options="{
disabledDate: (time) =>
time.getTime() < new Date(new Date().setHours(0, 0, 0, 0)),
}"
>
</el-date-picker>
</el-form-item>
</el-form> </el-form>
<p class="zjBtn"> <p class="zjBtn">
稽核规则<span @click="checkRules()">选择稽核规则</span> 稽核规则<span @click="checkRules()">选择稽核规则</span>
...@@ -891,7 +916,7 @@ ...@@ -891,7 +916,7 @@
addcurrentPage * pageSizeAdd addcurrentPage * pageSizeAdd
) )
" "
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable"
...@@ -901,9 +926,23 @@ ...@@ -901,9 +926,23 @@
<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="ruleName"> <el-table-column
label="规则名称"
prop="ruleName"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="quesCheckItem"
label="问题检查项"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="规则类型"> <el-table-column
prop="checkDesc"
label="检查说明"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -937,9 +976,7 @@ ...@@ -937,9 +976,7 @@
<el-table-column label="操作" width="130"> <el-table-column label="操作" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@click=" @click="handleClickBJ(scope.row, scope.$index, addtableData)"
handleClickBJ(scope.row, scope.$index, addtableData)
"
type="text" type="text"
size="small" size="small"
>删除</el-button >删除</el-button
...@@ -970,22 +1007,26 @@ ...@@ -970,22 +1007,26 @@
addcurrentPageXM * pageSizeAddXM addcurrentPageXM * pageSizeAddXM
) )
" "
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
header-cell-class-name="custom-th-background" header-cell-class-name="custom-th-background"
class="eltable" class="eltable"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<el-table-column type="selection"> </el-table-column> <el-table-column type="selection"> </el-table-column>
<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 prop="department" label="部门" width="150"> <el-table-column prop="department" label="部门" width="150">
</el-table-column> </el-table-column>
<el-table-column label="项目编码" width="150" prop="projectId"> <el-table-column label="项目编码" width="auto" prop="projectId">
</el-table-column>
<el-table-column prop="projectYear" label="项目年度" width="auto">
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="projectName" prop="projectName"
label="项目名称" label="项目名称"
...@@ -1004,7 +1045,6 @@ ...@@ -1004,7 +1045,6 @@
{{ scope.row.projectYear }}年 {{ scope.row.projectYear }}年
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总投资计划（万元）" width="200"> <el-table-column label="总投资计划（万元）" width="200">
<el-table-column <el-table-column
prop="costAmountTotal" prop="costAmountTotal"
...@@ -1075,13 +1115,20 @@ import { ...@@ -1075,13 +1115,20 @@ import {
selProject, selProject,
upauditTasks, upauditTasks,
delProject, delProject,
delRule delRule,
iPageRorm,
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache"; import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
yearsList: generateYearOptions(), yearsList: generateYearOptions(),
showDate: false,
pickerOptions: {
nowBtn: false,
},
auditTime: "",
yearsList: generateYearOptions(),
listData: {}, listData: {},
qdtableData: JSON.parse(JSON.stringify(MaterialsList())), qdtableData: JSON.parse(JSON.stringify(MaterialsList())),
tableDataNew: MaterialsList(), tableDataNew: MaterialsList(),
...@@ -1116,15 +1163,18 @@ export default { ...@@ -1116,15 +1163,18 @@ export default {
dialogBJ: false, dialogBJ: false,
ruleFormdialogBJ: { ruleFormdialogBJ: {
auditName: "", auditName: "",
dates: [], auditTime: "",
auditFrequency: "", auditFrequency: "",
auditType: "",
}, },
dialogAdd: false, dialogAdd: false,
ruleFormdialogAdd: { ruleFormdialogAdd: {
auditName: "", auditName: "",
dates: [], delivery: true,
auditFrequency: "", auditFrequency: "",
auditTime: "",
auditType: "",
}, },
rules: { rules: {
auditName: [ auditName: [
...@@ -1134,38 +1184,20 @@ export default { ...@@ -1134,38 +1184,20 @@ export default {
trigger: "change", trigger: "change",
}, },
], ],
auditFrequency: [ audiType: [
{ {
required: true, required: true,
message: "请选择稽核频率", message: "请选择稽核方式",
trigger: "change", trigger: "change",
}, },
], ],
dates: [ auditTime: [
{ {
type: "array",
required: true, required: true,
message: "请输入时间", message: "请输入时间",
fields: { trigger: "change",
0: { type: "string", required: true, message: "请选择开始日期" },
1: { type: "string", required: true, message: "请选择结束日期" },
},
}, },
], ],
// auditStartTime: [
// {
// required: true,
// message: "请选择开始日期",
// trigger: "change",
// },
// ],
// auditEndTime: [
// {
// required: true,
// message: "请选择结束日期",
// trigger: "change",
// },
// ],
}, },
rulesBJ: { rulesBJ: {
auditName: [ auditName: [
...@@ -1175,24 +1207,13 @@ export default { ...@@ -1175,24 +1207,13 @@ export default {
trigger: "change", trigger: "change",
}, },
], ],
auditFrequency: [ audiType: [
{ {
required: true, required: true,
message: "请选择稽核频率", message: "请选择稽核方式",
trigger: "change", trigger: "change",
}, },
], ],
dates: [
{
type: "array",
required: true,
message: "请输入时间",
fields: {
0: { type: "string", required: true, message: "请选择开始日期" },
1: { type: "string", required: true, message: "请选择结束日期" },
},
},
],
}, },
addtableData: [], addtableData: [],
currentPageRule: 1, currentPageRule: 1,
...@@ -1227,8 +1248,33 @@ export default { ...@@ -1227,8 +1248,33 @@ export default {
pageSizeXQXM: 5, pageSizeXQXM: 5,
XQcurrentPageXM: 1, XQcurrentPageXM: 1,
totalXQXM: 0, totalXQXM: 0,
defaultDate: new Date(),
}; };
}, },
watch: {
"ruleFormdialogAdd.auditType"(newVal, oldVal) {
console.log(newVal, oldVal, "2222");
if (newVal == 1) {
console.log("隐藏");
this.ruleFormdialogAdd.auditTime = "";
this.showDate = false;
} else {
console.log("显示");
this.showDate = true;
}
},
"ruleFormdialogBJ.auditType"(newVal, oldVal) {
console.log(newVal, oldVal, "2222");
if (newVal == 1) {
console.log("隐藏");
this.ruleFormdialogBJ.auditTime = "";
this.showDate = false;
} else {
console.log("显示");
this.showDate = true;
}
},
},
mounted() { mounted() {
this.submitForm(); this.submitForm();
}, },
...@@ -1236,8 +1282,11 @@ export default { ...@@ -1236,8 +1282,11 @@ export default {
timeChange(time) { timeChange(time) {
if (time) { if (time) {
//给后端的参数 //给后端的参数
this.ruleFormdialogAdd.auditStartTime = time[0]; this.ruleForm.auditStartTime = time[0];
this.ruleFormdialogAdd.auditEndTime = time[1]; this.ruleForm.auditEndTime = time[1];
} else {
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
} }
}, },
async submitForm() { async submitForm() {
...@@ -1271,6 +1320,9 @@ export default { ...@@ -1271,6 +1320,9 @@ export default {
this.$refs.formName.resetFields(); this.$refs.formName.resetFields();
this.currentPage = 1; this.currentPage = 1;
this.pageSize = 10; this.pageSize = 10;
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
this.ruleForm.datas = [];
this.submitForm(); this.submitForm();
}, },
//详情 //详情
...@@ -1287,25 +1339,25 @@ export default { ...@@ -1287,25 +1339,25 @@ export default {
]; ];
this.dialog = true; this.dialog = true;
let params = { let params = {
auditId: this.checkedList[0].id, auditId: this.checkedList[0].auditId,
current: this.XQcurrentPage, current: this.XQcurrentPage,
pageSize: this.pageSizeXQ, pageSize: this.pageSizeXQ,
}; };
let params2 = { let params2 = {
auditId: this.checkedList[0].id, auditId: this.checkedList[0].auditId,
current: this.XQcurrentPageXM, current: this.XQcurrentPageXM,
pageSize: this.pageSizeXQXM, pageSize: this.pageSizeXQXM,
}; };
Promise.all([selRuleProject(params), selProject(params2)]).then((res) => { Promise.all([selRuleProject(params), selProject(params2)]).then((res) => {
this.XQtableData = res[0].data.records; this.XQtableData = res[0].data.records;
this.XQtableDataXM = res[1].data.records; this.XQtableDataXM = res[1].data.records;
this.XQtableDataXM.forEach(item=>{ this.XQtableDataXM.forEach((item) => {
this.$set( this.$set(
item, item,
"projectCategory", "projectCategory",
projectCategoryText(item.projectCategory) projectCategoryText(item.projectCategory)
); );
}) });
this.XQtotal = res[0].data.total; this.XQtotal = res[0].data.total;
this.totalXQXM = res[1].data.total; this.totalXQXM = res[1].data.total;
this.dialogXQ = true; this.dialogXQ = true;
...@@ -1396,11 +1448,11 @@ export default { ...@@ -1396,11 +1448,11 @@ export default {
}, },
//点击新增 //点击新增
async add() { async add() {
this.addtableData = []; //每次新增清空不然点了还是这几个人 this.addtableData = []; //每次新增清空不然点了还是这几个人
this.addtableDataXM =[]; this.addtableDataXM = [];
this.addtotal = 0; this.addtotal = 0;
this.addtotalXM = 0; this.addtotalXM = 0;
this.showDate = false;
this.dialogAdd = true; this.dialogAdd = true;
}, },
...@@ -1410,13 +1462,17 @@ export default { ...@@ -1410,13 +1462,17 @@ export default {
let params = { let params = {
current: this.currentPageRule, current: this.currentPageRule,
pageSize: this.pageSizeRule, pageSize: this.pageSizeRule,
ruleStatus: 0,
}; };
Object.assign(params, this.ruleFormRule); Object.assign(params, this.ruleFormRule);
console.log(params); console.log(params);
let res = await ruleFormulation(params); let res = await iPageRorm(params);
if (res.code == "200") { if (res.code == "200") {
this.dialogRule = true; this.dialogRule = true;
this.tableDataRule = res.data.records; this.tableDataRule = res.data.records;
// this.tableDataRule=this.tableDataRule.filter(item=>{
// return item.ruleStatus==0
// })
this.totalRule = res.data.total * 1; this.totalRule = res.data.total * 1;
} }
}, },
...@@ -1438,9 +1494,13 @@ export default { ...@@ -1438,9 +1494,13 @@ export default {
this.addtotal = this.addtableData.length; this.addtotal = this.addtableData.length;
this.dialogRule = false; this.dialogRule = false;
}, },
handleSizeChangeRule() { handleSizeChangeRule(val) {
this.pageSizeRule = val; this.pageSizeRule = val;
this.checkRules() this.checkRules();
},
handleCurrentChangeRule(val) {
this.currentPageRule = val;
this.checkRules();
}, },
handleSizeChangeAdd(val) { handleSizeChangeAdd(val) {
this.pageSizeAdd = val; this.pageSizeAdd = val;
...@@ -1466,10 +1526,7 @@ export default { ...@@ -1466,10 +1526,7 @@ export default {
handleCurrentChangeAddXM(val) { handleCurrentChangeAddXM(val) {
this.addcurrentPageXM = val; this.addcurrentPageXM = val;
}, },
handleCurrentChangeRule() {
this.currentPageRule = val;
this.checkRules()
},
handleSelectionChangeZJ() { handleSelectionChangeZJ() {
this.addZJList = this.$refs.multipleTableZJ.selection; this.addZJList = this.$refs.multipleTableZJ.selection;
}, },
...@@ -1478,22 +1535,23 @@ export default { ...@@ -1478,22 +1535,23 @@ export default {
}, },
//编辑 //编辑
edit() { edit() {
this.showDate = false;
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
this.ruleFormdialogBJ=this.checkedList[0] this.ruleFormdialogBJ = this.checkedList[0];
this.ruleFormdialogBJ.dates = [ this.ruleFormdialogBJ.dates = [
this.checkedList[0].auditStartTime, this.checkedList[0].auditStartTime,
this.checkedList[0].auditEndTime, this.checkedList[0].auditEndTime,
]; ];
let params = { let params = {
auditId: this.checkedList[0].id, auditId: this.checkedList[0].auditId,
current: this.XQcurrentPage, current: this.XQcurrentPage,
pageSize: this.pageSizeXQ, pageSize: this.pageSizeXQ,
}; };
let params2 = { let params2 = {
auditId: this.checkedList[0].id, auditId: this.checkedList[0].auditId,
current: this.XQcurrentPageXM, current: this.XQcurrentPageXM,
pageSize: this.pageSizeXQXM, pageSize: this.pageSizeXQXM,
}; };
...@@ -1502,20 +1560,19 @@ export default { ...@@ -1502,20 +1560,19 @@ export default {
this.addtableDataXM = res[1].data.records; this.addtableDataXM = res[1].data.records;
this.addtotal = res[0].data.total; this.addtotal = res[0].data.total;
this.addtotalXM = res[1].data.total; this.addtotalXM = res[1].data.total;
this.dialogBJ=true this.dialogBJ = true;
this.oldid =""; this.oldid = "";
if(this.addtableDataXM.length>0){ if (this.addtableDataXM.length > 0) {
this.addtableDataXM.forEach((item) => { this.addtableDataXM.forEach((item) => {
this.oldid= this.oldid.concat(item.projectId+',') this.oldid = this.oldid.concat(item.projectId + ",");
this.$set( this.$set(
item, item,
"projectCategory", "projectCategory",
projectCategoryText(item.projectCategory) projectCategoryText(item.projectCategory)
); );
}); });
} }
}); });
}, },
//删除 //删除
async deletes() { async deletes() {
...@@ -1523,13 +1580,34 @@ export default { ...@@ -1523,13 +1580,34 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
let params = { this.$confirm("此操作将删除该批次, 是否继续?", "提示", {
id: this.checkedList[0].id, confirmButtonText: "确定",
}; cancelButtonText: "取消",
let res = await delAuditTasks(params); type: "warning",
if (res.code == 200) { })
this.resetForm(); .then(async () => {
} let res = await delAuditTasks({ id: this.checkedList[0].auditId });
if (res.code == 200) {
this.$message({
type: "success",
message: "删除成功!",
});
this.resetForm();
} else {
this.$message({
type: "info",
message: "删除失败!",
});
this.resetForm();
}
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
this.resetForm();
});
}, },
//选择项目 //选择项目
...@@ -1544,13 +1622,13 @@ export default { ...@@ -1544,13 +1622,13 @@ export default {
Object.assign(params, this.ruleFormZJ); Object.assign(params, this.ruleFormZJ);
let res = await getProjectInfo(params); let res = await getProjectInfo(params);
this.zjtableData = res.data.records; this.zjtableData = res.data.records;
this.zjtableData.forEach(item=>{ this.zjtableData.forEach((item) => {
this.$set( this.$set(
item, item,
"projectCategory", "projectCategory",
projectCategoryText(item.projectCategory) projectCategoryText(item.projectCategory)
); );
}) });
this.zjtotal = res.data.total * 1; this.zjtotal = res.data.total * 1;
console.log(res, "xxx"); console.log(res, "xxx");
}, },
...@@ -1583,27 +1661,27 @@ export default { ...@@ -1583,27 +1661,27 @@ export default {
console.log("删除", row); console.log("删除", row);
rows.splice(index, 1); rows.splice(index, 1);
this.addtableDataXM = rows; this.addtableDataXM = rows;
this.addtotalXM=rows.length this.addtotalXM = rows.length;
}, },
async handleClickBJ(row, index, rows) { async handleClickBJ(row, index, rows) {
console.log("删除", row); console.log("删除", row);
rows.splice(index, 1); rows.splice(index, 1);
this.addtableData = rows; this.addtableData = rows;
let params={ let params = {
ruleId:row.id, ruleId: row.id,
auditId: this.checkedList[0].id, auditId: this.checkedList[0].auditId,
} };
console.log(params,'222233') console.log(params, "222233");
let res = await delRule(params); let res = await delRule(params);
}, },
async handleClickbjxm(row, index, rows){ async handleClickbjxm(row, index, rows) {
console.log("删除编辑项目", row); console.log("删除编辑项目", row);
rows.splice(index, 1); rows.splice(index, 1);
this.addtableDataXM = rows; this.addtableDataXM = rows;
let params={ let params = {
projectId:row.projectId, projectId: row.projectId,
auditId: this.checkedList[0].id, auditId: this.checkedList[0].auditId,
} };
let res = await delProject(params); let res = await delProject(params);
}, },
//点击删除规则 //点击删除规则
...@@ -1611,10 +1689,10 @@ export default { ...@@ -1611,10 +1689,10 @@ export default {
console.log("删除", row); console.log("删除", row);
rows.splice(index, 1); rows.splice(index, 1);
this.addtableData = rows; this.addtableData = rows;
this.addtotal=rows.length this.addtotal = rows.length;
}, },
cancelZJ(){ cancelZJ() {
this.dialogAddzj=false this.dialogAddzj = false;
}, },
saveXZ() { saveXZ() {
...@@ -1650,23 +1728,26 @@ this.dialogAddzj=false ...@@ -1650,23 +1728,26 @@ this.dialogAddzj=false
let params = { let params = {
prjStr: expertIdList, prjStr: expertIdList,
ruleStr: ruleList, ruleStr: ruleList,
creator: sessionStorage.getItem("author"),
createTime: getCurrentDate(),
}; };
Object.assign(params, this.ruleFormdialogAdd); Object.assign(params, this.ruleFormdialogAdd);
console.log(params, "222"); console.log(params, "222");
addauditTasks(params).then((res) => { addauditTasks(params).then((res) => {
if (res.code == 200) {
this.$message("保存成功");
} else {
this.$message("保存失败");
}
this.dialogAdd = false; this.dialogAdd = false;
this.resetForm(); this.resetForm();
}); });
} }
}); });
}, },
cancelXZ(){ cancelXZ() {
this.dialogAdd = false; this.dialogAdd = false;
}, },
cancelBJ(){ cancelBJ() {
this.dialogBJ=false; this.dialogBJ = false;
}, },
saveBJ() { saveBJ() {
console.log("保存验证", this.$refs); console.log("保存验证", this.$refs);
...@@ -1698,18 +1779,15 @@ this.dialogAddzj=false ...@@ -1698,18 +1779,15 @@ this.dialogAddzj=false
}); });
} }
console.log(expertIdList,ruleList,'编辑值') console.log(expertIdList, ruleList, "编辑值");
// return // return
let params = { let params = {};
};
Object.assign(params, this.ruleFormdialogBJ); Object.assign(params, this.ruleFormdialogBJ);
params.auditId=this.checkedList[0].id params.auditId = this.checkedList[0].auditId;
params.prjStr=expertIdList, (params.prjStr = expertIdList),
params.ruleStr=ruleList, (params.ruleStr = ruleList),
console.log(params, "222"); console.log(params, "222");
upauditTasks(params).then((res) => { upauditTasks(params).then((res) => {
this.dialogBJ = false; this.dialogBJ = false;
this.resetForm(); this.resetForm();
...@@ -1790,7 +1868,7 @@ this.dialogAddzj=false ...@@ -1790,7 +1868,7 @@ this.dialogAddzj=false
// color: #2785e6; // color: #2785e6;
} }
.elpagination { .elpagination {
text-align: right; text-align: center;
margin-right: 100px; margin-right: 100px;
} }
/deep/ .el-dialog { /deep/ .el-dialog {
...@@ -2037,7 +2115,24 @@ h3 { ...@@ -2037,7 +2115,24 @@ h3 {
.cxItem { .cxItem {
position: absolute; position: absolute;
right: 0; right: 0;
top: 150px; top: 121px;
width: 20%;
bottom: 10px;
.zjquery {
display: inline-block;
background-color: #4ca6a7;
width: 89px;
height: 40px;
color: #fff;
text-align: center;
line-height: 40px;
border-radius: 5px;
}
}
.RuleItem {
position: absolute;
right: 0;
// top: 101px;
width: 20%; width: 20%;
.zjquery { .zjquery {
display: inline-block; display: inline-block;
...@@ -2054,4 +2149,7 @@ h3 { ...@@ -2054,4 +2149,7 @@ h3 {
/deep/ .el-table::before { /deep/ .el-table::before {
display: none !important; display: none !important;
} }
.demo-ruleForm {
margin-bottom: 20px;
}
</style> </style>
\ No newline at end of file
src/views/postConcentrationCheck/projectCheckQuestionQuery.vue
...@@ -407,7 +407,7 @@ export default { ...@@ -407,7 +407,7 @@ export default {
// color: #2785e6; // color: #2785e6;
} }
.elpagination { .elpagination {
text-align: right; text-align: center;
margin-right: 100px; margin-right: 100px;
} }
/deep/ .el-dialog { /deep/ .el-dialog {
......
src/views/postConcentrationCheck/rectificationFeedbackQuery.vue
...@@ -423,7 +423,7 @@ export default { ...@@ -423,7 +423,7 @@ export default {
// color: #2785e6; // color: #2785e6;
} }
.elpagination { .elpagination {
text-align: right; text-align: center;
margin-right: 100px; margin-right: 100px;
} }
/deep/ .el-dialog { /deep/ .el-dialog {
......
src/views/projectCheck/checkResault.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
label-width="100px" label-width="100px"
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="稽核名称:" prop="auditName" class="fromItem"> <el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input <el-input
v-model="ruleForm.auditName" v-model="ruleForm.auditName"
placeholder="请输入" placeholder="请输入"
...@@ -15,49 +15,50 @@ ...@@ -15,49 +15,50 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="稽核开始时间:" label="稽核时间:"
prop="auditStartTime" prop="auditTime"
class="fromItem" class="fromItem"
> >
<el-date-picker <el-date-picker
v-model="ruleForm.auditStartTime" @change="timeChange"
type="date" v-model="ruleForm.dates"
placeholder="选择日期" style="width: 240px"
> value-format="yyyy-MM-dd"
</el-date-picker> type="daterange"
</el-form-item> range-separator="-"
<el-form-item label="稽核结束时间:" prop="auditEndTime" class="fromItem"> start-placeholder="开始日期"
<el-date-picker end-placeholder="结束日期"
v-model="ruleForm.auditEndTime" ></el-date-picker>
type="date"
placeholder="选择日期"
>
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="稽核频率:" prop="auditFrequency" class="fromItem"> <!-- <el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-select <el-input
v-model="ruleForm.auditFrequency" v-model="ruleForm.projectId"
placeholder="请选择" placeholder="请输入"
clearable clearable
> ></el-input>
<el-option label="仅一次" value="0"></el-option> </el-form-item> -->
<el-option label="每周" value="1"></el-option> <el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-option label="每月" value="2"></el-option> <el-input
<el-option label="每季度" value="3"></el-option> v-model="ruleForm.projectName"
<el-option label="每年" value="4"></el-option> placeholder="请输入"
</el-select> clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="稽核状态:" prop="confirmStatus" class="fromItem"> <!-- <el-form-item label="项目年度:" prop="projectYear" class="fromItem">
<el-select <el-select
v-model="ruleForm.confirmStatus" v-model="ruleForm.projectYear"
placeholder="请选择" placeholder="请选择"
clearable clearable
> >
<el-option label="未确认" value="0"></el-option> <el-option
<el-option label="未下发" value="1"></el-option> v-for="(item, index) in yearsList"
<el-option label="已下发" value="2"></el-option> :key="index"
:label="item + '年'"
:value="item"
/>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm()">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
...@@ -82,27 +83,20 @@ ...@@ -82,27 +83,20 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<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="auditName"> </el-table-column> <el-table-column label="稽核名称" prop="auditName" width="320"> </el-table-column>
<el-table-column prop="auditStartTime" label="稽核开始时间"> <el-table-column prop="auditTime" label="稽核时间" width="250">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="auditEndTime" prop="fullName"
label="稽核结束时间" label="项目名称"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<!-- <el-table-column prop="confirmStatus" label="稽核状态">
</el-table-column> -->
<el-table-column prop="auditFrequencyText" label="稽核频率">
</el-table-column>
<el-table-column prop="abnormalResults" label="检查异常结果"> <el-table-column prop="abnormalResults" label="检查异常结果">
</el-table-column> </el-table-column>
<el-table-column prop="auditEndTime" label="稽核时间">
</el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
...@@ -133,38 +127,23 @@ ...@@ -133,38 +127,23 @@
<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="dates"> <el-form-item label="稽核时间:" class="fromItem" prop="auditTime">
<el-date-picker <el-input v-model="ruleFormdialogXQ.auditTime" disabled></el-input>
@change="timeChange"
v-model="ruleFormdialogXQ.dates"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
disabled
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item label="项目编码:" class="fromItem" prop="projectId">
label="稽核频率:" <el-input v-model="ruleFormdialogXQ.projectId" disabled></el-input>
prop="auditFrequency" </el-form-item> -->
class="fromItem" <el-form-item label="项目名称:" class="fromItem" prop="fullName">
> <el-input v-model="ruleFormdialogXQ.fullName" type="textarea" disabled></el-input>
<el-select </el-form-item>
v-model="ruleFormdialogXQ.auditFrequency" <!-- <el-form-item label="项目年度:" class="fromItem" prop="projectYear">
placeholder="请选择" <el-input v-model="ruleFormdialogXQ.projectYear" disabled></el-input>
disabled
>
<el-option label="仅一次" value="0"></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-form-item> </el-form-item>
<el-form-item label="建设形式:" class="fromItem" prop="projectCategory">
<el-input v-model="ruleFormdialogXQ.projectCategory" disabled></el-input>
</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"
...@@ -180,8 +159,8 @@ ...@@ -180,8 +159,8 @@
<el-table-column label="规则名称" width="auto" prop="ruleName"> <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> -->
<el-table-column <el-table-column
prop="projectName" prop="projectName"
label="稽核异常项目清单" label="稽核异常项目清单"
...@@ -190,7 +169,7 @@ ...@@ -190,7 +169,7 @@
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- <el-pagination <!-- <el-pagination
@size-change="handleSizeChangeXQ" @size-change="handleSizeChangeXQ"
@current-change="handleCurrentChangeXQ" @current-change="handleCurrentChangeXQ"
...@@ -213,17 +192,19 @@ ...@@ -213,17 +192,19 @@
<script> <script>
import { auditTasksResults, xqauditTasksResults } from "@/api/index"; import { auditTasksResults, xqauditTasksResults } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
yearsList: generateYearOptions(),
listData: {}, listData: {},
showButton: true, showButton: true,
ruleForm: { ruleForm: {
}, },
ruleFormdialogXQ: {}, ruleFormdialogXQ: {},
currentPageXQ:'', currentPageXQ:1,
pageSizeXQ:'', pageSizeXQ:5,
tableData: [], tableData: [],
checkedList: [], checkedList: [],
...@@ -241,8 +222,11 @@ export default { ...@@ -241,8 +222,11 @@ export default {
timeChange(time) { timeChange(time) {
if (time) { if (time) {
//给后端的参数 //给后端的参数
this.ruleFormdialogAdd.auditStartTime = time[0]; this.ruleForm.auditStartTime = time[0];
this.ruleFormdialogAdd.auditEndTime = time[1]; this.ruleForm.auditEndTime = time[1];
}else{
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
} }
}, },
async submitForm() { async submitForm() {
...@@ -268,6 +252,11 @@ export default { ...@@ -268,6 +252,11 @@ export default {
} else if (item.auditFrequency == 4) { } else if (item.auditFrequency == 4) {
this.$set(item, "auditFrequencyText", "每年"); this.$set(item, "auditFrequencyText", "每年");
} }
this.$set(
item,
"projectCategory",
projectCategoryText(item.projectCategory)
);
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
...@@ -276,6 +265,9 @@ export default { ...@@ -276,6 +265,9 @@ export default {
this.$refs.formName.resetFields(); this.$refs.formName.resetFields();
this.currentPage = 1; this.currentPage = 1;
this.pageSize = 10; this.pageSize = 10;
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
this.ruleForm.dates=[]
this.submitForm(); this.submitForm();
}, },
//详情 //详情
...@@ -415,7 +407,7 @@ export default { ...@@ -415,7 +407,7 @@ export default {
// color: #2785e6; // color: #2785e6;
} }
.elpagination { .elpagination {
text-align: right; text-align: center;
margin-right: 100px; margin-right: 100px;
} }
/deep/ .el-dialog { /deep/ .el-dialog {
......
src/views/projectCheck/confirmResault.vue
...@@ -15,48 +15,58 @@ ...@@ -15,48 +15,58 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="稽核开始时间:" label="稽核时间:"
prop="auditStartTime" prop="auditTime"
class="fromItem" class="fromItem"
> >
<el-date-picker <el-date-picker
v-model="ruleForm.auditStartTime" @change="timeChange"
type="date" v-model="ruleForm.dates"
placeholder="选择日期" style="width: 240px"
> value-format="yyyy-MM-dd"
</el-date-picker> type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="稽核结束时间:" prop="auditEndTime" class="fromItem"> <el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-date-picker <el-input
v-model="ruleForm.auditEndTime" v-model="ruleForm.projectId"
type="date" placeholder="请输入"
placeholder="选择日期" clearable
> ></el-input>
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-form-item label="稽核频率:" prop="auditFrequency" class="fromItem"> <el-input
v-model="ruleForm.projectName"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目年度:" prop="projectYear" class="fromItem">
<el-select <el-select
v-model="ruleForm.auditFrequency" v-model="ruleForm.projectYear"
placeholder="请选择" placeholder="请选择"
clearable clearable
> >
<el-option label="仅一次" value="0"></el-option> <el-option
<el-option label="每周" value="1"></el-option> v-for="(item, index) in yearsList"
<el-option label="每月" value="2"></el-option> :key="index"
<el-option label="每季度" value="3"></el-option> :label="item + '年'"
<el-option label="每年" value="4"></el-option> :value="item"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="稽核状态:" prop="confirmStatus" class="fromItem"> <el-form-item label="结果确认状态:" prop="confirmStatus" class="fromItem">
<el-select <el-select
v-model="ruleForm.confirmStatus" v-model="ruleForm.confirmStatus"
placeholder="请选择" placeholder="请选择"
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-select> </el-select>
</el-form-item> </el-form-item>
...@@ -92,26 +102,27 @@ ...@@ -92,26 +102,27 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<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="auditName"> </el-table-column> <el-table-column label="稽核名称" prop="auditName" width="320"> </el-table-column>
<el-table-column prop="auditStartTime" label="稽核开始时间"> <el-table-column prop="auditTime" label="稽核时间" width="250">
</el-table-column>
<el-table-column prop="projectId" label="项目编码" width="220">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="auditEndTime" prop="projectName"
label="稽核结束时间" label="项目名称"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<!-- <el-table-column prop="confirmStatus" label="稽核状态"> <el-table-column prop="projectYear" label="项目年度" width="200">
</el-table-column> --> <template slot-scope="scope">
<el-table-column prop="auditFrequencyText" label="稽核频率"> {{ scope.row.projectYear }}年
</template>
</el-table-column> </el-table-column>
<el-table-column prop="abnormalResults" label="检查异常结果"> <el-table-column prop="projectCategory" label="建设形式" width="200">
</el-table-column>
<el-table-column prop="auditEndTime" label="稽核时间">
</el-table-column> </el-table-column>
<el-table-column prop="confirmStatusText" label="结果确认状态"> <el-table-column prop="confirmStatusText" label="结果确认状态">
</el-table-column> </el-table-column>
...@@ -145,38 +156,13 @@ ...@@ -145,38 +156,13 @@
<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="dates">
<el-date-picker <el-form-item label="稽核时间:" prop="auditTime" class="fromItem">
@change="timeChange" <el-input v-model="ruleFormdialogXQ.auditTime" disabled></el-input>
v-model="ruleFormdialogXQ.dates"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
disabled
></el-date-picker>
</el-form-item>
<el-form-item
label="稽核频率:"
prop="auditFrequency"
class="fromItem"
>
<el-select
v-model="ruleFormdialogXQ.auditFrequency"
placeholder="请选择"
disabled
>
<el-option label="仅一次" value="0"></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-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"
...@@ -252,23 +238,6 @@ ...@@ -252,23 +238,6 @@
disabled disabled
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item
label="稽核频率:"
prop="auditFrequency"
class="fromItem"
>
<el-select
v-model="ruleFormdialogXQ.auditFrequency"
placeholder="请选择"
disabled
>
<el-option label="仅一次" value="0"></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-form-item>
</el-form> </el-form>
<p class="zjBtn">稽核规则配置</p> <p class="zjBtn">稽核规则配置</p>
<div class="setscroll"> <div class="setscroll">
...@@ -335,9 +304,11 @@ ...@@ -335,9 +304,11 @@
import { import {
auditTasksResults, xqauditTasksResults,scauditTasksResults,jgxqResults,wtxfResults auditTasksResults, xqauditTasksResults,scauditTasksResults,jgxqResults,wtxfResults
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
yearsList: generateYearOptions(),
listData: {}, listData: {},
QRtableData: [], QRtableData: [],
dialogQR: false, dialogQR: false,
...@@ -369,8 +340,11 @@ export default { ...@@ -369,8 +340,11 @@ export default {
timeChange(time) { timeChange(time) {
if (time) { if (time) {
//给后端的参数 //给后端的参数
this.ruleFormdialogAdd.auditStartTime = time[0]; this.ruleForm.auditStartTime = time[0];
this.ruleFormdialogAdd.auditEndTime = time[1]; this.ruleForm.auditEndTime = time[1];
}else{
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
} }
}, },
async submitForm() { async submitForm() {
...@@ -385,25 +359,18 @@ export default { ...@@ -385,25 +359,18 @@ 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.auditFrequency == 0) { if (item.confirmStatus == 0||item.confirmStatus==null) {
this.$set(item, "auditFrequencyText", "仅一次");
} else if (item.auditFrequency == 1) {
this.$set(item, "auditFrequencyText", "每周");
} else if (item.auditFrequency == 2) {
this.$set(item, "auditFrequencyText", "每月");
} else if (item.auditFrequency == 3) {
this.$set(item, "auditFrequencyText", "每季度");
} else if (item.auditFrequency == 4) {
this.$set(item, "auditFrequencyText", "每年");
}
if (item.confirmStatus == 0) {
this.$set(item, "confirmStatusText", "未确认"); this.$set(item, "confirmStatusText", "未确认");
} else if (item.confirmStatus == 1) { } else if (item.confirmStatus == 1) {
this.$set(item, "confirmStatusText", "未下发"); this.$set(item, "confirmStatusText", "未下发");
} else if (item.confirmStatus == 2) { } else if (item.confirmStatus == 2) {
this.$set(item, "confirmStatusText", "已下发"); this.$set(item, "confirmStatusText", "已下发");
} }
this.$set(
item,
"projectCategory",
projectCategoryText(item.projectCategory)
);
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
...@@ -412,6 +379,9 @@ export default { ...@@ -412,6 +379,9 @@ export default {
this.$refs.formName.resetFields(); this.$refs.formName.resetFields();
this.currentPage = 1; this.currentPage = 1;
this.pageSize = 10; this.pageSize = 10;
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
this.ruleForm.dates=[]
this.submitForm(); this.submitForm();
}, },
//详情 //详情
...@@ -584,7 +554,7 @@ export default { ...@@ -584,7 +554,7 @@ export default {
// color: #2785e6; // color: #2785e6;
} }
.elpagination { .elpagination {
text-align: right; text-align: center;
margin-right: 100px; margin-right: 100px;
} }
/deep/ .el-dialog { /deep/ .el-dialog {
......
src/views/projectCheck/problemRectify.vue
...@@ -7,41 +7,72 @@ ...@@ -7,41 +7,72 @@
label-width="100px" label-width="100px"
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="项目名称:" prop="projectName" class="fromItem"> <el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input <el-input
v-model="ruleForm.auditName" v-model="ruleForm.auditName"
placeholder="请输入" placeholder="请输入"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="稽核名称:" prop="auditName" class="fromItem"> <el-form-item
label="稽核时间:"
prop="auditTime"
class="fromItem"
>
<el-date-picker
@change="timeChange"
v-model="ruleForm.dates"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input <el-input
v-model="ruleForm.auditName" v-model="ruleForm.projectId"
placeholder="请输入" placeholder="请输入"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="项目名称:" prop="projectName" class="fromItem">
label="稽核开始时间:" <el-input
prop="auditStartTime" v-model="ruleForm.projectName"
class="fromItem" placeholder="请输入"
> clearable
<el-date-picker ></el-input>
v-model="ruleForm.auditStartTime" </el-form-item>
type="date" <el-form-item label="项目年度:" prop="projectYear" class="fromItem">
placeholder="选择日期" <el-select
v-model="ruleForm.projectYear"
placeholder="请选择"
clearable
> >
</el-date-picker> <el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="稽核结束时间:" prop="auditEndTime" class="fromItem"> <el-form-item label="问题整改状态:" prop="rectificationStatus" class="fromItem">
<el-date-picker <el-select
v-model="ruleForm.auditEndTime" v-model="ruleForm.rectificationStatus"
type="date" placeholder="请选择"
placeholder="选择日期" clearable
> >
</el-date-picker> <el-option label="待整改" value="0"></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-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm()">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
...@@ -70,22 +101,28 @@ ...@@ -70,22 +101,28 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<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="projectName"> </el-table-column> <el-table-column label="稽核名称" prop="auditName" width="320"> </el-table-column>
<el-table-column prop="personCharge" label="负责人"> <el-table-column prop="auditTime" label="稽核时间" width="250">
</el-table-column>
<el-table-column prop="projectId" label="项目编码" width="220">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="auditName" prop="projectName"
label="稽核名称" label="项目名称"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column prop="abnormalResults" label="检查异常项"> <el-table-column prop="projectYear" label="项目年度" width="200">
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
</el-table-column>
<el-table-column prop="projectCategory" label="建设形式" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="auditTime" label="稽核时间"> </el-table-column>
<el-table-column prop="rectificationStatusText" label="问题整改状态"> <el-table-column prop="rectificationStatusText" label="问题整改状态">
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -126,23 +163,6 @@ ...@@ -126,23 +163,6 @@
disabled disabled
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item
label="稽核频率:"
prop="auditFrequency"
class="fromItem"
>
<el-select
v-model="ruleFormdialogXQ.auditFrequency"
placeholder="请选择"
disabled
>
<el-option label="仅一次" value="0"></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-form-item>
</el-form> </el-form>
<p class="zjBtn">稽核结果</p> <p class="zjBtn">稽核结果</p>
<div class="setscroll"> <div class="setscroll">
...@@ -168,12 +188,11 @@ ...@@ -168,12 +188,11 @@
<el-table-column label="规则名称" width="auto" prop="ruleName"> <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> -->
<el-table-column label="问题申诉" width="auto"> <el-table-column label="问题申诉" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
disabled
v-model="scope.row.confirmStatus" v-model="scope.row.confirmStatus"
active-color="#C0C0C0" active-color="#C0C0C0"
inactive-color="#13ce66" inactive-color="#13ce66"
...@@ -182,6 +201,7 @@ ...@@ -182,6 +201,7 @@
active-text="无异议" active-text="无异议"
inactive-text="有异议" inactive-text="有异议"
@change="controlSwitch($event, scope.row)" @change="controlSwitch($event, scope.row)"
disabled
> >
<template v-slot:active> <template v-slot:active>
<span>开启</span> <span>开启</span>
...@@ -192,6 +212,24 @@ ...@@ -192,6 +212,24 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </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 prop="ruleType" label="问题解决佐证材料" width="auto">
<template
slot-scope="scope"
v-if="scope.row.confirmStatus == '1' && scope.row.sszzFileId"
>
{{ scope.row.sszzFileName}}
<el-button @click="handleClickXZ(scope.row.sszzFileId,scope.row.sszzFileName)">下载</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<!-- <el-pagination <!-- <el-pagination
...@@ -237,23 +275,6 @@ ...@@ -237,23 +275,6 @@
disabled disabled
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item
label="稽核频率:"
prop="auditFrequency"
class="fromItem"
>
<el-select
v-model="ruleFormdialogXQ.auditFrequency"
placeholder="请选择"
disabled
>
<el-option label="仅一次" value="0"></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-form-item>
</el-form> </el-form>
<p class="zjBtn">稽核结果</p> <p class="zjBtn">稽核结果</p>
<div class="setscroll"> <div class="setscroll">
...@@ -279,8 +300,8 @@ ...@@ -279,8 +300,8 @@
<el-table-column label="规则名称" width="auto" prop="ruleName"> <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> -->
<el-table-column label="问题申诉" width="auto"> <el-table-column label="问题申诉" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
...@@ -350,10 +371,13 @@ import { ...@@ -350,10 +371,13 @@ import {
savaauditRuleProjectLink, savaauditRuleProjectLink,
tjTasksRuleProjectLink, tjTasksRuleProjectLink,
ossupload, ossupload,
downloadObject
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
yearsList: generateYearOptions(),
listData: {}, listData: {},
QRtableData: [], QRtableData: [],
dialogQR: false, dialogQR: false,
...@@ -383,8 +407,11 @@ export default { ...@@ -383,8 +407,11 @@ export default {
timeChange(time) { timeChange(time) {
if (time) { if (time) {
//给后端的参数 //给后端的参数
this.ruleFormdialogAdd.auditStartTime = time[0]; this.ruleForm.auditStartTime = time[0];
this.ruleFormdialogAdd.auditEndTime = time[1]; this.ruleForm.auditEndTime = time[1];
}else{
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
} }
}, },
async submitForm() { async submitForm() {
...@@ -399,18 +426,6 @@ export default { ...@@ -399,18 +426,6 @@ 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.auditFrequency == 0) {
this.$set(item, "auditFrequencyText", "仅一次");
} else if (item.auditFrequency == 1) {
this.$set(item, "auditFrequencyText", "每周");
} else if (item.auditFrequency == 2) {
this.$set(item, "auditFrequencyText", "每月");
} else if (item.auditFrequency == 3) {
this.$set(item, "auditFrequencyText", "每季度");
} else if (item.auditFrequency == 4) {
this.$set(item, "auditFrequencyText", "每年");
}
if (item.rectificationStatus == 0||!item.rectificationStatus) { if (item.rectificationStatus == 0||!item.rectificationStatus) {
this.$set(item, "rectificationStatusText", "待整改 "); this.$set(item, "rectificationStatusText", "待整改 ");
} else if (item.rectificationStatus == 1) { } else if (item.rectificationStatus == 1) {
...@@ -422,6 +437,11 @@ export default { ...@@ -422,6 +437,11 @@ export default {
} else if (item.rectificationStatus == 2) { } else if (item.rectificationStatus == 2) {
this.$set(item, "rectificationStatusTextt", "整改完成"); this.$set(item, "rectificationStatusTextt", "整改完成");
} }
this.$set(
item,
"projectCategory",
projectCategoryText(item.projectCategory)
);
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
...@@ -430,6 +450,9 @@ export default { ...@@ -430,6 +450,9 @@ export default {
this.$refs.formName.resetFields(); this.$refs.formName.resetFields();
this.currentPage = 1; this.currentPage = 1;
this.pageSize = 10; this.pageSize = 10;
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
this.ruleForm.dates=[]
this.submitForm(); this.submitForm();
}, },
//详情 //详情
...@@ -553,6 +576,23 @@ export default { ...@@ -553,6 +576,23 @@ export default {
controlSwitch(val, row) { controlSwitch(val, row) {
console.log("333", val, row); console.log("333", val, row);
}, },
async handleClickXZ(fileId, fileName) {
console.log(fileId);
let response = await downloadObject({
fileId: fileId * 1,
});
let blob = new Blob([response]);
if ("download" in document.createElement("a")) {
let elink = document.createElement("a");
elink.download = fileName;
elink.style.display = "none";
elink.href = URL.createObjectURL(blob);
document.body.appendChild(elink);
elink.click();
URL.revokeObjectURL(elink.href); // 释放URL 对象
document.body.removeChild(elink);
}
},
}, },
}; };
</script> </script>
...@@ -626,7 +666,7 @@ export default { ...@@ -626,7 +666,7 @@ export default {
// color: #2785e6; // color: #2785e6;
} }
.elpagination { .elpagination {
text-align: right; text-align: center;
margin-right: 100px; margin-right: 100px;
} }
/deep/ .el-dialog { /deep/ .el-dialog {
......
src/views/projectCheck/verificationRectify.vue
...@@ -7,39 +7,69 @@ ...@@ -7,39 +7,69 @@
label-width="100px" label-width="100px"
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="项目名称:" prop="projectName" class="fromItem"> <el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input <el-input
v-model="ruleForm.auditName" v-model="ruleForm.auditName"
placeholder="请输入" placeholder="请输入"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="稽核名称:" prop="auditName" class="fromItem"> <el-form-item
label="稽核时间:"
prop="auditTime"
class="fromItem"
>
<el-date-picker
@change="timeChange"
v-model="ruleForm.dates"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input <el-input
v-model="ruleForm.auditName" v-model="ruleForm.projectId"
placeholder="请输入" placeholder="请输入"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="项目名称:" prop="projectName" class="fromItem">
label="稽核开始时间:" <el-input
prop="auditStartTime" v-model="ruleForm.projectName"
class="fromItem" placeholder="请输入"
> clearable
<el-date-picker ></el-input>
v-model="ruleForm.auditStartTime" </el-form-item>
type="date" <el-form-item label="项目年度:" prop="projectYear" class="fromItem">
placeholder="选择日期" <el-select
v-model="ruleForm.projectYear"
placeholder="请选择"
clearable
> >
</el-date-picker> <el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="稽核结束时间:" prop="auditEndTime" class="fromItem"> <el-form-item label="问题整改复核状态:" prop="rectificationStatus" class="fromItem">
<el-date-picker <el-select
v-model="ruleForm.auditEndTime" v-model="ruleForm.rectificationStatus"
type="date" placeholder="请选择"
placeholder="选择日期" clearable
> >
</el-date-picker> <el-option label="待整改" value="0"></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-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
...@@ -70,22 +100,28 @@ ...@@ -70,22 +100,28 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<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="projectName"> </el-table-column> <el-table-column label="稽核名称" prop="auditName" width="320"> </el-table-column>
<el-table-column prop="personCharge" label="负责人"> <el-table-column prop="auditTime" label="稽核时间" width="250">
</el-table-column>
<el-table-column prop="projectId" label="项目编码" width="220">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="auditName" prop="projectName"
label="稽核名称" label="项目名称"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column prop="abnormalResults" label="检查异常项"> <el-table-column prop="projectYear" label="项目年度" width="200">
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
</el-table-column>
<el-table-column prop="projectCategory" label="建设形式" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="auditTime" label="稽核时间"> </el-table-column>
<el-table-column <el-table-column
prop="rectificationStatusText" prop="rectificationStatusText"
label="问题整改复核状态" label="问题整改复核状态"
...@@ -129,23 +165,6 @@ ...@@ -129,23 +165,6 @@
disabled disabled
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item
label="稽核频率:"
prop="auditFrequency"
class="fromItem"
>
<el-select
v-model="ruleFormdialogXQ.auditFrequency"
placeholder="请选择"
disabled
>
<el-option label="仅一次" value="0"></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-form-item>
</el-form> </el-form>
<p class="zjBtn">稽核结果</p> <p class="zjBtn">稽核结果</p>
<div class="setscroll"> <div class="setscroll">
...@@ -171,8 +190,6 @@ ...@@ -171,8 +190,6 @@
<el-table-column label="规则名称" width="auto" prop="ruleName"> <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>
<el-table-column label="问题申诉" width="auto"> <el-table-column label="问题申诉" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
...@@ -195,6 +212,28 @@ ...@@ -195,6 +212,28 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </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
prop="ruleType"
label="问题解决佐证材料"
width="auto"
>
<template
slot-scope="scope"
v-if="scope.row.confirmStatus == '1' && 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="zgfhStatus" prop="zgfhStatus"
label="问题整改复核" label="问题整改复核"
...@@ -257,23 +296,6 @@ ...@@ -257,23 +296,6 @@
disabled disabled
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item
label="稽核频率:"
prop="auditFrequency"
class="fromItem"
>
<el-select
v-model="ruleFormdialogXQ.auditFrequency"
placeholder="请选择"
disabled
>
<el-option label="仅一次" value="0"></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-form-item>
</el-form> </el-form>
<p class="zjBtn">稽核结果</p> <p class="zjBtn">稽核结果</p>
<div class="setscroll"> <div class="setscroll">
...@@ -299,11 +321,10 @@ ...@@ -299,11 +321,10 @@
<el-table-column label="规则名称" width="auto" prop="ruleName"> <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>
<el-table-column label="问题申诉" width="auto"> <el-table-column label="问题申诉" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
disabled
v-model="scope.row.confirmStatus" v-model="scope.row.confirmStatus"
active-color="#C0C0C0" active-color="#C0C0C0"
inactive-color="#13ce66" inactive-color="#13ce66"
...@@ -323,12 +344,12 @@ ...@@ -323,12 +344,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ruleType" label="申诉证明材料" width="auto"> <el-table-column prop="ruleType" label="申诉证明材料" width="auto">
<template slot-scope="scope"> <template
<input slot-scope="scope"
type="file" v-if="scope.row.confirmStatus == '1' && scope.row.sszmFileId"
@change="handleFileUpload($event, scope.row, 'sszmFileId')" >
v-if="scope.row.confirmStatus == '1'" {{ scope.row.sszmFileName}}
/> <el-button @click="handleClickXZ(scope.row.sszmFileId,scope.row.sszmFileName)">下载</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -336,12 +357,12 @@ ...@@ -336,12 +357,12 @@
label="问题解决佐证材料" label="问题解决佐证材料"
width="auto" width="auto"
> >
<template slot-scope="scope"> <template
<input slot-scope="scope"
type="file" v-if="scope.row.confirmStatus == '1' && scope.row.sszzFileId"
@change="handleFileUpload($event, scope.row, 'sszzFileId')" >
v-if="scope.row.confirmStatus == '1'" {{ scope.row.sszzFileName}}
/> <el-button @click="handleClickXZ(scope.row.sszzFileId,scope.row.sszzFileName)">下载</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -387,10 +408,13 @@ import { ...@@ -387,10 +408,13 @@ import {
savaRuleProjectLink, savaRuleProjectLink,
tjRuleProjectLink, tjRuleProjectLink,
ossupload, ossupload,
downloadObject
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
yearsList: generateYearOptions(),
listData: {}, listData: {},
QRtableData: [], QRtableData: [],
dialogQR: false, dialogQR: false,
...@@ -420,8 +444,11 @@ export default { ...@@ -420,8 +444,11 @@ export default {
timeChange(time) { timeChange(time) {
if (time) { if (time) {
//给后端的参数 //给后端的参数
this.ruleFormdialogAdd.auditStartTime = time[0]; this.ruleForm.auditStartTime = time[0];
this.ruleFormdialogAdd.auditEndTime = time[1]; this.ruleForm.auditEndTime = time[1];
}else{
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
} }
}, },
async submitForm() { async submitForm() {
...@@ -449,7 +476,7 @@ export default { ...@@ -449,7 +476,7 @@ export default {
} }
if (item.rectificationStatus == 0 || !item.rectificationStatus) { if (item.rectificationStatus == 0 || !item.rectificationStatus) {
this.$set(item, "rectificationStatusText", "待整改 "); this.$set(item, "rectificationStatusText", "待整改");
} else if (item.rectificationStatus == 1) { } else if (item.rectificationStatus == 1) {
this.$set(item, "rectificationStatusText", "待提交"); this.$set(item, "rectificationStatusText", "待提交");
} else if (item.rectificationStatus == 2) { } else if (item.rectificationStatus == 2) {
...@@ -459,6 +486,11 @@ export default { ...@@ -459,6 +486,11 @@ export default {
} else if (item.rectificationStatus == 4) { } else if (item.rectificationStatus == 4) {
this.$set(item, "rectificationStatusText", "整改完成"); this.$set(item, "rectificationStatusText", "整改完成");
} }
this.$set(
item,
"projectCategory",
projectCategoryText(item.projectCategory)
);
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
...@@ -468,6 +500,9 @@ export default { ...@@ -468,6 +500,9 @@ export default {
this.$refs.formName.resetFields(); this.$refs.formName.resetFields();
this.currentPage = 1; this.currentPage = 1;
this.pageSize = 10; this.pageSize = 10;
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
this.ruleForm.dates=[]
this.submitForm(); this.submitForm();
}, },
//详情 //详情
...@@ -515,6 +550,23 @@ export default { ...@@ -515,6 +550,23 @@ export default {
} }
return ""; return "";
}, },
async handleClickXZ(fileId, fileName) {
console.log(fileId);
let response = await downloadObject({
fileId: fileId * 1,
});
let blob = new Blob([response]);
if ("download" in document.createElement("a")) {
let elink = document.createElement("a");
elink.download = fileName;
elink.style.display = "none";
elink.href = URL.createObjectURL(blob);
document.body.appendChild(elink);
elink.click();
URL.revokeObjectURL(elink.href); // 释放URL 对象
document.body.removeChild(elink);
}
},
//主列表选中行信息 //主列表选中行信息
handleSelectionChange(selection) { handleSelectionChange(selection) {
if (Array.isArray(selection) && selection.length > 1) { if (Array.isArray(selection) && selection.length > 1) {
...@@ -670,7 +722,7 @@ export default { ...@@ -670,7 +722,7 @@ export default {
// color: #2785e6; // color: #2785e6;
} }
.elpagination { .elpagination {
text-align: right; text-align: center;
margin-right: 100px; margin-right: 100px;
} }
/deep/ .el-dialog { /deep/ .el-dialog {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!