xuqiang hace 4 años
padre
commit
5c4374604d

+ 1 - 1
src/main/vue/src/components/OrganizationLog.vue

@@ -2,7 +2,7 @@
     <el-dialog
         v-loading="saving"
         @close="closeDialog"
-        title="承办单位编辑"
+        title="承办单位信息"
         center
         :visible.sync="dialogVisible"
         width="800px"

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

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

+ 17 - 4
src/main/vue/src/views/performance/ArrangeList.vue

@@ -23,8 +23,9 @@
                     <el-button type="primary" @click="getData">查看活动分组情况</el-button>
                     <el-button type="primary" @click="intoGroup">查看未分组情况情况</el-button>
                 </el-form-item>
-                <el-collapse v-model="activeNames" @change="handleChange">
-                    <el-collapse-item title="分组编排">
+                <!-- <el-collapse v-model="activeNames" @change="handleChange"> -->
+                <el-collapse-transition>
+                    <div v-show="showMore">
                         <el-card shadow="hover" :body-style="{ padding: '20px' }" style="margin-bottom: 20px">
                             <el-row :gutter="15">
                                 <el-col :span="12" :offset="0">
@@ -173,8 +174,19 @@
                                 <el-button type="primary">导出分组安排</el-button>
                             </el-form-item>
                         </el-card>
-                    </el-collapse-item>
-                </el-collapse>
+                    </div>
+                </el-collapse-transition>
+                <div style="width:100%;textAlign:center;margin-bottom:18px;">
+                    <el-button
+                        class="more"
+                        round
+                        type="primary"
+                        :plain="!showMore"
+                        :icon="showMore ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
+                        @click="showMore = !showMore"
+                        >{{ showMore ? '隐藏分组编排' : '显示分组编排' }}</el-button
+                    >
+                </div>
             </el-form>
         </div>
         <el-table
@@ -289,6 +301,7 @@ export default {
     mixins: [pageableTable, delChild],
     data() {
         return {
+            showMore: false,
             multipleMode: false,
             search: '',
             url: '/arrange/all',