lyq пре 4 месеци
родитељ
комит
1fffee3b0a
1 измењених фајлова са 11 додато и 10 уклоњено
  1. 11 10
      lawenforcement-ui/src/views/lawenforcement/record/index.vue

+ 11 - 10
lawenforcement-ui/src/views/lawenforcement/record/index.vue

@@ -28,7 +28,7 @@
         >新增
         </el-button>
       </el-col>
-      <el-col :span="1.5" v-if="isRegister === '1'">
+      <!--<el-col :span="1.5" v-if="isRegister === '1'">
         <el-button
           type="primary"
           plain
@@ -38,7 +38,7 @@
           v-hasPermi="['lawenforcement:case:register']"
         >立案
         </el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -91,22 +91,23 @@
           </el-button>-->
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
                        v-hasPermi="['system:role:edit']"
-                       v-if="scope.row.isRegister === '0' || scope.row.recordStatus === 'lawenforcement_type_2'
-                       || (scope.row.createMethod === 4 && scope.row.recordStatus === 'lawenforcement_type_1')">
+                       v-if="(scope.row.recordStatus === 'lawenforcement_type_2' || scope.row.recordStatus === 'lawenforcement_type_5') && scope.row.isRegister ==='0'
+                               || (scope.row.createMethod === 4 && scope.row.recordStatus === 'lawenforcement_type_1')">
             <span class="el-dropdown-link">
               <i class="el-icon-d-arrow-right el-icon--right"></i>更多
             </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item
-                v-if="scope.row.isRegister === '0'" command="register" icon="el-icon-edit" v-hasPermi="['lawenforcement:record:edit']">
+                v-if="(scope.row.recordStatus === 'lawenforcement_type_2' || scope.row.recordStatus === 'lawenforcement_type_5') && scope.row.isRegister ==='0'" command="register" icon="el-icon-edit" v-hasPermi="['lawenforcement:record:edit']">
                 立案
               </el-dropdown-item>
               <el-dropdown-item
-                v-if="scope.row.isRegister === '0'" command="fillForm" icon="el-icon-edit" v-hasPermi="['lawenforcement:record:edit']">
+                v-if="(scope.row.recordStatus === 'lawenforcement_type_2' || scope.row.recordStatus === 'lawenforcement_type_5') && scope.row.isRegister ==='0'"
+                command="fillForm" icon="el-icon-edit" v-hasPermi="['lawenforcement:record:edit']">
                 填报
               </el-dropdown-item>
               <el-dropdown-item
-                v-if="(scope.row.recordStatus === 'lawenforcement_type_2')" command="setStatus"
+                v-if="scope.row.recordStatus === 'lawenforcement_type_2' && scope.row.isRegister ==='0'" command="setStatus"
                 icon="el-icon-edit" v-hasPermi="['lawenforcement:record:edit']">
                 延续执法
               </el-dropdown-item>
@@ -123,19 +124,19 @@
             </el-dropdown-menu>
           </el-dropdown>
           <el-button
-            v-if="scope.row.isRegister === '1' && isRegister === '1'"
+            v-if="(scope.row.recordStatus === 'lawenforcement_type_2' || scope.row.recordStatus === 'lawenforcement_type_5') && scope.row.isRegister ==='1' && isRegister === '1'"
             v-hasPermi="['lawenforcement:case:register']" size="mini" type="text" icon="el-icon-paper-plus"
             @click="registerLiAn(scope.row)">
             案件填报
           </el-button>
           <el-button
-            v-if="scope.row.isRegister ==='1' && isRegister !== '1'"
+            v-if="(scope.row.recordStatus === 'lawenforcement_type_2' || scope.row.recordStatus === 'lawenforcement_type_5') && scope.row.isRegister ==='1' && isRegister !== '1'"
             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.isRegister ==='4' && isRegister !== '1' && hasApprovalPermission"
+            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)">
             审批