Skip to content

Administrator / project_progress

Go to a project
Commit c339a8a7 by liangzhen
Options

暂存

1 parent 902b1c71
Expand all
Inline Side-by-side
Showing with 178 additions and 120 deletions
src/api/index.js
...@@ -299,10 +299,7 @@ export function RectificationFeedbackQuery(params) { ...@@ -299,10 +299,7 @@ export function RectificationFeedbackQuery(params) {
// export function ruleFormulation(params) { // export function ruleFormulation(params) {
// return post(`${ARCH_EVALUATION}/ruleFormulation/ipage`, params) // return post(`${ARCH_EVALUATION}/ruleFormulation/ipage`, params)
// } // }
// //详情
// export function iPageRorm(params) {
// return post(`${ARCH_EVALUATION}/ruleFormulation/iPageRorm`, params)
// }
//分页 //分页
...@@ -321,6 +318,14 @@ export function addSelWtqd(params) { ...@@ -321,6 +318,14 @@ export function addSelWtqd(params) {
export function addruleFormulation(params) { export function addruleFormulation(params) {
return post(`${ARCH_EVALUATION}/ruleFormulation/addRuleFormulation`, params) return post(`${ARCH_EVALUATION}/ruleFormulation/addRuleFormulation`, params)
} }
//编辑
export function updateRuleFormulation(params) {
return post(`${ARCH_EVALUATION}/ruleFormulation/updateRuleFormulation`, params)
}
//查询编辑信息
export function updateSelWtqd(params) {
return post(`${ARCH_EVALUATION}/ruleFormulation/updateSelWtqd`, params)
}
//编制 //编制
export function addiPageRorm(params) { export function addiPageRorm(params) {
...@@ -343,6 +348,10 @@ export function addauditTasks(params) { ...@@ -343,6 +348,10 @@ export function addauditTasks(params) {
export function qidongTasks(params) { export function qidongTasks(params) {
return post(`${ARCH_EVALUATION}/auditTasks/qidong`, params) return post(`${ARCH_EVALUATION}/auditTasks/qidong`, params)
} }
//执行
export function qidongZx(params) {
return post(`${ARCH_EVALUATION}/auditTasks/qidongZx`, params)
}
//查询关联规则 //查询关联规则
export function selRuleProject(params) { export function selRuleProject(params) {
return post(`${ARCH_EVALUATION}/auditTasks/selRule`, params) return post(`${ARCH_EVALUATION}/auditTasks/selRule`, params)
...@@ -496,4 +505,6 @@ export function postEvalQuesInfocxtj(params) { ...@@ -496,4 +505,6 @@ export function postEvalQuesInfocxtj(params) {
//整改确认接口 //整改确认接口
export function zgqdauditTasks(params) { export function zgqdauditTasks(params) {
return post(`${ARCH_EVALUATION}/auditTasksRuleProjectLink/zgqd`, params) return post(`${ARCH_EVALUATION}/auditTasksRuleProjectLink/zgqd`, params)
} }
\ No newline at end of file
src/utils/leftBarRules.js
...@@ -350,11 +350,11 @@ export function trendsRules(type) { ...@@ -350,11 +350,11 @@ export function trendsRules(type) {
children: [ children: [
{ name: '合规检查结果', url: '/projectCheck/checkResault', children: [] }, { name: '合规检查结果', url: '/projectCheck/checkResault', children: [] },
{ name: '合规问题整改', url: '/projectCheck/problemRectify', children: [] }, { name: '合规问题整改', url: '/projectCheck/problemRectify', children: [] },
{ // {
name: '合规问题整改核验', // name: '合规问题整改核验',
url: '/projectCheck/verificationRectify', // url: '/projectCheck/verificationRectify',
children: [], // children: [],
}, // },
], ],
}, },
], ],
......
src/views/checkCompliance/automaticCheck.vue
...@@ -101,6 +101,22 @@ ...@@ -101,6 +101,22 @@
<el-button type="text" size="small" @click="detailsForm(scope.row)">{{scope.row.abnormalResults}}</el-button> <el-button type="text" size="small" @click="detailsForm(scope.row)">{{scope.row.abnormalResults}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="rectificationStatusText"
label="问题状态"
>
</el-table-column>
<!-- <el-table-column label="操作" width="130">
<template slot-scope="scope">
<el-button
@click="handleClick(scope.row, scope.$index)"
type="text"
size="small"
:disabled="scope.row.rectificationStatusText=='已下发'"
>下发</el-button
>
</template>
</el-table-column> -->
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
...@@ -195,7 +211,7 @@ ...@@ -195,7 +211,7 @@
</template> </template>
<script> <script>
import { auditTasksResults, xqauditTasksResults } from "@/api/index"; import { auditTasksResults, xqauditTasksResults,wtxfResults } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache"; import { generateYearOptions, projectCategoryText } from "@/utils/cache";
import tableMixin from '@/mixins/table.mixin.js' import tableMixin from '@/mixins/table.mixin.js'
export default { export default {
...@@ -224,9 +240,39 @@ export default { ...@@ -224,9 +240,39 @@ export default {
}; };
}, },
mounted() { mounted() {
this.ruleForm.auditName = this.$route.query.auditName
this.submitForm(); this.submitForm();
}, },
methods: { methods: {
async handleClick(row){
this.$confirm("是否确认下发?", "提示", {
confirmButtonText: "是",
cancelButtonText: "否",
distinguishCancelAndClose: true,
type: "warning",
})
.then(async () => {
// this.checkedList.forEach(item=>{
// if(item.confirmStatusText == "已下发") {
// this.$message.error("请选择未下发的项目");
// throw new Error("主动跳出循环");
// }
// })
let res = await wtxfResults(row);
if (res.code == 200) {
this.$message({
message: '下发成功',
type: 'success'
});
this.dialogXF = false;
this.resetForm();
}
})
.catch((action) => {});
},
timeChange(time) { timeChange(time) {
if (time) { if (time) {
//给后端的参数 //给后端的参数
...@@ -252,17 +298,13 @@ export default { ...@@ -252,17 +298,13 @@ 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 ==1||!item.confirmStatus){
this.$set(item, "auditFrequencyText", "仅一次"); this.$set(item, "rectificationStatusText", "未下发");
} else if (item.auditFrequency == 1) { }else if (item.confirmStatus == 2 ) {
this.$set(item, "auditFrequencyText", "每周"); this.$set(item, "rectificationStatusText", "已下发");
} else if (item.auditFrequency == 2) { } else if (item.confirmStatus == 3) {
this.$set(item, "auditFrequencyText", "每月"); this.$set(item, "rectificationStatusText", "已整改");
} else if (item.auditFrequency == 3) { }
this.$set(item, "auditFrequencyText", "每季度");
} else if (item.auditFrequency == 4) {
this.$set(item, "auditFrequencyText", "每年");
}
this.$set( this.$set(
item, item,
"projectCategory", "projectCategory",
...@@ -287,7 +329,7 @@ export default { ...@@ -287,7 +329,7 @@ export default {
this.checkedList[0]=info this.checkedList[0]=info
}else{ }else{
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message.error("请选择");
return; return;
} }
} }
......
src/views/compliance/addConfigure.vue
...@@ -16,14 +16,14 @@ ...@@ -16,14 +16,14 @@
></el-input> ></el-input>
</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="ruleFormdialogAdd.creator" v-model="ruleFormdialogAdd.creator"
placeholder="请输入" placeholder="请输入"
clearable clearable
@input="numberVal" @input="numberVal"
></el-input> ></el-input>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<p class="zjBtn"> <p class="zjBtn">
稽核规则<span @click="checkRules()">选择稽核规则</span> 稽核规则<span @click="checkRules()">选择稽核规则</span>
...@@ -46,23 +46,7 @@ ...@@ -46,23 +46,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="ruleStatus" label="规则状态"> <el-table-column prop="ruleStatus" label="规则状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <span>{{ scope.row.ruleStatus==1?"未开启":"已开启" }}</span>
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> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" prop="creator"> </el-table-column> <el-table-column label="创建人" prop="creator"> </el-table-column>
...@@ -325,18 +309,6 @@ ...@@ -325,18 +309,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="规则状态:" prop="ruleStatus" class="fromItem">
<el-select
v-model="ruleFormRule.ruleStatus"
placeholder="请选择"
clearable
@input="numberVal"
>
<el-option label="开启" value="0"></el-option>
<el-option label="关闭" value="1"></el-option>
</el-select>
</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"
...@@ -369,23 +341,7 @@ ...@@ -369,23 +341,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="ruleStatus" label="规则状态"> <el-table-column prop="ruleStatus" label="规则状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <span>{{ scope.row.ruleStatus==1?"未开启":"已开启" }}</span>
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> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" prop="creator"> </el-table-column> <el-table-column label="创建人" prop="creator"> </el-table-column>
...@@ -463,17 +419,17 @@ export default { ...@@ -463,17 +419,17 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
creator: [ // creator: [
{ // {
required: true, // required: true,
message: "请输入稽核名称", // message: "请输入稽核名称",
trigger: "change", // trigger: "change",
}, // },
{ // {
validator: this.validateNoWhitespace, // validator: this.validateNoWhitespace,
trigger: "blur", // trigger: "blur",
}, // },
], // ],
}, },
pageSizeZJ: 10, pageSizeZJ: 10,
...@@ -568,6 +524,7 @@ export default { ...@@ -568,6 +524,7 @@ export default {
auditStatus:0, auditStatus:0,
contractNumber:contractList.slice(0, -1), contractNumber:contractList.slice(0, -1),
createTime:getCurrentDate(), createTime:getCurrentDate(),
creator:sessionStorage.getItem('authorName')
}; };
......
src/views/projectCheck/checkResault.vue
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
<el-button @click="resetForm()"> <el-button @click="resetForm()">
<img class="buttonIcon" src="../../assets/cz.png" />重置</el-button <img class="buttonIcon" src="../../assets/cz.png" />重置</el-button
> >
<el-button @click="detailsForm()"> <!-- <el-button @click="detailsForm()">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button <img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
> > -->
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscrollOne"> <div class="setscrollOne">
...@@ -101,6 +101,28 @@ ...@@ -101,6 +101,28 @@
<el-button type="text" size="small" @click="detailsForm(scope.row)">{{scope.row.abnormalResults}}</el-button> <el-button type="text" size="small" @click="detailsForm(scope.row)">{{scope.row.abnormalResults}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="rectificationStatusText"
label="问题状态"
>
</el-table-column>
<el-table-column label="操作" width="130">
<template slot-scope="scope">
<el-button
@click="handleClick(scope.row, scope.$index)"
type="text"
size="small"
:disabled="scope.row.rectificationStatusText!='未下发'"
>下发</el-button
>
<el-button
@click="detailsForm(scope.row, scope.$index)"
type="text"
size="small"
>详情</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
...@@ -195,7 +217,7 @@ ...@@ -195,7 +217,7 @@
</template> </template>
<script> <script>
import { auditTasksResults, xqauditTasksResults } from "@/api/index"; import { auditTasksResults, xqauditTasksResults,wtxfResults } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache"; import { generateYearOptions, projectCategoryText } from "@/utils/cache";
import tableMixin from '@/mixins/table.mixin.js' import tableMixin from '@/mixins/table.mixin.js'
export default { export default {
...@@ -224,9 +246,39 @@ export default { ...@@ -224,9 +246,39 @@ export default {
}; };
}, },
mounted() { mounted() {
this.ruleForm.auditName = this.$route.query.auditName
this.submitForm(); this.submitForm();
}, },
methods: { methods: {
async handleClick(row){
this.$confirm("是否确认下发?", "提示", {
confirmButtonText: "是",
cancelButtonText: "否",
distinguishCancelAndClose: true,
type: "warning",
})
.then(async () => {
// this.checkedList.forEach(item=>{
// if(item.confirmStatusText == "已下发") {
// this.$message.error("请选择未下发的项目");
// throw new Error("主动跳出循环");
// }
// })
let res = await wtxfResults(row);
if (res.code == 200) {
this.$message({
message: '下发成功',
type: 'success'
});
this.dialogXF = false;
this.resetForm();
}
})
.catch((action) => {});
},
timeChange(time) { timeChange(time) {
if (time) { if (time) {
//给后端的参数 //给后端的参数
...@@ -252,17 +304,13 @@ export default { ...@@ -252,17 +304,13 @@ 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 ==1||!item.confirmStatus){
this.$set(item, "auditFrequencyText", "仅一次"); this.$set(item, "rectificationStatusText", "未下发");
} else if (item.auditFrequency == 1) { }else if (item.confirmStatus == 2 ) {
this.$set(item, "auditFrequencyText", "每周"); this.$set(item, "rectificationStatusText", "已下发");
} else if (item.auditFrequency == 2) { } else if (item.confirmStatus == 3) {
this.$set(item, "auditFrequencyText", "每月"); this.$set(item, "rectificationStatusText", "已整改");
} else if (item.auditFrequency == 3) { }
this.$set(item, "auditFrequencyText", "每季度");
} else if (item.auditFrequency == 4) {
this.$set(item, "auditFrequencyText", "每年");
}
this.$set( this.$set(
item, item,
"projectCategory", "projectCategory",
...@@ -285,13 +333,7 @@ export default { ...@@ -285,13 +333,7 @@ export default {
async detailsForm(info) { async detailsForm(info) {
if(info){ if(info){
this.checkedList[0]=info this.checkedList[0]=info
}else{
if (this.checkedList.length != 1) {
this.$message.error("请选择");
return;
}
} }
// console.log(this.checkedList[0],'22222334')
this.ruleFormdialogXQ = this.checkedList[0]; this.ruleFormdialogXQ = this.checkedList[0];
let params = { let params = {
current: this.currentPageXQ, current: this.currentPageXQ,
......
src/views/projectCheck/problemRectify.vue
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<el-button @click="resetForm()"> <el-button @click="resetForm()">
<img class="buttonIcon" src="../../assets/cz.png" />重置</el-button <img class="buttonIcon" src="../../assets/cz.png" />重置</el-button
> >
<el-button @click="detailsForm('xq')"> <!-- <el-button @click="detailsForm('xq')">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button <img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
> >
<el-button @click="zgqdauditTasks('xf')" <el-button @click="zgqdauditTasks('xf')"
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
:class="confirmdisabled ? 'noclick' : ''"> :class="confirmdisabled ? 'noclick' : ''">
<i class="el-icon-document-remove"></i <i class="el-icon-document-remove"></i
>&nbsp;&nbsp;&nbsp;整改确认</el-button >&nbsp;&nbsp;&nbsp;整改确认</el-button
> > -->
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscroll"> <div class="setscroll">
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,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="auditName" width="320"> </el-table-column> <el-table-column label="稽核名称" prop="auditName" width="320"> </el-table-column>
<el-table-column prop="auditTime" label="稽核时间" width="250"> <el-table-column prop="auditTime" label="稽核时间" width="250">
</el-table-column> </el-table-column>
...@@ -140,6 +140,23 @@ ...@@ -140,6 +140,23 @@
<span v-else>{{ scope.row.rectificationStatusText }}</span> <span v-else>{{ scope.row.rectificationStatusText }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="130">
<template slot-scope="scope">
<el-button
@click="zgqdauditTasks(scope.row, scope.$index)"
type="text"
size="small"
:disabled="scope.row.rectificationStatusText!='去整改'"
>整改确认</el-button
>
<el-button
@click="detailsForm(scope.row, scope.$index)"
type="text"
size="small"
>详情</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
...@@ -462,12 +479,8 @@ export default { ...@@ -462,12 +479,8 @@ export default {
this.ruleForm.dates=[] this.ruleForm.dates=[]
this.submitForm(); this.submitForm();
}, },
async zgqdauditTasks(){ async zgqdauditTasks(row){
if (this.checkedList.length < 1) { let res = await zgqdauditTasks(row);
this.$message.error("请选择");
return;
}
let res = await zgqdauditTasks(this.checkedList[0]);
if(res.code==200){ if(res.code==200){
this.$message({ this.$message({
message: '整改确认完成', message: '整改确认完成',
...@@ -477,17 +490,11 @@ export default { ...@@ -477,17 +490,11 @@ export default {
this.$message.error('整改确认失败') this.$message.error('整改确认失败')
} }
this.resetForm()() this.resetForm()
}, },
//详情 //详情
async detailsForm(info) { async detailsForm(info) {
this.checkedList[0]=info
if (this.checkedList.length != 1) {
this.$message.error("请选择");
return;
}
console.log(this.checkedList[0],'22222334')
this.ruleFormdialogXQ = this.checkedList[0]; this.ruleFormdialogXQ = this.checkedList[0];
let params = { let params = {
auditId: this.checkedList[0].auditId, auditId: this.checkedList[0].auditId,
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!