From cd7f94e8f2ed06ad72d7d7304b234085d8fc595a Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 23 May 2024 16:44:04 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PopoverDelete.vue              |  2 +-
 src/views/project-demand/collection/index.vue | 23 ++++++++++++------
 src/views/project-demand/summary/index.vue    | 24 ++++++++++++-------
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/components/PopoverDelete.vue b/src/components/PopoverDelete.vue
index 4c04031..1f9ac87 100644
--- a/src/components/PopoverDelete.vue
+++ b/src/components/PopoverDelete.vue
@@ -9,7 +9,7 @@
       @cancel="handleCancel"
   >
     <template #reference>
-      <el-button :type="btnType" size="mini" :disabled="isDisabled" :icon="btnIcon" :plain="isPlain" :link="link">
+      <el-button v-perm="perm"  :type="btnType" size="mini" :disabled="isDisabled" :icon="btnIcon" :plain="isPlain" :link="link">
         {{ btnText }}
       </el-button>
     </template>
diff --git a/src/views/project-demand/collection/index.vue b/src/views/project-demand/collection/index.vue
index cefb488..2ddfac9 100644
--- a/src/views/project-demand/collection/index.vue
+++ b/src/views/project-demand/collection/index.vue
@@ -86,7 +86,7 @@ const tableConfig = reactive({
       align: 'center',
       width: 200,
       showOverflowTooltip: false,
-      currentRender: ({row, index}) => (<Tag dictType={'process_state'} value={row.state}/>)
+      currentRender: ({row, index}) => (<Tag dictType={'demand_collection'} value={row.state}/>)
     },
     {
       prop: 'oper',
@@ -102,11 +102,11 @@ const tableConfig = reactive({
         if (buttons.has("edit")) {
           btn.push({label: '编辑',prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
         }
-        if (buttons.has("delete")) {
-          btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleEdit(row), type: 'primary'})
-        }
+        // if (buttons.has("delete")) {
+        //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
+        // }
         if (buttons.has("report")) {
-          btn.push({label: '需求上报',prem: ['mosr:requirement:info'], func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '需求上报',prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
         }
         return (
             <div style={{width: '100%'}}>
@@ -123,8 +123,8 @@ const tableConfig = reactive({
                 ))
               }
               {
-                row.state === '3' || row.state === '2' ?
-                    <popover-delete name={row.requirementName} type={'需求征集'} btnType={'danger'}
+                buttons.has("delete") ?
+                    <popover-delete name={row.requirementName} type={'需求征集'} btnType={'danger'} perm={['mosr:requirement:del']}
                                     onDelete={() => handleDelete(row)}/> : ''
               }
             </div>
@@ -147,6 +147,7 @@ const search = (val) => {
   tableIns.value.refresh()
 }
 const handleAdd = () => {
+  //新增
   router.push({
     // name: 'Add',
     path: '/project/demand/collection/add',
@@ -181,6 +182,14 @@ const handleDetail = (row) => {
     }
   })
 }
+const handleReport = (row) => {
+  router.push({
+    name: 'Summary/add',
+    query: {
+      id:row.requirementId
+    }
+  })
+}
 const headBtnClick = (key) => {
   switch (key) {
     case 'add':
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 5a82315..9d8dfac 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -108,8 +108,8 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        if (row.state !== null) {
-          return (<Tag dictType={'demand_collection'} value={row.state}/>)
+        if (row.state !== null&&row.state != 0) {
+          return (<Tag dictType={'demand_summary'} value={row.state}/>)
         } else {
           return '--'
         }
@@ -121,11 +121,19 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
-        if (row.state === '3') {
-          btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
-        } else if (row.state === '0') {
-          btn.push({label: '上报', func: () => handleAdd(row), type: 'primary'})
+        let btn = []
+        let buttons = new Set(Array.from(row.buttons))
+        if (buttons.has("detail")) {
+          btn.push({label: '详情', prem: ['mosr:collect:info'], func: () => handleDetail(row), type: 'primary'})
+        }
+        if (buttons.has("edit")) {
+          btn.push({label: '编辑',prem: ['mosr:collect:resubmit'], func: () => handleEdit(row), type: 'primary'})
+        }
+        // if (buttons.has("delete")) {
+        //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleEdit(row), type: 'primary'})
+        // }
+        if (buttons.has("reported")) {
+          btn.push({label: '上报',prem: ['mosr:collect:reported'], func: () => handleAdd(row), type: 'primary'})
         }
         return (
             <div style={{width: '100%'}}>
@@ -133,7 +141,7 @@ const tableConfig = reactive({
                 btn.map(item => (
                     <el-button
                         type={item.type}
-                        // v-perm={item.auth}
+                        v-perm={item.prem}
                         onClick={() => item.func()}
                         link
                     >