Commit f32b365c by xiehao

fix:选择系统后重置筛选条件

1 parent daf5e126
...@@ -6,57 +6,57 @@ ...@@ -6,57 +6,57 @@
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">建设单位</span> <span class="search_title">建设单位</span>
<el-select <el-select
v-model="searchParams.let1" v-model="searchParams.let1"
placeholder="请选择" placeholder="请选择"
class="search_item" class="search_item"
filterable filterable
> >
<el-option <el-option
v-for="item in sysOrgOptions" v-for="item in sysOrgOptions"
:key="item.orgId" :key="item.orgId"
:label="item.orgName" :label="item.orgName"
:value="item.orgId" :value="item.orgId"
></el-option> ></el-option>
</el-select> </el-select>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">业务部门</span> <span class="search_title">业务部门</span>
<el-select <el-select
filterable filterable
v-model="searchParams.let2" v-model="searchParams.let2"
placeholder="请选择" placeholder="请选择"
class="search_item" class="search_item"
> >
<el-option <el-option
v-for="item in sysDeptOptions" v-for="item in sysDeptOptions"
:key="item.orgId" :key="item.orgId"
:label="item.orgName" :label="item.orgName"
:value="item.orgId" :value="item.orgId"
></el-option> ></el-option>
</el-select> </el-select>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">系统名称</span> <span class="search_title">系统名称</span>
<el-input <el-input
v-no-backslash v-no-backslash
v-model="searchParams.let3" v-model="searchParams.let3"
maxlength="100" maxlength="100"
placeholder="请输入内容" placeholder="请输入内容"
class="search_item" class="search_item"
></el-input> ></el-input>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">建设类型</span> <span class="search_title">建设类型</span>
<el-select <el-select
v-model="searchParams.let4" v-model="searchParams.let4"
placeholder="请选择" placeholder="请选择"
class="search_item" class="search_item"
> >
<el-option <el-option
v-for="item in ziJianLeiXing" v-for="item in ziJianLeiXing"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</el-select> </el-select>
</div> </div>
...@@ -64,17 +64,17 @@ ...@@ -64,17 +64,17 @@
<div class="search_menu_btn_container"> <div class="search_menu_btn_container">
<div class="query_btn" @click="search_table"> <div class="query_btn" @click="search_table">
<img <img
class="btn_icon" class="btn_icon"
src="@/assets/archi-ele-list/search.png" src="@/assets/archi-ele-list/search.png"
alt="" alt=""
/> />
<p>查询</p> <p>查询</p>
</div> </div>
<div class="reset_btn" @click="reset"> <div class="reset_btn" @click="reset">
<img <img
class="btn_icon" class="btn_icon"
src="@/assets/archi-ele-list/reset.png" src="@/assets/archi-ele-list/reset.png"
alt="" alt=""
/> />
<p>重置</p> <p>重置</p>
</div> </div>
...@@ -82,49 +82,42 @@ ...@@ -82,49 +82,42 @@
</div> </div>
<div class="search_btn"> <div class="search_btn">
<el-button type="primary" size="medium" @click="toDetails" <el-button type="primary" size="medium" @click="toDetails"
>概设遵从情况</el-button >概设遵从情况
</el-button
> >
</div> </div>
<el-table <el-table
:height="tableHeight" :height="tableHeight"
v-loading="loading" v-loading="loading"
@selection-change="select_table_rows" @selection-change="select_table_rows"
:data="tableData" :data="tableData"
stripe stripe
border border
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column <el-table-column
type="index" type="index"
:index="indexMethod" :index="indexMethod"
label="序号" label="序号"
width="80" width="80"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="manageOrgId" prop="manageOrgName"
label="建设单位" label="建设单位"
align="center" align="center"
:formatter="
(row, column, cellValue, index) =>
formatterColumn(row, column, cellValue, index, 'sysOrgOptions')
"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="manageDeptId" prop="manageDeptName"
label="业务部门" label="业务部门"
align="center" align="center"
:formatter="
(row, column, cellValue, index) =>
formatterColumn(row, column, cellValue, index, 'sysDeptOptions')
"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="appName" prop="appName"
label="系统名称" label="系统名称"
align="center" align="center"
width="200" width="200"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column prop="buildType" label="建设类型" align="center"> <el-table-column prop="buildType" label="建设类型" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -133,11 +126,11 @@ ...@@ -133,11 +126,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="prjName" prop="prjName"
label="项目名称" label="项目名称"
align="center" align="center"
width="200" width="200"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column label="是否续建" align="center"> <el-table-column label="是否续建" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -146,99 +139,108 @@ ...@@ -146,99 +139,108 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="manageOrgId" prop="buildOrg"
label="承建单位" label="承建单位"
align="center" align="center"
:formatter="
(row, column, cellValue, index) =>
formatterColumn(row, column, cellValue, index, 'sysBuildOrgOptions')
"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="projectManager" prop="projectManager"
label="项目经理" label="项目经理"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column prop="remark" label="安全架构遵从" align="center"> <el-table-column prop="remark" label="安全架构遵从" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="check(scope.row, '1')" <el-button type="text" @click="check(scope.row, '1')"
>查看</el-button >查看
</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="部署架构审查" align="center"> <el-table-column prop="remark" label="部署架构审查" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="check(scope.row, '2')" <el-button type="text" @click="check(scope.row, '2')"
>查看</el-button >查看
</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="技术架构遵从" align="center"> <el-table-column prop="remark" label="技术架构遵从" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="check(scope.row, '3')" <el-button type="text" @click="check(scope.row, '3')"
>查看</el-button >查看
</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="应用架构遵从" align="center"> <el-table-column prop="remark" label="应用架构遵从" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="check(scope.row, '4')" <el-button type="text" @click="check(scope.row, '4')"
>查看</el-button >查看
</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="物理数据架构遵从" align="center"> <el-table-column prop="remark" label="物理数据架构遵从" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="check(scope.row, '5')" <el-button type="text" @click="check(scope.row, '5')"
>查看</el-button >查看
</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
background background
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="pager.current" :current-page="pager.current"
:page-sizes="pager.sizes" :page-sizes="pager.sizes"
:page-size="pager.size" :page-size="pager.size"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="pager.total" :total="pager.total"
> >
</el-pagination> </el-pagination>
</div> </div>
<el-dialog <el-dialog
:title="is_add_edit == 'add' ? '新建字典' : '编辑字典'" :title="is_add_edit == 'add' ? '新建字典' : '编辑字典'"
:visible.sync="add_dialog" :visible.sync="add_dialog"
:center="false" :center="false"
:close-on-click-modal="false" :close-on-click-modal="false"
width="60%" width="60%"
> >
<el-form <el-form
:model="ruleForm" :model="ruleForm"
ref="form" ref="form"
:rules="rules" :rules="rules"
style="display: flex; flex-wrap: wrap" style="display: flex; flex-wrap: wrap"
> >
<el-form-item label="字典名称:" prop="let1"> <el-form-item label="字典名称:" prop="let1">
<el-input <el-input
v-no-backslash v-no-backslash
v-model="ruleForm.let1" v-model="ruleForm.let1"
maxlength="100" maxlength="100"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="字典标识:" prop="let2"> <el-form-item label="字典标识:" prop="let2">
<el-input <el-input
v-no-backslash v-no-backslash
v-model="ruleForm.let2" v-model="ruleForm.let2"
maxlength="100" maxlength="100"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="cross1" label="描述:" prop="let3"> <el-form-item class="cross1" label="描述:" prop="let3">
<el-input <el-input
v-no-backslash v-no-backslash
v-model="ruleForm.let3" v-model="ruleForm.let3"
type="textarea" type="textarea"
:rows="3" :rows="3"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
placeholder="请输入内容" placeholder="请输入内容"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -251,14 +253,10 @@ ...@@ -251,14 +253,10 @@
</template> </template>
<script> <script>
import { import {getDeptOption, getDianXingAnLiSelectData, getGaiSheJiaGouZunCongJiaChaTable, getOrgOption,} from '@/api/index.js'
getDianXingAnLiSelectData, import {Message} from 'element-ui'
getGaiSheJiaGouZunCongJiaChaTable,
getOrgOption,
getDeptOption,
} from '@/api/index.js'
import { MessageBox, Message } from 'element-ui'
import $ from 'jquery' import $ from 'jquery'
import {getDictTypeOptions} from "@/utils";
export default { export default {
name: 'reviewArchiFollowCheck', name: 'reviewArchiFollowCheck',
...@@ -314,7 +312,8 @@ export default { ...@@ -314,7 +312,8 @@ export default {
}, },
methods: { methods: {
formatterColumn(row, column, cellValue, index, options) { formatterColumn(row, column, cellValue, index, options) {
const obj = this[options]?.find((v) => v.orgId == cellValue) || {} console.log(cellValue)
const obj = this[options]?.find((v) => v.value == cellValue) || {}
return obj.label return obj.label
}, },
getDicts() { getDicts() {
...@@ -328,6 +327,9 @@ export default { ...@@ -328,6 +327,9 @@ export default {
this.sysOrgOptions = res.data this.sysOrgOptions = res.data
} }
}) })
getDictTypeOptions('build_company').then((res) => {
this.sysBuildOrgOptions = res
})
}, },
indexMethod(index) { indexMethod(index) {
return (this.pager.current - 1) * this.pager.size + index + 1 return (this.pager.current - 1) * this.pager.size + index + 1
...@@ -354,17 +356,21 @@ export default { ...@@ -354,17 +356,21 @@ export default {
} }
const prjId = this.selectRows[0].prjId const prjId = this.selectRows[0].prjId
this.$router.push( this.$router.push(
`/main/reviewArchiFollowCheckDetails?prjId=${prjId}&type=1`, `/main/reviewArchiFollowCheckDetails?prjId=${prjId}&type=1`,
() => {}, () => {
() => {}, },
() => {
},
) )
}, },
check(row, type) { check(row, type) {
//查看点击 //查看点击
this.$router.push( this.$router.push(
`/main/reviewArchiFollowCheckDetails?prjId=${row.prjId}&type=${type}`, `/main/reviewArchiFollowCheckDetails?prjId=${row.prjId}&type=${type}`,
() => {}, () => {
() => {}, },
() => {
},
) )
}, },
save_dicy() { save_dicy() {
...@@ -408,11 +414,11 @@ export default { ...@@ -408,11 +414,11 @@ export default {
const search_menu_height = $('.search_menu').height() const search_menu_height = $('.search_menu').height()
const search_btn_height = $('.search_btn').outerHeight(true) const search_btn_height = $('.search_btn').outerHeight(true)
this.tableHeight = this.tableHeight =
table_container_height - table_container_height -
search_menu_height - search_menu_height -
search_btn_height - search_btn_height -
90 + 90 +
'px' 'px'
}, },
search_table() { search_table() {
//搜索 //搜索
...@@ -516,9 +522,11 @@ export default { ...@@ -516,9 +522,11 @@ export default {
color: #0d867f; color: #0d867f;
border: 0; border: 0;
} }
.el-button--text { .el-button--text {
color: #0d867f; color: #0d867f;
} }
/deep/ .el-input-group__append { /deep/ .el-input-group__append {
background-color: #0d867f; background-color: #0d867f;
color: #fff; color: #fff;
......
...@@ -3,22 +3,23 @@ ...@@ -3,22 +3,23 @@
<list-page> <list-page>
<!-- 查询表单插槽 --> <!-- 查询表单插槽 -->
<template #formWrap> <template #formWrap>
<SearchForm @onSearch="querySearch" :form-options="formOptions" /> <SearchForm @onSearch="querySearch" :form-options="formOptions"/>
</template> </template>
<!-- 中部操作按钮 --> <!-- 中部操作按钮 -->
<template #operationWrap> <template #operationWrap>
<el-button type="primary" size="medium" plain @click="toDetails" <el-button type="primary" size="medium" plain @click="toDetails"
>架构政策审查</el-button >架构政策审查
</el-button
> >
</template> </template>
<!-- 表格插槽 --> <!-- 表格插槽 -->
<template #tableWrap> <template #tableWrap>
<table-config <table-config
ref="searchTable" ref="searchTable"
@selection-change="selectionChange" @selection-change="selectionChange"
:query="query" :query="query"
:columns="columns" :columns="columns"
id-key="elementId" id-key="elementId"
> >
</table-config> </table-config>
</template> </template>
...@@ -31,10 +32,11 @@ import ListPage from '@/components/ListPage.vue' ...@@ -31,10 +32,11 @@ import ListPage from '@/components/ListPage.vue'
import SearchForm from '@/components/SearchForm.vue' import SearchForm from '@/components/SearchForm.vue'
import TableConfig from '@/components/TableConfig.vue' import TableConfig from '@/components/TableConfig.vue'
import { queryAppArchiControlRequirements } from '@/api/interface' import {queryAppArchiControlRequirements} from '@/api/interface'
import { getOrgOption, getDeptOption } from '@/api/index' import {getDeptOption, getOrgOption} from '@/api/index'
import { prjPlanClass } from '@/utils/dictionary' import {prjPlanClass} from '@/utils/dictionary'
import { getDictTypeOptions } from '@/utils' import {getDictTypeOptions} from '@/utils'
export default { export default {
name: 'batchPlanManagement', name: 'batchPlanManagement',
components: { components: {
...@@ -93,30 +95,26 @@ export default { ...@@ -93,30 +95,26 @@ export default {
}, },
columns() { columns() {
return [ return [
{ type: 'selection', width: '55px' }, {type: 'selection', width: '55px'},
{ label: '序号', type: 'index', width: '80px' }, {label: '序号', type: 'index', width: '80px'},
{ {
label: '建设单位', label: '建设单位',
prop: 'manageOrgId', prop: 'manageOrgName',
options: this.sysOrgOptions,
collectionType: true,
width: '120px', width: '120px',
}, },
{ {
label: '业务部门', label: '业务部门',
prop: 'manageDeptId', prop: 'manageDeptName',
options: this.sysDeptOptions,
collectionType: true,
width: '120px', width: '120px',
}, },
{ label: '系统名称', width: '280px', prop: 'appName' }, {label: '系统名称', width: '280px', prop: 'appName'},
{ {
label: '建设类型', label: '建设类型',
prop: 'buildType', prop: 'buildType',
options: this.buildTypeOptions, options: this.buildTypeOptions,
collectionType: 'build_type', collectionType: 'build_type',
}, },
{ label: '项目名称', width: '295px', prop: 'prjName' }, {label: '项目名称', width: '295px', prop: 'prjName'},
{ {
label: '是否续建', label: '是否续建',
prop: 'prjPlanClass', prop: 'prjPlanClass',
...@@ -134,7 +132,7 @@ export default { ...@@ -134,7 +132,7 @@ export default {
label: '运安符合性审查', label: '运安符合性审查',
prop: 'version3', prop: 'version3',
type: 'operation', type: 'operation',
actionButtons: [{ title: '查看', type: 'text' }], actionButtons: [{title: '查看', type: 'text'}],
callback: (row, title) => { callback: (row, title) => {
this.fnToDetailsTab('1', row.prjId) this.fnToDetailsTab('1', row.prjId)
}, },
...@@ -143,7 +141,7 @@ export default { ...@@ -143,7 +141,7 @@ export default {
label: '功能满足审查', label: '功能满足审查',
prop: 'version4', prop: 'version4',
type: 'operation', type: 'operation',
actionButtons: [{ title: '查看', type: 'text' }], actionButtons: [{title: '查看', type: 'text'}],
callback: (row, title) => { callback: (row, title) => {
this.fnToDetailsTab('2', row.prjId) this.fnToDetailsTab('2', row.prjId)
}, },
...@@ -152,7 +150,7 @@ export default { ...@@ -152,7 +150,7 @@ export default {
label: '运行可靠性审查', label: '运行可靠性审查',
prop: 'version5', prop: 'version5',
type: 'operation', type: 'operation',
actionButtons: [{ title: '查看', type: 'text' }], actionButtons: [{title: '查看', type: 'text'}],
callback: (row, title) => { callback: (row, title) => {
this.fnToDetailsTab('3', row.prjId) this.fnToDetailsTab('3', row.prjId)
}, },
...@@ -161,7 +159,7 @@ export default { ...@@ -161,7 +159,7 @@ export default {
label: '系统实用性审查', label: '系统实用性审查',
prop: 'version6', prop: 'version6',
type: 'operation', type: 'operation',
actionButtons: [{ title: '查看', type: 'text' }], actionButtons: [{title: '查看', type: 'text'}],
callback: (row, title) => { callback: (row, title) => {
this.fnToDetailsTab('4', row.prjId) this.fnToDetailsTab('4', row.prjId)
}, },
...@@ -170,7 +168,7 @@ export default { ...@@ -170,7 +168,7 @@ export default {
label: '系统安全性审查', label: '系统安全性审查',
prop: 'version8', prop: 'version8',
type: 'operation', type: 'operation',
actionButtons: [{ title: '查看', type: 'text' }], actionButtons: [{title: '查看', type: 'text'}],
callback: (row, title) => { callback: (row, title) => {
this.fnToDetailsTab('5', row.prjId) this.fnToDetailsTab('5', row.prjId)
}, },
...@@ -179,7 +177,7 @@ export default { ...@@ -179,7 +177,7 @@ export default {
label: '资源复用性审查', label: '资源复用性审查',
prop: 'version7', prop: 'version7',
type: 'operation', type: 'operation',
actionButtons: [{ title: '查看', type: 'text' }], actionButtons: [{title: '查看', type: 'text'}],
callback: (row, title) => { callback: (row, title) => {
this.fnToDetailsTab('6', row.prjId) this.fnToDetailsTab('6', row.prjId)
}, },
...@@ -215,7 +213,7 @@ export default { ...@@ -215,7 +213,7 @@ export default {
}) })
} }
}) })
getDictTypeOptions('sys_build_org').then((res) => { getDictTypeOptions('build_company').then((res) => {
this.sysBuildOrgOptions = res this.sysBuildOrgOptions = res
}) })
}, },
...@@ -237,7 +235,7 @@ export default { ...@@ -237,7 +235,7 @@ export default {
if (this.selectRows.length > 1) { if (this.selectRows.length > 1) {
return this.$message.warning('只能选择一条数据') return this.$message.warning('只能选择一条数据')
} }
const { name, prjId } = this.selectRows[0] const {name, prjId} = this.selectRows[0]
this.$router.push({ this.$router.push({
path: '/main/reviewArchiPoliticeCheckDetails', path: '/main/reviewArchiPoliticeCheckDetails',
query: { query: {
......
...@@ -3,26 +3,27 @@ ...@@ -3,26 +3,27 @@
<list-page> <list-page>
<!-- 查询表单插槽 --> <!-- 查询表单插槽 -->
<template #formWrap> <template #formWrap>
<SearchForm @onSearch="querySearch" :form-options="formOptions" /> <SearchForm @onSearch="querySearch" :form-options="formOptions"/>
</template> </template>
<!-- 中部操作按钮 --> <!-- 中部操作按钮 -->
<template #operationWrap> <template #operationWrap>
<el-button <el-button
icon="el-icon-document-add" icon="el-icon-document-add"
type="primary" type="primary"
size="medium" size="medium"
plain plain
@click="toDetails()" @click="toDetails()"
>评审情况(概要设计)</el-button >评审情况(概要设计)
</el-button
> >
</template> </template>
<!-- 表格插槽 --> <!-- 表格插槽 -->
<template #tableWrap> <template #tableWrap>
<table-config <table-config
ref="searchTable" ref="searchTable"
@selection-change="selectionChange" @selection-change="selectionChange"
:query="query" :query="query"
:columns="columns" :columns="columns"
> >
</table-config> </table-config>
</template> </template>
...@@ -35,10 +36,11 @@ import ListPage from '@/components/ListPage.vue' ...@@ -35,10 +36,11 @@ import ListPage from '@/components/ListPage.vue'
import SearchForm from '@/components/SearchForm.vue' import SearchForm from '@/components/SearchForm.vue'
import TableConfig from '@/components/TableConfig.vue' import TableConfig from '@/components/TableConfig.vue'
import { queryPrelDesInspecte } from '@/api/interface' import {queryPrelDesInspecte} from '@/api/interface'
import { getOrgOption, getDeptOption } from '@/api/index' import {getDeptOption, getOrgOption} from '@/api/index'
import { prjPlanClass, completionStatus } from '@/utils/dictionary' import {completionStatus, prjPlanClass} from '@/utils/dictionary'
import { getDictTypeOptions } from '@/utils' import {getDictTypeOptions} from '@/utils'
export default { export default {
name: 'reviewSituation', name: 'reviewSituation',
data() { data() {
...@@ -98,20 +100,16 @@ export default { ...@@ -98,20 +100,16 @@ export default {
}, },
columns() { columns() {
let arr = [ let arr = [
{ type: 'selection', width: '55px' }, {type: 'selection', width: '55px'},
{ label: '序号', type: 'index', width: '80px' }, {label: '序号', type: 'index', width: '80px'},
{ {
label: '建设单位', label: '建设单位',
prop: 'manageOrgId', prop: 'manageOrgName',
options: this.sysOrgOptions,
collectionType: true,
width: '120px', width: '120px',
}, },
{ {
label: '业务部门', label: '业务部门',
prop: 'manageDeptId', prop: 'manageDeptName',
options: this.sysDeptOptions,
collectionType: true,
width: '120px', width: '120px',
}, },
{ {
...@@ -216,7 +214,7 @@ export default { ...@@ -216,7 +214,7 @@ export default {
}) })
} }
}) })
getDictTypeOptions('sys_build_org').then((res) => { getDictTypeOptions('build_company').then((res) => {
this.sysBuildOrgOptions = res this.sysBuildOrgOptions = res
}) })
}, },
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!