Skip to content

Administrator / project_progress

Go to a project
Commit 2ebe0e18 by liangzhen
Options

暂存

1 parent 45c15e59
Expand all
Inline Side-by-side
Showing with 198 additions and 250 deletions
src/api/index.js
......@@ -281,7 +281,11 @@ export function RectificationFeedbackQuery(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) {
......
src/views/checkCompliance/automaticCheck.vue
......@@ -15,47 +15,47 @@
></el-input>
</el-form-item>
<el-form-item
label="稽核开始时间:"
prop="auditStartTime"
label="稽核时间:"
prop="auditTime"
class="fromItem"
>
<el-date-picker
v-model="ruleForm.auditStartTime"
type="date"
placeholder="选择日期"
>
</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="auditEndTime" class="fromItem">
<el-date-picker
v-model="ruleForm.auditEndTime"
type="date"
placeholder="选择日期"
>
</el-date-picker>
<el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input
v-model="ruleForm.projectId"
placeholder="请输入"
clearable
></el-input>
</el-form-item>
<el-form-item label="稽核频率:" prop="auditFrequency" class="fromItem">
<el-select
v-model="ruleForm.auditFrequency"
placeholder="请选择"
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input
v-model="ruleForm.projectName"
placeholder="请输入"
clearable
>
<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-input>
</el-form-item>
<el-form-item label="稽核状态:" prop="confirmStatus" class="fromItem">
<el-form-item label="项目年度:" prop="projectYear" class="fromItem">
<el-select
v-model="ruleForm.confirmStatus"
v-model="ruleForm.projectYear"
placeholder="请选择"
clearable
>
<el-option label="未确认" value="0"></el-option>
<el-option label="未下发" value="1"></el-option>
<el-option label="已下发" value="2"></el-option>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item class="button">
......@@ -85,23 +85,24 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="稽核名称" prop="auditName"> </el-table-column>
<el-table-column prop="auditStartTime" label="稽核开始时间">
<el-table-column label="稽核名称" prop="auditName" width="320"> </el-table-column>
<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
prop="auditEndTime"
label="稽核结束时间"
prop="projectName"
label="项目名称"
show-overflow-tooltip
>
</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="projectYear" label="项目年度" width="200">
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
</el-table-column>
<el-table-column prop="auditEndTime" label="稽核时间">
<el-table-column prop="projectCategory" label="建设形式" width="200">
</el-table-column>
</el-table>
</div>
......@@ -133,35 +134,8 @@
<el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input v-model="ruleFormdialogXQ.auditName" disabled></el-input>
</el-form-item>
<el-form-item label="稽核时间:" class="fromItem" prop="dates">
<el-date-picker
@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 label="稽核时间:" class="fromItem" prop="auditStartTime">
<el-input v-model="ruleFormdialogXQ.auditStartTime" disabled></el-input>
</el-form-item>
</el-form>
<p class="zjBtn">稽核规则配置</p>
......@@ -213,9 +187,11 @@
<script>
import { auditTasksResults, xqauditTasksResults } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default {
data() {
return {
yearsList: generateYearOptions(),
listData: {},
showButton: true,
ruleForm: {
......@@ -241,8 +217,11 @@ export default {
timeChange(time) {
if (time) {
//给后端的参数
this.ruleFormdialogAdd.auditStartTime = time[0];
this.ruleFormdialogAdd.auditEndTime = time[1];
this.ruleForm.auditStartTime = time[0];
this.ruleForm.auditEndTime = time[1];
}else{
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
}
},
async submitForm() {
......@@ -276,6 +255,9 @@ export default {
this.$refs.formName.resetFields();
this.currentPage = 1;
this.pageSize = 10;
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
this.ruleForm.dates=[]
this.submitForm();
},
//详情
......@@ -415,7 +397,7 @@ export default {
// color: #2785e6;
}
.elpagination {
text-align: right;
text-align: center;
margin-right: 100px;
}
/deep/ .el-dialog {
......
src/views/postConcentrationCheck/projectCheckQuestionQuery.vue
......@@ -407,7 +407,7 @@ export default {
// color: #2785e6;
}
.elpagination {
text-align: right;
text-align: center;
margin-right: 100px;
}
/deep/ .el-dialog {
......
src/views/postConcentrationCheck/rectificationFeedbackQuery.vue
......@@ -423,7 +423,7 @@ export default {
// color: #2785e6;
}
.elpagination {
text-align: right;
text-align: center;
margin-right: 100px;
}
/deep/ .el-dialog {
......
src/views/projectCheck/checkResault.vue
......@@ -15,49 +15,50 @@
></el-input>
</el-form-item>
<el-form-item
label="稽核开始时间:"
prop="auditStartTime"
label="稽核时间:"
prop="auditTime"
class="fromItem"
>
<el-date-picker
v-model="ruleForm.auditStartTime"
type="date"
placeholder="选择日期"
>
</el-date-picker>
</el-form-item>
<el-form-item label="稽核结束时间:" prop="auditEndTime" class="fromItem">
<el-date-picker
v-model="ruleForm.auditEndTime"
type="date"
placeholder="选择日期"
>
</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="auditFrequency" class="fromItem">
<el-select
v-model="ruleForm.auditFrequency"
placeholder="请选择"
<!-- <el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input
v-model="ruleForm.projectId"
placeholder="请输入"
clearable
>
<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-input>
</el-form-item> -->
<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="confirmStatus" class="fromItem">
<!-- <el-form-item label="项目年度:" prop="projectYear" class="fromItem">
<el-select
v-model="ruleForm.confirmStatus"
v-model="ruleForm.projectYear"
placeholder="请选择"
clearable
>
<el-option label="未确认" value="0"></el-option>
<el-option label="未下发" value="1"></el-option>
<el-option label="已下发" value="2"></el-option>
<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 class="button">
<el-button @click="submitForm()">
<img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
......@@ -85,24 +86,17 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="稽核名称" prop="auditName"> </el-table-column>
<el-table-column prop="auditStartTime" label="稽核开始时间">
<el-table-column label="稽核名称" prop="auditName" width="320"> </el-table-column>
<el-table-column prop="auditTime" label="稽核时间" width="250">
</el-table-column>
<el-table-column
prop="auditEndTime"
label="稽核结束时间"
prop="fullName"
label="项目名称"
show-overflow-tooltip
>
</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>
<el-table-column prop="auditEndTime" label="稽核时间">
</el-table-column>
</el-table>
</div>
<el-pagination
......@@ -133,38 +127,23 @@
<el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input v-model="ruleFormdialogXQ.auditName" disabled></el-input>
</el-form-item>
<el-form-item label="稽核时间:" class="fromItem" prop="dates">
<el-date-picker
@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 label="稽核时间:" class="fromItem" prop="auditTime">
<el-input v-model="ruleFormdialogXQ.auditTime" disabled></el-input>
</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 label="项目编码:" class="fromItem" prop="projectId">
<el-input v-model="ruleFormdialogXQ.projectId" disabled></el-input>
</el-form-item> -->
<el-form-item label="项目名称:" class="fromItem" prop="fullName">
<el-input v-model="ruleFormdialogXQ.fullName" type="textarea" disabled></el-input>
</el-form-item>
<!-- <el-form-item label="项目年度:" class="fromItem" prop="projectYear">
<el-input v-model="ruleFormdialogXQ.projectYear" disabled></el-input>
</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>
<p class="zjBtn">稽核规则配置</p>
<p class="zjBtn">稽核结果</p>
<div class="setscroll">
<el-table
:data="XQtableData"
......@@ -180,8 +159,8 @@
<el-table-column label="规则名称" width="auto" prop="ruleName">
</el-table-column>
<el-table-column prop="ruleType" label="规则类型" width="auto">
</el-table-column>
<!-- <el-table-column prop="ruleType" label="规则类型" width="auto">
</el-table-column> -->
<el-table-column
prop="projectName"
label="稽核异常项目清单"
......@@ -213,17 +192,19 @@
<script>
import { auditTasksResults, xqauditTasksResults } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default {
data() {
return {
yearsList: generateYearOptions(),
listData: {},
showButton: true,
ruleForm: {
},
ruleFormdialogXQ: {},
currentPageXQ:'',
pageSizeXQ:'',
currentPageXQ:1,
pageSizeXQ:5,
tableData: [],
checkedList: [],
......@@ -241,8 +222,11 @@ export default {
timeChange(time) {
if (time) {
//给后端的参数
this.ruleFormdialogAdd.auditStartTime = time[0];
this.ruleFormdialogAdd.auditEndTime = time[1];
this.ruleForm.auditStartTime = time[0];
this.ruleForm.auditEndTime = time[1];
}else{
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
}
},
async submitForm() {
......@@ -268,6 +252,11 @@ export default {
} else if (item.auditFrequency == 4) {
this.$set(item, "auditFrequencyText", "每年");
}
this.$set(
item,
"projectCategory",
projectCategoryText(item.projectCategory)
);
});
this.total = res.data.total * 1;
}
......@@ -276,6 +265,9 @@ export default {
this.$refs.formName.resetFields();
this.currentPage = 1;
this.pageSize = 10;
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
this.ruleForm.dates=[]
this.submitForm();
},
//详情
......@@ -415,7 +407,7 @@ export default {
// color: #2785e6;
}
.elpagination {
text-align: right;
text-align: center;
margin-right: 100px;
}
/deep/ .el-dialog {
......
src/views/projectCheck/confirmResault.vue
......@@ -15,40 +15,50 @@
></el-input>
</el-form-item>
<el-form-item
label="稽核开始时间:"
prop="auditStartTime"
label="稽核时间:"
prop="auditTime"
class="fromItem"
>
<el-date-picker
v-model="ruleForm.auditStartTime"
type="date"
placeholder="选择日期"
>
</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="auditEndTime" class="fromItem">
<el-date-picker
v-model="ruleForm.auditEndTime"
type="date"
placeholder="选择日期"
>
</el-date-picker>
<el-form-item label="项目编码:" prop="projectId" class="fromItem">
<el-input
v-model="ruleForm.projectId"
placeholder="请输入"
clearable
></el-input>
</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
v-model="ruleForm.auditFrequency"
v-model="ruleForm.projectYear"
placeholder="请选择"
clearable
>
<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-option
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="稽核状态:" prop="confirmStatus" class="fromItem">
<el-form-item label="结果确认状态:" prop="confirmStatus" class="fromItem">
<el-select
v-model="ruleForm.confirmStatus"
placeholder="请选择"
......@@ -95,23 +105,24 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="稽核名称" prop="auditName"> </el-table-column>
<el-table-column prop="auditStartTime" label="稽核开始时间">
<el-table-column label="稽核名称" prop="auditName" width="320"> </el-table-column>
<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
prop="auditEndTime"
label="稽核结束时间"
prop="projectName"
label="项目名称"
show-overflow-tooltip
>
</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="projectYear" label="项目年度" width="200">
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
</el-table-column>
<el-table-column prop="auditEndTime" label="稽核时间">
<el-table-column prop="projectCategory" label="建设形式" width="200">
</el-table-column>
<el-table-column prop="confirmStatusText" label="结果确认状态">
</el-table-column>
......@@ -145,38 +156,13 @@
<el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input v-model="ruleFormdialogXQ.auditName" disabled></el-input>
</el-form-item>
<el-form-item label="稽核时间:" class="fromItem" prop="dates">
<el-date-picker
@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 label="稽核时间:" prop="auditTime" class="fromItem">
<el-input v-model="ruleFormdialogXQ.auditTime" disabled></el-input>
</el-form-item>
</el-form>
<p class="zjBtn">稽核规则配置</p>
<p class="zjBtn">稽核稽核结果</p>
<div class="setscroll">
<el-table
:data="XQtableData"
......@@ -252,23 +238,6 @@
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>
<p class="zjBtn">稽核规则配置</p>
<div class="setscroll">
......@@ -335,9 +304,11 @@
import {
auditTasksResults, xqauditTasksResults,scauditTasksResults,jgxqResults,wtxfResults
} from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache";
export default {
data() {
return {
yearsList: generateYearOptions(),
listData: {},
QRtableData: [],
dialogQR: false,
......@@ -369,8 +340,11 @@ export default {
timeChange(time) {
if (time) {
//给后端的参数
this.ruleFormdialogAdd.auditStartTime = time[0];
this.ruleFormdialogAdd.auditEndTime = time[1];
this.ruleForm.auditStartTime = time[0];
this.ruleForm.auditEndTime = time[1];
}else{
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
}
},
async submitForm() {
......@@ -385,25 +359,18 @@ export default {
if (res.code == "200") {
this.tableData = res.data.records;
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.confirmStatus == 0) {
if (item.confirmStatus == 0||item.confirmStatus==null) {
this.$set(item, "confirmStatusText", "未确认");
} else if (item.confirmStatus == 1) {
this.$set(item, "confirmStatusText", "未下发");
} else if (item.confirmStatus == 2) {
this.$set(item, "confirmStatusText", "已下发");
}
this.$set(
item,
"projectCategory",
projectCategoryText(item.projectCategory)
);
});
this.total = res.data.total * 1;
}
......@@ -412,6 +379,9 @@ export default {
this.$refs.formName.resetFields();
this.currentPage = 1;
this.pageSize = 10;
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
this.ruleForm.dates=[]
this.submitForm();
},
//详情
......@@ -584,7 +554,7 @@ export default {
// color: #2785e6;
}
.elpagination {
text-align: right;
text-align: center;
margin-right: 100px;
}
/deep/ .el-dialog {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!