Skip to content

Administrator / project_progress

Go to a project
Commit 40b6314a by liangzhen
Options

新增暂存

1 parent 4c4e4722
Inline Side-by-side
Showing with 1337 additions and 624 deletions
src/api/index.js
...@@ -339,6 +339,10 @@ export function selProjectList(params) { ...@@ -339,6 +339,10 @@ export function selProjectList(params) {
export function addauditTasks(params) { export function addauditTasks(params) {
return post(`${ARCH_EVALUATION}/auditTasks/ad`, params) return post(`${ARCH_EVALUATION}/auditTasks/ad`, params)
} }
//启动
export function qidongTasks(params) {
return post(`${ARCH_EVALUATION}/auditTasks/qidong`, params)
}
//查询关联规则 //查询关联规则
export function selRuleProject(params) { export function selRuleProject(params) {
return post(`${ARCH_EVALUATION}/auditTasks/selRule`, params) return post(`${ARCH_EVALUATION}/auditTasks/selRule`, params)
......
src/router/index.js
...@@ -184,6 +184,14 @@ export const routes = [ ...@@ -184,6 +184,14 @@ export const routes = [
title: "自动稽核任务配置", title: "自动稽核任务配置",
}, },
}, },
{
path: '/compliance/addConfigure',
name: 'addConfigure',
component: () => import('@/views/compliance/addConfigure.vue'),
meta: {
title: "新增自动稽核任务",
},
},
//后评估集中检查 //后评估集中检查
// { // {
// path: '/mainLayout/projectcheckQuestionQuery', // path: '/mainLayout/projectcheckQuestionQuery',
......
src/views/compliance/addConfigure.vue 0 → 100644
<template>
<div class="mains">
<div class="dialogDiv">
<el-form
ref="formNameAD"
:model="ruleFormdialogAdd"
label-width="100px"
class="el-form demo-ruleForm"
:rules="rules"
>
<el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input
v-model="ruleFormdialogAdd.auditName"
trim
clearable
></el-input>
</el-form-item>
<el-form-item label="创建人:" prop="creator" class="fromItem">
<el-input
v-model="ruleFormdialogAdd.creator"
placeholder="请输入"
clearable
@input="numberVal"
></el-input>
</el-form-item>
</el-form>
<p class="zjBtn">
稽核规则<span @click="checkRules()">选择稽核规则</span>
</p>
<div class="setscrolldialoggz">
<el-table
@selection-change="handleSelectionChangeZJ"
:data="addtableData"
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" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="ruleStatus" label="规则状态">
<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 label="创建人" prop="creator"> </el-table-column>
<el-table-column label="创建时间" prop="createTime"> </el-table-column>
<el-table-column label="操作" width="130">
<template slot-scope="scope">
<el-button
@click="handleClickADGZ(scope.row, scope.$index, addtableData)"
type="text"
size="small"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
</div>
<!-- <el-pagination
@size-change="handleSizeChangeAdd"
@current-change="handleCurrentChangeAdd"
:current-page="addcurrentPage"
:page-sizes="[ 10, 20, 50]"
:page-size="1000"
layout="total, sizes, prev, pager, next, jumper"
:total="addtotal"
class="elpagination"
>
</el-pagination> -->
<p class="zjBtn">
待稽核项目<span @click="checkXM()">选择待稽核项目</span>
</p>
<div class="setscrolldialogAdd">
<el-table
:data="addtableDataXM"
tooltip-effect="dark myTooltips"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column prop="projectCode" label="项目编码" width="130">
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="issueYear" label="项目年度" width="120">
<template slot-scope="scope">
<span v-show="scope.row.issueYear">
{{ scope.row.issueYear }}年</span
>
</template>
</el-table-column>
<el-table-column prop="projectType" label="项目类型" width="120">
<template slot-scope="scope">
<span v-show="scope.row.type"> {{ scope.row.type | proType }}</span>
</template>
</el-table-column>
<el-table-column prop="constructionForm" label="建设形式" width="120">
</el-table-column>
<el-table-column
prop="contractNumber"
label="合同编号"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="操作" width="130">
<template slot-scope="scope">
<el-button
@click="handleClickAD(scope.row, scope.$index, addtableDataXM)"
type="text"
size="small"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChangeAddXM"
@current-change="handleCurrentChangeAddXM"
:current-page="addcurrentPageXM"
:page-sizes="[ 10, 20, 50]"
:page-size="1000"
layout="total, sizes, prev, pager, next, jumper"
:total="addtotalXM"
class="elpagination"
>
</el-pagination>
<p class="midBtn">
<span @click="cancelXZ()">取消</span><span @click="saveXZ()">保存</span>
</p>
</div>
<!-- 选择项目 -->
<el-dialog
title="选择待稽核项目"
:visible.sync="dialogAddzj"
width="90%"
:modal-append-to-body="false"
:append-to-body="false"
>
<div class="dialog">
<el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm">
<el-form-item label="项目编码:" prop="projectCode" class="fromItem">
<el-input
v-model="ruleFormZJ.projectCode"
placeholder="请输入"
clearable
@input="numberVal"
></el-input>
</el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input v-model="ruleFormZJ.projectName" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="计划年度:" prop="issueYear" class="fromItem">
<el-select v-model="ruleFormZJ.issueYear" placeholder="请选择" clearable>
<el-option
v-for="(item, index) in yearsList"
:key="index"
:label="item + '年'"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="建设形式:" prop="constructionForm" class="fromItem">
<el-select v-model="ruleFormZJ.constructionForm" placeholder="请选择" clearable>
<el-option label="独立建设" value="1"></el-option>
<el-option label="统推" value="2"></el-option>
<el-option label="自建" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="合同编码:" prop="contractNumber" class="fromItem">
<el-input v-model="ruleFormZJ.contractNumber" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="合同名称:" prop="contractName" class="fromItem">
<el-input v-model="ruleFormZJ.contractName" placeholder="请输入" clearable></el-input>
</el-form-item>
<!-- <el-form-item label="项目内容:" prop="projectInfo" class="fromItem">
<el-input
v-model="ruleFormZJ.projectInfo"
placeholder="请输入"
clearable
></el-input>
</el-form-item> -->
<el-form-item class="cxItem">
<span class="zjquery" @click="checkXM('999')"> 查询 </span>
</el-form-item>
</el-form>
<div class="setscrolldialogx">
<el-table
@select="handleSelectionChangeXM"
@select-all="selectAll"
@row-click="handleRowClickSelf"
ref="multipleTableXM"
:data="zjtableData"
tooltip-effect="dark myTooltips"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column type="selection" :selectable="selectable"> </el-table-column>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column prop="projectCode" label="项目编码" width="130">
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="issueYear" label="项目年度" width="120">
<template slot-scope="scope">
<span v-show="scope.row.issueYear">
{{ scope.row.issueYear }}年</span
>
</template>
</el-table-column>
<el-table-column prop="projectType" label="项目类型" width="120">
<template slot-scope="scope">
<span v-show="scope.row.type"> {{ scope.row.type | proType }}</span>
</template>
</el-table-column>
<el-table-column
prop="constructionForm"
label="建设形式"
width="120"
>
</el-table-column>
<el-table-column
prop="contractNumber"
label="合同编号"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChangeZJ"
@current-change="handleCurrentChangeZJ"
:current-page="currentZJ"
:page-sizes="[10, 20, 50]"
:page-size="1000"
layout="total, sizes, prev, pager, next, jumper"
:total="zjtotal"
class="elpagination"
>
</el-pagination>
<p class="midBtn">
<span @click="cancelZJ()">取消</span
><span @click="saveZJ()">选择</span>
</p>
</div>
</el-dialog>
<!-- 规则弹窗 -->
<el-dialog
title="选择稽核规则"
:visible.sync="dialogRule"
width="90%"
:modal-append-to-body="false"
:append-to-body="false"
>
<div class="dialog">
<el-form
:model="ruleForm"
ref="ruleForm"
label-width="100px"
class="demo-ruleForm"
>
<el-form-item label="规则名称:" prop="ruleName" class="fromItem">
<el-input
v-model="ruleFormRule.ruleName"
placeholder="请输入"
clearable
></el-input>
</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-input
v-model="ruleFormRule.creator"
placeholder="请输入"
clearable
@input="numberVal"
></el-input>
</el-form-item>
<el-form-item class="RuleItem">
<span class="zjquery" @click="checkRules('999')"> 查询 </span>
</el-form-item>
</el-form>
<div class="setscrolldialog">
<el-table
@selection-change="handleSelectionChangeZJ"
ref="multipleTableZJ"
:data="tableDataRule"
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" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="ruleStatus" label="规则状态">
<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 label="创建人" prop="creator"> </el-table-column>
<el-table-column label="创建时间" prop="createTime"> </el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChangeRule"
@current-change="handleCurrentChangeRule"
:current-page="currentPageRule"
:page-sizes="[10, 15, 20]"
:page-size="1000"
layout="total, sizes, prev, pager, next, jumper"
:total="totalRule"
class="elpagination"
>
</el-pagination>
<p class="midBtn">
<span @click="cancelGZ()">取消</span
><span @click="saveGZ()">保存</span>
</p>
</div>
</el-dialog>
</div>
</template>
<script>
import {
auditTasks,
ruleFormulation,
getProjectInfo,
addauditTasks,
selRuleProject,
delAuditTasks,
selProject,
upauditTasks,
delProject,
delRule,
iPageRorm,
selProjectList,
qidongTasks,
} from "@/api/index";
import { generateYearOptions, constructionFormText } from "@/utils/cache";
import { getCurrentDate } from "@/utils/format";
export default {
data() {
return {
yearsList: generateYearOptions(),
ruleFormZJ: {},
addcurrentPageXM: 1,
pageSizeAddXM: 10,
addtotalXM: 0,
addtableDataXM: [], //项目
addtotal: 0,
addcurrentPage: 1,
pageSizeAdd: 10,
addtableData: [],
showDate: false,
ruleFormdialogAdd: {
auditName: "",
creator: "",
},
rules: {
auditName: [
{
required: true,
message: "请输入稽核名称",
trigger: "change",
},
{
validator: this.validateNoWhitespace,
trigger: "blur",
},
],
creator: [
{
required: true,
message: "请输入稽核名称",
trigger: "change",
},
{
validator: this.validateNoWhitespace,
trigger: "blur",
},
],
},
pageSizeZJ: 10,
currentZJ: 1,
zjtotal: 0,
currentPageRule: 1,
pageSizeRule: 10,
totalRule: 0,
zjtableData: [],
oldid: "", //已经选中的
tableDataRule: [],
dialogAddzj: false,
addZJListXM: [],
dialogRule: false,
ruleForm: {},
ruleFormRule: {},
};
},
filters: {
proType(val) {
if (val == 1) {
return "咨询设计类";
} else if (val == 2) {
return "开发实施类";
} else if (val == 3) {
return "业务运营类";
} else if (val == 4) {
return "数据工程类";
} else if (val == 5) {
return "产品购置类";
}
},
},
watch: {
},
methods: {
selectable(item, index) {
if (
!item.contractNumber ||
!item.projectCode
) {
return false
} else {
return true
}
},
numberVal(val) {
this.$forceUpdate();
},
handleRowClickSelf(row, column, event) {
console.log('点击了')
console.log(row,'2222')
if (row.contractNumber && row.projectCode) {
this.$refs['multipleTableZJ'].toggleRowSelection(row)
this.addZJList = this.$refs.multipleTableZJ.selection
} else {
this.$message.warning('项目编码或合同编码为空')
}
},
saveXZ() {
this.$refs.formNameAD.validate((valid) => {
if (!valid) {
return false;
} else {
if (this.addtableData.length < 1) {
this.$message("请选择稽核规则");
return;
}
if (this.addtableDataXM.length < 1) {
this.$message("请选择待稽核项目");
return;
}
let expertIdList = "";
let contractList ="";
if (this.addtableDataXM.length > 0) {
this.addtableDataXM.forEach((item) => {
expertIdList = expertIdList.concat(item.projectCode + ",");
contractList=contractList.concat(item.contractNumber + ",");
});
}
// if (this.addtableData.length > 0) {
// this.addtableData.forEach((item) => {
// console.log(item, "item");
// ruleList = ruleList.concat(item.id + ",");
// });
// }
let params = {
prjStr: expertIdList.slice(0, -1),
ruleStr: this.addtableData[0].id,
auditStatus:0,
contractNumber:contractList.slice(0, -1),
createTime:getCurrentDate(),
};
Object.assign(params, this.ruleFormdialogAdd);
console.log(params, "222");
addauditTasks(params).then((res) => {
if (res.code == 200) {
this.$message("保存成功");
this.$router.go(-1)
} else {
this.$message("保存失败");
}
});
}
});
},
cancelXZ() {
this.$router.go(-1)
},
//选择项目
saveZJ() {
if (this.addZJListXM.length < 1) {
this.$message("请选择项目");
return;
}
this.addtableDataXM = [...this.addZJListXM, ...this.addtableDataXM];
this.addtableDataXM = this.addtableDataXM.filter((obj, index, self) => {
return (
index ==
self.findIndex(
(t) => t.projectCode == obj.projectCode && t.contractNumber == obj.contractNumber,
)
)
});
this.addtotalXM = this.addtableDataXM.length;
this.dialogAddzj = false;
},
cancelZJ() {
this.dialogAddzj = false;
},
//规则取消
cancelGZ() {
this.dialogRule = false;
},
//规则选择
saveGZ() {
if (this.addZJList.length < 1) {
this.$message("请选择规则");
return;
}
// this.addtableData = [...this.addtableData, ...this.addZJList];
// this.addtableData = this.addtableData.filter(
// (obj, index, self) =>
// index === self.findIndex((t) => t.id === obj.id)
// );
this.addtableData = this.addZJList
console.log(this.addtableData, "选完是什么");
this.addtotal = this.addtableData.length;
this.dialogRule = false;
},
//选择项目
async checkXM(info) {
if(info==999){
this.currentZJ=1
}
this.dialogAddzj = true;
let params = {
current: this.currentZJ,
pageSize: this.pageSizeZJ,
// prjStr: this.oldid,
};
Object.assign(params, this.ruleFormZJ);
let res = await getProjectInfo(params);
this.zjtableData = res.data.records;
this.zjtableData.forEach((item) => {
this.$set(
item,
"constructionForm",
constructionFormText(item.constructionForm)
);
});
this.zjtotal = res.data.total * 1;
},
//选择规则
async checkRules(info) {
if(info==999){
this.currentPageRule=1
}
let params = {
current: this.currentPageRule,
pageSize: this.pageSizeRule,
// ruleStatus: 0,
};
Object.assign(params, this.ruleFormRule);
console.log(params);
let res = await ruleFormulation(params);
if (res.code == "200") {
this.dialogRule = true;
this.tableDataRule = res.data.records;
this.totalRule = res.data.total * 1;
}
},
handleSizeChangeRule(val) {
this.pageSizeRule = val;
this.checkRules();
},
handleCurrentChangeRule(val) {
this.currentPageRule = val;
this.checkRules();
},
handleCurrentChangeZJ(val) {
this.currentZJ = val;
this.checkXM();
},
handleSizeChangeZJ(val) {
this.pageSizeZJ = val;
this.checkXM();
},
selectAll(selection) {
this.addZJListXM = this.$refs.multipleTableXM.selection;
},
handleSelectionChangeXM(selection) {
// this.addZJListXM = this.$refs.multipleTableXM.selection;
if (selection.length < 1) {
return
}
if (selection.length === this.zjtableData.Length) {
console.log('全选')
}
this.addZJListXM = this.$refs.multipleTableXM.selection;
},
handleSizeChangeAddXM(val) {
this.pageSizeAddXM = val;
},
handleCurrentChangeAddXM(val) {
this.addcurrentPageXM = val;
},
handleSizeChangeAdd(val) {
this.pageSizeAdd = val;
},
handleCurrentChangeAdd(val) {
this.addcurrentPage = val;
},
//表格颜色
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) {
return "warning-row";
}
return "";
},
handleSelectionChangeZJ(selection) {
if (selection.length > 0) {
this.inspectdisabled = false
if (Array.isArray(selection) && selection.length > 1) {
this.$refs.multipleTableZJ.toggleRowSelection(selection[0], false)
this.$refs.multipleTableZJ.toggleRowSelection(selection[1], true)
}
this.addZJList = this.$refs.multipleTableZJ.selection
}
// this.addZJList = this.$refs.multipleTableZJ.selection;
},
//点击删除规则
handleClickADGZ(row, index, rows) {
console.log("删除", row);
rows.splice(index, 1);
this.addtableData = rows;
this.addtotal = rows.length;
},
//点击删除
handleClickAD(row, index, rows) {
console.log("删除", row);
rows.splice(index, 1);
this.addtableDataXM = rows;
this.addtotalXM = rows.length;
},
},
};
</script>
<style scoped lang="scss">
/deep/ .el-table .warning-row {
background: #f0ffff;
// color: #2785e6;
}
.demo-ruleForm {
position: relative;
margin-bottom: 20px;
}
.el-form {
display: flex;
width: 99%;
flex-wrap: wrap;
border-top: 2px solid #23c6c8;
border-left: 1px solid #dee5e7;
border-right: 1px solid #dee5e7;
border-bottom: 1px solid #dee5e7;
padding: 20px 10px;
margin-bottom: 20px;
.fromItem {
min-width: 24%;
margin: 0 0.5%;
margin-bottom: 20px;
.el-input {
width: 226px;
}
.el-select {
width: 226px;
}
}
/deep/ .el-form-item__content {
text-align: left;
display: inline-block;
margin-left: 10px !important;
}
/deep/ .el-form-item__label {
font-weight: bold;
color: #000;
width: 160px !important;
}
}
.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;
}
}
.setscrolldialoggz{
width: 100%;
height: 100px;
overflow: hidden;
box-sizing: border-box;
/deep/ .el-table {
width: 96% !important;
height: 100px;
overflow: hidden;
}
}
.setscrolldialogAdd {
width: 100%;
height: 450px;
overflow-y: auto;
box-sizing: border-box;
/deep/ .el-table {
width: 96% !important;
height:450px;
overflow-y: auto;
}
}
.dialogDiv {
overflow-y: auto;
overflow-x: hidden;
}
.mains {
overflow-y: auto;
}
.dialog {
.title {
text-align: left;
font-size: 18px;
font-family: "PingFangSC-Regular", "PingFang SC", sans-serif;
font-weight: 400;
font-style: normal;
font-size: 16px;
color: #1ec695;
text-align: left;
height: 20px;
margin-top: 0;
span {
border-radius: 2px;
display: inline-block;
width: 5px;
height: 18px;
background-color: #1ec695;
margin-right: 14px;
vertical-align: middle;
}
}
.content {
width: 100%;
display: flex;
flex-wrap: wrap;
p {
width: 24%;
text-align: left;
display: flex;
label {
display: inline-block;
width: 150px;
flex-shrink: 0;
text-align: right;
font-weight: bold;
margin-right: 20px;
vertical-align: middle;
}
span {
display: inline-block;
text-align: left;
}
}
}
.table {
width: 100%;
display: flex;
p {
width: 150px;
text-align: right;
font-weight: bold;
}
.tablepg {
margin-top: 20px;
margin-left: 5px;
}
}
}
/deep/ .el-dialog {
border-radius: 10px;
margin-top: 3vh !important;
margin-left: 3vw !important;
// height: 500px;
// box-sizing: border-box;
// overflow-y: auto;
}
/deep/ .el-dialog__wrapper {
position: absolute;
}
/deep/ .v-modal {
position: absolute;
}
/deep/ .el-dialog__header {
background-color: #0d867f;
// padding-bottom: 20px;
text-align: left;
border-radius: 10px 10px 0 0;
.el-dialog__title {
color: #fff;
}
}
/deep/ .el-table__header th {
background-color: #f5f5f5;
font-weight: bold;
.cell {
color: #333;
}
}
/deep/.el-table {
width: 100%;
.el-table__header-wrapper table,
.el-table__body-wrapper table {
width: 100% !important;
}
.el-table__body,
.el-table__footer,
.el-table__header {
table-layout: auto;
}
}
.midBtn {
margin: 0 auto;
height: 50px;
line-height: 50px;
span {
display: inline-block;
width: 80px;
height: 25px;
line-height: 25px;
text-align: center;
margin-right: 10px;
border-radius: 5px;
}
span:first-of-type {
border: 1px solid grey;
}
span:last-of-type {
background-color: #4ca6a7;
color: #fff;
}
}
.cxItem {
position: absolute;
right: 0;
// 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%;
.zjquery {
display: inline-block;
background-color: #4ca6a7;
width: 89px;
height: 40px;
color: #fff;
text-align: center;
line-height: 40px;
border-radius: 5px;
}
}
/deep/.el-table th.el-table__cell.is-leaf,
.el-table td.el-table__cell {
text-align: center;
}
/deep/ .el-table__cell {
text-align: center;
}
</style>
\ No newline at end of file
src/views/compliance/taskConfigure.vue
...@@ -73,6 +73,9 @@ ...@@ -73,6 +73,9 @@
<el-button @click="deletes()"> <el-button @click="deletes()">
<img class="buttonIcon" src="../../assets/sc.png" /> 删除 <img class="buttonIcon" src="../../assets/sc.png" /> 删除
</el-button> </el-button>
<el-button @click="working()">
<img class="buttonIcon" src="../../assets/dr.png" />运行
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscrollOne"> <div class="setscrollOne">
...@@ -92,7 +95,11 @@ ...@@ -92,7 +95,11 @@
<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 label="稽核名称" prop="auditName" width="320">
</el-table-column> </el-table-column>
<el-table-column prop="auditStatusText" label="稽核状态" show-overflow-tooltip> <el-table-column
prop="auditStatusText"
label="稽核状态"
show-overflow-tooltip
>
</el-table-column> </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>
...@@ -124,257 +131,6 @@ ...@@ -124,257 +131,6 @@
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination>
<!-- 新增弹窗 -->
<el-dialog
title="新增自动稽核任务"
:visible.sync="dialogAdd"
width="90%"
:modal-append-to-body="false"
:append-to-body="false"
>
<div class="dialog">
<el-form
ref="formNameAD"
:model="ruleFormdialogAdd"
label-width="100px"
class="demo-ruleForm"
:rules="rules"
>
<el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input
v-model="ruleFormdialogAdd.auditName"
trim
clearable
></el-input>
</el-form-item>
<el-form-item label="稽核方式:" prop="auditType" class="fromItem">
<el-select
v-model="ruleFormdialogAdd.auditType"
placeholder="请选择"
clearable
>
<el-option label="立即发起" value="1"></el-option>
<el-option label="选择时间" value="2"></el-option>
</el-select>
</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>
<p class="zjBtn">
稽核规则<span @click="checkRules()">选择稽核规则</span>
</p>
<div class="setscrolldialogAdd">
<el-table
@selection-change="handleSelectionChangeZJ"
:data="
addtableData.slice(
(addcurrentPage - 1) * pageSizeAdd,
addcurrentPage * pageSizeAdd
)
"
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"
show-overflow-tooltip
>
</el-table-column>
<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
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-column label="操作" width="130">
<template slot-scope="scope">
<el-button
@click="
handleClickADGZ(scope.row, scope.$index, addtableData)
"
type="text"
size="small"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
</div>
<el-pagination
@size-change="handleSizeChangeAdd"
@current-change="handleCurrentChangeAdd"
:current-page="addcurrentPage"
:page-sizes="[5, 10, 20, 50]"
:page-size="1000"
layout="total, sizes, prev, pager, next, jumper"
:total="addtotal"
class="elpagination"
>
</el-pagination>
<p class="zjBtn">
待稽核项目<span @click="checkXM()">选择待稽核项目</span>
</p>
<div class="setscrolldialogAdd">
<el-table
:data="
addtableDataXM.slice(
(addcurrentPageXM - 1) * pageSizeAddXM,
addcurrentPageXM * pageSizeAddXM
)
"
tooltip-effect="dark myTooltips"
style="width: 100%"
header-cell-class-name="custom-th-background"
class="eltable"
:row-class-name="tableRowClassName"
border
>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column prop="department" label="部门" width="150">
</el-table-column>
<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
prop="projectName"
label="项目名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="projectCategory"
label="建设形式"
width="100"
>
</el-table-column>
<el-table-column prop="projectYear" label="项目年度" width="100">
<template slot-scope="scope">
{{ scope.row.projectYear }}年
</template>
</el-table-column>
<el-table-column label="总投资计划（万元）" width="200">
<el-table-column
prop="costAmountTotal"
label="成本金"
width="100"
>
</el-table-column>
<el-table-column
prop="capitalAmountTotal"
label="资本金"
width="100"
>
</el-table-column>
</el-table-column>
<!-- <el-table-column prop="department" label="承建单位" width="150">
</el-table-column> -->
<el-table-column prop="personCharge" label="负责人" width="110">
</el-table-column>
<el-table-column
prop="projectInfo"
label="项目内容"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="操作" width="130">
<template slot-scope="scope">
<el-button
@click="
handleClickAD(scope.row, scope.$index, addtableDataXM)
"
type="text"
size="small"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="handleSizeChangeAddXM"
@current-change="handleCurrentChangeAddXM"
:current-page="addcurrentPageXM"
:page-sizes="[5, 10, 20, 50]"
:page-size="1000"
layout="total, sizes, prev, pager, next, jumper"
:total="addtotalXM"
class="elpagination"
>
</el-pagination>
</div>
<p class="midBtn">
<span @click="cancelXZ()">取消</span
><span @click="saveXZ()">保存</span>
</p>
</div>
</el-dialog>
<!-- 规则弹窗 --> <!-- 规则弹窗 -->
<el-dialog <el-dialog
title="选择稽核规则" title="选择稽核规则"
...@@ -397,20 +153,28 @@ ...@@ -397,20 +153,28 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="规则状态:" prop="ruleStatus" class="fromItem">
<el-form-item <el-select
label="问题检查项:" v-model="ruleFormRule.ruleStatus"
prop="quesCheckItem" placeholder="请选择"
class="fromItem" 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-input <el-input
v-model="ruleFormRule.quesCheckItem" v-model="ruleFormRule.creator"
placeholder="请输入" placeholder="请输入"
clearable clearable
@input="numberVal"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="RuleItem"> <el-form-item class="RuleItem">
<span class="zjquery" @click="checkRules()"> 查询 </span> <span class="zjquery" @click="checkRules('999')"> 查询 </span>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscrolldialog"> <div class="setscrolldialog">
...@@ -428,31 +192,9 @@ ...@@ -428,31 +192,9 @@
<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 <el-table-column label="规则名称" prop="ruleName" show-overflow-tooltip>
label="规则名称"
prop="ruleName"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="ruleStatus" label="规则状态">
prop="quesCheckItem"
label="问题检查项"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="checkDesc"
label="检查说明"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="ruleStatus"
label="规则状态"
show-overflow-tooltip
width="150"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.ruleStatus" v-model="scope.row.ruleStatus"
...@@ -473,17 +215,15 @@ ...@@ -473,17 +215,15 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="creator" label="创建人" width="150"> <el-table-column label="创建人" prop="creator"> </el-table-column>
</el-table-column> <el-table-column label="创建时间" prop="createTime"> </el-table-column>
<el-table-column prop="createTime" label="创建时间" width="200">
</el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination
@size-change="handleSizeChangeRule" @size-change="handleSizeChangeRule"
@current-change="handleCurrentChangeRule" @current-change="handleCurrentChangeRule"
:current-page="currentPageRule" :current-page="currentPageRule"
:page-sizes="[5, 10, 15, 20]" :page-sizes="[10, 15, 20]"
:page-size="1000" :page-size="1000"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="totalRule" :total="totalRule"
...@@ -527,7 +267,11 @@ ...@@ -527,7 +267,11 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目年度:" prop="projectYearStr" class="fromItem"> <el-form-item
label="项目年度:"
prop="projectYearStr"
class="fromItem"
>
<el-select <el-select
v-model="ruleFormZJ.projectYearStr" v-model="ruleFormZJ.projectYearStr"
placeholder="请选择" placeholder="请选择"
...@@ -542,7 +286,11 @@ ...@@ -542,7 +286,11 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="建设形式:" prop="projectCategory" class="fromItem"> <el-form-item
label="建设形式:"
prop="projectCategory"
class="fromItem"
>
<el-select <el-select
v-model="ruleFormZJ.projectCategory" v-model="ruleFormZJ.projectCategory"
placeholder="请选择" placeholder="请选择"
...@@ -574,7 +322,9 @@ ...@@ -574,7 +322,9 @@
</el-form> </el-form>
<div class="setscrolldialogx"> <div class="setscrolldialogx">
<el-table <el-table
@selection-change="handleSelectionChangeXM" @select="handleSelectionChangeXM"
@select-all="selectAll"
@row-click="handleRowClickSelf"
ref="multipleTableXM" ref="multipleTableXM"
:data="zjtableData" :data="zjtableData"
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
...@@ -584,57 +334,27 @@ ...@@ -584,57 +334,27 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
> >
<el-table-column type="selection"> </el-table-column> <el-table-column type="selection" :selectable="selectable"> </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="projectCode" label="项目编码" width="130"> </el-table-column>
</el-table-column> <el-table-column prop="projectName" label="项目名称" show-overflow-tooltip>
<el-table-column label="项目编码" width="150" prop="projectId">
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
width="auto"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="issueYear" label="项目年度" width="120">
prop="projectCategory" <template slot-scope="scope">
label="建设形式" <span v-show="scope.row.issueYear"> {{ scope.row.issueYear }}年</span>
width="100" </template>
>
</el-table-column> </el-table-column>
<el-table-column prop="projectYear" label="项目年度" width="100"> <el-table-column prop="projectType" label="项目类型" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.projectYear }}年 <span v-show="scope.row.type"> {{ scope.row.type | proType }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="constructionForm" label="建设形式" width="120"> </el-table-column>
<el-table-column label="总投资计划（万元）" width="200"> <el-table-column prop="contractNumber" label="合同编号" show-overflow-tooltip>
<el-table-column
prop="costAmountTotal"
label="成本金"
width="100"
>
</el-table-column>
<el-table-column
prop="capitalAmountTotal"
label="资本金"
width="100"
>
</el-table-column> </el-table-column>
</el-table-column> <el-table-column prop="contractName" label="合同名称" width="auto" show-overflow-tooltip>
<!-- <el-table-column prop="department" label="承建单位" width="150">
</el-table-column> -->
<el-table-column prop="personCharge" label="负责人" width="110">
</el-table-column>
<el-table-column
prop="projectInfo"
label="项目内容"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -677,7 +397,7 @@ ...@@ -677,7 +397,7 @@
</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
v-model="ruleFormdialogAdd.auditTime" v-model="ruleFormdialogXQ.auditTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间" placeholder="选择日期时间"
...@@ -687,7 +407,7 @@ ...@@ -687,7 +407,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<p class="zjBtn">稽核规则</p> <p class="zjBtn">稽核规则</p>
<div class="setscrolldialogAdd"> <div class="setscrolldialoggz">
<el-table <el-table
:data="addtableData" :data="addtableData"
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
...@@ -700,30 +420,9 @@ ...@@ -700,30 +420,9 @@
<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 <el-table-column label="规则名称" prop="ruleName" show-overflow-tooltip>
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 <el-table-column prop="ruleStatus" label="规则状态">
prop="checkDesc"
label="检查说明"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="ruleStatus"
label="规则状态"
show-overflow-tooltip
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.ruleStatus" v-model="scope.row.ruleStatus"
...@@ -744,12 +443,11 @@ ...@@ -744,12 +443,11 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="creator" label="创建人"> </el-table-column> <el-table-column label="创建人" prop="creator"> </el-table-column>
<el-table-column prop="createTime" label="创建时间"> <el-table-column label="创建时间" prop="createTime"> </el-table-column>
</el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <!-- <el-pagination
@size-change="handleSizeChangeBJGZ" @size-change="handleSizeChangeBJGZ"
@current-change="handleCurrentChangeBJGZ" @current-change="handleCurrentChangeBJGZ"
:current-page="currentPageBJGZ" :current-page="currentPageBJGZ"
...@@ -759,7 +457,7 @@ ...@@ -759,7 +457,7 @@
:total="addtotal" :total="addtotal"
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination> -->
<p class="zjBtn">待稽核项目</p> <p class="zjBtn">待稽核项目</p>
<div class="setscrolldialogAdd"> <div class="setscrolldialogAdd">
<el-table <el-table
...@@ -774,57 +472,39 @@ ...@@ -774,57 +472,39 @@
<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="projectCode" label="项目编码" width="130">
</el-table-column> </el-table-column>
<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
prop="projectName" prop="projectName"
label="项目名称" label="项目名称"
width="auto"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="issueYear" label="项目年度" width="120">
prop="projectCategory" <template slot-scope="scope">
label="建设形式" <span v-show="scope.row.issueYear">
width="100" {{ scope.row.issueYear }}年</span
> >
</template>
</el-table-column> </el-table-column>
<el-table-column prop="projectYear" label="项目年度" width="100"> <!-- <el-table-column prop="projectType" label="项目类型" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.projectYear }}年 <span v-show="scope.row.type"> {{ scope.row.type | proType }}</span>
</template> </template>
</el-table-column> -->
<el-table-column prop="constructionForm" label="建设形式" width="120">
</el-table-column> </el-table-column>
<el-table-column label="总投资计划（万元）" width="200">
<el-table-column <el-table-column
prop="costAmountTotal" prop="contractNumber"
label="成本金" label="合同编号"
width="100" show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="capitalAmountTotal"
label="资本金"
width="100"
> >
</el-table-column> </el-table-column>
</el-table-column>
<!-- <el-table-column prop="department" label="承建单位" width="150">
</el-table-column> -->
<el-table-column prop="personCharge" label="负责人" width="110">
</el-table-column>
<el-table-column <el-table-column
prop="projectInfo" prop="contractName"
label="项目内容" label="合同名称"
width="auto"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
...@@ -865,41 +545,35 @@ ...@@ -865,41 +545,35 @@
:rules="rulesBJ" :rules="rulesBJ"
> >
<el-form-item label="稽核名称:" prop="auditName" class="fromItem"> <el-form-item label="稽核名称:" prop="auditName" class="fromItem">
<el-input v-model="ruleFormdialogBJ.auditName" trim clearable></el-input> <el-input
v-model="ruleFormdialogBJ.auditName"
trim
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="稽核方式:" prop="auditType" class="fromItem"> <el-form-item label="创建人:" prop="creator" class="fromItem">
<el-select <el-input
v-model="ruleFormdialogBJ.auditType" v-model="ruleFormdialogBJ.creator"
placeholder="请选择" placeholder="请输入"
clearable clearable
> @input="numberVal"
<el-option label="立即发起" value="1"></el-option> ></el-input>
<el-option label="选择时间" value="2"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item label="稽核时间:" class="fromItem" prop="dates">
label="稽核时间:"
class="fromItem"
prop="auditTime"
v-if="showDate"
>
<el-date-picker <el-date-picker
v-model="ruleFormdialogBJ.auditTime" v-model="ruleFormdialogBJ.auditTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间" placeholder="选择日期时间"
:picker-options="{ disabled
disabledDate: (time) =>
time.getTime() < new Date(new Date().setHours(0, 0, 0, 0)),
}"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<p class="zjBtn"> <p class="zjBtn">
稽核规则<span @click="checkRules()">选择稽核规则</span> 稽核规则<span @click="checkRules('999')">选择稽核规则</span>
</p> </p>
<div class="setscrolldialogAdd"> <div class="setscrolldialoggz">
<el-table <el-table
@selection-change="handleSelectionChangeZJ" @selection-change="handleSelectionChangeZJ"
:data="addtableData" :data="addtableData"
...@@ -913,30 +587,9 @@ ...@@ -913,30 +587,9 @@
<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 <el-table-column label="规则名称" prop="ruleName" show-overflow-tooltip>
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 <el-table-column prop="ruleStatus" label="规则状态">
prop="checkDesc"
label="检查说明"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="ruleStatus"
label="规则状态"
show-overflow-tooltip
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.ruleStatus" v-model="scope.row.ruleStatus"
...@@ -957,10 +610,9 @@ ...@@ -957,10 +610,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 label="创建人" prop="creator"> </el-table-column>
<el-table-column prop="createTime" label="创建时间"> <el-table-column label="创建时间" prop="createTime"> </el-table-column>
</el-table-column> <!-- <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="handleClickBJ(scope.row, scope.$index, addtableData)" @click="handleClickBJ(scope.row, scope.$index, addtableData)"
...@@ -969,10 +621,10 @@ ...@@ -969,10 +621,10 @@
>删除</el-button >删除</el-button
> >
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
</div> </div>
<el-pagination <!-- <el-pagination
@size-change="handleSizeChangeBJGZ" @size-change="handleSizeChangeBJGZ"
@current-change="handleCurrentChangeBJGZ" @current-change="handleCurrentChangeBJGZ"
:current-page="currentPageBJGZ" :current-page="currentPageBJGZ"
...@@ -982,7 +634,7 @@ ...@@ -982,7 +634,7 @@
:total="addtotal" :total="addtotal"
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination> -->
<p class="zjBtn"> <p class="zjBtn">
待稽核项目<span @click="checkXM()">选择待稽核项目</span> 待稽核项目<span @click="checkXM()">选择待稽核项目</span>
</p> </p>
...@@ -999,57 +651,24 @@ ...@@ -999,57 +651,24 @@
<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="projectCode" label="项目编码" width="130"> </el-table-column>
<el-table-column prop="projectName" label="项目名称" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="issueYear" label="项目年度" width="120">
<el-table-column label="项目编码" width="auto" prop="projectId">
</el-table-column>
<el-table-column prop="projectYear" label="项目年度" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.projectYear }}年 <span v-show="scope.row.issueYear"> {{ scope.row.issueYear }}年</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="projectType" label="项目类型" width="120">
prop="projectName"
label="项目名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="projectCategory"
label="建设形式"
width="100"
>
</el-table-column>
<el-table-column prop="projectYear" label="项目年度" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.projectYear }}年 <span v-show="scope.row.type"> {{ scope.row.type | proType }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总投资计划（万元）" width="200"> <el-table-column prop="constructionForm" label="建设形式" width="120"> </el-table-column>
<el-table-column
prop="costAmountTotal" <el-table-column prop="contractNumber" label="合同编号" show-overflow-tooltip>
label="成本金"
width="100"
>
</el-table-column>
<el-table-column
prop="capitalAmountTotal"
label="资本金"
width="100"
>
</el-table-column>
</el-table-column>
<!-- <el-table-column prop="department" label="承建单位" width="150">
</el-table-column> -->
<el-table-column prop="personCharge" label="负责人" width="110">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="contractName" label="合同名称" width="auto" show-overflow-tooltip>
prop="projectInfo"
label="项目内容"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="130"> <el-table-column label="操作" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -1099,13 +718,13 @@ import { ...@@ -1099,13 +718,13 @@ import {
delProject, delProject,
delRule, delRule,
iPageRorm, iPageRorm,
selProjectList selProjectList,
qidongTasks,
} from "@/api/index"; } from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache"; import { generateYearOptions, constructionFormText } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
yearsList: generateYearOptions(),
showDate: false, showDate: false,
pickerOptions: { pickerOptions: {
nowBtn: false, nowBtn: false,
...@@ -1164,8 +783,9 @@ export default { ...@@ -1164,8 +783,9 @@ export default {
trigger: "change", trigger: "change",
}, },
{ {
validator: this.validateNoWhitespace,trigger: 'blur' validator: this.validateNoWhitespace,
} trigger: "blur",
},
], ],
audiType: [ audiType: [
{ {
...@@ -1184,26 +804,31 @@ export default { ...@@ -1184,26 +804,31 @@ export default {
}, },
rulesBJ: { rulesBJ: {
auditName: [ auditName: [
// {
// required: true,
// message: "请输入稽核名称",
// trigger: "change",
// },
{ {
validator: this.validateNoWhitespace,trigger: 'change' required: true,
} message: "请输入稽核名称",
trigger: "change",
},
{
validator: this.validateNoWhitespace,
trigger: "change",
},
], ],
audiType: [ creator: [
{ {
required: true, required: true,
message: "请选择稽核方式", message: "请输入创建人",
trigger: "change",
},
{
validator: this.validateNoWhitespace,
trigger: "change", trigger: "change",
}, },
], ],
}, },
addtableData: [], addtableData: [],
currentPageRule: 1, currentPageRule: 1,
pageSizeRule: 5, pageSizeRule: 10,
ruleFormRule: {}, ruleFormRule: {},
tableDataRule: [], tableDataRule: [],
totalRule: 0, totalRule: 0,
...@@ -1219,7 +844,7 @@ export default { ...@@ -1219,7 +844,7 @@ export default {
dialogAddzj: false, dialogAddzj: false,
ruleFormZJ: {}, ruleFormZJ: {},
zjtableData: [], zjtableData: [],
pageSizeZJ: 5, pageSizeZJ: 10,
currentZJ: 1, currentZJ: 1,
zjtotal: 0, zjtotal: 0,
addZJListXM: [], addZJListXM: [],
...@@ -1234,33 +859,24 @@ export default { ...@@ -1234,33 +859,24 @@ export default {
XQcurrentPageXM: 1, XQcurrentPageXM: 1,
totalXQXM: 0, totalXQXM: 0,
defaultDate: new Date(), defaultDate: new Date(),
currentPageBJXM:1, currentPageBJXM: 1,
pageSizeBJXM:5, pageSizeBJXM: 5,
currentPageBJGZ:1, currentPageBJGZ: 1,
pageSizeBJGZ:5, pageSizeBJGZ: 5,
}; };
}, },
watch: { filters: {
"ruleFormdialogAdd.auditType"(newVal, oldVal) { proType(val) {
if (val == 1) {
if (newVal == 1) { return "咨询设计类";
; } else if (val == 2) {
this.ruleFormdialogAdd.auditTime = ""; return "开发实施类";
this.showDate = false; } else if (val == 3) {
} else { return "业务运营类";
} else if (val == 4) {
this.showDate = true; return "数据工程类";
} } else if (val == 5) {
}, return "产品购置类";
"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;
} }
}, },
}, },
...@@ -1268,9 +884,19 @@ export default { ...@@ -1268,9 +884,19 @@ export default {
this.submitForm(); this.submitForm();
}, },
methods: { methods: {
selectable(item, index) {
if (
!item.contractNumber ||
!item.projectCode
) {
return false
} else {
return true
}
},
validateNoWhitespace(rule, value, callback) { validateNoWhitespace(rule, value, callback) {
if (value.trim() === '') { if (value.trim() === "") {
callback(new Error('名称不能为空仅包含空格')); callback(new Error("名称不能为空仅包含空格"));
} else { } else {
callback(); callback();
} }
...@@ -1297,14 +923,13 @@ export default { ...@@ -1297,14 +923,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.auditStatus=='1'){ if (item.auditStatus == "1") {
this.$set(item, "auditStatusText", "执行中"); this.$set(item, "auditStatusText", "执行中");
}else if(item.auditStatus=='2'){ } else if (item.auditStatus == "2") {
this.$set(item, "auditStatusText", "已完成"); this.$set(item, "auditStatusText", "已完成");
}else { } else {
this.$set(item, "auditStatusText", "未执行"); this.$set(item, "auditStatusText", "未执行");
} }
}); });
this.total = res.data.total * 1; this.total = res.data.total * 1;
} }
...@@ -1320,10 +945,10 @@ export default { ...@@ -1320,10 +945,10 @@ export default {
}, },
//详情 //详情
async detailsForm() { async detailsForm() {
this.currentPageBJXM=1 this.currentPageBJXM = 1;
this.pageSizeBJXM=5 this.pageSizeBJXM = 5;
this.currentPageBJGZ=1 this.currentPageBJGZ = 1;
this.pageSizeBJGZ=5 this.pageSizeBJGZ = 5;
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择");
return; return;
...@@ -1350,8 +975,8 @@ export default { ...@@ -1350,8 +975,8 @@ export default {
this.addtableDataXM.forEach((item) => { this.addtableDataXM.forEach((item) => {
this.$set( this.$set(
item, item,
"projectCategory", "constructionForm",
projectCategoryText(item.projectCategory) constructionFormText(item.constructionForm)
); );
}); });
this.addtotal = res[0].data.total; this.addtotal = res[0].data.total;
...@@ -1370,9 +995,16 @@ export default { ...@@ -1370,9 +995,16 @@ export default {
} }
return ""; return "";
}, },
handleRowClickSelf(row, column, event) {
console.log(row,'2222')
if (row.contractNumber && row.projectCode) {
this.$refs['multipleTableZJ'].toggleRowSelection(row)
this.addZJList = this.$refs.multipleTableZJ.selection
} else {
this.$message.warning('项目编码或合同编码为空')
}
},
async handleClick() { async handleClick() {
if (this.activeName == "second") { if (this.activeName == "second") {
let params = { let params = {
batchId: this.checkedList[0].batchId, batchId: this.checkedList[0].batchId,
...@@ -1427,15 +1059,12 @@ export default { ...@@ -1427,15 +1059,12 @@ export default {
} }
this.checkedList = this.$refs.multipleTable.selection; this.checkedList = this.$refs.multipleTable.selection;
this.ruleFormdialog = this.checkedList[0]; this.ruleFormdialog = this.checkedList[0];
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.pageSize = val; this.pageSize = val;
this.submitForm(); this.submitForm();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.currentPage = val; this.currentPage = val;
this.submitForm(); this.submitForm();
}, },
...@@ -1449,20 +1078,45 @@ export default { ...@@ -1449,20 +1078,45 @@ export default {
this.addtotal = 0; this.addtotal = 0;
this.addtotalXM = 0; this.addtotalXM = 0;
this.showDate = false; this.showDate = false;
// this.dialogAdd = true;
this.dialogAdd = true; this.$router.push({
path: "/compliance/addConfigure",
});
},
//运行
async working() {
if (this.checkedList.length != 1) {
this.$message("请选择");
return;
}
if (this.checkedList[0].auditStatus == 1||this.checkedList[0].auditStatus == 2) {
this.$message("只能运行未执行的任务");
return;
}
// let params = {
// batchId: this.checkedList[0].batchId,
// projectId: this.checkedList[0].projectId,
// };
let res = await qidongTasks(this.checkedList[0]);
if (res.code == 200) {
this.$message("运行成功");
} else {
this.$message("运行失败");
}
}, },
//选择规则 //选择规则
async checkRules() { async checkRules(info) {
// this.addZJList = []; if(info==999){
this.currentPageRule=1
}
let params = { let params = {
current: this.currentPageRule, current: this.currentPageRule,
pageSize: this.pageSizeRule, pageSize: this.pageSizeRule,
ruleStatus: 0, // ruleStatus: 0,
}; };
Object.assign(params, this.ruleFormRule); Object.assign(params, this.ruleFormRule);
console.log(params); console.log(params);
let res = await iPageRorm(params); let res = await ruleFormulation(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;
...@@ -1479,10 +1133,11 @@ export default { ...@@ -1479,10 +1133,11 @@ export default {
this.$message("请选择规则"); this.$message("请选择规则");
return; return;
} }
this.addtableData = [...this.addtableData, ...this.addZJList]; // this.addtableData = [...this.addtableData, ...this.addZJList];
this.addtableData = this.addtableData.filter( // this.addtableData = this.addtableData.filter(
(obj, index, self) => index === self.findIndex((t) => t.id === obj.id) // (obj, index, self) => index === self.findIndex((t) => t.id === obj.id)
); // );
this.addtableData = this.addZJList
this.addtotal = this.addtableData.length; this.addtotal = this.addtableData.length;
this.dialogRule = false; this.dialogRule = false;
}, },
...@@ -1509,47 +1164,47 @@ export default { ...@@ -1509,47 +1164,47 @@ export default {
handleSizeChangeAddXM(val) { handleSizeChangeAddXM(val) {
this.pageSizeAddXM = val; this.pageSizeAddXM = val;
}, },
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();
}, },
handleCurrentChangeBJGZ(val){ handleCurrentChangeBJGZ(val) {
this.currentPageBJGZ = val; this.currentPageBJGZ = val;
this. BJselRuleProject() this.BJselRuleProject();
}, },
handleSizeChangeBJGZ(val) { handleSizeChangeBJGZ(val) {
this.pageSizeBJGZ = val; this.pageSizeBJGZ = val;
this. BJselRuleProject() this.BJselRuleProject();
}, },
//分页从新调取 //分页从新调取
async handselProject(){ async handselProject() {
let params2 = { let params2 = {
auditId: this.checkedList[0].auditId, auditId: this.checkedList[0].auditId,
current: this.currentPageBJXM, current: this.currentPageBJXM,
pageSize: this.pageSizeBJXM, pageSize: this.pageSizeBJXM,
}; };
let res=await selProject(params2) let res = await selProject(params2);
this.addtableDataXM = res.data.records; this.addtableDataXM = res.data.records;
this.addtableDataXM.forEach(item=>{ this.addtableDataXM.forEach((item) => {
this.$set( this.$set(
item, item,
"projectCategory", "constructionForm",
projectCategoryText(item.projectCategory) constructionFormText(item.constructionForm)
); );
}) });
}, },
//编辑规则 //编辑规则
async BJselRuleProject(){ async BJselRuleProject() {
let params = { let params = {
auditId: this.checkedList[0].auditId, auditId: this.checkedList[0].auditId,
current: this.currentPageBJGZ, current: this.currentPageBJGZ,
pageSize: this.pageSizeBJGZ, pageSize: this.pageSizeBJGZ,
}; };
let res=await selRuleProject(params) let res = await selRuleProject(params);
this.addtableData = res.data.records; this.addtableData = res.data.records;
}, },
...@@ -1557,19 +1212,39 @@ export default { ...@@ -1557,19 +1212,39 @@ export default {
this.addcurrentPageXM = val; this.addcurrentPageXM = val;
}, },
handleSelectionChangeZJ() { handleSelectionChangeZJ(selection) {
this.addZJList = this.$refs.multipleTableZJ.selection; if (selection.length > 0) {
this.inspectdisabled = false
if (Array.isArray(selection) && selection.length > 1) {
this.$refs.multipleTableZJ.toggleRowSelection(selection[0], false)
this.$refs.multipleTableZJ.toggleRowSelection(selection[1], true)
}
this.addZJList = this.$refs.multipleTableZJ.selection
}
}, },
handleSelectionChangeXM() { selectAll(selection) {
this.addZJListXM = this.$refs.multipleTableXM.selection;
},
handleSelectionChangeXM(selection) {
// this.addZJListXM = this.$refs.multipleTableXM.selection;
if (selection.length < 1) {
return
}
if (selection.length === this.zjtableData.Length) {
console.log('全选')
}
this.addZJListXM = this.$refs.multipleTableXM.selection; this.addZJListXM = this.$refs.multipleTableXM.selection;
}, },
//编辑 //编辑
edit() { edit() {
this.currentPageBJXM=1 this.currentPageBJXM = 1;
this.pageSizeBJXM=5 this.pageSizeBJXM = 5;
this.currentPageBJGZ=1 this.currentPageBJGZ = 1;
this.pageSizeBJGZ=5 this.pageSizeBJGZ = 5;
this.oldid="" this.oldid = "";
this.showDate = false; this.showDate = false;
if (this.checkedList.length != 1) { if (this.checkedList.length != 1) {
this.$message("请选择"); this.$message("请选择");
...@@ -1580,7 +1255,7 @@ export default { ...@@ -1580,7 +1255,7 @@ export default {
this.checkedList[0].auditStartTime, this.checkedList[0].auditStartTime,
this.checkedList[0].auditEndTime, this.checkedList[0].auditEndTime,
]; ];
this.addtableDataXM=[] this.addtableDataXM = [];
let params = { let params = {
auditId: this.checkedList[0].auditId, auditId: this.checkedList[0].auditId,
current: this.currentPageBJGZ, current: this.currentPageBJGZ,
...@@ -1591,26 +1266,29 @@ export default { ...@@ -1591,26 +1266,29 @@ export default {
current: this.currentPageBJXM, current: this.currentPageBJXM,
pageSize: this.pageSizeBJXM, pageSize: this.pageSizeBJXM,
}; };
Promise.all([selRuleProject(params), selProject(params2),selProjectList(params2)]).then((res) => { Promise.all([
selRuleProject(params),
selProject(params2),
// selProjectList(params2),
]).then((res) => {
this.addtableData = res[0].data.records; this.addtableData = res[0].data.records;
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;
let allList=res[2].data.records; // let allList = res[2].data.records;
allList.forEach(item=>{ this.addtableDataXM.forEach((item) => {
this.oldid = this.oldid.concat(item.projectId + ","); this.oldid = this.oldid.concat(item.projectCode + ",");
}) });
this.dialogBJ = true; this.dialogBJ = true;
if (this.addtableDataXM.length > 0) { if (this.addtableDataXM.length > 0) {
this.addtableDataXM.forEach((item) => { this.addtableDataXM.forEach((item) => {
this.$set( this.$set(
item, item,
"projectCategory", "constructionForm",
projectCategoryText(item.projectCategory) constructionFormText(item.constructionForm)
); );
}); });
} }
}); });
}, },
//删除 //删除
...@@ -1619,13 +1297,17 @@ export default { ...@@ -1619,13 +1297,17 @@ export default {
this.$message("请选择"); this.$message("请选择");
return; return;
} }
if (this.checkedList[0].auditStatus == 1||this.checkedList[0].auditStatus == 2) {
this.$message("只能删除未执行的任务");
return;
}
this.$confirm("此操作将删除该批次, 是否继续?", "提示", { this.$confirm("此操作将删除该批次, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(async () => { .then(async () => {
let res = await delAuditTasks({ id: this.checkedList[0].auditId }); let res = await delAuditTasks({auditId: this.checkedList[0].auditId });
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
type: "success", type: "success",
...@@ -1664,20 +1346,17 @@ export default { ...@@ -1664,20 +1346,17 @@ export default {
this.zjtableData.forEach((item) => { this.zjtableData.forEach((item) => {
this.$set( this.$set(
item, item,
"projectCategory", "constructionForm",
projectCategoryText(item.projectCategory) constructionFormText(item.constructionForm)
); );
}); });
this.zjtotal = res.data.total * 1; this.zjtotal = res.data.total * 1;
}, },
handleSizeChangeZJ(val) { handleSizeChangeZJ(val) {
this.pageSizeZJ = val; this.pageSizeZJ = val;
this.checkXM(); this.checkXM();
}, },
handleCurrentChangeZJ(val) { handleCurrentChangeZJ(val) {
this.currentZJ = val; this.currentZJ = val;
this.checkXM(); this.checkXM();
}, },
...@@ -1689,7 +1368,12 @@ export default { ...@@ -1689,7 +1368,12 @@ export default {
} }
this.addtableDataXM = [...this.addZJListXM, ...this.addtableDataXM]; this.addtableDataXM = [...this.addZJListXM, ...this.addtableDataXM];
this.addtableDataXM = this.addtableDataXM.filter((obj, index, self) => { this.addtableDataXM = this.addtableDataXM.filter((obj, index, self) => {
return index == self.findIndex((t) => t.projectId == obj.projectId); return (
index ==
self.findIndex(
(t) => t.projectCode == obj.projectCode && t.contractNumber == obj.contractNumber,
)
)
}); });
this.addtotalXM = this.addtableDataXM.length; this.addtotalXM = this.addtableDataXM.length;
...@@ -1718,9 +1402,10 @@ export default { ...@@ -1718,9 +1402,10 @@ export default {
rows.splice(index, 1); rows.splice(index, 1);
this.addtableDataXM = rows; this.addtableDataXM = rows;
let params = { let params = {
projectId: row.projectId, projectId: row.projectCode,
auditId: this.checkedList[0].auditId, auditId: this.checkedList[0].auditId,
}; };
console.log(params,'2222')
let res = await delProject(params); let res = await delProject(params);
}, },
//点击删除规则 //点击删除规则
...@@ -1735,10 +1420,8 @@ export default { ...@@ -1735,10 +1420,8 @@ export default {
}, },
saveXZ() { saveXZ() {
this.$refs.formNameAD.validate((valid) => { this.$refs.formNameAD.validate((valid) => {
if (!valid) { if (!valid) {
return false; return false;
} else { } else {
if (this.addtableData.length < 1) { if (this.addtableData.length < 1) {
...@@ -1789,10 +1472,8 @@ export default { ...@@ -1789,10 +1472,8 @@ export default {
this.dialogBJ = false; this.dialogBJ = false;
}, },
saveBJ() { saveBJ() {
this.$refs.formNameBJ.validate((valid) => { this.$refs.formNameBJ.validate((valid) => {
if (!valid) { if (!valid) {
return false; return false;
} else { } else {
if (this.addtableData.length < 1) { if (this.addtableData.length < 1) {
...@@ -1805,28 +1486,24 @@ export default { ...@@ -1805,28 +1486,24 @@ export default {
} }
let expertIdList = ""; let expertIdList = "";
let contractList ="";
if (this.addtableDataXM.length > 0) { if (this.addtableDataXM.length > 0) {
this.addtableDataXM.forEach((item) => { this.addtableDataXM.forEach((item) => {
expertIdList = expertIdList.concat(item.projectId + ","); expertIdList = expertIdList.concat(item.projectCode + ",");
}); contractList=contractList.concat(item.contractNumber + ",");
}
let ruleList = "";
if (this.addtableData.length > 0) {
this.addtableData.forEach((item) => {
console.log(item, "item");
ruleList = ruleList.concat(item.id + ",");
}); });
} }
let params = {
prjStr: expertIdList.slice(0, -1),
ruleStr: this.addtableData[0].id,
auditStatus:0,
contractNumber:contractList.slice(0, -1),
createTime:getCurrentDate(),
auditName:this.ruleFormdialogBJ.auditName,
creator:this.ruleFormdialogBJ.creator,
auditId:this.checkedList[0].auditId
};
console.log(expertIdList, ruleList, "编辑值");
// return
let params = {};
Object.assign(params, this.ruleFormdialogBJ);
params.auditId = this.checkedList[0].auditId;
(params.prjStr = expertIdList),
(params.ruleStr = ruleList),
console.log(params, "222");
upauditTasks(params).then((res) => { upauditTasks(params).then((res) => {
this.dialogBJ = false; this.dialogBJ = false;
this.resetForm(); this.resetForm();
...@@ -1834,6 +1511,9 @@ export default { ...@@ -1834,6 +1511,9 @@ export default {
} }
}); });
}, },
numberVal(val) {
this.$forceUpdate();
},
}, },
}; };
</script> </script>
...@@ -2084,14 +1764,25 @@ h3 { ...@@ -2084,14 +1764,25 @@ h3 {
border-radius: 5px; border-radius: 5px;
} }
} }
.setscrolldialoggz{
width: 100%;
height:100px;
overflow: auto;
box-sizing: border-box;
/deep/ .el-table {
width: 96% !important;
height: 100px;
overflow: auto;
}
}
.setscrolldialogAdd { .setscrolldialogAdd {
width: 100%; width: 100%;
height: 200px; height: 400px;
overflow: auto; overflow: auto;
box-sizing: border-box; box-sizing: border-box;
/deep/ .el-table { /deep/ .el-table {
width: 96% !important; width: 96% !important;
height: 200px; height: 340px;
overflow: auto; overflow: auto;
} }
} }
...@@ -2183,10 +1874,10 @@ h3 { ...@@ -2183,10 +1874,10 @@ h3 {
display: none !important; display: none !important;
} }
.demo-ruleForm { .demo-ruleForm {
position: relative; position: relative;
margin-bottom: 20px; margin-bottom: 20px;
} }
/deep/ .el-table thead.is-group th.el-table__cell{ /deep/ .el-table thead.is-group th.el-table__cell {
background: #f5f5f5; background: #f5f5f5;
} }
</style> </style>
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!