Skip to content

Administrator / project_progress

Go to a project
Commit 24328878 by liangzhen
Options

互查提交

1 parent ed4c149a
Inline Side-by-side
Showing with 572 additions and 396 deletions
src/api/index.js
......@@ -436,7 +436,7 @@ export function projectInfoSy(params){
}
//项目列表页面
export function pmProInitiation(params){
return post(`${ARCH_EVALUATION}/projectInfoZc/getProjectInfo`, params)
return post(`${ARCH_EVALUATION}/projectInfo/getProjectInfo`, params)
}
//项目清单
export function MaterialWarehous(params){
......
src/views/assessChecks/confirmRelease.vue
......@@ -85,7 +85,7 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear" width="120">
<el-table-column label="批次年度" prop="batchYear" width="120">
<template slot-scope="scope"> {{ scope.row.batchYear }}年 </template>
</el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
......@@ -114,17 +114,24 @@
>
</el-table-column> -->
<el-table-column label="后评估批次状态" prop="link">
<template v-slot="scope">
<!-- <router-link :to="`/mainLayout/assistedViewing/${scope.row.id}`">
<template v-slot="scope">
<!-- <router-link :to="`/mainLayout/assistedViewing/${scope.row.id}`">
<el-button type="text" size="small">{{scope.row.postEvalStateText}}</el-button>
</router-link> -->
<router-link :to="{path:'/mainLayout/auxiliaryInspection',query:{batchName:scope.row.batchName}}">
<el-button type="text" size="small">{{scope.row.postEvalStateText}}</el-button>
</router-link>
</template>
<router-link
:to="{
path: '/mainLayout/auxiliaryInspection',
query: { batchName: scope.row.batchName },
}"
>
<el-button type="text" size="small">{{
scope.row.postEvalStateText
}}</el-button>
</router-link>
</template>
</el-table-column>
<el-table-column prop="creator" label="发起人" width="120" >
<el-table-column prop="creator" label="发起人" width="120">
</el-table-column>
<el-table-column prop="createTime" label="发起时间" width="auto">
</el-table-column>
......@@ -205,9 +212,9 @@
<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 prop="department" label="部门" width="150">
</el-table-column> -->
<el-table-column label="项目编码" width="150" prop="projectCode">
</el-table-column>
......@@ -226,42 +233,50 @@
</el-table-column>
<el-table-column prop="issueYear" label="项目年度" width="140">
<template slot-scope="scope">
{{ scope.row.issueYear}}年
{{ scope.row.issueYear }}年
</template>
</el-table-column>
<el-table-column prop="startupStatus" label="启动日期" width="90">
</el-table-column>
<el-table-column prop="accountingStatus" label="入账状态" width="90">
</el-table-column>
<el-table-column
prop="accountingProportion"
label="累计入账占比"
width="90"
>
<template slot-scope="scope">
{{ scope.row.accountingProportion }}%
</template>
</el-table-column>
<el-table-column prop="entryAmount" label="入账金额（万）" width="120">
</el-table-column>
<el-table-column prop="currentProgress" label="当前进度" width="120">
</el-table-column>
<el-table-column
prop="contractNumber"
label="合同编号"
width="220"
>
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column>
</el-table-column>
<el-table-column
prop="accountingStatus"
label="入账状态"
width="90"
>
</el-table-column>
<el-table-column
prop="accountingProportion"
label="累计入账占比"
width="90"
>
<template slot-scope="scope">
{{ scope.row.accountingProportion }}%
</template>
</el-table-column>
<el-table-column
prop="entryAmount"
label="入账金额（万）"
width="120"
>
</el-table-column>
<el-table-column
prop="currentProgress"
label="当前进度"
width="120"
>
</el-table-column>
<el-table-column prop="contractNumber" label="合同编号" width="220">
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column>
</el-table>
</div>
<el-pagination
......@@ -269,7 +284,7 @@
@current-change="handleCurrentChangeXQ"
:current-page="currentPageXQ"
:page-sizes="[5, 10, 20, 50]"
:page-size="1000"
:page-size="10"
layout="total, sizes, prev, pager, next, jumper"
:total="addtotal"
class="elpagination"
......@@ -344,7 +359,7 @@
<el-table-column type="selection"> </el-table-column>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column label="项目编码" width="150" prop="projectCode">
</el-table-column>
......@@ -363,42 +378,50 @@
</el-table-column>
<el-table-column prop="issueYear" label="项目年度" width="140">
<template slot-scope="scope">
{{ scope.row.issueYear}}年
{{ scope.row.issueYear }}年
</template>
</el-table-column>
<el-table-column prop="startupStatus" label="启动日期" width="90">
</el-table-column>
<el-table-column prop="accountingStatus" label="入账状态" width="90">
</el-table-column>
<el-table-column
prop="accountingProportion"
label="累计入账占比"
width="90"
>
<template slot-scope="scope">
{{ scope.row.accountingProportion }}%
</template>
</el-table-column>
<el-table-column prop="entryAmount" label="入账金额（万）" width="120">
</el-table-column>
<el-table-column prop="currentProgress" label="当前进度" width="120">
</el-table-column>
<el-table-column
prop="contractNumber"
label="合同编号"
width="220"
>
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column>
</el-table-column>
<el-table-column
prop="accountingStatus"
label="入账状态"
width="90"
>
</el-table-column>
<el-table-column
prop="accountingProportion"
label="累计入账占比"
width="90"
>
<template slot-scope="scope">
{{ scope.row.accountingProportion }}%
</template>
</el-table-column>
<el-table-column
prop="entryAmount"
label="入账金额（万）"
width="120"
>
</el-table-column>
<el-table-column
prop="currentProgress"
label="当前进度"
width="120"
>
</el-table-column>
<el-table-column prop="contractNumber" label="合同编号" width="220">
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column>
<el-table-column label="操作" width="130">
<template slot-scope="scope">
......@@ -417,7 +440,7 @@
@current-change="handleCurrentChangeAdd"
:current-page="addcurrentPage"
:page-sizes="[5, 10, 20, 50]"
:page-size="1000"
:page-size="10"
layout="total, sizes, prev, pager, next, jumper"
:total="addtotal"
class="elpagination"
......@@ -430,6 +453,7 @@
</p>
</div>
</el-dialog>
<!-- 选择评估项目 -->
<el-dialog
title="选择待评估项目"
......@@ -441,61 +465,75 @@
<div class="adzjdialog">
<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
></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-input
v-model="ruleFormZJ.projectCode"
placeholder="请输入"
clearable
></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 class="cxItem">
<span class="zjquery" @click="xzExperts()"> 查询 </span>
</el-form-item>
</el-form>
<p class="tipred">*已在流程中还未归档的项目不可重复选择</p>
<div class="setscrolldialogx">
<el-table
@selection-change="handleSelectionChangeZJ"
@select="handleSelectionChangeZJ"
@select-all="selectAll"
ref="multipleTableZJ"
:data="zjtableData"
tooltip-effect="dark myTooltips"
......@@ -505,12 +543,12 @@
:row-class-name="tableRowClassName"
border
>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="序号" width="55" type="index">
<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="department" label="部门" width="150">
</el-table-column> -->
<el-table-column label="项目编码" width="150" prop="projectCode">
</el-table-column>
......@@ -529,46 +567,55 @@
</el-table-column>
<el-table-column prop="issueYear" label="项目年度" width="140">
<template slot-scope="scope">
{{ scope.row.issueYear}}年
{{ scope.row.issueYear }}年
</template>
</el-table-column>
<el-table-column prop="startupStatus" label="启动日期" width="90">
</el-table-column>
<el-table-column prop="accountingStatus" label="入账状态" width="90">
</el-table-column>
<el-table-column
prop="accountingProportion"
label="累计入账占比"
width="90"
>
<template slot-scope="scope">
{{ scope.row.accountingProportion }}%
</template>
</el-table-column>
<el-table-column prop="entryAmount" label="入账金额（万）" width="120">
</el-table-column>
<el-table-column prop="currentProgress" label="当前进度" width="120">
</el-table-column>
<el-table-column
prop="contractNumber"
label="合同编号"
width="220"
>
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="zcstate" label="审核状态" width="110">
<template slot-scope="scope"> {{ scope.row.zcstate|zcstatefilter }}</template>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column>
</el-table-column>
<el-table-column
prop="accountingStatus"
label="入账状态"
width="90"
>
</el-table-column>
<el-table-column
prop="accountingProportion"
label="累计入账占比"
width="90"
>
<template slot-scope="scope">
{{ scope.row.accountingProportion }}%
</template>
</el-table-column>
<el-table-column
prop="entryAmount"
label="入账金额（万）"
width="120"
>
</el-table-column>
<el-table-column
prop="currentProgress"
label="当前进度"
width="120"
>
</el-table-column>
<el-table-column prop="contractNumber" label="合同编号" width="220">
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="zcstate" label="审核状态" width="110">
<template slot-scope="scope">
{{ scope.row.zcstate | zcstatefilter }}</template
>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column>
</el-table>
</div>
......@@ -577,7 +624,7 @@
@current-change="handleCurrentChangeZJ"
:current-page="currentZJ"
:page-sizes="[5, 10, 20, 50]"
:page-size="1000"
:page-size="10"
layout="total, sizes, prev, pager, next, jumper"
:total="zjtotal"
class="elpagination"
......@@ -601,9 +648,9 @@ import {
joinProjectInfo,
pmProInitiation,
chProjectInfo,
bcProjectInfo
bcProjectInfo,
} from "@/api/index";
import { generateYearOptions,constructionFormText } from "@/utils/cache";
import { generateYearOptions, constructionFormText } from "@/utils/cache";
export default {
data() {
return {
......@@ -654,14 +701,14 @@ export default {
pageSize: 10,
current: 1,
pageSizeZJ: 10,
pageSizeXQ:10,
pageSizeXQ: 10,
currentPageXQ: 1,
currentZJ: 1,
addtotal: 0,
currentAdd: 1,
pageSizeAdd: 10,
currentedit: 1,
pageSizeedit:10,
pageSizeedit: 10,
xfParam: "",
dialogedit: false,
expertIdList: [],
......@@ -687,6 +734,8 @@ export default {
return "已整改";
} else if (val == 4) {
return "已归档";
} else {
return " ";
}
},
},
......@@ -705,12 +754,12 @@ export default {
},
methods: {
timeChange(time) {
console.log('tttttt',time)
console.log("tttttt", time);
if (time) {
//给后端的参数
this.ruleForm.createStartTime = time[0];
this.ruleForm.createEndTime = time[1];
}else{
} else {
this.ruleForm.createStartTime = "";
this.ruleForm.createEndTime = "";
}
......@@ -719,7 +768,7 @@ export default {
let params = {
current: this.currentPage,
pageSize: this.pageSize,
module:0
module: 0,
};
Object.assign(params, this.ruleForm);
console.log(params);
......@@ -746,7 +795,7 @@ export default {
this.pageSize = 10;
this.ruleForm.createStartTime = "";
this.ruleForm.createEndTime = "";
this.ruleForm.dates=[]
this.ruleForm.dates = [];
this.submitForm();
},
//详情
......@@ -941,9 +990,8 @@ export default {
fbProjectInfo(params).then((res) => {
this.dialogAdd = false;
this.expertIdList = expertIdList;
this.$message('提交成功')
this.$message("提交成功");
this.resetForm();
});
},
savepro() {
......@@ -967,7 +1015,7 @@ export default {
console.log(params, "222");
// return
bcProjectInfo(params).then((res) => {
this.$message('保存成功')
this.$message("保存成功");
// this.dialogAdd = false;
this.expertIdList = expertIdList;
// this.resetForm();
......@@ -976,22 +1024,58 @@ export default {
cancelXZ() {
this.dialogAdd = false;
},
selectable(item,index){
if(item.zcstate == 1 || item.zcstate == 2 || item.zcstate == 3){
return false
}else{
return true
}
},
selectAll(selection) {
this.addZJList = this.$refs.multipleTableZJ.selection;
console.log(this.$refs.multipleTableZJ.selection, "2222222");
// selection = selection.filter(item=>{
// return item.zcstate!=1&&item.zcstate!=2&&item.zcstate!=3
// });
// this.$refs.multipleTableZJ.selection=selection
// console.log(selection,'selection')
// // this.addZJList = JSON.parse(JSON.stringify(this.$refs.multipleTableZJ.selection))
// this.addZJList.forEach((item, index) => {
// if (item.zcstate == 1 || item.zcstate == 2 || item.zcstate == 3) {
// console.log("不符合", index,this.addZJList[index]);
// this.$refs.multipleTableZJ.toggleRowSelection(
// this.addZJList[index],
// false
// )
// }
// });
// console.log(this.$refs.multipleTableZJ.selection, "2222223");
},
//选中的项目
handleSelectionChangeZJ(selection) {
if(selection.length<1){
return
handleSelectionChangeZJ(selection, row) {
console.log("来了么", row);
if (selection.length < 1) {
return;
}
let info=selection[selection.length-1].zcstate
if(info==1||info==2||info==3){
this.$refs.multipleTableZJ.toggleRowSelection(selection[selection.length-1], false);
this.$message('该项目在流程中，请选择其他项目')
console.log('不让点')
return
if (selection.length === this.zjtableData.Length) {
console.log("全选");
}
let info = row.zcstate;
if (info == 1 || info == 2 || info == 3) {
this.$refs.multipleTableZJ.toggleRowSelection(
selection[selection.length - 1],
false
);
this.$message("该项目在流程中，请选择其他项目");
console.log("不让点");
return;
}
this.addZJList = this.$refs.multipleTableZJ.selection;
console.log(this.$refs.multipleTableZJ.selection, "2222222");
this.addZJList = this.$refs.multipleTableZJ.selection;
console.log(this.$refs.multipleTableZJ.selection, "2222222");
},
//点击删除
async handleClick(row, index, rows) {
......@@ -1011,13 +1095,12 @@ export default {
type: "success",
message: "删除成功!",
});
this.addtotal--
this.addtotal--;
} else {
this.$message({
type: "info",
message: "删除失败!",
});
}
})
.catch(() => {
......@@ -1027,14 +1110,13 @@ export default {
});
});
rows.splice(index, 1);
// let res = await delProjectInfo(params);
// if(res.code=200){
// this.$message('删除成功')
// this.addtotal--
// }
// this.addtotal = rows.length;
},
//点击撤回
async withdraw() {
......@@ -1061,7 +1143,7 @@ export default {
batchId: this.checkedList[0].batchId,
});
if ((res.code = "200")) {
this.$message('已撤回')
this.$message("已撤回");
this.resetForm();
}
})
......@@ -1403,9 +1485,14 @@ export default {
overflow-x: hidden !important;
}
}
.hide-selection /deep/.el-table__header-wrapper .el-checkbox {
display: none;
.tipred{
color: red;
text-align: left;
font-size: 13px;
}
// .hide-selection /deep/.el-table__header-wrapper .el-checkbox {
// display: none;
// }
</style>
<style>
......
src/views/assessZC/confirmRelease.vue
......@@ -85,7 +85,7 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="批次年度" prop="batchYear" width="120">
<el-table-column label="批次年度" prop="batchYear" width="120">
<template slot-scope="scope"> {{ scope.row.batchYear }}年 </template>
</el-table-column>
<el-table-column prop="batchName" label="后评估批次名称">
......@@ -114,17 +114,24 @@
>
</el-table-column> -->
<el-table-column label="后评估批次状态" prop="link">
<template v-slot="scope">
<!-- <router-link :to="`/mainLayout/assistedViewing/${scope.row.id}`">
<template v-slot="scope">
<!-- <router-link :to="`/mainLayout/assistedViewing/${scope.row.id}`">
<el-button type="text" size="small">{{scope.row.postEvalStateText}}</el-button>
</router-link> -->
<router-link :to="{path:'/assesszc/auxiliaryInspection',query:{batchName:scope.row.batchName}}">
<el-button type="text" size="small">{{scope.row.postEvalStateText}}</el-button>
</router-link>
</template>
<router-link
:to="{
path: '/assesszc/auxiliaryInspection',
query: { batchName: scope.row.batchName },
}"
>
<el-button type="text" size="small">{{
scope.row.postEvalStateText
}}</el-button>
</router-link>
</template>
</el-table-column>
<el-table-column prop="creator" label="发起人" width="120" >
<el-table-column prop="creator" label="发起人" width="120">
</el-table-column>
<el-table-column prop="createTime" label="发起时间" width="auto">
</el-table-column>
......@@ -205,9 +212,9 @@
<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 prop="department" label="部门" width="150">
</el-table-column> -->
<el-table-column label="项目编码" width="150" prop="projectCode">
</el-table-column>
......@@ -226,42 +233,50 @@
</el-table-column>
<el-table-column prop="issueYear" label="项目年度" width="140">
<template slot-scope="scope">
{{ scope.row.issueYear}}年
{{ scope.row.issueYear }}年
</template>
</el-table-column>
<el-table-column prop="startupStatus" label="启动日期" width="90">
</el-table-column>
<el-table-column prop="accountingStatus" label="入账状态" width="90">
</el-table-column>
<el-table-column
prop="accountingProportion"
label="累计入账占比"
width="90"
>
<template slot-scope="scope">
{{ scope.row.accountingProportion }}%
</template>
</el-table-column>
<el-table-column prop="entryAmount" label="入账金额（万）" width="120">
</el-table-column>
<el-table-column prop="currentProgress" label="当前进度" width="120">
</el-table-column>
<el-table-column
prop="contractNumber"
label="合同编号"
width="220"
>
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column>
</el-table-column>
<el-table-column
prop="accountingStatus"
label="入账状态"
width="90"
>
</el-table-column>
<el-table-column
prop="accountingProportion"
label="累计入账占比"
width="90"
>
<template slot-scope="scope">
{{ scope.row.accountingProportion }}%
</template>
</el-table-column>
<el-table-column
prop="entryAmount"
label="入账金额（万）"
width="120"
>
</el-table-column>
<el-table-column
prop="currentProgress"
label="当前进度"
width="120"
>
</el-table-column>
<el-table-column prop="contractNumber" label="合同编号" width="220">
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column>
</el-table>
</div>
<el-pagination
......@@ -269,7 +284,7 @@
@current-change="handleCurrentChangeXQ"
:current-page="currentPageXQ"
:page-sizes="[5, 10, 20, 50]"
:page-size="1000"
:page-size="10"
layout="total, sizes, prev, pager, next, jumper"
:total="addtotal"
class="elpagination"
......@@ -344,7 +359,7 @@
<el-table-column type="selection"> </el-table-column>
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column label="项目编码" width="150" prop="projectCode">
</el-table-column>
......@@ -363,42 +378,50 @@
</el-table-column>
<el-table-column prop="issueYear" label="项目年度" width="140">
<template slot-scope="scope">
{{ scope.row.issueYear}}年
{{ scope.row.issueYear }}年
</template>
</el-table-column>
<el-table-column prop="startupStatus" label="启动日期" width="90">
</el-table-column>
<el-table-column prop="accountingStatus" label="入账状态" width="90">
</el-table-column>
<el-table-column
prop="accountingProportion"
label="累计入账占比"
width="90"
>
<template slot-scope="scope">
{{ scope.row.accountingProportion }}%
</template>
</el-table-column>
<el-table-column prop="entryAmount" label="入账金额（万）" width="120">
</el-table-column>
<el-table-column prop="currentProgress" label="当前进度" width="120">
</el-table-column>
<el-table-column
prop="contractNumber"
label="合同编号"
width="220"
>
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column>
</el-table-column>
<el-table-column
prop="accountingStatus"
label="入账状态"
width="90"
>
</el-table-column>
<el-table-column
prop="accountingProportion"
label="累计入账占比"
width="90"
>
<template slot-scope="scope">
{{ scope.row.accountingProportion }}%
</template>
</el-table-column>
<el-table-column
prop="entryAmount"
label="入账金额（万）"
width="120"
>
</el-table-column>
<el-table-column
prop="currentProgress"
label="当前进度"
width="120"
>
</el-table-column>
<el-table-column prop="contractNumber" label="合同编号" width="220">
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column>
<el-table-column label="操作" width="130">
<template slot-scope="scope">
......@@ -417,7 +440,7 @@
@current-change="handleCurrentChangeAdd"
:current-page="addcurrentPage"
:page-sizes="[5, 10, 20, 50]"
:page-size="1000"
:page-size="10"
layout="total, sizes, prev, pager, next, jumper"
:total="addtotal"
class="elpagination"
......@@ -441,61 +464,75 @@
<div class="adzjdialog">
<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
></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-input
v-model="ruleFormZJ.projectCode"
placeholder="请输入"
clearable
></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 class="cxItem">
<span class="zjquery" @click="xzExperts()"> 查询 </span>
</el-form-item>
</el-form>
<p class="tipred">*已在流程中还未归档的项目不可重复选择</p>
<div class="setscrolldialogx">
<el-table
@selection-change="handleSelectionChangeZJ"
@select="handleSelectionChangeZJ"
@select-all="selectAll"
ref="multipleTableZJ"
:data="zjtableData"
tooltip-effect="dark myTooltips"
......@@ -505,12 +542,12 @@
:row-class-name="tableRowClassName"
border
>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="序号" width="55" type="index">
<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="department" label="部门" width="150">
</el-table-column> -->
<el-table-column label="项目编码" width="150" prop="projectCode">
</el-table-column>
......@@ -529,46 +566,55 @@
</el-table-column>
<el-table-column prop="issueYear" label="项目年度" width="140">
<template slot-scope="scope">
{{ scope.row.issueYear}}年
{{ scope.row.issueYear }}年
</template>
</el-table-column>
<el-table-column prop="startupStatus" label="启动日期" width="90">
</el-table-column>
<el-table-column prop="accountingStatus" label="入账状态" width="90">
</el-table-column>
<el-table-column
prop="accountingProportion"
label="累计入账占比"
width="90"
>
<template slot-scope="scope">
{{ scope.row.accountingProportion }}%
</template>
</el-table-column>
<el-table-column prop="entryAmount" label="入账金额（万）" width="120">
</el-table-column>
<el-table-column prop="currentProgress" label="当前进度" width="120">
</el-table-column>
<el-table-column
prop="contractNumber"
label="合同编号"
width="220"
>
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="zcstate" label="审核状态" width="110">
<template slot-scope="scope"> {{ scope.row.zcstate|zcstatefilter }}</template>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column>
</el-table-column>
<el-table-column
prop="accountingStatus"
label="入账状态"
width="90"
>
</el-table-column>
<el-table-column
prop="accountingProportion"
label="累计入账占比"
width="90"
>
<template slot-scope="scope">
{{ scope.row.accountingProportion }}%
</template>
</el-table-column>
<el-table-column
prop="entryAmount"
label="入账金额（万）"
width="120"
>
</el-table-column>
<el-table-column
prop="currentProgress"
label="当前进度"
width="120"
>
</el-table-column>
<el-table-column prop="contractNumber" label="合同编号" width="220">
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
width="auto"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="zcstate" label="审核状态" width="110">
<template slot-scope="scope">
{{ scope.row.zcstate | zcstatefilter }}</template
>
</el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110">
</el-table-column>
</el-table>
</div>
......@@ -577,7 +623,7 @@
@current-change="handleCurrentChangeZJ"
:current-page="currentZJ"
:page-sizes="[5, 10, 20, 50]"
:page-size="1000"
:page-size="10"
layout="total, sizes, prev, pager, next, jumper"
:total="zjtotal"
class="elpagination"
......@@ -601,9 +647,9 @@ import {
joinProjectInfo,
pmProInitiation,
chProjectInfo,
bcProjectInfo
bcProjectInfo,
} from "@/api/indexzc";
import { generateYearOptions,constructionFormText } from "@/utils/cache";
import { generateYearOptions, constructionFormText } from "@/utils/cache";
export default {
data() {
return {
......@@ -654,14 +700,14 @@ export default {
pageSize: 10,
current: 1,
pageSizeZJ: 10,
pageSizeXQ:10,
pageSizeXQ: 10,
currentPageXQ: 1,
currentZJ: 1,
addtotal: 0,
currentAdd: 1,
pageSizeAdd: 10,
currentedit: 1,
pageSizeedit:10,
pageSizeedit: 10,
xfParam: "",
dialogedit: false,
expertIdList: [],
......@@ -687,6 +733,8 @@ export default {
return "已整改";
} else if (val == 4) {
return "已归档";
} else {
return " ";
}
},
},
......@@ -705,12 +753,12 @@ export default {
},
methods: {
timeChange(time) {
console.log('tttttt',time)
console.log("tttttt", time);
if (time) {
//给后端的参数
this.ruleForm.createStartTime = time[0];
this.ruleForm.createEndTime = time[1];
}else{
} else {
this.ruleForm.createStartTime = "";
this.ruleForm.createEndTime = "";
}
......@@ -719,7 +767,7 @@ export default {
let params = {
current: this.currentPage,
pageSize: this.pageSize,
module:1
module: 1,
};
Object.assign(params, this.ruleForm);
console.log(params);
......@@ -746,7 +794,7 @@ export default {
this.pageSize = 10;
this.ruleForm.createStartTime = "";
this.ruleForm.createEndTime = "";
this.ruleForm.dates=[]
this.ruleForm.dates = [];
this.submitForm();
},
//详情
......@@ -941,9 +989,8 @@ export default {
fbProjectInfo(params).then((res) => {
this.dialogAdd = false;
this.expertIdList = expertIdList;
this.$message('提交成功')
this.$message("提交成功");
this.resetForm();
});
},
savepro() {
......@@ -967,7 +1014,7 @@ export default {
console.log(params, "222");
// return
bcProjectInfo(params).then((res) => {
this.$message('保存成功')
this.$message("保存成功");
// this.dialogAdd = false;
this.expertIdList = expertIdList;
// this.resetForm();
......@@ -976,22 +1023,58 @@ export default {
cancelXZ() {
this.dialogAdd = false;
},
selectable(item,index){
if(item.zcstate == 1 || item.zcstate == 2 || item.zcstate == 3){
return false
}else{
return true
}
},
selectAll(selection) {
this.addZJList = this.$refs.multipleTableZJ.selection;
console.log(this.$refs.multipleTableZJ.selection, "2222222");
// selection = selection.filter(item=>{
// return item.zcstate!=1&&item.zcstate!=2&&item.zcstate!=3
// });
// this.$refs.multipleTableZJ.selection=selection
// console.log(selection,'selection')
// // this.addZJList = JSON.parse(JSON.stringify(this.$refs.multipleTableZJ.selection))
// this.addZJList.forEach((item, index) => {
// if (item.zcstate == 1 || item.zcstate == 2 || item.zcstate == 3) {
// console.log("不符合", index,this.addZJList[index]);
// this.$refs.multipleTableZJ.toggleRowSelection(
// this.addZJList[index],
// false
// )
// }
// });
// console.log(this.$refs.multipleTableZJ.selection, "2222223");
},
//选中的项目
handleSelectionChangeZJ(selection) {
if(selection.length<1){
return
handleSelectionChangeZJ(selection, row) {
console.log("来了么", row);
if (selection.length < 1) {
return;
}
let info=selection[selection.length-1].zcstate
if(info==1||info==2||info==3){
this.$refs.multipleTableZJ.toggleRowSelection(selection[selection.length-1], false);
this.$message('该项目在流程中，请选择其他项目')
console.log('不让点')
return
if (selection.length === this.zjtableData.Length) {
console.log("全选");
}
let info = row.zcstate;
if (info == 1 || info == 2 || info == 3) {
this.$refs.multipleTableZJ.toggleRowSelection(
selection[selection.length - 1],
false
);
this.$message("该项目在流程中，请选择其他项目");
console.log("不让点");
return;
}
this.addZJList = this.$refs.multipleTableZJ.selection;
console.log(this.$refs.multipleTableZJ.selection, "2222222");
this.addZJList = this.$refs.multipleTableZJ.selection;
console.log(this.$refs.multipleTableZJ.selection, "2222222");
},
//点击删除
async handleClick(row, index, rows) {
......@@ -1011,13 +1094,12 @@ export default {
type: "success",
message: "删除成功!",
});
this.addtotal--
this.addtotal--;
} else {
this.$message({
type: "info",
message: "删除失败!",
});
}
})
.catch(() => {
......@@ -1027,14 +1109,13 @@ export default {
});
});
rows.splice(index, 1);
// let res = await delProjectInfo(params);
// if(res.code=200){
// this.$message('删除成功')
// this.addtotal--
// }
// this.addtotal = rows.length;
},
//点击撤回
async withdraw() {
......@@ -1061,7 +1142,7 @@ export default {
batchId: this.checkedList[0].batchId,
});
if ((res.code = "200")) {
this.$message('已撤回')
this.$message("已撤回");
this.resetForm();
}
})
......@@ -1403,9 +1484,14 @@ export default {
overflow-x: hidden !important;
}
}
.hide-selection /deep/.el-table__header-wrapper .el-checkbox {
display: none;
.tipred{
color: red;
text-align: left;
font-size: 13px;
}
// .hide-selection /deep/.el-table__header-wrapper .el-checkbox {
// display: none;
// }
</style>
<style>
......@@ -1417,5 +1503,4 @@ export default {
position: absolute;
right: 0;
}
</style>
\ No newline at end of file
src/views/assessZC/projectView.vue
......@@ -445,7 +445,7 @@ export default {
tabListYL: [],
iframeUrl: "",
blobType: "",
inspectdisabled: false,
inspectdisabled: true,
mergingPos: 0,
mergingRows: [],
};
......@@ -574,6 +574,7 @@ export default {
};
params.projectType = projectType;
let res = await chpmProInitiation(params);
this.resetForm()
},
async MaterialWarehous(projectType) {
this.mergingPos = 0;
......@@ -649,7 +650,8 @@ export default {
},
//主列表选中行信息
handleSelectionChange(selection) {
this.inspectdisabled = false;
if(selection.length>0){
this.inspectdisabled = false;
if (Array.isArray(selection) && selection.length > 1) {
this.$refs.multipleTable.toggleRowSelection(selection[0], false);
this.$refs.multipleTable.toggleRowSelection(selection[1], true);
......@@ -658,6 +660,10 @@ export default {
if (!this.ruleFormdialog.projectType) {
this.inspectdisabled = true;
}
}else{
this.inspectdisabled = true;
}
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
......@@ -693,7 +699,6 @@ export default {
this.submitForm();
},
async history(msg) {
console.log("达拉");
let res = await HistoryVersion({ ...msg });
this.tableHistory = res.data.records;
this.innerVisible = true;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!