Skip to content

Administrator / project_progress

Go to a project
Commit e72c69fe by 史敦盼
Options

修改

1 parent c40760bc
Inline Side-by-side
Showing with 99 additions and 40 deletions
src/views/assessChecks/checkCompliance.vue
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
</div> </div>
</div> </div>
<p class="Btn"> <p class="Btn">
<span @click="cancel()">取消</span><span @click="save()">保存</span> <span @click="cancel()">取消</span><span @click="save('3', active)">保存</span>
<span @click="submitNexts()">提交</span> <span @click="submitNexts()">提交</span>
</p> </p>
</div> </div>
......
src/views/assessChecks/confirmRelease.vue
...@@ -259,35 +259,44 @@ ...@@ -259,35 +259,44 @@
<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> <el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column label="项目编码" width="150" prop="projectCode"> </el-table-column> <el-table-column label="项目编码" min-width="150" prop="projectCode"> </el-table-column>
<el-table-column prop="projectName" label="项目名称" width="auto" show-overflow-tooltip> <el-table-column
prop="projectName"
label="项目名称"
min-width="200"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column prop="constructionForm" label="建设形式" width="100"> <el-table-column prop="constructionForm" label="建设形式" min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="issueYear" label="项目年度" width="140"> <el-table-column prop="issueYear" label="计划年度" min-width="140">
<template slot-scope="scope"> {{ scope.row.issueYear }}年 </template> <template slot-scope="scope"> {{ scope.row.issueYear }}年 </template>
</el-table-column> </el-table-column>
<el-table-column prop="startupStatus" label="启动日期" width="90"> </el-table-column> <el-table-column prop="startupStatus" label="启动日期" min-width="90">
<el-table-column prop="accountingStatus" label="入账状态" width="90"> </el-table-column> </el-table-column>
<el-table-column prop="accountingProportion" label="累计入账占比" width="90"> <el-table-column prop="accountingStatus" label="入账状态" min-width="90">
</el-table-column>
<el-table-column prop="accountingProportion" label="累计入账占比" min-width="90">
<template slot-scope="scope"> {{ scope.row.accountingProportion }}% </template> <template slot-scope="scope"> {{ scope.row.accountingProportion }}% </template>
</el-table-column> </el-table-column>
<el-table-column prop="entryAmount" label="入账金额（万）" width="120"> <el-table-column prop="entryAmount" label="入账金额（万）" min-width="120">
</el-table-column>
<el-table-column prop="currentProgress" label="当前进度" min-width="120">
</el-table-column>
<el-table-column prop="contractNumber" label="合同编号" min-width="220">
</el-table-column> </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 <el-table-column
prop="contractName" prop="contractName"
label="合同名称" label="合同名称"
width="auto" min-width="200"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110"> </el-table-column> <el-table-column prop="projectLeader" label="负责人" min-width="110"> </el-table-column>
<el-table-column label="操作" width="130"> <el-table-column label="操作" min-width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@click="handleClick(scope.row, scope.$index, addtableData)" @click="handleClick(scope.row, scope.$index, addtableData)"
...@@ -334,7 +343,7 @@ ...@@ -334,7 +343,7 @@
<el-form-item label="项目名称:" prop="projectName" class="fromItem"> <el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input v-model="ruleFormZJ.projectName" placeholder="请输入" clearable></el-input> <el-input v-model="ruleFormZJ.projectName" placeholder="请输入" clearable></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 v-model="ruleFormZJ.issueYear" placeholder="请选择" clearable>
<el-option <el-option
v-for="(item, index) in yearsList" v-for="(item, index) in yearsList"
...@@ -365,6 +374,7 @@ ...@@ -365,6 +374,7 @@
<div class="setscrolldialogx"> <div class="setscrolldialogx">
<el-table <el-table
@select="handleSelectionChangeZJ" @select="handleSelectionChangeZJ"
@row-click="handleRowClickSelf"
@select-all="selectAll" @select-all="selectAll"
ref="multipleTableZJ" ref="multipleTableZJ"
:data="zjtableData" :data="zjtableData"
...@@ -391,7 +401,7 @@ ...@@ -391,7 +401,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="constructionForm" label="建设形式" min-width="100"> <el-table-column prop="constructionForm" label="建设形式" min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="issueYear" label="项目年度" min-width="140"> <el-table-column prop="issueYear" label="计划年度" min-width="140">
<template slot-scope="scope"> {{ scope.row.issueYear }}年 </template> <template slot-scope="scope"> {{ scope.row.issueYear }}年 </template>
</el-table-column> </el-table-column>
...@@ -557,6 +567,14 @@ export default { ...@@ -557,6 +567,14 @@ export default {
// this.submitForm(); // this.submitForm();
}, },
methods: { methods: {
handleRowClickSelf(row, column, event) {
if (!['1', '2', '3'].includes(row.zcstate) && row.contractNumber && row.projectCode) {
this.$refs['multipleTableZJ'].toggleRowSelection(row)
this.addZJList = this.$refs.multipleTableZJ.selection
} else {
this.$message.warning('项目编码或合同编码为空')
}
},
timeChange(time) { timeChange(time) {
console.log('tttttt', time) console.log('tttttt', time)
if (time) { if (time) {
...@@ -822,7 +840,13 @@ export default { ...@@ -822,7 +840,13 @@ export default {
this.dialogAdd = false this.dialogAdd = false
}, },
selectable(item, index) { selectable(item, index) {
if (item.zcstate == 1 || item.zcstate == 2 || item.zcstate == 3) { if (
item.zcstate == 1 ||
item.zcstate == 2 ||
item.zcstate == 3 ||
!item.contractNumber ||
!item.projectCode
) {
return false return false
} else { } else {
return true return true
......
src/views/assessChecks/materialAcquisition.vue
...@@ -181,6 +181,12 @@ ...@@ -181,6 +181,12 @@
<el-form-item label="后评估专家:" prop="expertName" class="fromItem"> <el-form-item label="后评估专家:" prop="expertName" class="fromItem">
<el-input v-model="ruleFormdialog.expertName" disabled></el-input> <el-input v-model="ruleFormdialog.expertName" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目编码:" prop="projectCode" class="fromItem">
<el-input v-model="ruleFormdialog.projectCode" disabled></el-input>
</el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input v-model="ruleFormdialog.projectName" disabled></el-input>
</el-form-item>
<el-form-item label="工作组织情况:" class="textarea"> <el-form-item label="工作组织情况:" class="textarea">
<el-input type="textarea" v-model="ruleFormdialog.desc" disabled></el-input> <el-input type="textarea" v-model="ruleFormdialog.desc" disabled></el-input>
</el-form-item> </el-form-item>
......
src/views/assessZC/checkCompliance.vue
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
</div> </div>
</div> </div>
<p class="Btn"> <p class="Btn">
<span @click="cancel()">取消</span><span @click="save()">保存</span> <span @click="cancel()">取消</span><span @click="save('3', active)">保存</span>
<span @click="submitNexts()">提交</span> <span @click="submitNexts()">提交</span>
</p> </p>
</div> </div>
......
src/views/assessZC/confirmRelease.vue
...@@ -255,35 +255,44 @@ ...@@ -255,35 +255,44 @@
<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> <el-table-column label="序号" width="55" type="index"> </el-table-column>
<el-table-column label="项目编码" width="150" prop="projectCode"> </el-table-column> <el-table-column label="项目编码" min-width="150" prop="projectCode"> </el-table-column>
<el-table-column prop="projectName" label="项目名称" width="auto" show-overflow-tooltip> <el-table-column
prop="projectName"
label="项目名称"
min-width="200"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column prop="constructionForm" label="建设形式" width="100"> <el-table-column prop="constructionForm" label="建设形式" min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="issueYear" label="项目年度" width="140"> <el-table-column prop="issueYear" label="计划年度" min-width="140">
<template slot-scope="scope"> {{ scope.row.issueYear }}年 </template> <template slot-scope="scope"> {{ scope.row.issueYear }}年 </template>
</el-table-column> </el-table-column>
<el-table-column prop="startupStatus" label="启动日期" width="90"> </el-table-column> <el-table-column prop="startupStatus" label="启动日期" min-width="90">
<el-table-column prop="accountingStatus" label="入账状态" width="90"> </el-table-column> </el-table-column>
<el-table-column prop="accountingProportion" label="累计入账占比" width="90"> <el-table-column prop="accountingStatus" label="入账状态" min-width="90">
</el-table-column>
<el-table-column prop="accountingProportion" label="累计入账占比" min-width="90">
<template slot-scope="scope"> {{ scope.row.accountingProportion }}% </template> <template slot-scope="scope"> {{ scope.row.accountingProportion }}% </template>
</el-table-column> </el-table-column>
<el-table-column prop="entryAmount" label="入账金额（万）" width="120"> <el-table-column prop="entryAmount" label="入账金额（万）" min-width="120">
</el-table-column>
<el-table-column prop="currentProgress" label="当前进度" min-width="120">
</el-table-column>
<el-table-column prop="contractNumber" label="合同编号" min-width="220">
</el-table-column> </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 <el-table-column
prop="contractName" prop="contractName"
label="合同名称" label="合同名称"
width="auto" min-width="200"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column prop="projectLeader" label="负责人" width="110"> </el-table-column> <el-table-column prop="projectLeader" label="负责人" min-width="110"> </el-table-column>
<el-table-column label="操作" width="130"> <el-table-column label="操作" min-width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@click="handleClick(scope.row, scope.$index, addtableData)" @click="handleClick(scope.row, scope.$index, addtableData)"
...@@ -329,7 +338,7 @@ ...@@ -329,7 +338,7 @@
<el-form-item label="项目名称:" prop="projectName" class="fromItem"> <el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input v-model="ruleFormZJ.projectName" placeholder="请输入" clearable></el-input> <el-input v-model="ruleFormZJ.projectName" placeholder="请输入" clearable></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 v-model="ruleFormZJ.issueYear" placeholder="请选择" clearable>
<el-option <el-option
v-for="(item, index) in yearsList" v-for="(item, index) in yearsList"
...@@ -361,9 +370,7 @@ ...@@ -361,9 +370,7 @@
<el-table <el-table
@select="handleSelectionChangeZJ" @select="handleSelectionChangeZJ"
@select-all="selectAll" @select-all="selectAll"
@row-click=" @row-click="handleRowClickSelf"
(row, column, event) => handleRowClick(row, column, event, 'multipleTableZJ')
"
ref="multipleTableZJ" ref="multipleTableZJ"
:data="zjtableData" :data="zjtableData"
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
...@@ -389,7 +396,7 @@ ...@@ -389,7 +396,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="constructionForm" label="建设形式" min-width="100"> <el-table-column prop="constructionForm" label="建设形式" min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="issueYear" label="项目年度" min-width="140"> <el-table-column prop="issueYear" label="计划年度" min-width="140">
<template slot-scope="scope"> {{ scope.row.issueYear }}年 </template> <template slot-scope="scope"> {{ scope.row.issueYear }}年 </template>
</el-table-column> </el-table-column>
...@@ -555,6 +562,14 @@ export default { ...@@ -555,6 +562,14 @@ export default {
// this.submitForm(); // this.submitForm();
}, },
methods: { methods: {
handleRowClickSelf(row, column, event) {
if (!['1', '2', '3'].includes(row.zcstate) && row.contractNumber && row.projectCode) {
this.$refs['multipleTableZJ'].toggleRowSelection(row)
this.addZJList = this.$refs.multipleTableZJ.selection
} else {
this.$message.warning('项目编码或合同编码为空')
}
},
timeChange(time) { timeChange(time) {
console.log('tttttt', time) console.log('tttttt', time)
if (time) { if (time) {
...@@ -820,7 +835,13 @@ export default { ...@@ -820,7 +835,13 @@ export default {
this.dialogAdd = false this.dialogAdd = false
}, },
selectable(item, index) { selectable(item, index) {
if (item.zcstate == 1 || item.zcstate == 2 || item.zcstate == 3) { if (
item.zcstate == 1 ||
item.zcstate == 2 ||
item.zcstate == 3 ||
!item.contractNumber ||
!item.projectCode
) {
return false return false
} else { } else {
return true return true
......
src/views/assessZC/materialAcquisition.vue
...@@ -181,6 +181,12 @@ ...@@ -181,6 +181,12 @@
<el-form-item label="后评估专家:" prop="expertName" class="fromItem"> <el-form-item label="后评估专家:" prop="expertName" class="fromItem">
<el-input v-model="ruleFormdialog.expertName" disabled></el-input> <el-input v-model="ruleFormdialog.expertName" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目编码:" prop="projectCode" class="fromItem">
<el-input v-model="ruleFormdialog.projectCode" disabled></el-input>
</el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input v-model="ruleFormdialog.projectName" disabled></el-input>
</el-form-item>
<el-form-item label="工作组织情况:" class="textarea"> <el-form-item label="工作组织情况:" class="textarea">
<el-input type="textarea" v-model="ruleFormdialog.desc" disabled></el-input> <el-input type="textarea" v-model="ruleFormdialog.desc" disabled></el-input>
</el-form-item> </el-form-item>
......
src/views/assessZC/projectView.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<el-form-item label="项目名称:" prop="projectName" class="fromItem"> <el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input v-model="ruleForm.projectName" placeholder="请输入" clearable></el-input> <el-input v-model="ruleForm.projectName" placeholder="请输入" clearable></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="ruleForm.issueYear" placeholder="请选择" clearable> <el-select v-model="ruleForm.issueYear" placeholder="请选择" clearable>
<el-option <el-option
v-for="(item, index) in yearsList" v-for="(item, index) in yearsList"
...@@ -80,8 +80,10 @@ ...@@ -80,8 +80,10 @@
<el-table-column prop="projectName" label="项目名称" show-overflow-tooltip> <el-table-column prop="projectName" label="项目名称" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="issueYear" label="项目年度" width="90"> <el-table-column prop="issueYear" label="计划年度" width="90">
<template slot-scope="scope"> {{ scope.row.issueYear }}年 </template> <template slot-scope="scope">
{{ scope.row.issueYear ? scope.row.issueYear + '年' : '' }}
</template>
</el-table-column> </el-table-column>
<el-table-column prop="projectType" label="项目类型" width="120"> <el-table-column prop="projectType" label="项目类型" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!