Merge pull request 'master' (#114) from master into dj

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/114

src/fvcomponents/fvSearchForm/index.vue

@@ -68,7 +68,7 @@ const filterConfig = computed(()=>{
 // 搜索功能表单元素默认值
 const setDefaultFormValues = () => {
   filterConfig.value.forEach(item=>{
-    form.value[item.prop] = item.props.defaultValue || null
+    form.value[item.prop] = item.props?.defaultValue || null
   })
 }
 

src/stores/permisstion.js

@@ -107,7 +107,17 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
   }
 
   const removeMenu = () => {
-    menuList.value.length = 0
+    menuList.value = [
+      {
+        name: 'home',
+        path: '/home',
+        icon: 'home',
+        title: '首页',
+        meta: {
+          breadcrumb: true
+        }
+      }
+    ]
     asyncRouters.value.length = 0
   }
 

src/views/projectdemand/demandsummary/index.vue

@@ -1,11 +1,127 @@
 <template>
-  <div>
-    需求汇总
-  </div>
+  <fvSearchForm :searchConfig="searchConfig"></fvSearchForm>
+  <fvTable :table-config="tableConfig"></fvTable>
 </template>
 
 <script setup lang="jsx">
+import { reactive, shallowRef } from 'vue';
+import fvSelect from './../../../fvcomponents/fvSelect/index.vue'
 
+const localData = reactive({
+  // 表格配置
+  
+})
+
+const searchConfig = reactive([
+  {
+    label: '名称',
+    prop: 'name',
+    component: 'el-input',
+    colProps: {}
+  },
+  {
+    label: '项目类型',
+    prop: 'projectType',
+    component: shallowRef(fvSelect),
+    props: {},
+    colProps: {}
+  },
+  {
+    label: '研发主体',
+    prop: 'productMainBody',
+    component: shallowRef(fvSelect),
+    props: {},
+    colProps: {}
+  },
+  {
+    label: '项目影响',
+    prop: 'projectEffect',
+    component: shallowRef(fvSelect),
+    props: {},
+    colProps: {}
+  },
+  {
+    label: '起止时间',
+    prop: 'time',
+    component: 'el-date-picker',
+    props: {},
+    colProps: {}
+  },
+  {
+    label: '最小金额',
+    prop: 'minMoney',
+    component: 'el-input',
+    colProps: {}
+  },
+  {
+    label: '最大金额',
+    prop: 'maxMoney',
+    component: 'el-input',
+    colProps: {}
+  },
+])
+
+const tableConfig = reactive({
+  columns: [
+    {
+      type: 'selection',
+      prop: 'selection'
+    },
+    {
+      prop: 'name',
+      label: '名称',
+      align: 'center'
+    },
+    {
+      prop: 'company',
+      label: '所属公司',
+      align: 'center'
+    },
+    {
+      prop: 'projectType',
+      label: '项目类型',
+      align: 'center'
+    },
+    {
+      prop: 'productMainBody',
+      label: '研发主体',
+      align: 'center'
+    },
+    {
+      prop: 'projectEffect',
+      label: '项目影响',
+      align: 'center'
+    },
+    {
+      prop: 'survey',
+      label: '经营概况',
+      align: 'center'
+    },
+    {
+      prop: 'time',
+      label: '起止时间',
+      align: 'center'
+    },
+    {
+      prop: 'status',
+      label: '发布状态',
+      align: 'center'
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      currentRender: ({row, index}) => {
+        return (
+          <div>
+            <el-button type={'primary'} link onClick={()=>{}}>详情</el-button>
+            <el-button type={'primary'} link onClick={()=>{}}>上报</el-button>
+          </div>
+        )
+      }
+    }
+  ]
+}) 
 </script>
 
 <style lang="scss" scoped>