修改

史敦盼
Commit 6208408b authored Apr 17, 2024 by 史敦盼
Showing with 101 additions and 35 deletions
src/views/archi-asset-manage/index.vue
src/views/reviewArchiFollowCheck/index.vue
src/views/reviewArchiPoliticeCheck/index.vue
src/views/reviewSituation/index.vue
src/views/systemInfoManage/index.vue
--- a/src/views/archi-asset-manage/index.vue
+++ b/src/views/archi-asset-manage/index.vue
--- a/src/views/reviewArchiFollowCheck/index.vue
+++ b/src/views/reviewArchiFollowCheck/index.vue
@@ -4,32 +4,34 @@
      <div class="search_menu">
        <div class="search_menu_item_container">
          <div class="search_menu_item">
-            <span class="search_title">单位</span>
+            <span class="search_title">建设单位</span>
            <el-select
              v-model="searchParams.let1"
              placeholder="请选择"
              class="search_item"
+              filterable
            >
              <el-option
-                v-for="item in fuHeDu"
+                v-for="item in sysOrgOptions"
-                :key="item.value"
+                :key="item.orgId"
-                :label="item.label"
+                :label="item.orgName"
-                :value="item.value"
+                :value="item.orgId"
              ></el-option>
            </el-select>
          </div>
          <div class="search_menu_item">
-            <span class="search_title">部门</span>
+            <span class="search_title">业务部门</span>
            <el-select
+              filterable
              v-model="searchParams.let2"
              placeholder="请选择"
              class="search_item"
            >
              <el-option
-                v-for="item in fuHeDu"
+                v-for="item in sysDeptOptions"
-                :key="item.value"
+                :key="item.orgId"
-                :label="item.label"
+                :label="item.orgName"
-                :value="item.value"
+                :value="item.orgId"
              ></el-option>
            </el-select>
          </div>
@@ -101,13 +103,21 @@
        ></el-table-column>
        <el-table-column
          prop="manageOrgId"
-          label="单位"
+          label="建设单位"
          align="center"
+          :formatter="
+            (row, column, cellValue, index) =>
+              formatterColumn(row, column, cellValue, index, 'sysOrgOptions')
+          "
        ></el-table-column>
        <el-table-column
          prop="manageDeptId"
-          label="部门"
+          label="业务部门"
          align="center"
+          :formatter="
+            (row, column, cellValue, index) =>
+              formatterColumn(row, column, cellValue, index, 'sysDeptOptions')
+          "
        ></el-table-column>
        <el-table-column
          prop="appName"
@@ -244,6 +254,8 @@
 import {
  getDianXingAnLiSelectData,
  getGaiSheJiaGouZunCongJiaChaTable,
+  getOrgOption,
+  getDeptOption,
 } from '@/api/index.js'
 import { MessageBox, Message } from 'element-ui'
 import $ from 'jquery'
@@ -268,7 +280,7 @@ export default {
        current: 1,
        sizes: [10, 20, 50, 100, 200],
        size: 10,
-        total: 20, //总条数
+        total: 0, //总条数
      },
      tableHeight: null,
      searchParams: {
@@ -280,8 +292,13 @@ export default {
      fuHeDu: [],
      ziJianLeiXing: [],
      selectRows: [],
+      sysOrgOptions: [],
+      sysDeptOptions: [],
    }
  },
