Merge branch 'main' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangVUE

src/views/wmsManagement/WmpatchSearch.vue

@@ -24,11 +24,10 @@
 
     <vxe-table
       resizable
-      keep-source
+
-      border="inner"
       ref="xTable"
-      :tree-config="{ expandAll: true, transform: true, rowField: 'packageCodeClient_son', parentField: 'packageCodeClient_short_parent' }"
+      :tree-config="{ transform: true, rowField: 'packageCodeClient_son', parentField: 'packageCodeClient_short_parent' }"
-      :edit-config="{ trigger: 'manual', mode: 'row' }"
+
       :data="dataList"
     >
       <vxe-column field="partnumber" title="零件号"></vxe-column>
@@ -38,12 +37,13 @@
       <vxe-column field="pack_num" title="箱数"></vxe-column>
       <vxe-column field="goodsNumLogic" title="理论库存"></vxe-column>
       <!-- <vxe-column field="goodsNumAction" title="实际库存"></vxe-column> -->
-      <vxe-column field="goodsNumAction" title="实际库存" :edit-render="{}">
+      <!--     :edit-config="{ trigger: 'manual', mode: 'row' }" -->
+      <!-- <vxe-column field="goodsNumAction" title="实际库存" :edit-render="{}">
         <template #edit="{ row }">
           <vxe-input v-model="row.goodsNumAction" type="text"></vxe-input>
         </template>
-      </vxe-column>
+      </vxe-column> -->
-      <vxe-column title="操作" width="160"  >
+      <!-- <vxe-column title="操作" width="160"  >
         <template #default="{ row }">
           <template v-if="$refs.xTable.isActiveByRow(row)">
             <vxe-button @click="saveRowEvent(row)">保存</vxe-button>
@@ -53,7 +53,7 @@
             <vxe-button @click="editRowEvent(row)">编辑</vxe-button>
           </template>
         </template>
-      </vxe-column>
+      </vxe-column> -->
       <vxe-column field="entryWarehouseTime" title="入库时间"></vxe-column>
       <vxe-column field="remark" title="备注"></vxe-column>
     </vxe-table>
@@ -84,7 +84,7 @@ export default {
         partnumber: '',
         packageCodeClient_short: '',
         pageNum: 1,
-        pageSize: 100,
+        pageSize: 10,
         sort: undefined,
         sortType: undefined,
       },

src/views/wmsManagement/components/TheChouseMaterial/TheChouseMaterial.vue

@@ -72,7 +72,7 @@ export default {
 			},
 			queryParams: {
 				pageNum: 1,
-				pageSize: 10,
+				pageSize: 20,
 			},
 			// 数据列表
 			dataList: [],