xuqiang 4 лет назад
Родитель
Сommit
2606b1841c

+ 25 - 5
src/main/vue/src/views/performance/ArrangeJudgeList.vue

@@ -19,8 +19,10 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-collapse v-model="activeNames" @change="handleChange">
-                    <el-collapse-item title="查询区域">
+                <!-- <el-collapse v-model="activeNames" @change="handleChange">
+                    <el-collapse-item title="查询区域"> -->
+                <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">
@@ -60,8 +62,21 @@
                                 <el-button type="primary" @click="getData">查询</el-button>
                             </el-form-item>
                         </el-card>
-                    </el-collapse-item>
-                </el-collapse>
+                        <!-- </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
@@ -169,6 +184,7 @@ export default {
     data() {
         return {
             multipleMode: false,
+            showMore: false,
             search: '',
             url: '/arrange/all2',
             downloading: false,
@@ -460,4 +476,8 @@ export default {
     }
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+/deep/ .el-col-12 {
+    width: 53%;
+}
+</style>

+ 22 - 14
src/main/vue/src/views/rate/AssignExpert.vue

@@ -131,21 +131,18 @@
                     :readonly="formData.status != 'ASSIGN_EXPERT'"
                 ></el-input>
             </el-form-item>
-            <el-form-item class="fixed-btn">
-                <el-button @click="onSave" :loading="saving" type="primary" v-if="formData.status == 'ASSIGN_EXPERT'"
-                    >保存</el-button
-                >
-                <el-button
-                    type="danger"
-                    v-if="formData.status == 'REVIEW_PENDING'"
-                    @click="saveDismiss"
-                    :loading="loading"
-                >
-                    退回
-                </el-button>
-                <el-button @click="$router.go(-1)">返回</el-button>
-            </el-form-item>
         </el-form>
+        <el-form-item class="btn">
+            <el-button @click="onSave" :loading="saving" type="primary" v-if="formData.status == 'ASSIGN_EXPERT'"
+                >保存</el-button
+            >
+            <el-button type="danger" v-if="formData.status == 'REVIEW_PENDING'" @click="saveDismiss" :loading="loading">
+                退回
+            </el-button>
+        </el-form-item>
+        <div class="btn">
+            <el-button @click="$router.go(-1)">返回</el-button>
+        </div>
     </div>
 </template>
 <script>
@@ -372,6 +369,17 @@ export default {
         // margin-bottom: 10px;
     }
 }
+.btn {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    background: #ffffff;
+    height: 50px;
+    line-height: 50px;
+    z-index: 999;
+    margin-left: -40px;
+    padding-left: 20px;
+}
 .subform {
     padding: 16px 16px 16px 16px;
     background: #f7f7f7;