licailing 5 лет назад
Родитель
Сommit
efa3680a31

+ 2 - 2
src/main/vue/src/plugins/http.js

@@ -5,8 +5,8 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
 switch (process.env.NODE_ENV) {
     case 'development':
     case 'development':
-        baseUrl = 'http://localhost:8080';
-        // baseUrl = 'http://wlj.izouma.com';
+        // baseUrl = 'http://localhost:8080';
+        baseUrl = 'http://wlj.izouma.com';
         break;
         break;
     case 'test':
     case 'test':
         baseUrl = 'http://localhost:8080';
         baseUrl = 'http://localhost:8080';

+ 27 - 1
src/main/vue/src/views/rate/RateAuditEdit.vue

@@ -16,7 +16,28 @@
                     </el-form-item>
                     </el-form-item>
 
 
                     <el-form-item label="进度">
                     <el-form-item label="进度">
-                        <el-input style="width: 400px" type="textarea" v-model="item.remark" readonly></el-input>
+                        <div class="tishi" v-if="item.status == 'REVIEW_DENY'">
+                            <span>市文旅局退回意见:</span>
+                        </div>
+                        <div class="tishi" v-if="item.status == 'FIRST_REVIEW_DENY'">
+                            <span>区文旅局退回意见:</span>
+                        </div>
+                        <el-input
+                            v-if="item.status == 'REVIEW_DENY' || item.status == 'FIRST_REVIEW_DENY'"
+                            style="width: 400px;margin-left: 40px"
+                            type="textarea"
+                            v-model="item.remark"
+                            readonly
+                            autosize
+                        ></el-input>
+                        <el-input
+                            v-else
+                            style="width: 400px;"
+                            type="textarea"
+                            v-model="item.remark"
+                            readonly
+                            autosize
+                        ></el-input>
                     </el-form-item>
                     </el-form-item>
                 </el-form>
                 </el-form>
             </div>
             </div>
@@ -107,4 +128,9 @@ export default {
     background-color: #ffffff;
     background-color: #ffffff;
     color: #606266;
     color: #606266;
 }
 }
+.tishi {
+    margin: 0 0 4px 40px;
+    color: #606266;
+    font-size: 14px;
+}
 </style>
 </style>

+ 1 - 1
src/main/vue/src/views/rate/RateDistrictList.vue

@@ -575,7 +575,7 @@ export default {
                     id: this.form.id,
                     id: this.form.id,
                     status: 'FIRST_REVIEW_DENY',
                     status: 'FIRST_REVIEW_DENY',
                     score: 0,
                     score: 0,
-                    remark: '区文旅局退回意见:' + this.reason
+                    remark: this.reason
                 })
                 })
                 .then(res => {
                 .then(res => {
                     this.$set(row, 'loading', false);
                     this.$set(row, 'loading', false);

+ 1 - 1
src/main/vue/src/views/rate/RateDistrictListDone.vue

@@ -594,7 +594,7 @@ export default {
                     id: this.form.id,
                     id: this.form.id,
                     status: 'FIRST_REVIEW_DENY',
                     status: 'FIRST_REVIEW_DENY',
                     score: 0,
                     score: 0,
-                    remark: '区文旅局退回意见:' + this.reason
+                    remark: this.reason
                 })
                 })
                 .then(res => {
                 .then(res => {
                     this.$set(row, 'loading', false);
                     this.$set(row, 'loading', false);

+ 1 - 1
src/main/vue/src/views/rate/RateDistrictListPending.vue

@@ -570,7 +570,7 @@ export default {
                     id: this.form.id,
                     id: this.form.id,
                     status: 'FIRST_REVIEW_DENY',
                     status: 'FIRST_REVIEW_DENY',
                     score: 0,
                     score: 0,
-                    remark: '区文旅局退回意见:' + this.reason
+                    remark: this.reason
                 })
                 })
                 .then(res => {
                 .then(res => {
                     this.$set(row, 'loading', false);
                     this.$set(row, 'loading', false);

+ 1 - 1
src/main/vue/src/views/rate/RateList.vue

@@ -579,7 +579,7 @@ export default {
                     id: this.form.id,
                     id: this.form.id,
                     status: 'REVIEW_DENY',
                     status: 'REVIEW_DENY',
                     score: 0,
                     score: 0,
-                    remark: '市文旅局退回意见:' + this.reason
+                    remark: this.reason
                 })
                 })
                 .then(res => {
                 .then(res => {
                     this.$set(row, 'loading', false);
                     this.$set(row, 'loading', false);

+ 1 - 1
src/main/vue/src/views/rate/RateListDone.vue

@@ -503,7 +503,7 @@ export default {
                     id: this.form.id,
                     id: this.form.id,
                     status: 'REVIEW_DENY',
                     status: 'REVIEW_DENY',
                     score: 0,
                     score: 0,
-                    remark: '市文旅局退回意见:' + this.reason
+                    remark: this.reason
                 })
                 })
                 .then(res => {
                 .then(res => {
                     this.$set(row, 'loading', false);
                     this.$set(row, 'loading', false);

+ 1 - 1
src/main/vue/src/views/rate/RateListPending.vue

@@ -503,7 +503,7 @@ export default {
                     id: this.form.id,
                     id: this.form.id,
                     status: 'REVIEW_DENY',
                     status: 'REVIEW_DENY',
                     score: 0,
                     score: 0,
-                    remark: '市文旅局退回意见:' + this.reason
+                    remark: this.reason
                 })
                 })
                 .then(res => {
                 .then(res => {
                     this.$set(row, 'loading', false);
                     this.$set(row, 'loading', false);

+ 1 - 1
src/main/vue/src/views/rate/RateListRejected.vue

@@ -413,7 +413,7 @@ export default {
                     id: this.form.id,
                     id: this.form.id,
                     status: 'REVIEW_DENY',
                     status: 'REVIEW_DENY',
                     score: 0,
                     score: 0,
-                    remark: '市文旅局退回意见:' + this.reason
+                    remark: this.reason
                 })
                 })
                 .then(res => {
                 .then(res => {
                     this.$set(row, 'loading', false);
                     this.$set(row, 'loading', false);