Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into develop

src/components/Pagination/index.vue

@@ -23,9 +23,9 @@ export default {
       // eslint-disable-next-line vue/require-valid-default-prop
       default: {
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 100,
         total: 0,
-        pageSizes:[10, 20, 30, 50]
+        pageSizes:[10, 20, 30, 50, 100]
       },
     },
   },

src/mixins/ListMixin.js

@@ -7,7 +7,7 @@ export const ListMixin = {
       pagination: {
         // 分页参数
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 100,
         total: 0,
       },
       queryParams: {},

src/mixins/newListMixin.js

@@ -7,7 +7,7 @@ export const ListMixin = {
 			pagination: {
 				// 分页参数
 				pageNumber: 1,
-				pageSize: 10,
+				pageSize: 100,
 				total: 0,
 			},
 			queryParams: {},

src/views/factoryModel/part/BOMConfiguration/index.vue

@@ -9,8 +9,8 @@
         size="mini"
         style="width: 100%"
         :height="bomHeight"
-        row-key="ArtCheckRule-AttriCode"
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        row-key="ME_BomLst-CmatNr"
+        :tree-props="{ children: 'ME_BomLst-ItemLi', hasChildren: 'hasChildren' }"
       >
         <el-table-column
           v-for="(item, index) in headers"

src/views/factoryModel/part/material/BOMConfigure.vue

@@ -257,7 +257,7 @@ export default {
       }, // 参数
       treeData: [],
       defaultProps: {
-        children: "children",
+        children: "ME_BomLst-ItemLi",
         label: arg => `${arg['ME_BomLst-CmatNr']}/${arg['ME_BomLst-CmatName']}`
       },
       uomArray: [], // uom单位