Merge remote-tracking branch 'origin/reg' into reg

base-manager-ui/admin/src/pages/basicset/surface/AddSurfaceTemplate.vue

@@ -245,6 +245,10 @@ const rightColumns = [
     title: "字段名称",
     dataIndex: "fieldName",
   },
+  {
+    title: "字段编码",
+    dataIndex: "fieldCode",
+  },
   {
     title: "数据类型",
     scopedSlots: {
@@ -547,4 +551,4 @@ export default {
   cursor: pointer;
   color: #1890ff;
 }
-</style>
\ No newline at end of file
+</style>

base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue

@@ -351,9 +351,11 @@ export default {
               item.fieldOrderNo = 1000;
             }
           }
-          v.skinFieldList.sort((a, b) => {
-            return a.fieldOrderNo - b.fieldOrderNo;
-          });
+          v.skinFieldList = v.skinFieldList
+            .sort((a, b) => {
+              return a.fieldOrderNo - b.fieldOrderNo;
+            })
+            .filter((v) => v.enabled != 0);
         });
         this.skinTemplate = data;
         // this.formData.skinFieldList = this.skinTemplate[0].skinFieldList;

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/queueRecord.vue

@@ -390,7 +390,6 @@ export default {
       if (res.code == 1) {
         let { data } = res;
         let { business } = row;
-        console.log(data);
         this.businessName = business;
         this.businessInfo = data;
         this.analysisVisible = true;