Merge branch 'master' into dev-erqi

src/components/customComponent/dkForm.vue

@@ -39,7 +39,11 @@
             <template v-else>
               <div class="flex">
                 <span class="mr-3"> {{ item.label }}</span>
-              </div>
+                <span v-if="model['dkghytlx'] == '4'">
+                  <a-input v-model:value="qt" />
+                </span>
+                <span v-else> <a-input v-model:value="qt" disabled="true" /> </span
+              ></div>
             </template>
           </a-radio>
           <div class="flex" style="display:inline-block;">

src/settings/componentSetting.ts

@@ -18,7 +18,7 @@ export default {
       totalField: 'total',
     },
     // 可选的分页选项
-    pageSizeOptions: ['10', '20', '30', '40', '50'],
+    pageSizeOptions: ['10', '20', '50', '100', '500'],
     // 表格默认尺寸
     defaultSize: 'middle',
     //默认每页显示多少条