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

xiehao
Commit f32b365c authored May 30, 2024 by xiehao
Showing with 72 additions and 68 deletions
src/views/reviewArchiFollowCheck/index.vue
src/views/reviewArchiPoliticeCheck/index.vue
src/views/reviewSituation/index.vue
--- a/src/views/reviewArchiFollowCheck/index.vue
+++ b/src/views/reviewArchiFollowCheck/index.vue
@@ -82,7 +82,8 @@
      </div>
      <div class="search_btn">
        <el-button type="primary" size="medium" @click="toDetails"
-          >概设遵从情况</el-button
+        >概设遵从情况
+        </el-button
        >
      </div>
      <el-table
@@ -102,22 +103,14 @@
            align="center"
        ></el-table-column>
        <el-table-column
-          prop="manageOrgId"
+            prop="manageOrgName"
            label="建设单位"
            align="center"
-          :formatter="
-            (row, column, cellValue, index) =>
-              formatterColumn(row, column, cellValue, index, 'sysOrgOptions')
-          "
        ></el-table-column>
        <el-table-column
-          prop="manageDeptId"
+            prop="manageDeptName"
            label="业务部门"
            align="center"
-          :formatter="
-            (row, column, cellValue, index) =>
-              formatterColumn(row, column, cellValue, index, 'sysDeptOptions')
-          "
        ></el-table-column>
        <el-table-column
            prop="appName"
@@ -146,9 +139,13 @@
          </template>
        </el-table-column>
        <el-table-column
-          prop="manageOrgId"
+            prop="buildOrg"
            label="承建单位"
            align="center"
+            :formatter="
+            (row, column, cellValue, index) =>
+              formatterColumn(row, column, cellValue, index, 'sysBuildOrgOptions')
+          "
        ></el-table-column>
        <el-table-column
            prop="projectManager"
@@ -158,35 +155,40 @@
        <el-table-column prop="remark" label="安全架构遵从" align="center">
          <template slot-scope="scope">
            <el-button type="text" @click="check(scope.row, '1')"
-              >查看</el-button
+            >查看
+            </el-button
            >
          </template>
        </el-table-column>
        <el-table-column prop="remark" label="部署架构审查" align="center">
          <template slot-scope="scope">
            <el-button type="text" @click="check(scope.row, '2')"
-              >查看</el-button
+            >查看
+            </el-button
            >
          </template>
        </el-table-column>
        <el-table-column prop="remark" label="技术架构遵从" align="center">
          <template slot-scope="scope">
            <el-button type="text" @click="check(scope.row, '3')"
-              >查看</el-button
+            >查看
+            </el-button
            >
          </template>
        </el-table-column>
        <el-table-column prop="remark" label="应用架构遵从" align="center">
          <template slot-scope="scope">
            <el-button type="text" @click="check(scope.row, '4')"
-              >查看</el-button
+            >查看
+            </el-button
            >
          </template>
        </el-table-column>
        <el-table-column prop="remark" label="物理数据架构遵从" align="center">
          <template slot-scope="scope">
            <el-button type="text" @click="check(scope.row, '5')"
-              >查看</el-button
+            >查看
+            </el-button
            >
          </template>
        </el-table-column>
@@ -251,14 +253,10 @@
 </template>
 <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 {getDictTypeOptions} from "@/utils";
 export default {
  name: 'reviewArchiFollowCheck',
@@ -314,7 +312,8 @@ export default {
  },
  methods: {
    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
    },
    getDicts() {
@@ -328,6 +327,9 @@ export default {
          this.sysOrgOptions = res.data
        }
      })
