Merge branch 'dev' of licailing/wenlvju into master

src/main/java/com/izouma/wenlvju/enums/RateStatus.java

@@ -25,9 +25,12 @@ public enum RateStatus {
     待分配专家组
      */
     ASSIGN_EXPERT("区县已上报"),
-
     /*
-    待专家组考察（分配专家组）
+    市里退回
+     */
+    REVIEW_DENY("复审驳回"),
+    /*
+    待专家组考察（已分配专家组）
      */
     REVIEW_PENDING("待线下考察"),
     /*

src/main/java/com/izouma/wenlvju/service/RateService.java

@@ -120,7 +120,7 @@ public class RateService {
         if (RateStatus.FIRST_REVIEW_DENY.equals(status)) {// 初审不通过
             // 发送短信给承办单位
             njwlSmsService.sendSms(rate.getOwnerPhone(), "你单位等级评定申请被退回");
-        } else { // 初审通过 2
+        } else if(RateStatus.ASSIGN_EXPERT.equals(status)) { // 初审通过 2
             DateTimeFormatter dtf = DateTimeFormatter.ofPattern(DateConfig.DEFAULT_DATE_TIME_FORMAT);
             String phone1 = userRepo.findAllByAuthoritiesContainsAndDelFalse(Authority.get(AuthorityName.ROLE_ADMIN))
                     .stream()

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

@@ -2,12 +2,13 @@ export default {
     data() {
         return {
             statusOptions: [
-                { label: '草稿', value: 'DRAFT' },
+                // { 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' },

src/main/vue/src/views/rate/RateAudit.vue

@@ -197,7 +197,10 @@
             </div>
             <el-form-item class="fixed-btn">
                 <div style="margin-top: 10px">
-                    <el-button type="success" v-if="formData.status == 'ACCEPT'" @click="completed()"
+                    <el-button
+                        type="success"
+                        v-if="formData.status == 'ACCEPT' || formData.status == 'REVIEW_DENY'"
+                        @click="completed"
                         >审核完成</el-button
                     >
                     <el-button @click="$router.go(-1)">返回</el-button>

src/main/vue/src/views/rate/RateDistrictList.vue

@@ -109,7 +109,11 @@
                         <span v-else>查看材料</span>
                     </el-button>
                     <el-button
-                        v-if="row.status === 'ACCEPT' || row.status === 'FIRST_REVIEW_COMPLETED'"
+                        v-if="
+                            row.status === 'ACCEPT' ||
+                                row.status === 'FIRST_REVIEW_COMPLETED' ||
+                                row.status === 'REVIEW_DENY'
+                        "
                         :loading="row.loading"
                         @click="audit(row, 'ASSIGN_EXPERT', '区县管理员已审核上报')"
                         type="success"
@@ -119,7 +123,11 @@
                         同意上报
                     </el-button>
                     <el-button
-                        v-if="row.status === 'ACCEPT' || row.status === 'FIRST_REVIEW_COMPLETED'"
+                        v-if="
+                            row.status === 'ACCEPT' ||
+                                row.status === 'FIRST_REVIEW_COMPLETED' ||
+                                row.status === 'REVIEW_DENY'
+                        "
                         :loading="row.loading"
                         @click="dismiss(row)"
                         type="warning"
@@ -170,7 +178,7 @@
             >
             </el-pagination>
         </div>
-        <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
+        <!-- <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
             <div style="height: 150px;width:330px;margin:2px auto">
                 <label style="margin-right: 10px">退回缘由</label>
                 <el-select
@@ -188,6 +196,19 @@
                     <el-button type="primary" @click="saveDismiss">确认</el-button>
                 </div>
             </div>
+        </el-dialog> -->
+        <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
+            <div style="height: 150px;width:400px;margin:2px auto">
+                <el-input
+                    type="textarea"
+                    v-model="reason"
+                    :autosize="{ minRows: 4, maxRows: 4 }"
+                    placeholder="请输入退回缘由"
+                ></el-input>
+                <div style="margin: 20px 0 0 345px">
+                    <el-button type="primary" @click="saveDismiss">确认</el-button>
+                </div>
+            </div>
         </el-dialog>
     </div>
 </template>
@@ -358,7 +379,7 @@ export default {
         },
         audit(row, status, remark) {
             this.$set(row, 'loading', true);
-            if (row.status === 'ACCEPT') {
+            if (row.status === 'ACCEPT' || row.status === 'REVIEW_DENY') {
                 this.$alert('请先审核材料，并确认已审核完成', '提示', {
                     confirmButtonText: '确认',
                     callback: action => {
@@ -400,7 +421,7 @@ export default {
             }
         },
         dismiss(row) {
-            if (row.status === 'ACCEPT') {
+            if (row.status === 'ACCEPT' || row.status === 'REVIEW_DENY') {
                 this.$alert('请先审核材料，并确认已审核完成', '提示', {
                     confirmButtonText: '确认',
                     callback: action => {

src/main/vue/src/views/rate/RateList.vue

@@ -148,7 +148,7 @@
                     <span v-else><el-link :underline="false" type="info">暂无</el-link></span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="right" fixed="right" min-width="100">
+            <el-table-column label="操作" align="right" fixed="right" min-width="150">
                 <template slot-scope="{ row }">
                     <!-- <el-button
                         v-if="row.status === 'FIRST_REVIEW_PENDING'"
@@ -159,16 +159,6 @@
                         plain
                     >
                         同意上报
-                    </el-button>
-                    <el-button
-                        v-if="row.status === 'FIRST_REVIEW_PENDING'"
-                        :loading="row.loading"
-                        @click="dismiss(row)"
-                        type="warning"
-                        size="mini"
-                        plain
-                    >
-                        退回
                     </el-button> -->
                     <el-button
                         @click="supervision(row.id)"
@@ -178,6 +168,16 @@
                         v-if="row.status === 'ASSIGN_EXPERT'"
                         >分配专家组</el-button
                     >
+                    <el-button
+                        v-if="row.status === 'ASSIGN_EXPERT'"
+                        :loading="row.loading"
+                        @click="dismiss(row)"
+                        type="warning"
+                        size="mini"
+                        plain
+                    >
+                        退回
+                    </el-button>
                     <el-button
                         v-if="row.status === 'COLLECT_PAPER_MATERIALS'"
                         type="success"
@@ -257,20 +257,14 @@
             </el-form>
         </el-dialog>
         <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
-            <div style="height: 150px;width:330px;margin:2px auto">
-                <label style="margin-right: 10px">退回缘由</label>
-                <el-select
+            <div style="height: 150px;width:400px;margin:2px auto">
+                <el-input
+                    type="textarea"
                     v-model="reason"
-                    filterable
-                    allow-create
-                    default-first-option
-                    clearable
-                    placeholder="请选择缘由"
-                    style="width: 70%"
-                >
-                    <el-option v-for="item in dismissReason" :key="item" :label="item" :value="item"> </el-option>
-                </el-select>
-                <div style="margin: 45px 0 0 240px">
+                    :autosize="{ minRows: 4, maxRows: 4 }"
+                    placeholder="请输入退回缘由"
+                ></el-input>
+                <div style="margin: 20px 0 0 345px">
                     <el-button type="primary" @click="saveDismiss">确认</el-button>
                 </div>
             </div>
@@ -311,8 +305,8 @@ export default {
             grade: '',
             status: [],
             statusOptions: [
-                { label: '已审核上报', value: 'ASSIGN_EXPERT' },
-                { label: '待专家组考察', value: 'REVIEW_PENDING' },
+                { label: '区县已上报', value: 'ASSIGN_EXPERT' },
+                { label: '待线下考察', value: 'REVIEW_PENDING' },
                 { label: '待最终评审', value: 'SUBMIT_GRADE' },
                 { label: '待承办单位提交材料', value: 'SUBMIT_PAPER_MATERIALS' },
                 { label: '待区县提交材料', value: 'COLLECT_PAPER_MATERIALS' },
@@ -499,24 +493,25 @@ export default {
                 });
         },
         dismiss(row) {
-            // this.$prompt('请输入驳回缘由', '提示', {
-            //     confirmButtonText: '确定',
-            //     cancelButtonText: '取消'
-            // })
-            //     .then(({ value }) => {
-            //         this.audit(row, 'FIRST_REVIEW_DENY', value);
-            //     })
-            //     .catch(() => {
-            //         this.$message({
-            //             type: 'info',
-            //             message: '取消输入'
-            //         });
-            //     });
             this.dialogDismiss = true;
             this.form = row;
         },
         saveDismiss() {
-            this.audit(this.form, 'FIRST_REVIEW_DENY', this.reason);
+            this.$http
+                .post('/rate/audit', {
+                    id: this.form.id,
+                    status: 'REVIEW_DENY',
+                    score: 0,
+                    remark: '复审驳回：' + this.reason
+                })
+                .then(res => {
+                    this.$message.success('退回成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
             this.form = '';
             this.reason = '';
             this.dialogDismiss = false;