Merge branch 'sdp-v1'

src/views/demandManagement/ChoosePrjDialog.vue → src/components/ChoosePrjDialog.vue

@@ -39,7 +39,9 @@ import SearchForm from '@/components/SearchForm.vue'
 import TableConfig from '@/components/TableConfig.vue'
 
 import { queryProjectInfo } from '@/api/interface'
+import { getDeptOption, getOrgOption } from '@/api/index.js'
 import { buildType, prjPlanClass } from '@/utils/dictionary'
+import { getDictTypeOptions } from '@/utils'
 export default {
   props: {
     title: {
@@ -59,6 +61,10 @@ export default {
         queryParam: {},
       },
       selectRows: [],
+      buildTypeOptions: [],
+      buildOrgOptions: [],
+      sysDeptOptions: [],
+      sysOrgOptions: [],
     }
   },
   components: { ListPage, SearchForm, TableConfig },
@@ -68,16 +74,20 @@ export default {
         {
           label: '单位', // label文字
           prop: 'manageOrgId', // 字段名
-          element: 'el-input', // 指定elementui组件
+          element: 'el-select', // 指定elementui组件
           initValue: '', // 字段初始值
-          placeholder: '请输入内容', // elementui组件属性
+          placeholder: '请选择', // elementui组件属性
+          options: this.sysOrgOptions,
+          filterable: true
         },
         {
           label: '部门', // label文字
           prop: 'manageDeptId', // 字段名
-          element: 'el-input', // 指定elementui组件
+          element: 'el-select', // 指定elementui组件
           initValue: '', // 字段初始值
-          placeholder: '请输入内容', // elementui组件属性
+          placeholder: '请选择', // elementui组件属性
+          options: this.sysDeptOptions,
+          filterable: true
         },
         {
           label: '系统名称', // label文字
@@ -100,14 +110,26 @@ export default {
       return [
         { type: 'selection', width: '55px' },
         { label: '序号', type: 'index', width: '80px' },
-        { label: '单位', prop: 'manageOrgId' },
-        { label: '部门', prop: 'manageDeptId' },
+        {
+          label: '单位',
+          prop: 'manageOrgId',
+           width: '200px',
+          options: this.sysOrgOptions,
+          collectionType: true,
+        },
+        {
+          label: '部门',
+          prop: 'manageDeptId',
+           width: '200px',
+          options: this.sysDeptOptions,
+          collectionType: true,
+        },
         { label: '系统名称', prop: 'appName', width: '200px' },
         {
           label: '建设类型',
           width: '100px',
           prop: 'buildType',
-          options: buildType,
+          options: this.buildTypeOptions,
           collectionType: 'buildType',
         },
         {
@@ -121,10 +143,16 @@ export default {
           options: prjPlanClass,
           collectionType: 'prjPlanClass',
         },
-        { label: '承建单位', prop: 'buildOrg' },
-        { label: '项目经理', prop: 'projectManager' },
-        { label: '创建人', prop: 'createMan' },
-        { label: '创建时间', prop: 'createTime' },
+        {
+          label: '承建单位',
+          prop: 'buildOrg',
+          width: '200px',
+          options: this.buildOrgOptions,
+          collectionType: true,
+        },
+        { label: '项目经理', prop: 'projectManager', width: '100px' },
+        { label: '创建人', prop: 'createMan', width: '100px' },
+        { label: '创建时间', prop: 'createTime', width: '120px' },
       ]
     },
     showDialog: {
@@ -136,8 +164,38 @@ export default {
       },
     },
   },
-  mounted() {},
+  created() {
+    this.getDicts()
+  },
   methods: {
+    getDicts() {
+      getDictTypeOptions('build_type').then((res) => {
+        this.buildTypeOptions = res
+      })
+      getDictTypeOptions('build_company').then((res) => {
+        this.buildOrgOptions = res
+      })
+      getDeptOption().then((res) => {
+        if (res.code === 200) {
+          this.sysDeptOptions = res.data.map((v) => {
+            return {
+              label: v.orgName,
+              value: v.orgId,
+            }
+          })
+        }
+      })
+      getOrgOption().then((res) => {
+        if (res.code === 200) {
+          this.sysOrgOptions = res.data.map((v) => {
+            return {
+              label: v.orgName,
+              value: v.orgId,
+            }
+          })
+        }
+      })
+    },
     clearSelection() {
       this.$refs['searchTable'].clearSelection()
     },

src/views/demandManagement/Add.vue

@@ -37,7 +37,7 @@
 
 <script>
 import Form from '@/components/Form.vue'
-import ChoosePrjDialog from './ChoosePrjDialog.vue'
+import ChoosePrjDialog from '@/components/ChoosePrjDialog.vue'
 
 import { addNeedInfo, editNeedInfo } from '@/api'
 import { materialOptions } from '@/utils/dictionary'