Commit b6a0e3cb by xiehao

fix:修复了承建单位不显示问题

1 parent 88d8e4d4
Showing with 384 additions and 431 deletions
......@@ -5,72 +5,48 @@
<div class="search_menu_item_container">
<div class="search_menu_item">
<span class="search_title">组织单位</span>
<!-- <el-input
v-no-backslash
v-model="searchParams.let1"
maxlength="100"
placeholder="请输入内容"
class="search_item"
></el-input> -->
<el-select
v-model="searchParams.let1"
placeholder="请选择"
class="search_item"
filterable
>
<el-select v-model="searchParams.let1" placeholder="请选择" class="search_item" filterable>
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
v-for="item in sysOrgOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
<div class="search_menu_item">
<span class="search_title">业务部门</span>
<!-- <el-input
v-no-backslash
v-model="searchParams.let2"
maxlength="100"
placeholder="请输入内容"
class="search_item"
></el-input> -->
<el-select
filterable
v-model="searchParams.let2"
placeholder="请选择"
class="search_item"
>
<el-select filterable v-model="searchParams.let2" placeholder="请选择" class="search_item">
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
v-for="item in sysDeptOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
<div class="search_menu_item">
<span class="search_title">项目名称</span>
<span class="search_title">系统名称</span>
<el-input
v-no-backslash
v-model="searchParams.let3"
maxlength="100"
placeholder="请输入内容"
class="search_item"
v-no-backslash
v-model="searchParams.let3"
maxlength="100"
placeholder="请输入内容"
class="search_item"
></el-input>
</div>
<div class="search_menu_item">
<span class="search_title">建设类型</span>
<el-select
v-model="searchParams.let4"
placeholder="请选择"
class="search_item"
v-model="searchParams.let4"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in jianSheLeiXingSelect"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in jianSheLeiXingSelect"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</div>
......@@ -78,17 +54,17 @@
<div class="search_menu_btn_container">
<div class="query_btn" @click="search_table">
<img
class="btn_icon"
src="@/assets/archi-ele-list/search.png"
alt=""
class="btn_icon"
src="@/assets/archi-ele-list/search.png"
alt=""
/>
<p>查询</p>
</div>
<div class="reset_btn" @click="reset">
<img
class="btn_icon"
src="@/assets/archi-ele-list/reset.png"
alt=""
class="btn_icon"
src="@/assets/archi-ele-list/reset.png"
alt=""
/>
<p>重置</p>
</div>
......@@ -96,56 +72,54 @@
</div>
<div class="search_btn">
<el-button
type="primary"
size="medium"
icon="el-icon-document-add"
@click="operation('add', null)"
>新建项目</el-button
>
<!-- <el-button type="primary" size="medium" icon="el-icon-document-add" @click="operation('add', null)">续建项目</el-button> -->
<!-- <el-button type="primary" size="medium" icon="el-icon-delete">删除</el-button> -->
type="primary"
size="medium"
icon="el-icon-document-add"
@click="operation('add', null)"
>新建项目
</el-button>
</div>
<el-table
:height="tableHeight"
v-loading="loading"
:data="tableData"
stripe
border
:height="tableHeight"
v-loading="loading"
:data="tableData"
stripe
border
>
<el-table-column
type="index"
label="序号"
width="80"
:index="indexMethod"
align="center"
type="index"
label="序号"
width="80"
:index="indexMethod"
align="center"
></el-table-column>
<el-table-column
prop="manageOrgId"
label="建设单位"
align="center"
width="160"
show-overflow-tooltip
:formatter="
prop="manageOrgId"
label="建设单位"
align="center"
width="160"
show-overflow-tooltip
:formatter="
(row, column, cellValue, index) =>
formatterDept(row, column, cellValue, index, 'sysOrgOptions')
"
></el-table-column>
<el-table-column
prop="manageDeptId"
label="业务部门"
show-overflow-tooltip
align="center"
:formatter="
prop="manageDeptId"
label="业务部门"
show-overflow-tooltip
align="center"
:formatter="
(row, column, cellValue, index) =>
formatterDept(row, column, cellValue, index, 'sysDeptOptions')
"
></el-table-column>
<el-table-column
prop="appName"
label="系统名称"
align="center"
width="200"
:show-overflow-tooltip="true"
prop="appName"
label="系统名称"
align="center"
width="200"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column label="建设类型" align="center">
<template slot-scope="scope">
......@@ -154,16 +128,16 @@
</template>
</el-table-column>
<el-table-column
prop="prjName"
label="项目名称"
align="center"
width="200"
:show-overflow-tooltip="true"
prop="prjName"
label="项目名称"
align="center"
width="200"
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
<span class="prjName" @click="openDetail(row)">{{
row.prjName
}}</span>
row.prjName
}}</span>
</template>
</el-table-column>
<el-table-column label="项目类型" align="center">
......@@ -178,7 +152,7 @@
</template>
</el-table-column>
<el-table-column prop="projAmount" label="项目金额" align="right">
<template slot-scope="scope">
<template v-slot="scope">
<span style="font-weight: bold">{{ scope.row.projAmount | formatMoney }}</span>
</template>
</el-table-column>
......@@ -192,27 +166,29 @@
<el-table-column label="操作" width="200" align="center">
<template slot-scope="scope">
<div
style="
style="
display: flex;
align-items: center;
justify-content: center;
"
>
<el-button
icon="el-icon-edit"
type="primary"
size="mini"
@click="operation('edit', scope.row)"
:disabled="scope.row.state == 1"
>编辑</el-button
icon="el-icon-edit"
type="primary"
size="mini"
@click="operation('edit', scope.row)"
:disabled="scope.row.state == 1"
>编辑
</el-button
>
<el-button
class="shanChu_btn"
icon="el-icon-delete"
size="mini"
@click="operation('delete', scope.row)"
:disabled="scope.row.state == 1"
>删除</el-button
class="shanChu_btn"
icon="el-icon-delete"
size="mini"
@click="operation('delete', scope.row)"
:disabled="scope.row.state == 1"
>删除
</el-button
>
</div>
</template>
......@@ -224,30 +200,30 @@
:total="50">
</el-pagination> -->
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="pager.current"
:page-sizes="pager.sizes"
:page-size="pager.size"
layout="total, sizes, prev, pager, next, jumper"
:total="pager.total"
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="pager.current"
:page-sizes="pager.sizes"
:page-size="pager.size"
layout="total, sizes, prev, pager, next, jumper"
:total="pager.total"
>
</el-pagination>
</div>
<el-dialog
:title="is_add_edit == 'add' ? '新建系统' : '编辑系统'"
:visible.sync="add_dialog"
:center="false"
:close-on-click-modal="false"
width="80%"
@close="handleClose()"
:title="is_add_edit == 'add' ? '新建系统' : '编辑系统'"
:visible.sync="add_dialog"
:center="false"
:close-on-click-modal="false"
width="80%"
@close="handleClose()"
>
<el-form
:model="ruleForm"
ref="form"
:rules="rules"
style="display: flex; flex-wrap: wrap"
:model="ruleForm"
ref="form"
:rules="rules"
style="display: flex; flex-wrap: wrap"
>
<el-form-item label="关联系统:" prop="let1" style="width: 30%">
<el-input v-model="ruleForm.let1" readonly>
......@@ -257,14 +233,14 @@
</el-input>
</el-form-item>
<el-form-item
label="项目名称:"
prop="let2"
style="width: 30%; margin-left: 46px"
label="项目名称:"
prop="let2"
style="width: 30%; margin-left: 46px"
>
<el-input
v-no-backslash
v-model="ruleForm.let2"
maxlength="100"
v-no-backslash
v-model="ruleForm.let2"
maxlength="100"
></el-input>
</el-form-item>
<!--项目金额-只可以输入金额-->
......@@ -293,9 +269,9 @@
</el-select>
</el-form-item>
<el-form-item
label="前期项目:"
prop="let4"
style="width: 29.5%; margin-left: 10px"
label="前期项目:"
prop="let4"
style="width: 29.5%; margin-left: 10px"
>
<el-input v-model="ruleForm.let4" readonly>
<div slot="append" @click="operation('open_add_dialog3', null)">
......@@ -314,31 +290,31 @@
<div style="text-align: left; margin-left: 10px">项目资料:</div>
<el-table :data="tableData4" stripe border>
<el-table-column
type="index"
label="序号"
width="80"
align="center"
type="index"
label="序号"
width="80"
align="center"
></el-table-column>
<el-table-column
prop="label"
label="资料类型"
align="center"
prop="label"
label="资料类型"
align="center"
></el-table-column>
<el-table-column label="资料名称" align="center">
<template slot-scope="scope">
<el-upload
class="upload-demo"
action="/eadc-shared-ability/oss/upload"
ref="upload"
:on-remove="
class="upload-demo"
action="/eadc-shared-ability/oss/upload"
ref="upload"
:on-remove="
(file, fileList) => handleRemove(file, fileList, scope.row)
"
:on-success="
:on-success="
(res, file, fileList) =>
handleFileUploadSuccess(res, file, fileList, scope.row)
"
:limit="1"
:file-list="scope.row.fileList"
:limit="1"
:file-list="scope.row.fileList"
>
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
......@@ -348,64 +324,45 @@
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="dialogOperation('save', null)"
>保存</el-button
>保存</el-button
>
<el-button @click="add_dialog = false">取消</el-button>
</span>
</el-dialog>
<el-dialog
title="选择系统"
:visible.sync="add_dialog2"
:center="false"
:close-on-click-modal="false"
width="80%"
title="选择系统"
:visible.sync="add_dialog2"
:center="false"
:close-on-click-modal="false"
width="80%"
>
<div class="search_menu" style="justify-content: center">
<div class="search_menu_item_container">
<div class="search_menu_item" style="width: auto">
<span class="search_title">组织单位</span>
<!-- <el-input
v-no-backslash
v-model="searchParams2.let1"
maxlength="100"
placeholder="请输入内容"
class="search_item"
></el-input> -->
<el-select v-model="searchParams2.let1" placeholder="请选择">
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
<el-select filterable v-model="searchParams2.let1" placeholder="请选择" class="search_item">
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</div>
<div class="search_menu_item" style="width: auto">
<span class="search_title">业务部门</span>
<!-- <el-input
v-no-backslash
v-model="searchParams2.let2"
maxlength="100"
placeholder="请输入内容"
class="search_item"
></el-input> -->
<el-select
filterable
v-model="searchParams2.let2"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
<el-select filterable v-model="searchParams2.let2" placeholder="请选择" class="search_item">
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</div>
<div class="search_menu_item" style="width: auto">
<span class="search_title">项目名称</span>
<span class="search_title">系统名称</span>
<el-input
v-no-backslash
v-model="searchParams2.let3"
......@@ -416,16 +373,12 @@
</div>
<div class="search_menu_item" style="width: auto">
<span class="search_title">建设类型</span>
<el-select
v-model="searchParams2.let4"
placeholder="请选择"
class="search_item"
>
<el-select v-model="searchParams2.let4" placeholder="请选择" class="search_item">
<el-option
v-for="item in jianSheLeiXingSelect"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in jianSheLeiXingSelect"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</div>
......@@ -433,53 +386,53 @@
<div class="search_menu_btn_container">
<div class="query_btn" @click="search_table2">
<img
class="btn_icon"
src="@/assets/archi-ele-list/search.png"
alt=""
class="btn_icon"
src="@/assets/archi-ele-list/search.png"
alt=""
/>
<p>查询</p>
</div>
<div class="reset_btn" @click="reset2">
<img
class="btn_icon"
src="@/assets/archi-ele-list/reset.png"
alt=""
class="btn_icon"
src="@/assets/archi-ele-list/reset.png"
alt=""
/>
<p>重置</p>
</div>
</div>
</div>
<el-table
height="300"
v-loading="loading2"
@selection-change="select_table_rows"
:data="tableData2"
stripe
border
height="300"
v-loading="loading2"
@selection-change="select_table_rows"
:data="tableData2"
stripe
border
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column
type="index"
label="序号"
width="80"
align="center"
type="index"
label="序号"
width="80"
align="center"
></el-table-column>
<el-table-column
prop="manageOrgId_"
label="组织单位"
align="center"
prop="manageOrgId_"
label="组织单位"
align="center"
></el-table-column>
<el-table-column
prop="manageDeptId_"
label="业务部门"
align="center"
prop="manageDeptId_"
label="业务部门"
align="center"
></el-table-column>
<el-table-column
prop="appName"
label="系统名称"
align="center"
width="200"
:show-overflow-tooltip="true"
prop="appName"
label="系统名称"
align="center"
width="200"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column label="建设类型" align="center">
<template slot-scope="scope">
......@@ -487,122 +440,98 @@
<span v-else>自建</span>
</template>
</el-table-column>
<el-table-column prop="buildOrg" label="承建单位" align="center">
<template v-slot="scope">
<span>{{ scope.row.buildOrg | orgNameFilter(that) }}</span>
</template>
</el-table-column>
<el-table-column
prop="buildOrg"
label="承建单位"
align="center"
></el-table-column>
<el-table-column
prop="projectManager"
label="项目经理"
align="center"
></el-table-column>
<el-table-column
prop="createMan"
label="创建人"
align="center"
prop="projectManager"
label="项目经理"
align="center"
></el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
align="center"
prop="createTime"
label="创建时间"
align="center"
></el-table-column>
</el-table>
<el-pagination
background
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"
:current-page="pager2.current"
:page-sizes="pager2.sizes"
:page-size="pager2.size"
layout="total, sizes, prev, pager, next, jumper"
:total="pager2.total"
background
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"
:current-page="pager2.current"
:page-sizes="pager2.sizes"
:page-size="pager2.size"
layout="total, sizes, prev, pager, next, jumper"
:total="pager2.total"
>
</el-pagination>
<span slot="footer" class="dialog-footer">
<el-button
class="greenButton"
@click="dialogOperation('selectSystem', null)"
>确定</el-button
class="greenButton"
@click="dialogOperation('selectSystem', null)"
>确定</el-button
>
<el-button @click="dialogOperation('cancelSelectSystem', null)"
>取消</el-button
>取消</el-button
>
</span>
</el-dialog>
<el-dialog
title="选择项目"
:visible.sync="add_dialog3"
:center="false"
:close-on-click-modal="false"
width="80%"
title="选择项目"
:visible.sync="add_dialog3"
:center="false"
:close-on-click-modal="false"
width="80%"
>
<div class="search_menu" style="justify-content: center">
<div class="search_menu_item_container">
<div class="search_menu_item" style="width: auto">
<span class="search_title">组织单位</span>
<!-- <el-input
v-no-backslash
v-model="searchParams3.let1"
maxlength="100"
placeholder="请输入内容"
class="search_item"
></el-input> -->
<el-select v-model="searchParams3.let1" placeholder="请选择">
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
<el-select filterable v-model="searchParams3.let1" placeholder="请选择" class="search_item">
<el-option
v-for="item in sysOrgOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
<div class="search_menu_item" style="width: auto">
<span class="search_title">业务部门</span>
<!-- <el-input
v-no-backslash
v-model="searchParams3.let2"
maxlength="100"
placeholder="请输入内容"
class="search_item"
></el-input> -->
<el-select
filterable
v-model="searchParams2.let2"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
<el-select filterable v-model="searchParams2.let2" placeholder="请选择" class="search_item">
<el-option
v-for="item in sysDeptOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
<div class="search_menu_item" style="width: auto">
<span class="search_title">系统名称</span>
<span class="search_title">项目名称</span>
<el-input
v-no-backslash
v-model="searchParams.let3"
maxlength="100"
placeholder="请输入内容"
class="search_item"
v-no-backslash
v-model="searchParams.let3"
maxlength="100"
placeholder="请输入内容"
class="search_item"
></el-input>
</div>
<div class="search_menu_item" style="width: auto">
<span class="search_title">建设类型</span>
<el-select
v-model="searchParams3.let4"
placeholder="请选择"
class="search_item"
v-model="searchParams3.let4"
placeholder="请选择"
class="search_item"
>
<el-option
v-for="item in jianSheLeiXingSelect"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in jianSheLeiXingSelect"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</div>
......@@ -610,53 +539,53 @@
<div class="search_menu_btn_container">
<div class="query_btn" @click="search_table3">
<img
class="btn_icon"
src="@/assets/archi-ele-list/search.png"
alt=""
class="btn_icon"
src="@/assets/archi-ele-list/search.png"
alt=""
/>
<p>查询</p>
</div>
<div class="reset_btn" @click="reset3">
<img
class="btn_icon"
src="@/assets/archi-ele-list/reset.png"
alt=""
class="btn_icon"
src="@/assets/archi-ele-list/reset.png"
alt=""
/>
<p>重置</p>
</div>
</div>
</div>
<el-table
height="300"
v-loading="loading3"
@selection-change="select_table_row3"
:data="tableData3"
stripe
border
height="300"
v-loading="loading3"
@selection-change="select_table_row3"
:data="tableData3"
stripe
border
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column
type="index"
label="序号"
width="80"
align="center"
type="index"
label="序号"
width="80"
align="center"
></el-table-column>
<el-table-column
prop="manageOrgId_"
label="组织单位"
align="center"
prop="manageOrgId_"
label="组织单位"
align="center"
></el-table-column>
<el-table-column
prop="manageDeptId_"
label="业务部门"
align="center"
prop="manageDeptId_"
label="业务部门"
align="center"
></el-table-column>
<el-table-column
prop="appName"
label="系统名称"
align="center"
width="200"
:show-overflow-tooltip="true"
prop="appName"
label="系统名称"
align="center"
width="200"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column label="建设类型" align="center">
<template slot-scope="scope">
......@@ -665,11 +594,11 @@
</template>
</el-table-column>
<el-table-column
prop="prjName"
label="项目名称"
align="center"
width="200"
:show-overflow-tooltip="true"
prop="prjName"
label="项目名称"
align="center"
width="200"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column label="是否续建" align="center">
<template slot-scope="scope">
......@@ -677,76 +606,71 @@
<span v-else></span>
</template>
</el-table-column>
<el-table-column prop="buildOrg" label="承建单位" align="center">
<template v-slot="scope">
<span>{{ scope.row.buildOrg | orgNameFilter(that) }}</span>
</template>
</el-table-column>
<!--<el-table-column-->
<!-- prop="projectManager"-->
<!-- label="项目经理"-->
<!-- align="center"-->
<!--&gt;</el-table-column>-->
<el-table-column
prop="buildOrg"
label="承建单位"
align="center"
></el-table-column>
<el-table-column
prop="projectManager"
label="项目经理"
align="center"
></el-table-column>
<el-table-column
prop="createMan"
label="创建人"
align="center"
></el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
align="center"
prop="createTime"
label="创建时间"
align="center"
></el-table-column>
</el-table>
<el-pagination
background
@size-change="handleSizeChange3"
@current-change="handleCurrentChange3"
:current-page="pager3.current"
:page-sizes="pager3.sizes"
:page-size="pager3.size"
layout="total, sizes, prev, pager, next, jumper"
:total="pager3.total"
background
@size-change="handleSizeChange3"
@current-change="handleCurrentChange3"
:current-page="pager3.current"
:page-sizes="pager3.sizes"
:page-size="pager3.size"
layout="total, sizes, prev, pager, next, jumper"
:total="pager3.total"
>
</el-pagination>
<span slot="footer" class="dialog-footer">
<el-button
class="greenButton"
@click="dialogOperation('selectProject', null)"
>确定</el-button
class="greenButton"
@click="dialogOperation('selectProject', null)"
>确定</el-button
>
<el-button @click="dialogOperation('cancelSelectProject', null)"
>取消</el-button
>取消</el-button
>
</span>
</el-dialog>
<el-dialog
title="选择报告"
:visible.sync="add_dialog4"
:center="false"
:close-on-click-modal="false"
width="80%"
title="选择报告"
:visible.sync="add_dialog4"
:center="false"
:close-on-click-modal="false"
width="80%"
>
<span slot="footer" class="dialog-footer">
<el-button
class="greenButton"
@click="dialogOperation('selectReport', null)"
>确定</el-button
class="greenButton"
@click="dialogOperation('selectReport', null)"
>确定</el-button
>
<el-button @click="dialogOperation('cancelSelectReport', null)"
>取消</el-button
>取消</el-button
>
</span>
</el-dialog>
<!-- 项目信息详情 -->
<ProjectDetail
:sysOrgOptions="sysOrgOptions"
:sysDeptOptions="sysDeptOptions"
:buildTypeOptins="jianSheLeiXingSelect"
:row-data="rowData"
:visible.sync="projectDetailVisible"
:sysOrgOptions="sysOrgOptions"
:sysDeptOptions="sysDeptOptions"
:buildTypeOptins="jianSheLeiXingSelect"
:row-data="rowData"
:visible.sync="projectDetailVisible"
/>
</div>
</template>
......@@ -764,12 +688,13 @@ import {
getOrgOption,
deleteProjectInfoManageTable
} from '@/api/index.js'
import { MessageBox, Message } from 'element-ui'
import {MessageBox, Message} from 'element-ui'
import $ from 'jquery'
import { getDictTypeOptions } from '@/utils'
import {getDictTypeOptions} from '@/utils'
export default {
name: 'projectInfoManage',
components: { ProjectDetail },
components: {ProjectDetail},
data() {
return {
add_dialog2: false,
......@@ -785,10 +710,10 @@ export default {
let7: null,
},
rules: {
let1: [{ required: true, message: '请选择关联系统', trigger: 'blur' }],
let2: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
let1: [{required: true, message: '请选择关联系统', trigger: 'blur'}],
let2: [{required: true, message: '请输入项目名称', trigger: 'blur'}],
let3: [
{ required: true, message: '请选择是否续建', trigger: 'change' },
{required: true, message: '请选择是否续建', trigger: 'change'},
],
},
add_dialog: false,
......@@ -902,7 +827,7 @@ export default {
})
})
getDeptOption().then(res => {
if(res.code === 200) {
if (res.code === 200) {
this.sysDeptOptions = res.data.map(v => {
return {
label: v.orgName,
......@@ -912,7 +837,7 @@ export default {
}
})
getOrgOption().then(res => {
if(res.code === 200) {
if (res.code === 200) {
this.sysOrgOptions = res.data.map(v => {
return {
label: v.orgName,
......@@ -1098,6 +1023,8 @@ export default {
},
]
this.ruleForm.let2 = row.prjName
this.ruleForm.let6 = row.projAmount
this.ruleForm.let7 = row.projectInitiationTime
this.ruleForm.let3 = row.prjPlanClass
if (row.prjPlanClass == 2) {
this.selectRow3 = [
......@@ -1193,18 +1120,18 @@ export default {
}
queryProjectInfoManageTable(params).then((res) => {
if (res.code == 200) {
this.loading3 = false
res.data.records.map(item => {
const resultItem1 = this.sysOrgOptions.filter(item2 => item2.value == item.manageOrgId);
const resultItem2 = this.sysDeptOptions.filter(item2 => item2.value == item.manageDeptId);
this.loading3 = false
res.data.records.map(item => {
const resultItem1 = this.sysOrgOptions.filter(item2 => item2.value == item.manageOrgId);
const resultItem2 = this.sysDeptOptions.filter(item2 => item2.value == item.manageDeptId);
item.manageOrgId_ = resultItem1.length > 0 ? resultItem1[0].label : null;
item.manageDeptId_ = resultItem2.length > 0 ? resultItem2[0].label : null;
})
this.tableData3 = res.data.records
this.pager3.current = res.data.current
this.pager3.total = res.data.total
this.pager3.size = res.data.size
item.manageOrgId_ = resultItem1.length > 0 ? resultItem1[0].label : null;
item.manageDeptId_ = resultItem2.length > 0 ? resultItem2[0].label : null;
})
this.tableData3 = res.data.records
this.pager3.current = res.data.current
this.pager3.total = res.data.total
this.pager3.size = res.data.size
}
})
},
......@@ -1235,15 +1162,15 @@ export default {
this.$refs.form.validate((valid) => {
if (valid) {
let agoPrjCode,
agoPrjId,
agoPrjName,
appCode,
appId,
appName,
buildOrg,
buildType,
manageDeptId,
manageOrgId
agoPrjId,
agoPrjName,
appCode,
appId,
appName,
buildOrg,
buildType,
manageDeptId,
manageOrgId
if (this.ruleForm.let3 == 2) {
if (this.selectRow3.length == 0) {
Message({
......@@ -1296,9 +1223,9 @@ export default {
filesValue,
}
const requestParams =
this.is_add_edit == 'add'
? params
: { ...params, prjId: this.prjId }
this.is_add_edit == 'add'
? params
: {...params, prjId: this.prjId}
if (this.is_add_edit == 'add') {
addProjectManageTable(requestParams).then((res) => {
if (res.code == 200) {
......@@ -1377,17 +1304,17 @@ export default {
}
querysystemInfoManageTable(params).then((res) => {
if (res.code == 200) {
this.loading2 = false
res.data.records.map(item => {
const resultItem1 = this.sysOrgOptions.filter(item2 => item2.value == item.manageOrgId);
const resultItem2 = this.sysDeptOptions.filter(item2 => item2.value == item.manageDeptId);
item.manageOrgId_ = resultItem1.length > 0 ? resultItem1[0].label : null;
item.manageDeptId_ = resultItem2.length > 0 ? resultItem2[0].label : null;
})
this.tableData2 = res.data.records
this.pager2.current = res.data.current
this.pager2.total = res.data.total
this.pager2.size = res.data.size
this.loading2 = false
res.data.records.map(item => {
const resultItem1 = this.sysOrgOptions.filter(item2 => item2.value == item.manageOrgId);
const resultItem2 = this.sysDeptOptions.filter(item2 => item2.value == item.manageDeptId);
item.manageOrgId_ = resultItem1.length > 0 ? resultItem1[0].label : null;
item.manageDeptId_ = resultItem2.length > 0 ? resultItem2[0].label : null;
})
this.tableData2 = res.data.records
this.pager2.current = res.data.current
this.pager2.total = res.data.total
this.pager2.size = res.data.size
}
// res.records.map(item => {
// const startTime_year = String(new Date(item.startTime).getFullYear());
......@@ -1442,11 +1369,11 @@ export default {
const search_menu_height = $('.search_menu').height()
const search_btn_height = $('.search_btn').outerHeight(true)
this.tableHeight =
table_container_height -
search_menu_height -
search_btn_height -
90 +
'px'
table_container_height -
search_menu_height -
search_btn_height -
90 +
'px'
},
search_table() {
//搜索
......@@ -1524,16 +1451,19 @@ export default {
.confirmClass {
background-color: #0d867f !important;
}
.el-message-box__content {
padding: 60px 15px 60px 15px;
}
</style>
<style scoped lang="scss">
@import '@/styles/elementui.scss';
.prjName {
color: $color-primary;
cursor: pointer;
}
.version_btn {
display: flex;
align-items: center;
......@@ -1548,6 +1478,7 @@ export default {
cursor: pointer;
margin-left: 15px;
}
.cancel_version_btn {
display: flex;
align-items: center;
......@@ -1562,6 +1493,7 @@ export default {
cursor: pointer;
margin-left: 15px;
}
.projectInfoManage {
width: 100%;
height: 100%;
......@@ -1570,52 +1502,63 @@ export default {
justify-content: flex-start;
align-items: center;
}
.el-button--primary {
background: rgba(13, 134, 127, 0.1);
color: #0d867f;
border: 0;
}
/deep/ .el-input-group__append {
background-color: #0d867f;
color: #fff;
cursor: pointer;
}
.search_btn {
width: 100%;
display: flex;
margin-top: 14px;
margin-bottom: 14px;
}
.search_menu {
display: flex;
justify-content: space-between;
margin-bottom: 14px;
}
.search_menu_item_container {
display: flex;
align-items: center;
}
.shanChu_btn {
color: #dd6a15;
background-color: #f8ebe2;
}
.search_menu_btn_container {
display: flex;
align-items: center;
}
.search_menu_item {
display: flex;
align-items: center;
width: 344px;
}
.search_title {
/* width: 20%; */
flex-shrink: 0;
margin-right: 15px;
}
.search_item {
width: 60%;
}
.query_btn {
display: flex;
align-items: center;
......@@ -1630,6 +1573,7 @@ export default {
margin-right: 10px;
cursor: pointer;
}
.reset_btn {
display: flex;
align-items: center;
......@@ -1643,34 +1587,43 @@ export default {
color: #666;
cursor: pointer;
}
.btn_icon {
margin-right: 10px;
}
.table_container {
width: 97%;
height: calc(100% - 40px);
margin-top: 20px;
}
.el-pagination {
margin-top: 30px;
}
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #0d867f;
}
/deep/ .el-dialog__header {
background-color: #0d867f;
text-align: left;
}
/deep/ .el-dialog__title {
color: #fff;
}
/deep/ .el-dialog__close {
color: #fff;
}
.greenButton {
background-color: #0d867f;
color: #fff;
}
.el-form-item {
display: flex;
align-items: center;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!