Skip to content

Administrator / project_progress

Go to a project
Commit 783f4652 by liangzhen
Options

再存一版本

1 parent 54a52706
Inline Side-by-side
Showing with 64 additions and 42 deletions
src/views/checkCompliance/automaticCheck.vue
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
@row-click="(row, column, event) => handleRowClick(row, column, event, 'multipleTable')"
:data="tableData" :data="tableData"
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
...@@ -90,7 +91,7 @@ ...@@ -90,7 +91,7 @@
<el-table-column prop="auditTime" label="稽核时间" width="250"> <el-table-column prop="auditTime" label="稽核时间" width="250">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="fullName" prop="projectName"
label="项目名称" label="项目名称"
show-overflow-tooltip show-overflow-tooltip
> >
...@@ -136,15 +137,9 @@ ...@@ -136,15 +137,9 @@
<!-- <el-form-item label="项目编码:" class="fromItem" prop="projectId"> <!-- <el-form-item label="项目编码:" class="fromItem" prop="projectId">
<el-input v-model="ruleFormdialogXQ.projectId" disabled></el-input> <el-input v-model="ruleFormdialogXQ.projectId" disabled></el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item label="项目名称:" class="fromItem" prop="fullName"> <el-form-item label="项目名称:" class="fromItem" prop="projectName">
<el-input v-model="ruleFormdialogXQ.fullName" type="textarea" disabled></el-input> <el-input v-model="ruleFormdialogXQ.projectName" 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>
<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">
...@@ -160,8 +155,14 @@ ...@@ -160,8 +155,14 @@
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="projectName" label="问题检查项"
label="稽核异常项目清单" prop="quesCheckItem"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="questionValue"
label="问题描述"
width="auto" width="auto"
show-overflow-tooltip show-overflow-tooltip
> >
...@@ -196,7 +197,9 @@ ...@@ -196,7 +197,9 @@
<script> <script>
import { auditTasksResults, xqauditTasksResults } from "@/api/index"; import { auditTasksResults, xqauditTasksResults } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache"; import { generateYearOptions, projectCategoryText } from "@/utils/cache";
import tableMixin from '@/mixins/table.mixin.js'
export default { export default {
mixins: [tableMixin],
data() { data() {
return { return {
yearsList: generateYearOptions(), yearsList: generateYearOptions(),
...@@ -283,19 +286,24 @@ export default { ...@@ -283,19 +286,24 @@ export default {
return; return;
} }
} }
// console.log(this.checkedList[0],'22222334')
this.ruleFormdialogXQ = this.checkedList[0];
let params = { let params = {
current: this.currentPageXQ, current: this.currentPageXQ,
pageSize: this.pageSizeXQ, pageSize: this.pageSizeXQ,
auditId: this.checkedList[0].auditId, auditId: this.checkedList[0].auditId,
contractNumber: this.checkedList[0].contractNumber,
projectId:this.checkedList[0].projectId
}; };
let res = await xqauditTasksResults(params); let res = await xqauditTasksResults(params);
// this.ruleFormdialogXQ = this.checkedList[0];
if (res.code == 200) { if (res.code == 200) {
this.ruleFormdialogXQ = this.checkedList[0];
this.ruleFormdialogXQ.dates = [ // this.ruleFormdialogXQ.dates = [
this.checkedList[0].auditStartTime, // this.checkedList[0].auditStartTime,
this.checkedList[0].auditEndTime, // this.checkedList[0].auditEndTime,
]; // ];
this.XQtableData = res.data.records; this.XQtableData = res.data.records;
console.log(this.XQtableData,'XQtableDataXQtableData') console.log(this.XQtableData,'XQtableDataXQtableData')
this.dialog = true; this.dialog = true;
...@@ -316,7 +324,7 @@ export default { ...@@ -316,7 +324,7 @@ export default {
this.$refs.multipleTable.toggleRowSelection(selection[1], true); this.$refs.multipleTable.toggleRowSelection(selection[1], true);
} }
this.checkedList = this.$refs.multipleTable.selection; this.checkedList = this.$refs.multipleTable.selection;
this.ruleFormdialog = this.checkedList[0]; // this.ruleFormdialog = this.checkedList[0];
console.log(this.checkedList, "2222"); console.log(this.checkedList, "2222");
}, },
handleSizeChange(val) { handleSizeChange(val) {
...@@ -653,12 +661,6 @@ h3 { ...@@ -653,12 +661,6 @@ h3 {
color: #fff; color: #fff;
} }
} }
.setscroll {
width: 100%;
height:520px;
position: relative;
overflow: auto;
}
/deep/.el-button--small{ /deep/.el-button--small{
font-size: 14px; font-size: 14px;
} }
......
src/views/compliance/addConfigure.vue
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
> >
<el-table-column label="序号" width="55" type="index"> <el-table-column label="序号" width="55" type="index">
</el-table-column> </el-table-column>
<el-table-column type="selection"> </el-table-column> <!-- <el-table-column type="selection"> </el-table-column> -->
<el-table-column label="规则名称" prop="ruleName" show-overflow-tooltip> <el-table-column label="规则名称" prop="ruleName" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="ruleStatus" label="规则状态"> <el-table-column prop="ruleStatus" label="规则状态">
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
: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="projectCode" label="项目编码" width="130"> <el-table-column prop="projectCode" label="项目编码" width="130">
......
src/views/compliance/checkRules.vue
...@@ -7,6 +7,14 @@ ...@@ -7,6 +7,14 @@
label-width="100px" label-width="100px"
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="规则名称:" prop="ruleName" class="fromItem">
<el-input
v-model="ruleForm.ruleName"
placeholder="请输入"
clearable
@input="numberVal"
></el-input>
</el-form-item>
<el-form-item label="规则状态:" prop="ruleStatus" class="fromItem"> <el-form-item label="规则状态:" prop="ruleStatus" class="fromItem">
<el-select <el-select
v-model="ruleForm.ruleStatus" v-model="ruleForm.ruleStatus"
...@@ -40,7 +48,7 @@ ...@@ -40,7 +48,7 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> --> </el-form-item> -->
<el-form-item label="创建时间:" prop="planReviewDate" class="fromItem"> <!-- <el-form-item label="创建时间:" prop="planReviewDate" class="fromItem">
<el-date-picker <el-date-picker
v-model="ruleForm.dates" v-model="ruleForm.dates"
type="datetime" type="datetime"
...@@ -48,7 +56,7 @@ ...@@ -48,7 +56,7 @@
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item> -->
<el-form-item class="button"> <el-form-item class="button">
<el-button @click="submitForm()"> <el-button @click="submitForm()">
......
src/views/compliance/taskConfigure.vue
...@@ -463,7 +463,7 @@ ...@@ -463,7 +463,7 @@
<p class="zjBtn">待稽核项目</p> <p class="zjBtn">待稽核项目</p>
<div class="setscrolldialogAdd"> <div class="setscrolldialogAdd">
<el-table <el-table
:data="addtableDataXM" :data="addtableDataXM.slice((currentPageBJXM-1)*pageSizeBJXM,currentPageBJXM*pageSizeBJXM)"
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"
...@@ -642,7 +642,7 @@ ...@@ -642,7 +642,7 @@
</p> </p>
<div class="setscrolldialogAdd"> <div class="setscrolldialogAdd">
<el-table <el-table
:data="addtableDataXM" :data="addtableDataXM.slice((currentPageBJXM-1)*pageSizeBJXM,currentPageBJXM*pageSizeBJXM)"
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"
...@@ -974,9 +974,10 @@ export default { ...@@ -974,9 +974,10 @@ export default {
current: this.currentPageBJXM, current: this.currentPageBJXM,
pageSize: this.pageSizeBJXM, pageSize: this.pageSizeBJXM,
}; };
Promise.all([selRuleProject(params), selProject(params2)]).then((res) => { Promise.all([selRuleProject(params), selProject(params2), selProjectList({ auditId: this.checkedList[0].auditId}),]).then((res) => {
this.addtableData = res[0].data.records; this.addtableData = res[0].data.records;
this.addtableDataXM = res[1].data.records; this.addtableDataXM = res[2].data.records;
this.addtableDataXM.forEach((item) => { this.addtableDataXM.forEach((item) => {
this.$set( this.$set(
item, item,
...@@ -1172,12 +1173,15 @@ export default { ...@@ -1172,12 +1173,15 @@ export default {
}, },
handleCurrentChangeBJXM(val) { handleCurrentChangeBJXM(val) {
this.currentPageBJXM = val; this.currentPageBJXM = val;
this.handselProject(); // this.handselProject();
}, },
handleSizeChangeBJXM(val) { handleSizeChangeBJXM(val) {
this.pageSizeBJXM = val; this.pageSizeBJXM = val;
this.handselProject(); // this.handselProject();
}, },
// handleSizeChangeBJXM(){
// },
handleCurrentChangeBJGZ(val) { handleCurrentChangeBJGZ(val) {
this.currentPageBJGZ = val; this.currentPageBJGZ = val;
this.BJselRuleProject(); this.BJselRuleProject();
...@@ -1246,6 +1250,10 @@ export default { ...@@ -1246,6 +1250,10 @@ export default {
}, },
//编辑 //编辑
edit() { edit() {
if (this.checkedList[0].auditStatus == 1||this.checkedList[0].auditStatus == 2) {
this.$message("只能编辑未执行的任务");
return;
}
this.currentPageBJXM = 1; this.currentPageBJXM = 1;
this.pageSizeBJXM = 5; this.pageSizeBJXM = 5;
this.currentPageBJGZ = 1; this.currentPageBJGZ = 1;
...@@ -1278,7 +1286,7 @@ export default { ...@@ -1278,7 +1286,7 @@ export default {
selProjectList({ auditId: this.checkedList[0].auditId}), selProjectList({ auditId: this.checkedList[0].auditId}),
]).then((res) => { ]).then((res) => {
this.addtableData = res[0].data.records; this.addtableData = res[0].data.records;
this.addtableDataXM = res[1].data.records; this.addtableDataXM = res[2].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;
let allList = res[2].data.records; let allList = res[2].data.records;
......
src/views/projectCheck/checkResault.vue
...@@ -286,7 +286,8 @@ export default { ...@@ -286,7 +286,8 @@ export default {
return; return;
} }
} }
// console.log(this.checkedList[0],'22222334')
this.ruleFormdialogXQ = this.checkedList[0];
let params = { let params = {
current: this.currentPageXQ, current: this.currentPageXQ,
pageSize: this.pageSizeXQ, pageSize: this.pageSizeXQ,
...@@ -295,12 +296,14 @@ export default { ...@@ -295,12 +296,14 @@ export default {
projectId:this.checkedList[0].projectId projectId:this.checkedList[0].projectId
}; };
let res = await xqauditTasksResults(params); let res = await xqauditTasksResults(params);
// this.ruleFormdialogXQ = this.checkedList[0];
if (res.code == 200) { if (res.code == 200) {
this.ruleFormdialogXQ = this.checkedList[0];
this.ruleFormdialogXQ.dates = [ // this.ruleFormdialogXQ.dates = [
this.checkedList[0].auditStartTime, // this.checkedList[0].auditStartTime,
this.checkedList[0].auditEndTime, // this.checkedList[0].auditEndTime,
]; // ];
this.XQtableData = res.data.records; this.XQtableData = res.data.records;
console.log(this.XQtableData,'XQtableDataXQtableData') console.log(this.XQtableData,'XQtableDataXQtableData')
this.dialog = true; this.dialog = true;
...@@ -321,7 +324,7 @@ export default { ...@@ -321,7 +324,7 @@ export default {
this.$refs.multipleTable.toggleRowSelection(selection[1], true); this.$refs.multipleTable.toggleRowSelection(selection[1], true);
} }
this.checkedList = this.$refs.multipleTable.selection; this.checkedList = this.$refs.multipleTable.selection;
this.ruleFormdialog = this.checkedList[0]; // this.ruleFormdialog = this.checkedList[0];
console.log(this.checkedList, "2222"); console.log(this.checkedList, "2222");
}, },
handleSizeChange(val) { handleSizeChange(val) {
......
src/views/projectCheck/problemRectify.vue
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
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="3"></el-option>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!