+  created() {
+    this.getDicts()
+  },
  mounted() {
    window.addEventListener('resize', () => {
      this.set_table_height()
@@ -296,6 +313,22 @@ export default {
    })
  },
  methods: {
+    formatterColumn(row, column, cellValue, index, options) {
+      const obj = this[options]?.find((v) => v.orgId == cellValue) || {}
+      return obj.label
+    },
+    getDicts() {
+      getDeptOption().then((res) => {
+        if (res.code === 200) {
+          this.sysDeptOptions = res.data
+        }
+      })
+      getOrgOption().then((res) => {
+        if (res.code === 200) {
+          this.sysOrgOptions = res.data
+        }
+      })
+    },
    indexMethod(index) {
      return (this.pager.current - 1) * this.pager.size + index + 1
    },

--- a/src/views/reviewArchiPoliticeCheck/index.vue
+++ b/src/views/reviewArchiPoliticeCheck/index.vue
@@ -31,8 +31,8 @@ import ListPage from '@/components/ListPage.vue'
 import SearchForm from '@/components/SearchForm.vue'
 import TableConfig from '@/components/TableConfig.vue'
-// import { getDianXingAnLiSelectData } from '@/api/index.js'
 import { queryAppArchiControlRequirements } from '@/api/interface'
+import { getOrgOption, getDeptOption } from '@/api/index'
 import { prjPlanClass } from '@/utils/dictionary'
 import { getDictTypeOptions } from '@/utils'
 export default {
@@ -61,18 +61,20 @@ export default {
    formOptions() {
      return [
        {
-          label: '单位', // label文字
+          label: '建设单位', // label文字
          prop: 'manageOrgId', // 字段名
          element: 'el-select', // 指定elementui组件
          placeholder: '请选择', // elementui组件属性
-          dictType: 'sys_org',
+          options: this.sysOrgOptions,
+          filterable: true
        },
        {
-          label: '部门', // label文字
+          label: '业务部门', // label文字
          prop: 'manageDeptId', // 字段名
          element: 'el-select', // 指定elementui组件
          placeholder: '请选择', // elementui组件属性
-          dictType: 'sys_dept',
+          options: this.sysDeptOptions,
+          filterable: true
        },
        {
          label: '系统名称', // label文字
@@ -94,14 +96,14 @@ export default {
        { type: 'selection', width: '55px' },
        { label: '序号', type: 'index', width: '80px' },
        {
-          label: '单位',
+          label: '建设单位',
          prop: 'manageOrgId',
          options: this.sysOrgOptions,
          collectionType: true,
          width: '120px',
        },
        {
-          label: '部门',
+          label: '业务部门',
          prop: 'manageDeptId',
          options: this.sysDeptOptions,
          collectionType: true,
@@ -193,11 +195,25 @@ export default {
      getDictTypeOptions('build_type').then((res) => {
        this.buildTypeOptions = res
      })
-      getDictTypeOptions('sys_org').then((res) => {
+      getDeptOption().then((res) => {
-        this.sysOrgOptions = res
+        if (res.code === 200) {
+          this.sysDeptOptions = res.data.map((v) => {
+            return {
+              label: v.orgName,
+              value: v.orgId,
+            }
+          })
+        }
      })
-      getDictTypeOptions('sys_dept').then((res) => {
+      getOrgOption().then((res) => {
-        this.sysDeptOptions = res
+        if (res.code === 200) {
+          this.sysOrgOptions = res.data.map((v) => {
+            return {
+              label: v.orgName,
+              value: v.orgId,
+            }
+          })
+        }
      })
      getDictTypeOptions('sys_build_org').then((res) => {
        this.sysBuildOrgOptions = res

--- a/src/views/reviewSituation/index.vue
+++ b/src/views/reviewSituation/index.vue
@@ -36,6 +36,7 @@ import SearchForm from '@/components/SearchForm.vue'
 import TableConfig from '@/components/TableConfig.vue'
 import { queryPrelDesInspecte } from '@/api/interface'
+import { getOrgOption, getDeptOption } from '@/api/index'
 import { prjPlanClass, completionStatus } from '@/utils/dictionary'
 import { getDictTypeOptions } from '@/utils'
 export default {
@@ -63,18 +64,20 @@ export default {
    formOptions() {
      let arr = [
        {
-          label: '单位', // label文字
+          label: '建设单位', // label文字
          prop: 'manageOrgId', // 字段名
          element: 'el-select', // 指定elementui组件
          placeholder: '请选择', // elementui组件属性
-          dictType: 'sys_org',
+          options: this.sysOrgOptions,
+          filterable: true
        },
        {
-          label: '部门', // label文字
+          label: '业务部门', // label文字
          prop: 'manageDeptId', // 字段名
          element: 'el-select', // 指定elementui组件
          placeholder: '请选择', // elementui组件属性
-          dictType: 'sys_dept',
+          options: this.sysDeptOptions,
+          filterable: true
        },
        {
          label: '系统名称', // label文字
@@ -98,14 +101,14 @@ export default {
        { type: 'selection', width: '55px' },
        { label: '序号', type: 'index', width: '80px' },
        {
-          label: '单位',
+          label: '建设单位',
          prop: 'manageOrgId',
          options: this.sysOrgOptions,
          collectionType: true,
          width: '120px',
        },
        {
-          label: '部门',
+          label: '业务部门',
          prop: 'manageDeptId',
          options: this.sysDeptOptions,
          collectionType: true,
@@ -193,11 +196,25 @@ export default {
      getDictTypeOptions('build_type').then((res) => {
        this.buildTypeOptions = res
      })
-      getDictTypeOptions('sys_org').then((res) => {
+      getDeptOption().then((res) => {
-        this.sysOrgOptions = res
+        if (res.code === 200) {
+          this.sysDeptOptions = res.data.map((v) => {
+            return {
+              label: v.orgName,
+              value: v.orgId,
+            }
+          })
+        }
      })
-      getDictTypeOptions('sys_dept').then((res) => {
+      getOrgOption().then((res) => {
-        this.sysDeptOptions = res
+        if (res.code === 200) {
+          this.sysOrgOptions = res.data.map((v) => {
+            return {
+              label: v.orgName,
+              value: v.orgId,
+            }
+          })
+        }
      })
      getDictTypeOptions('sys_build_org').then((res) => {
        this.sysBuildOrgOptions = res

--- a/src/views/systemInfoManage/index.vue
+++ b/src/views/systemInfoManage/index.vue
@@ -433,7 +433,7 @@ export default {
          })
        }
      })
-      getDictTypeOptions('sys_build_org').then((res) => {
+      getDictTypeOptions('build_company').then((res) => {
        this.sysBuildOrgOptions = res
      })
      // console.log(getDictTypeOptions('sys_build_org'))