|
@@ -654,6 +654,11 @@
|
|
|
<span> {{ row.productSequence }}</span>
|
|
<span> {{ row.productSequence }}</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
+ <el-table-column label="盘具" prop="reelSpecification" width="140">
|
|
|
|
|
+ <template slot-scope="{ row, $index }">
|
|
|
|
|
+ <span> {{ row.reelSpecification }}</span>
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="刻码" prop="engrave" width="140">
|
|
<el-table-column label="刻码" prop="engrave" width="140">
|
|
|
<template slot-scope="{ row, $index }">
|
|
<template slot-scope="{ row, $index }">
|
|
|
<el-input
|
|
<el-input
|
|
@@ -980,6 +985,7 @@
|
|
|
import BigNumber from 'bignumber.js';
|
|
import BigNumber from 'bignumber.js';
|
|
|
import headList from '@/components/headList';
|
|
import headList from '@/components/headList';
|
|
|
import tabMixins from '@/mixins/tableColumnsMixin';
|
|
import tabMixins from '@/mixins/tableColumnsMixin';
|
|
|
|
|
+ import { parameterGetByCode } from '@/api/main/index.js';
|
|
|
|
|
|
|
|
// import dictMixins from '@/mixins/dictMixins';
|
|
// import dictMixins from '@/mixins/dictMixins';
|
|
|
export default {
|
|
export default {
|
|
@@ -1056,7 +1062,8 @@
|
|
|
batchTime: '', // 生产日期、采购日期
|
|
batchTime: '', // 生产日期、采购日期
|
|
|
pageSize: 20, // 物料和包装列表条数
|
|
pageSize: 20, // 物料和包装列表条数
|
|
|
pickingPageNum: 1, // 包装虚拟分页页数
|
|
pickingPageNum: 1, // 包装虚拟分页页数
|
|
|
- materielPageNum: 1 // 物料虚拟分页页数
|
|
|
|
|
|
|
+ materielPageNum: 1, // 物料虚拟分页页数
|
|
|
|
|
+ isReelSpecification: 0
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
computed: {
|
|
computed: {
|
|
@@ -1270,6 +1277,14 @@
|
|
|
width: 120,
|
|
width: 120,
|
|
|
showOverflowTooltip: true
|
|
showOverflowTooltip: true
|
|
|
},
|
|
},
|
|
|
|
|
+ // 盘具显示
|
|
|
|
|
+ {
|
|
|
|
|
+ label: '盘具',
|
|
|
|
|
+ prop: 'reelSpecification',
|
|
|
|
|
+ align: 'center',
|
|
|
|
|
+ width: 120,
|
|
|
|
|
+ showOverflowTooltip: true
|
|
|
|
|
+ },
|
|
|
// 产地
|
|
// 产地
|
|
|
{
|
|
{
|
|
|
label: '产地',
|
|
label: '产地',
|
|
@@ -1400,6 +1415,13 @@
|
|
|
// },
|
|
// },
|
|
|
},
|
|
},
|
|
|
async created() {
|
|
async created() {
|
|
|
|
|
+ // 生产报工是否有盘具的填写输入框 //0否 1是
|
|
|
|
|
+ parameterGetByCode({
|
|
|
|
|
+ code: 'dishware_specifications'
|
|
|
|
|
+ }).then((res) => {
|
|
|
|
|
+ this.isReelSpecification = res.value;
|
|
|
|
|
+ console.log('isReelSpecification', this.isReelSpecification);
|
|
|
|
|
+ });
|
|
|
await this.requestDict('产地');
|
|
await this.requestDict('产地');
|
|
|
await this.requestDict('不拆物料层规格');
|
|
await this.requestDict('不拆物料层规格');
|
|
|
await this.requestDict('物品颜色');
|
|
await this.requestDict('物品颜色');
|
|
@@ -2199,6 +2221,7 @@
|
|
|
weightUnit: item.weightUnit, // 重量单位
|
|
weightUnit: item.weightUnit, // 重量单位
|
|
|
totalMoney: filtersItem.totalPrice, // 总价
|
|
totalMoney: filtersItem.totalPrice, // 总价
|
|
|
unitPrice: filtersItem.unitPrice, // 单价
|
|
unitPrice: filtersItem.unitPrice, // 单价
|
|
|
|
|
+ reelSpecification: filtersItem.reelSpecification || filtersItem.extInfo?.reelSpecification, // 盘具
|
|
|
purpose: '', // 用途
|
|
purpose: '', // 用途
|
|
|
isUnpack: item.isUnpack, // 是否允许拆包
|
|
isUnpack: item.isUnpack, // 是否允许拆包
|
|
|
warehouseId: this.isMoreProduct
|
|
warehouseId: this.isMoreProduct
|
|
@@ -2393,6 +2416,7 @@
|
|
|
materielDesignation:
|
|
materielDesignation:
|
|
|
item.materielDesignation || item.extInfo?.materielCode, // 物料代号
|
|
item.materielDesignation || item.extInfo?.materielCode, // 物料代号
|
|
|
engrave: item.engrave || item.extInfo?.engrave, // 刻码
|
|
engrave: item.engrave || item.extInfo?.engrave, // 刻码
|
|
|
|
|
+ reelSpecification: item.reelSpecification || item.extInfo?.reelSpecification, // 盘具
|
|
|
isUnpack: item.isUnpack || this.productList[0].isUnpack, // 是否允许拆包
|
|
isUnpack: item.isUnpack || this.productList[0].isUnpack, // 是否允许拆包
|
|
|
productionDate: productionDate, // 生产日期
|
|
productionDate: productionDate, // 生产日期
|
|
|
purchaseDate: purchaseDate, // 采购时间
|
|
purchaseDate: purchaseDate, // 采购时间
|