Merge pull request 'fix : 修复文章操作权限' (#819) from dj into master

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

src/components/DetailComponent/ApprovalDetail.vue

@@ -155,7 +155,6 @@ const editSingleTableConfig = reactive({
               }
               {
                 row.newFile ? <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
-                                              perm={['mosr:requirement:del']}
                                               onDelete={() => handleDelete(row)}/>
                     : ''
               }

src/components/DetailComponent/FileComponent.vue

@@ -115,7 +115,6 @@ const tableConfig = reactive({
               }
               {
                 row.newFile ? <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
-                                              perm={['mosr:requirement:del']}
                                               onDelete={() => handleDelete(row)}/>
                     : ''
               }

src/components/DetailComponent/singleFileComponent.vue

@@ -104,7 +104,6 @@ const tableConfig = reactive({
               }
               {
                 row.newFile ? <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
-                                              perm={['mosr:requirement:del']}
                                               onDelete={() => handleDelete(row)}/>
                     : ''
               }

src/components/PopoverDelete.vue

@@ -10,7 +10,11 @@
   >
     <template #reference>
 <!--      v-perm="perm"-->
-      <el-button  :type="btnType" size="mini" :disabled="isDisabled" :icon="btnIcon" :plain="isPlain" :link="link">
+
+      <el-button  :type="btnType" size="mini" :disabled="isDisabled" v-if="perm" v-perm="perm" :icon="btnIcon" :plain="isPlain" :link="link">
+        {{ btnText }}
+      </el-button>
+      <el-button  :type="btnType" size="mini" :disabled="isDisabled" v-else  :icon="btnIcon" :plain="isPlain" :link="link">
         {{ btnText }}
       </el-button>
     </template>

src/views/article-management/index.vue

@@ -103,23 +103,32 @@ const researchFundTableConfig = reactive({
       currentRender: ({row, index}) => {
         let btn = []
         btn.push({label: '详情', func: () => handleDetail(row), type: 'primary'})
-        btn.push({label: '编辑',  func: () => handleEdit(row), type: 'primary'})
+        btn.push({label: '编辑', prem: ['mosr:article:edit'], func: () => handleEdit(row), type: 'primary'})
         return (
             <div style={{width: '100%'}}>
               {
+
                 btn.map(item => (
-                    <el-button
+                    item.prem ?
-                        type={item.type}
+                        <el-button
-                        // v-perm={item.prem}
+                            type={item.type}
-                        onClick={() => item.func()}
+                            v-perm={item.prem}
-                        link
+                            onClick={() => item.func()}
-                    >
+                            link
-                      {item.label}
+                        >
-                    </el-button>
+                          {item.label}
+                        </el-button> :
+                        <el-button
+                            type={item.type}
+                            onClick={() => item.func()}
+                            link
+                        >
+                          {item.label}
+                        </el-button>
                 ))
               }
               {
-                <popover-delete name={row.articleTitle} type={'文章'} btnType={'danger'}
+                <popover-delete name={row.articleTitle} type={'文章'} btnType={'danger'} perm={['mosr:article:del']}
                                 onDelete={() => handleDelete(row)}/>
               }
             </div>
@@ -129,7 +138,7 @@ const researchFundTableConfig = reactive({
   ],
   api: '/workflow/mosr/article/list',
   btns: [
-    {name: '新增', key: 'add', color: '#DED0B2'}
+    {name: '新增', key: 'add', color: '#DED0B2', auth: ['mosr:article:add']}
   ],
   params: {}
 })

src/views/expense-management/share/index.vue

@@ -175,7 +175,6 @@ const tableConfig = reactive({
               {
                 buttons.has("delete") ?
                     <popover-delete name={row.shareName} type={'费用分摊'} btnType={'danger'}
-                                    perm={['mosr:requirement:del']}
                                     onDelete={() => handleDelete(row)}/>
                     : ''
               }

src/views/project-demand/requirement/add.vue

@@ -241,7 +241,6 @@ const tableConfig = reactive({
             <div>
               <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
               <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
-                              perm={['mosr:requirement:del']}
                               onDelete={() => handleDelete(row)}/>
             </div>
         )

src/views/project-management/mobledetail/ApprovalDetailMoblie.vue

@@ -154,7 +154,6 @@ const editSingleTableConfig = reactive({
               }
               {
                 row.newFile ? <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
-                                              perm={['mosr:requirement:del']}
                                               onDelete={() => handleDelete(row)}/>
                     : ''
               }

src/views/special-fund/add.vue

@@ -141,7 +141,6 @@ const tableConfig = reactive({
             <div>
               <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
               <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
-                              perm={['mosr:requirement:del']}
                               onDelete={() => handleDelete(row)}/>
             </div>
         )