|
@@ -39,6 +39,7 @@
|
|
|
import productModal from "../orderTask/components/productModal.vue";
|
|
|
import Focus from "../orderTask/components/focus.vue";
|
|
|
import towInOne from "./components/towInOne.vue";
|
|
|
+ import batchNumber from "./components/batchNumber.vue";
|
|
|
import BusinessType from "./components/businessType.vue";
|
|
|
import { add } from '@/benyun/utils/accuracy'
|
|
|
@Component({ components: { productModal } })
|
|
@@ -204,6 +205,12 @@
|
|
|
title: '单位编码',
|
|
|
field: 'unitCode',
|
|
|
},
|
|
|
+ {
|
|
|
+ width: 150,
|
|
|
+ title: '批次号',
|
|
|
+ field: 'batchNumber',
|
|
|
+ component: batchNumber
|
|
|
+ },
|
|
|
{
|
|
|
width: 110,
|
|
|
title: '数量',
|
|
@@ -858,7 +865,7 @@
|
|
|
}]
|
|
|
})
|
|
|
};
|
|
|
- billConfig.tableConfig[0].table.columns[5] = {
|
|
|
+ billConfig.tableConfig[0].table.columns[6] = {
|
|
|
width: 120,
|
|
|
title: '数量',
|
|
|
field: 'number',
|
|
@@ -871,7 +878,7 @@
|
|
|
},
|
|
|
}
|
|
|
};
|
|
|
- billConfig.tableConfig[0].table.columns[7] = {
|
|
|
+ billConfig.tableConfig[0].table.columns[8] = {
|
|
|
width: 90,
|
|
|
title: '单价',
|
|
|
field: 'unitPrice',
|
|
@@ -901,6 +908,7 @@
|
|
|
let loading = this.$loading({ target: '.main-container' });
|
|
|
api.single({ id: e.id }, 'supplyEntryOrder').then((res : any) => {
|
|
|
if (res.code === 200) {
|
|
|
+ res.data.batchNumber = ''
|
|
|
let parentData = res.data ? res.data : e;
|
|
|
this.baseInfo = parentData;
|
|
|
if (this.tabType === 'all' || this.tabType === 'draftsBox') {
|
|
@@ -985,12 +993,12 @@
|
|
|
if (e.submitState === 1) readonly.tool.tools = { return: true, returnSmt: true, print: true };
|
|
|
}
|
|
|
readonly.tableConfig[0].table.columns = readonly.tableConfig[0].table.columns.filter((v : any) => v.title != '操作');
|
|
|
- readonly.tableConfig[0].table.columns[5] = {
|
|
|
+ readonly.tableConfig[0].table.columns[6] = {
|
|
|
width: 120,
|
|
|
title: '数量',
|
|
|
field: 'number',
|
|
|
};
|
|
|
- readonly.tableConfig[0].table.columns[7] = {
|
|
|
+ readonly.tableConfig[0].table.columns[8] = {
|
|
|
width: 90,
|
|
|
title: '单价',
|
|
|
field: 'unitPrice',
|