hanfucheng 7 місяців тому
батько
коміт
13d0401049

+ 15 - 2
lawenforcement-ui/src/views/lawenforcement/record/index.vue

@@ -60,6 +60,12 @@
           <span v-else>未知方式</span>
         </template>
       </el-table-column>
+      <el-table-column label="是否立案" align="center" prop="isRegister">
+        <template v-slot="scope">
+          <span v-if="scope.row.isRegister === '1'|| scope.row.isRegister === '2'">是</span>
+          <span v-else>否</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-paper-plus" @click="detailShow(scope.row)">
@@ -111,12 +117,12 @@
           </el-dropdown>
           <el-button
             v-if="(scope.row.recordStatus === 'lawenforcement_type_2' || scope.row.recordStatus === 'lawenforcement_type_5') && scope.row.isRegister ==='1' && isRegister !== '1'"
-            v-hasPermi="['lawenforcement:record:revoke']" size="mini" type="text" icon="el-icon-paper-plus"
+            v-hasPermi="['lawenforcement:record:edit']" size="mini" type="text" icon="el-icon-paper-plus"
             @click="fillFormHandle(scope.row,1)">
             撤销
           </el-button>
           <el-button
-            v-if="(scope.row.recordStatus === 'lawenforcement_type_2' || scope.row.recordStatus === 'lawenforcement_type_5') && scope.row.isRegister ==='4' && isRegister !== '1'"
+            v-if="(scope.row.recordStatus === 'lawenforcement_type_2' || scope.row.recordStatus === 'lawenforcement_type_5') && scope.row.isRegister ==='4' && isRegister !== '1' && hasApprovalPermission"
             v-hasPermi="['lawenforcement:record:revoke']" size="mini" type="text" icon="el-icon-paper-plus"
             @click="approval(scope.row)">
             审批
@@ -391,6 +397,7 @@ import register from "@/views/lawenforcement/register/index.vue";
 import FillForm from "@/views/lawenforcement/record/fillForm.vue";
 import Treeselect from "@riophae/vue-treeselect";
 import fileUpload from '@/views/components/FileUpload/index.vue';
+import {checkPermi} from "@/utils/permission";
 
 export default {
   name: "Record",
@@ -401,6 +408,7 @@ export default {
   ],
   data() {
     return {
+      hasApprovalPermission:false,
       attachPath: '',
       describe: '',
       // 遮罩层
@@ -479,6 +487,11 @@ export default {
       type: null,
     };
   },
+  mounted() {
+    const hasPermission = checkPermi(['lawenforcement:record:revoke']);
+    console.log('用户是否有审批权限:', hasPermission);
+    this.hasApprovalPermission = hasPermission;
+  },
   created() {
     this.queryParams.isRegister = this.$route.query.isRegister;
     this.isRegister = this.$route.query.isRegister?this.$route.query.isRegister:0;

+ 1 - 0
src/main/java/com/sooka/sponest/lawenforcement/record/controller/LawenforcementRecordController.java

@@ -179,6 +179,7 @@ public class LawenforcementRecordController extends BaseController {
     * @author 韩福成
     * @date 2024/11/5 上午8:31
     */
+    @RequiresPermissions("lawenforcement:record:revoke")
     @GetMapping("/getFillForm")
     public AjaxResult getFillForm(LawenforcementFillFormBO fillFormBO){
         return AjaxResult.success(lawenforcementRecordService.getFillForm(fillFormBO));