Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/business/platform/form/formbuilder/right-aside/editors/editor-base.vue

@@ -256,6 +256,7 @@
         /></template>
         <el-switch
           v-model="fieldOptions.sortable"
+          @change="sortTableChange"
           active-value="Y"
           inactive-value="N"
         />
@@ -429,6 +430,13 @@ export default {
     }
   },
   methods: {
+    sortTableChange(val) {
+      if (val === 'Y') {
+        this.fieldOptions.page = 'N'
+      } else {
+        this.fieldOptions.page = 'Y'
+      }
+    },
     changeBoName(value, node) {
       if (this.$utils.isNotEmpty(value)) {
         this.fieldItem.label = node.label

src/business/platform/form/formrender/dynamic-form/dynamic-form-table.vue

@@ -1,5 +1,6 @@
 <template>
   <div v-if="!tableHidden && dynamicShow" class="dynamic-form-table">
+    {{ field.field_options.page }}
     <template v-if="columns && columns.length > 0">
       <!--================表内和弹窗模式=================================-->
       <div
@@ -679,7 +680,6 @@ export default {
     },
     handlePagination(val) {
       if (this.canSortable && this.sortFlag) {
-        console.log('我tmd的来了')
         this.copDataModel = []
         this.sortFlag = false
       }
@@ -699,12 +699,16 @@ export default {
           this.currentPage =
             this.currentPage > pageCount ? pageCount : this.currentPage
         }
-
-        this.copDataModel = this.getShowData(
-          val,
-          this.currentPage,
-          this.pageSize
-        )
+        // if (this.needPage === 'N') {
+        //   this.copDataModel = this.dataModel
+        // } else {
+        //   this.copDataModel = this.getShowData(
+        //     val,
+        //     this.currentPage,
+        //     this.pageSize
+        //   )
+        // }
+        this.$emit('update:value', val)
         this.editFromType = ''
       })