licailing 5 years ago
parent
commit
be04aa0e86

+ 15 - 0
src/main/h5/src/views/inspector/addRecord.vue

@@ -59,6 +59,21 @@
           </van-radio-group>
         </template>
       </van-field>
+      <van-field
+          name="isSameAddress"
+          label="考试地点与备案考试地点是否一致"
+      >
+        <template #input>
+          <van-radio-group
+              :disabled="!!formData.id"
+              v-model="formData.isSameAddress"
+              direction="horizontal"
+          >
+            <van-radio :name="true" label-disabled>是</van-radio>
+            <van-radio :name="false" label-disabled>否</van-radio>
+          </van-radio-group>
+        </template>
+      </van-field>
       <van-field name="isExaminer" label="是否有无相关专业考官且佩戴考官证">
         <template #input>
           <van-radio-group

+ 1 - 1
src/main/java/com/izouma/wenlvju/web/MenuController.java

@@ -73,7 +73,7 @@ public class MenuController extends BaseController {
         ids.stream().parallel().forEach(id -> menuRepo.saveAuthority(name, id));
     }
 
-    @PreAuthorize("hasRole('ADMIN')")
+//    @PreAuthorize("hasRole('ADMIN')")
     @GetMapping("/all")
     public List<Menu> all(String category) {
         List<Menu> menuList = menuRepo.findAll((Specification<Menu>) (root, criteriaQuery, criteriaBuilder) -> {

+ 2 - 0
src/main/java/com/izouma/wenlvju/web/RegulatoryController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDate;
 import java.util.List;
 
 @RestController
@@ -40,6 +41,7 @@ public class RegulatoryController extends BaseController {
             record1.setRegulatoryStatus(RegulatoryStatus.SUBMITTED);
             recordRepo.save(record1);
         }
+        record.setTime(LocalDate.now());
         return regulatoryRepo.save(record);
     }
 

+ 1 - 1
src/main/java/com/izouma/wenlvju/web/UserController.java

@@ -75,7 +75,7 @@ public class UserController extends BaseController {
                 .orElseThrow(new BusinessException("用户不存在"));
     }
 
-    @PreAuthorize("hasRole('ADMIN')")
+//    @PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
     public Page<User> all(@RequestBody PageQuery pageQuery) {
         return userService.all(pageQuery);

BIN
src/main/vue/src/assets/code.png


+ 3 - 2
src/main/vue/src/views/RecordDistrictList.vue

@@ -6,8 +6,8 @@
                 <el-option v-for="item in district" :key="item.id" :value="item.name" :label="item.name"></el-option>
             </el-select> -->
             <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">查询 </el-button>
-            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
-            <el-button @click="update" type="primary" class="filter-item">一键更新 </el-button>
+            <!-- <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button> -->
+            <!-- <el-button @click="update" type="primary" class="filter-item">一键更新 </el-button> -->
             <!-- <el-button @click="distribute" type="primary" class="filter-item">一键分发 </el-button> -->
             <!-- <el-button
                 @click="download"
@@ -127,6 +127,7 @@ export default {
         beforeGetData() {
             return {
                 search: this.search,
+                sort: 'recordTime,desc',
                 query: {
                     district: '玄武区',
                     del: false