Merge branch 'b_lms' into master_merge

lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue

@@ -46,7 +46,6 @@
         <el-table-column show-overflow-tooltip prop="package_box_sn" label="木箱号" align="center" />
         <el-table-column show-overflow-tooltip prop="container_name" label="子卷号" align="center" />
         <el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次" align="center" />
-
       </el-table>
     </el-card>
     <div style="margin-bottom: 20px;" />

lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue

@@ -66,7 +66,7 @@ export default {
       url: 'api/Materialbase',
       idField: 'material_id',
       sort: 'material_id,desc',
-      query: { box: '木箱', material_id: '' },
+      query: { box: '木箱', search: 'MX', material_id: '' },
       crudMethod: { ...crudMaterattr }
     })
   },