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

+ 1 - 1
src/main/vue/src/views/AssignExpert.vue

@@ -65,7 +65,7 @@
                     </el-table>
                 </div>
             </el-form-item>
-            <el-form-item label="材料">
+            <el-form-item label="材料" v-if="audits.length > 0">
                 <div class="subform" v-for="(item, index) in audits" :key="index">
                     <el-input style="margin-bottom: 10px" v-model="item.createdAt"></el-input>
                     <el-input :rows="3" type="textarea" style="margin-bottom: 10px" v-model="item.remark"></el-input>

+ 2 - 2
src/main/vue/src/views/RateAudit.vue

@@ -180,9 +180,9 @@ export default {
         ...mapState(['organization'])
     },
     created() {
-        if (this.$route.query.rateId) {
+        if (this.$route.query.id) {
             this.$http
-                .get('rate/get/' + this.$route.query.rateId)
+                .get('rate/get/' + this.$route.query.id)
                 .then(res => {
                     this.formData = res;
                     let data = res.rateAudits;

+ 8 - 5
src/main/vue/src/views/RateList.vue

@@ -62,14 +62,14 @@
                         v-if="(row.status === 'ASSIGN_EXPERT') & display"
                         >分配专家组</el-button
                     >
-                    <el-button
+                    <!-- <el-button
                         @click="supervision(row.id)"
                         type="success"
                         size="mini"
                         plain
                         v-if="(row.status === 'SUBMIT_GRADE' || row.status === 'REVIEW_PENDING') & display"
                         >查看专家组</el-button
-                    >
+                    > -->
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>查看附件</el-button>
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
@@ -208,10 +208,13 @@ export default {
         },
         editRow(row) {
             this.$router.push({
-                path: '/rateAudit',
+                // path: '/rateAudit',
+                path: '/organization',
                 query: {
-                    organId: row.organizationId,
-                    rateId: row.id
+                    // organId: row.organizationId,
+                    // rateId: row.id
+                    id: row.id,
+                    status: row.status
                 }
             });
         },

+ 35 - 0
src/main/vue/src/views/organization/Organization copy.vue

@@ -0,0 +1,35 @@
+<template>
+    <div class="edit-view">
+        <el-tabs v-model="active">
+            <el-tab-pane label="基本信息" name="first"><OrganizationEdit ref="page1" @next="goNext"/></el-tab-pane>
+            <el-tab-pane label="申请信息" name="second"><RateEdit ref="page2"/></el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+<script>
+import OrganizationEdit from './OrganizationEdit.vue';
+import RateEdit from './RateEdit.vue';
+export default {
+    name: 'Organization',
+    created() {},
+    data() {
+        return {
+            active: 'first'
+        };
+    },
+    methods: {
+        goNext(page) {
+            // this.active = page;
+            // this.$refs.page2.init();
+            this.$nextTick(() => {
+                this.activeName = 'second';
+            });
+        }
+    },
+    components: {
+        OrganizationEdit,
+        RateEdit
+    }
+};
+</script>
+<style lang="less" scoped></style>

+ 15 - 10
src/main/vue/src/views/organization/Organization.vue

@@ -1,34 +1,39 @@
 <template>
     <div class="edit-view">
         <el-tabs v-model="active">
-            <el-tab-pane label="基本信息" name="first"><OrganizationEdit ref="page1" @next="goNext"/></el-tab-pane>
-            <el-tab-pane label="申请信息" name="second"><RateEdit ref="page2"/></el-tab-pane>
+            <el-tab-pane label="申请信息" name="first"><RateAudit ref="page1" @next="goNext"/></el-tab-pane>
+            <el-tab-pane label="专家组" name="second" :disabled="status"><AssignExpert ref="page2"/></el-tab-pane>
         </el-tabs>
     </div>
 </template>
 <script>
-import OrganizationEdit from './OrganizationEdit.vue';
-import RateEdit from './RateEdit.vue';
+import RateAudit from '../RateAudit.vue';
+import AssignExpert from '../AssignExpert.vue';
 export default {
     name: 'Organization',
-    created() {},
+    created() {
+        let data = this.$route.query.status;
+        console.log(data != 'SUBMIT_GRADE');
+        if (data == 'SUBMIT_GRADE' || data == 'REVIEW_PENDING') {
+            this.status = false;
+        }
+    },
     data() {
         return {
-            active: 'first'
+            active: 'first',
+            status: true
         };
     },
     methods: {
         goNext(page) {
-            // this.active = page;
-            // this.$refs.page2.init();
             this.$nextTick(() => {
                 this.activeName = 'second';
             });
         }
     },
     components: {
-        OrganizationEdit,
-        RateEdit
+        AssignExpert,
+        RateAudit
     }
 };
 </script>