Merge branch 'dev' of licailing/wenlvju into master

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

@@ -272,7 +272,7 @@
                         "
                         :loading="saving"
                         type="warning"
-                        v-if="formData.status == 'FIRST_REVIEW_PENDING' && readonly"
+                        v-if="formData.status == 'FIRST_REVIEW_DENY' && readonly"
                         >编辑</el-button
                     >
                     <el-button @click="onSave(true)" :loading="saving" type="primary" v-if="!formData.submit"
@@ -285,7 +285,11 @@
                         @click="onCancel"
                         :loading="saving"
                         type="danger"
-                        v-if="formData.id && formData.status == 'FIRST_REVIEW_PENDING' && readonly"
+                        v-if="
+                            formData.id &&
+                                (formData.status == 'FIRST_REVIEW_PENDING' || formData.status == 'FIRST_REVIEW_DENY') &&
+                                readonly
+                        "
                         >撤回
                     </el-button>
                     <el-button @click="$router.go(-1)">返回</el-button>
@@ -321,7 +325,7 @@ export default {
                 .get('rate/get/' + this.$route.query.id)
                 .then(res => {
                     this.formData = res;
-                    // if (res.status != 'FIRST_REVIEW_DENY' || formData.status == 'FIRST_REVIEW_DENY' || res.submit) {
+                    // if (res.status != 'FIRST_REVIEW_DENY' || res.submit) {
                     //     this.readonly = true;
                     // }
                     if (res.status == 'CANCEL' || !res.submit) {
@@ -356,7 +360,7 @@ export default {
             this.formData.organizationId = this.organization.id;
             this.readonly = false;
         } else {
-            this.readonly = false;
+            this.readonly = true;
         }
         this.$http
             // .get('/district/NJ')