Merge branch 'dev' of licailing/wenlvju into master

src/main/java/com/izouma/wenlvju/domain/RateAudit.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
@@ -30,5 +31,6 @@ public class RateAudit extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private RateStatus status;
 
+    @Column(columnDefinition = "TEXT")
     private String remark;
 }

src/main/vue/src/mixins/rateStatus.js

@@ -16,6 +16,21 @@ export default {
                 { label: '完成', value: 'COMPLETE' },
                 { label: '撤回', value: 'CANCEL' }
             ],
+            statusOptions1: [
+                { label: '草稿', value: 'DRAFT' },
+                { label: '等待初审', value: 'FIRST_REVIEW_PENDING' },
+                { label: '正在受理', value: 'ACCEPT' },
+                { label: '审核完成', value: 'FIRST_REVIEW_COMPLETED' },
+                { label: '初审驳回', value: 'FIRST_REVIEW_DENY' },
+                { label: '区县已上报', value: 'ASSIGN_EXPERT' },
+                { label: '复审驳回', value: 'REVIEW_DENY' },
+                { label: '待线下考察', value: 'REVIEW_PENDING' },
+                { label: '待最终评审', value: 'SUBMIT_GRADE' },
+                { label: '待承办单位提交材料', value: 'SUBMIT_PAPER_MATERIALS' },
+                { label: '待区县提交材料', value: 'COLLECT_PAPER_MATERIALS' },
+                { label: '完成', value: 'COMPLETE' },
+                { label: '撤回', value: 'CANCEL' }
+            ],
             statusOptions2: [
                 { label: '区县已上报', value: 'ASSIGN_EXPERT' },
                 { label: '待线下考察', value: 'REVIEW_PENDING' },
@@ -33,6 +48,13 @@ export default {
                 return selectedOption.label;
             }
             return '';
+        },
+        statusFormatter1(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions1.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
         }
     }
 };

src/main/vue/src/views/organization/OrganizationInfo.vue

@@ -28,7 +28,7 @@
                     <el-input v-model="userInfo.email" placeholder="请输入邮箱"></el-input>
                 </el-form-item>
                 <el-form-item label="电话" prop="phone">
-                    <el-input v-model="userInfo.phone" placeholder="请输入邮箱"></el-input>
+                    <el-input v-model="userInfo.phone" placeholder="请输入电话"></el-input>
                 </el-form-item>
             </div>
 

src/main/vue/src/views/rate/RateEdit.vue

@@ -508,20 +508,24 @@ export default {
             this.inputValue = '';
         },
         onSave(isSubmit) {
-            this.$refs.form.validate(valid => {
-                if (valid) {
-                    this.submit(isSubmit);
-                } else {
-                    return false;
-                }
-            });
+            if (isSubmit) {
+                this.$refs.form.validate(valid => {
+                    if (valid) {
+                        this.submit(isSubmit);
+                    } else {
+                        return false;
+                    }
+                });
+            } else {
+                this.submit(false);
+            }
         },
         submit(isSubmit) {
             let data = { ...this.formData };
             data.status = 'FIRST_REVIEW_PENDING';
-            if (this.formData.status == 'EXPERT_DENY') {
-                data.status = 'SUBMIT_GRADE';
-            }
+            // if (this.formData.status == 'EXPERT_DENY') {
+            //     data.status = 'SUBMIT_GRADE';
+            // }
             if (!isSubmit) {
                 data.status = 'DRAFT';
             }

src/main/vue/src/views/rate/RateOrganizerList.vue

@@ -28,7 +28,7 @@
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <el-table-column prop="createdAt" label="申请时间"></el-table-column>
             <el-table-column prop="year" label="年度"> </el-table-column>
-            <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
+            <el-table-column prop="status" label="状态" :formatter="statusFormatter1"> </el-table-column>
             <el-table-column prop="submit" label="提交">
                 <template slot-scope="{ row }">
                     <span v-if="row.submit">已提交</span>
@@ -52,7 +52,7 @@
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>
-                        <span v-if="row.status == 'FIRST_REVIEW_DENY'">编辑资料</span>
+                        <span v-if="row.status == 'FIRST_REVIEW_DENY' || !row.submit">编辑资料</span>
                         <span v-else>查看材料</span></el-button
                     >
                     <el-button

src/test/java/com/izouma/wenlvju/repo/UserRepoTest.java

@@ -4,6 +4,8 @@ import com.izouma.wenlvju.domain.User;
 import com.izouma.wenlvju.enums.AuthorityName;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.security.Authority;
+import com.izouma.wenlvju.security.JwtTokenUtil;
+import com.izouma.wenlvju.security.JwtUserFactory;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +20,9 @@ import java.util.List;
 @SpringBootTest
 public class UserRepoTest {
     @Autowired
-    private UserRepo userRepo;
+    private UserRepo     userRepo;
+    @Autowired
+    private JwtTokenUtil jwtTokenUtil;
 
     @Test
     public void testUser() {
@@ -67,4 +71,10 @@ public class UserRepoTest {
         User user = userRepo.findById(1L).orElseThrow(new BusinessException("无用户"));
         System.out.println(new BCryptPasswordEncoder().matches("123456", user.getPassword()));
     }
+
+    @Test
+    public void test3() {
+        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(59L)
+                .orElseThrow(new BusinessException("用户不存在")))));
+    }
 }