|
@@ -35,7 +35,7 @@
|
|
|
<script>
|
|
<script>
|
|
|
|
|
|
|
|
|
|
|
|
|
-import { getMaterialList } from '@/api/materialPlan/index';
|
|
|
|
|
|
|
+import { getList } from '@/api/classifyManage/itemInformation';
|
|
|
import ProductSearch from './product-search.vue'
|
|
import ProductSearch from './product-search.vue'
|
|
|
import { getTreeByPid } from '@/api/classifyManage';
|
|
import { getTreeByPid } from '@/api/classifyManage';
|
|
|
export default {
|
|
export default {
|
|
@@ -91,38 +91,40 @@ export default {
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
{
|
|
{
|
|
|
- prop: 'availableCountBase',
|
|
|
|
|
- label: '包装库存',
|
|
|
|
|
- sortable: 'custom',
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- label: '单位',
|
|
|
|
|
- prop: 'weightUnit'
|
|
|
|
|
|
|
+ prop: 'measuringUnit',
|
|
|
|
|
+ label: '计量单位',
|
|
|
|
|
+ showOverflowTooltip: true,
|
|
|
|
|
+
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
{
|
|
{
|
|
|
- prop: 'packingCountBase',
|
|
|
|
|
- label: '计量库存',
|
|
|
|
|
- sortable: 'custom',
|
|
|
|
|
- },
|
|
|
|
|
-
|
|
|
|
|
- {
|
|
|
|
|
- label: '计量单位',
|
|
|
|
|
- prop: 'unit'
|
|
|
|
|
|
|
+ prop: 'weightUnit',
|
|
|
|
|
+ label: '重量单位',
|
|
|
|
|
+ showOverflowTooltip: true,
|
|
|
|
|
+
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+ {
|
|
|
|
|
+ prop: 'roughWeight',
|
|
|
|
|
+ label: '毛重',
|
|
|
|
|
+ showOverflowTooltip: true,
|
|
|
|
|
+ minWidth: 90
|
|
|
|
|
+ },
|
|
|
|
|
|
|
|
{
|
|
{
|
|
|
- label: '数量',
|
|
|
|
|
- prop: 'count'
|
|
|
|
|
|
|
+ prop: 'netWeight',
|
|
|
|
|
+ label: '净重',
|
|
|
|
|
+ showOverflowTooltip: true,
|
|
|
|
|
+ minWidth: 90
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
],
|
|
],
|
|
|
|
|
|
|
|
// 表格选中数据
|
|
// 表格选中数据
|
|
@@ -142,13 +144,13 @@ export default {
|
|
|
|
|
|
|
|
/* 表格数据源 */
|
|
/* 表格数据源 */
|
|
|
async datasource({ page, limit, where }) {
|
|
async datasource({ page, limit, where }) {
|
|
|
- const res = await getMaterialList({
|
|
|
|
|
|
|
+ const res = await getList({
|
|
|
...where,
|
|
...where,
|
|
|
|
|
|
|
|
pageNum: page,
|
|
pageNum: page,
|
|
|
size: limit,
|
|
size: limit,
|
|
|
categoryLevelId: 1,
|
|
categoryLevelId: 1,
|
|
|
- dimension: 1
|
|
|
|
|
|
|
+
|
|
|
});
|
|
});
|
|
|
return res;
|
|
return res;
|
|
|
},
|
|
},
|