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