From b2369d17026acb81e8abc7979e18cc1fcbf72439 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 15 May 2024 00:17:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat=20:=20=E9=A1=B9=E7=9B=AE=E5=AE=9E?=
 =?UTF-8?q?=E6=96=BD=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../implementation/check.vue                  |  13 ++
 .../implementation/detail.vue                 |  49 +++++
 .../implementation/index.vue                  | 200 +++++++++++++++++-
 3 files changed, 252 insertions(+), 10 deletions(-)
 create mode 100644 src/views/project-management/implementation/check.vue
 create mode 100644 src/views/project-management/implementation/detail.vue

diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
new file mode 100644
index 0000000..3832ce4
--- /dev/null
+++ b/src/views/project-management/implementation/check.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "check"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
new file mode 100644
index 0000000..386dc31
--- /dev/null
+++ b/src/views/project-management/implementation/detail.vue
@@ -0,0 +1,49 @@
+<template>
+<div class="detail-block">
+  <el-tabs
+      v-model="activeName"
+      type="card"
+      class="demo-tabs"
+      @tab-click="handleClick"
+  >
+    <el-tab-pane label="需求征集" name="first">
+
+    </el-tab-pane>
+    <el-tab-pane label="需求上报" name="second"></el-tab-pane>
+    <el-tab-pane label="项目立项" name="third" ></el-tab-pane>
+    <el-tab-pane label="项目实施" name="third" :disabled="true"></el-tab-pane>
+  </el-tabs>
+</div>
+</template>
+
+<script setup lang="jsx">
+const activeName = ref('first')
+const handleClick = (tab, event) => {
+  console.log(tab, event)
+  if(tab.index.value === 0){
+
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.detail-block{
+  padding-top: 15px;
+  :deep(.el-tabs__nav-scroll){
+    width: 100%;
+    display: flex;
+    .el-tabs__nav{
+      display: flex;
+      flex: 1;
+      .el-tabs__item{
+        flex: 1;
+        font-size: 16px;
+      }
+      .is-active{
+        color: black;
+        background-color: #DED0B2;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 9c8ed39..433f00c 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -1,15 +1,195 @@
 <template>
-  <div>
-    项目实施
-  </div>
+  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig">
+    <template #empty>
+      <el-empty description="暂无数据"/>
+    </template>
+  </fvTable>
 </template>
 
-<script>
-export default {
-  name: "index"
+<script setup lang="jsx">
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import {reactive, shallowRef} from "vue";
+
+const router = useRouter()
+const searchConfig = reactive([
+  {
+    label: '名称',
+    prop: 'requirementName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入名称查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '项目类型',
+    prop: 'collectType',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择项目类型',
+      clearable: true,
+      filterable: true,
+    }
+  },
+  {
+    label: '项目影响',
+    prop: 'projectEffect',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择项目影响',
+      clearable: true,
+      filterable: true,
+    },
+    colProps: {}
+  },
+  {
+    label: '研发主体',
+    prop: 'collectType',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择研发主体',
+      clearable: true,
+      filterable: true,
+    }
+  },
+
+  {
+    label: '起止时间',
+    prop: 'time',
+    component: 'el-date-picker',
+    props: {
+      placeholder: '请选择起止时间',
+      clearable: true,
+    },
+    colProps: {}
+  },
+  {
+    label: '最小金额',
+    prop: 'requirementName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入金额查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '最大金额',
+    prop: 'requirementName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入金额查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+])
+const tableIns = ref()
+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',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => (<Tag dictType={'process_state'} value={row.state}/>)
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
+        if (row.state === '3') {
+          btn.push({label: '验收', func: () => handleCheck(row), type: 'primary'})
+        } else if (row.state === '4') {
+          btn.push({label: '台账', func: () => handleStandingBook(row), type: 'primary'})
+          btn.push({label: '附件', func: () => handleAttachment(row), type: 'primary'})
+          btn.push({label: '分摊', func: () => handleShare(row), type: 'primary'})
+        }
+        return (
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        // v-perm={item.auth}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
+            </div>
+        )
+      }
+    }
+  ],
+  api: '',
+  params: {},
+  btns: [
+    {name: '生成分摊报表', key: '_export', color: '#DED0B2',auth: ''}
+  ]
+})
+
+const search = (val) => {
+  tableConfig.params = {...val}
+  tableIns.value.refresh()
 }
+
+const handleDetail = (row) => {
+  router.push({
+    name:'Implementation/detail',
+    query: {
+      id: row.requirementId
+    }
+  })
+}
+
 </script>
-
-<style scoped>
-
-</style>

From 9ae0b7547cf7ed522a9dd6e0a58ef9eb342d3e18 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 15 May 2024 00:18:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat=20:=20=E9=A1=B9=E7=9B=AE=E7=AB=8B?=
 =?UTF-8?q?=E9=A1=B9=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project-management/initiation/detail.vue  | 44 +++++++++++++++++--
 .../project-management/initiation/edit.vue    | 12 -----
 .../project-management/initiation/index.vue   |  4 +-
 3 files changed, 42 insertions(+), 18 deletions(-)
 delete mode 100644 src/views/project-management/initiation/edit.vue

diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index 8ad911c..aeebf62 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -1,12 +1,48 @@
 <template>
-<div>
-  项目立项详情
+<div class="detail-block">
+  <el-tabs
+      v-model="activeName"
+      type="card"
+      class="demo-tabs"
+      @tab-click="handleClick"
+  >
+    <el-tab-pane label="需求征集" name="first">
+
+    </el-tab-pane>
+    <el-tab-pane label="需求上报" name="second"></el-tab-pane>
+    <el-tab-pane label="项目立项" name="third" :disabled="true"></el-tab-pane>
+  </el-tabs>
 </div>
 </template>
 
 <script setup lang="jsx">
+const activeName = ref('first')
+const handleClick = (tab, event) => {
+  console.log(tab, event)
+  if(tab.index.value === 0){
+
+  }
+}
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+.detail-block{
+  padding-top: 15px;
+  :deep(.el-tabs__nav-scroll){
+    width: 100%;
+    display: flex;
+    .el-tabs__nav{
+      display: flex;
+      flex: 1;
+      .el-tabs__item{
+        flex: 1;
+        font-size: 16px;
+      }
+      .is-active{
+        color: black;
+        background-color: #DED0B2;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/project-management/initiation/edit.vue b/src/views/project-management/initiation/edit.vue
deleted file mode 100644
index 94125ec..0000000
--- a/src/views/project-management/initiation/edit.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-  <div>
-    项目立项编辑
-  </div>
-</template>
-
-<script setup lang="jsx">
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index c7c865f..c47dcbc 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -129,7 +129,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'status',
-      label: '发布状态',
+      label: '状态',
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => (<Tag dictType={'process_state'} value={row.state}/>)
@@ -165,7 +165,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '/workflow/mosr/requirement',
+  api: '',
   params: {},
 })