Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppCategoryController.java

 package com.mortals.xhx.module.app.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,4 +48,17 @@ public class AppCategoryController extends BaseCRUDJsonBodyMappingController<App
     }
 
 
+    /**
+     * @param query
+     * @param model
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void doListBefore(AppCategoryEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+
+        query.setOrderColList(Arrays.asList(new OrderCol("sort")));
+
+    }
 }
\ No newline at end of file

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue

@@ -233,10 +233,10 @@ export default {
         "pjxt",
         "pj_name",
       ],
-      datingList:[],
-      bumenList:[],
-      hallid:'',
-      sectionid:''
+      datingList: [],
+      bumenList: [],
+      hallid: '',
+      sectionid: ''
     };
   },
   components: {
@@ -343,8 +343,8 @@ export default {
         pjxt,
         time: this.BegindAndEndTime,
         info: this.searchName,
-        hallid:this.hallid,
-        sectionid:this.sectionid,
+        hallid: this.hallid,
+        sectionid: this.sectionid,
         ...search,
       });
       if (res.code == 1) {
@@ -363,7 +363,7 @@ export default {
     openHandlingDetails(record) {
       console.log(record)
       // 判断为窗口屏或者其他状况，调用不同接口
-      if (record.pjxt == 1) {
+      if (record.pjxt == 1 && record.queueid) {
         this.$refs.HandlingDetails.modalInfo.title = "办理明细";
         this.$refs.HandlingDetails.modalInfo.show = 1;
         this.togetQueEvaData(record);