+      getDictTypeOptions('build_company').then((res) => {
+        this.sysBuildOrgOptions = res
+      })
    },
    indexMethod(index) {
      return (this.pager.current - 1) * this.pager.size + index + 1
@@ -355,16 +357,20 @@ export default {
      const prjId = this.selectRows[0].prjId
      this.$router.push(
          `/main/reviewArchiFollowCheckDetails?prjId=${prjId}&type=1`,
-        () => {},
+          () => {
-        () => {},
+          },
+          () => {
+          },
      )
    },
    check(row, type) {
      //查看点击
      this.$router.push(
          `/main/reviewArchiFollowCheckDetails?prjId=${row.prjId}&type=${type}`,
-        () => {},
+          () => {
-        () => {},
+          },
+          () => {
+          },
      )
    },
    save_dicy() {
@@ -516,9 +522,11 @@ export default {
  color: #0d867f;
  border: 0;
 }
 .el-button--text {
  color: #0d867f;
 }
 /deep/ .el-input-group__append {
  background-color: #0d867f;
  color: #fff;

--- a/src/views/reviewArchiPoliticeCheck/index.vue
+++ b/src/views/reviewArchiPoliticeCheck/index.vue
@@ -3,12 +3,13 @@
    <list-page>
      <!-- 查询表单插槽 -->
      <template #formWrap>
-        <SearchForm @onSearch="querySearch" :form-options="formOptions" />
+        <SearchForm @onSearch="querySearch" :form-options="formOptions"/>
      </template>
      <!-- 中部操作按钮 -->
      <template #operationWrap>
        <el-button type="primary" size="medium" plain @click="toDetails"
-          >架构政策审查</el-button
+        >架构政策审查
+        </el-button
        >
      </template>
      <!-- 表格插槽 -->
@@ -31,10 +32,11 @@ import ListPage from '@/components/ListPage.vue'
 import SearchForm from '@/components/SearchForm.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 {
  name: 'batchPlanManagement',
  components: {
@@ -93,30 +95,26 @@ export default {
    },
    columns() {
      return [
-        { type: 'selection', width: '55px' },
+        {type: 'selection', width: '55px'},
-        { label: '序号', type: 'index', width: '80px' },
+        {label: '序号', type: 'index', width: '80px'},
        {
          label: '建设单位',
-          prop: 'manageOrgId',
+          prop: 'manageOrgName',
-          options: this.sysOrgOptions,
-          collectionType: true,
          width: '120px',
        },
        {
          label: '业务部门',
-          prop: 'manageDeptId',
+          prop: 'manageDeptName',
-          options: this.sysDeptOptions,
-          collectionType: true,
          width: '120px',
        },
-        { label: '系统名称', width: '280px', prop: 'appName' },
+        {label: '系统名称', width: '280px', prop: 'appName'},
        {
          label: '建设类型',
          prop: 'buildType',
          options: this.buildTypeOptions,
          collectionType: 'build_type',
        },
-        { label: '项目名称', width: '295px', prop: 'prjName' },
+        {label: '项目名称', width: '295px', prop: 'prjName'},
        {
          label: '是否续建',
          prop: 'prjPlanClass',
@@ -134,7 +132,7 @@ export default {
          label: '运安符合性审查',
          prop: 'version3',
          type: 'operation',
-          actionButtons: [{ title: '查看', type: 'text' }],
+          actionButtons: [{title: '查看', type: 'text'}],
          callback: (row, title) => {
            this.fnToDetailsTab('1', row.prjId)
          },
@@ -143,7 +141,7 @@ export default {
          label: '功能满足审查',
          prop: 'version4',
          type: 'operation',
-          actionButtons: [{ title: '查看', type: 'text' }],
+          actionButtons: [{title: '查看', type: 'text'}],
          callback: (row, title) => {
            this.fnToDetailsTab('2', row.prjId)
          },
@@ -152,7 +150,7 @@ export default {
          label: '运行可靠性审查',
          prop: 'version5',
          type: 'operation',
-          actionButtons: [{ title: '查看', type: 'text' }],
+          actionButtons: [{title: '查看', type: 'text'}],
          callback: (row, title) => {
            this.fnToDetailsTab('3', row.prjId)
          },
@@ -161,7 +159,7 @@ export default {
          label: '系统实用性审查',
          prop: 'version6',
          type: 'operation',
-          actionButtons: [{ title: '查看', type: 'text' }],
+          actionButtons: [{title: '查看', type: 'text'}],
          callback: (row, title) => {
            this.fnToDetailsTab('4', row.prjId)
          },
@@ -170,7 +168,7 @@ export default {
          label: '系统安全性审查',
          prop: 'version8',
          type: 'operation',
-          actionButtons: [{ title: '查看', type: 'text' }],
+          actionButtons: [{title: '查看', type: 'text'}],
          callback: (row, title) => {
            this.fnToDetailsTab('5', row.prjId)
          },
@@ -179,7 +177,7 @@ export default {
          label: '资源复用性审查',
          prop: 'version7',
          type: 'operation',
-          actionButtons: [{ title: '查看', type: 'text' }],
+          actionButtons: [{title: '查看', type: 'text'}],
          callback: (row, title) => {
            this.fnToDetailsTab('6', row.prjId)
          },
@@ -215,7 +213,7 @@ export default {
          })
        }
      })
-      getDictTypeOptions('sys_build_org').then((res) => {
+      getDictTypeOptions('build_company').then((res) => {
        this.sysBuildOrgOptions = res
      })
    },
@@ -237,7 +235,7 @@ export default {
      if (this.selectRows.length > 1) {
        return this.$message.warning('只能选择一条数据')
      }
-      const { name, prjId } = this.selectRows[0]
+      const {name, prjId} = this.selectRows[0]
      this.$router.push({
        path: '/main/reviewArchiPoliticeCheckDetails',
        query: {

--- a/src/views/reviewSituation/index.vue
+++ b/src/views/reviewSituation/index.vue
@@ -3,7 +3,7 @@
    <list-page>
      <!-- 查询表单插槽 -->
      <template #formWrap>
-        <SearchForm @onSearch="querySearch" :form-options="formOptions" />
+        <SearchForm @onSearch="querySearch" :form-options="formOptions"/>
      </template>
      <!-- 中部操作按钮 -->
      <template #operationWrap>
@@ -13,7 +13,8 @@
            size="medium"
            plain
            @click="toDetails()"
-          >评审情况(概要设计)</el-button
+        >评审情况(概要设计)
+        </el-button
        >
      </template>
      <!-- 表格插槽 -->
@@ -35,10 +36,11 @@ import ListPage from '@/components/ListPage.vue'
 import SearchForm from '@/components/SearchForm.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 {
  name: 'reviewSituation',
  data() {
@@ -98,20 +100,16 @@ export default {
    },
    columns() {
      let arr = [
-        { type: 'selection', width: '55px' },
+        {type: 'selection', width: '55px'},
-        { label: '序号', type: 'index', width: '80px' },
+        {label: '序号', type: 'index', width: '80px'},
        {
          label: '建设单位',
-          prop: 'manageOrgId',
+          prop: 'manageOrgName',
-          options: this.sysOrgOptions,
-          collectionType: true,
          width: '120px',
        },
        {
          label: '业务部门',
-          prop: 'manageDeptId',
+          prop: 'manageDeptName',
-          options: this.sysDeptOptions,
-          collectionType: true,
          width: '120px',
        },
        {
@@ -216,7 +214,7 @@ export default {
          })
        }
      })
-      getDictTypeOptions('sys_build_org').then((res) => {
+      getDictTypeOptions('build_company').then((res) => {
        this.sysBuildOrgOptions = res
      })
    },