|
|
@@ -397,6 +397,36 @@
|
|
|
<template slot="append"> </template>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="机型" prop="modelKey" width="300">
|
|
|
+ <template slot-scope="{ row, $index }">
|
|
|
+ <DictSelection
|
|
|
+ dictName="物品机型"
|
|
|
+ clearable
|
|
|
+ v-model="row.modelKey"
|
|
|
+ :isOne="$index == 1"
|
|
|
+ multiple
|
|
|
+ filterable
|
|
|
+ allow-create
|
|
|
+ default-first-option
|
|
|
+ >
|
|
|
+ </DictSelection>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="颜色" prop="colorKey" width="300">
|
|
|
+ <template slot-scope="{ row, $index }">
|
|
|
+ <DictSelection
|
|
|
+ dictName="物品颜色"
|
|
|
+ clearable
|
|
|
+ v-model="row.colorKey"
|
|
|
+ :isOne="$index == 1"
|
|
|
+ multiple
|
|
|
+ filterable
|
|
|
+ allow-create
|
|
|
+ default-first-option
|
|
|
+ >
|
|
|
+ </DictSelection>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<!-- <el-table-column label="单价" prop="unitPrice" width="200" align="center">
|
|
|
<template slot-scope="{ row, $index }">
|
|
|
<template v-if="row.isSave">
|
|
|
@@ -856,6 +886,36 @@
|
|
|
{{ row.weightUnit }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="机型" prop="modelKey" width="300">
|
|
|
+ <template slot-scope="{ row, $index }">
|
|
|
+ <DictSelection
|
|
|
+ dictName="物品机型"
|
|
|
+ clearable
|
|
|
+ v-model="row.modelKey"
|
|
|
+ :isOne="$index == 1"
|
|
|
+ multiple
|
|
|
+ filterable
|
|
|
+ allow-create
|
|
|
+ default-first-option
|
|
|
+ >
|
|
|
+ </DictSelection>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="颜色" prop="colorKey" width="300">
|
|
|
+ <template slot-scope="{ row, $index }">
|
|
|
+ <DictSelection
|
|
|
+ dictName="物品颜色"
|
|
|
+ clearable
|
|
|
+ v-model="row.colorKey"
|
|
|
+ :isOne="$index == 1"
|
|
|
+ multiple
|
|
|
+ filterable
|
|
|
+ allow-create
|
|
|
+ default-first-option
|
|
|
+ >
|
|
|
+ </DictSelection>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="序列号" prop="serialNumber">
|
|
|
</el-table-column>
|
|
|
<el-table-column label="质检结果" prop="result" width="120">
|
|
|
@@ -1116,10 +1176,9 @@
|
|
|
} from '@/utils/dict/index';
|
|
|
import { getTreeByGroup } from '@/api/classifyManage';
|
|
|
import { deepClone } from '@/utils';
|
|
|
- import { getDetails } from '@/api/classifyManage/itemInformation';
|
|
|
import { mapActions, mapGetters } from 'vuex';
|
|
|
import BigNumber from 'bignumber.js';
|
|
|
- import { status } from 'nprogress';
|
|
|
+
|
|
|
// import dictMixins from '@/mixins/dictMixins';
|
|
|
export default {
|
|
|
components: {
|
|
|
@@ -1545,6 +1604,12 @@
|
|
|
packingUnit: packingUnit, // 单位
|
|
|
measureQuantity: measureQuantity, // 计量数量
|
|
|
measureUnit: item.measuringUnit, // 计量单位
|
|
|
+ modelKey: filtersItem.modelKey
|
|
|
+ ? filtersItem.modelKey.split(',')
|
|
|
+ : '', // 机型
|
|
|
+ colorKey: filtersItem.colorKey
|
|
|
+ ? filtersItem.colorKey.split(',')
|
|
|
+ : '', // 颜色
|
|
|
measureType: item.measureType, // 计量方式
|
|
|
netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
|
|
|
singleWeight: singleWeight, // 单重重量
|
|
|
@@ -2223,7 +2288,7 @@
|
|
|
}
|
|
|
},
|
|
|
// 入库
|
|
|
- getReturnStorage() {
|
|
|
+ async getReturnStorage() {
|
|
|
if (this.productList.length <= 0) {
|
|
|
this.$message.error('请先添加产品信息');
|
|
|
return;
|
|
|
@@ -2246,6 +2311,12 @@
|
|
|
_workOrderId = this.detailProductList[0]?.workOrderId;
|
|
|
_taskId = this.detailProductList[0]?.taskId;
|
|
|
}
|
|
|
+ if (packingItem.modelKey) {
|
|
|
+ packingItem.modelKey = packingItem.modelKey.toString();
|
|
|
+ }
|
|
|
+ if (packingItem.colorKey) {
|
|
|
+ packingItem.colorKey = packingItem.colorKey.toString();
|
|
|
+ }
|
|
|
return {
|
|
|
...packingItem,
|
|
|
workOrderId: _workOrderId,
|
|
|
@@ -2260,6 +2331,12 @@
|
|
|
|
|
|
// 处理产品数据
|
|
|
this.productList = this.productList.map((productItem) => {
|
|
|
+ if (productItem.modelKey) {
|
|
|
+ productItem.modelKey = productItem.modelKey.toString();
|
|
|
+ }
|
|
|
+ if (productItem.colorKey) {
|
|
|
+ productItem.colorKey = productItem.colorKey.toString();
|
|
|
+ }
|
|
|
return {
|
|
|
...productItem,
|
|
|
outInDetailRecordRequestList: _packingList.filter(
|
|
|
@@ -2298,8 +2375,51 @@
|
|
|
// setTimeout(() => {
|
|
|
// resolve(obj);
|
|
|
// }, 1000);
|
|
|
- console.log(obj, 'obj');
|
|
|
- return obj;
|
|
|
+
|
|
|
+ // if (productData.length) {
|
|
|
+ // this.$alert(
|
|
|
+ // `物料${productData.join(',')}没有维护供应商，${
|
|
|
+ // productData.length > 1 ? '会合并下发为一个采购订单，' : ''
|
|
|
+ // }是否继续下发！`,
|
|
|
+ // {
|
|
|
+ // confirmButtonText: '确定',
|
|
|
+ // callback: (action) => {
|
|
|
+ // if (action == 'confirm') {
|
|
|
+ // this.issuePurchaseOrderFn();
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // );
|
|
|
+ // } else {
|
|
|
+ // this.issuePurchaseOrderFn();
|
|
|
+ // }
|
|
|
+ const isVerifyData = await storageApi.isVerifyRepeatIsStock({
|
|
|
+ categoryCodes: this.productList.map((item) => item.categoryCode),
|
|
|
+ batchNos: this.productList.map((item) => item.batchNo)
|
|
|
+ });
|
|
|
+
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
+ if (isVerifyData?.length) {
|
|
|
+ this.$confirm(
|
|
|
+ `当前批次：${isVerifyData[0].batchNo},物品${isVerifyData
|
|
|
+ .map((item) => item.categoryName)
|
|
|
+ .join(',')}已有入库记录，是否继续入库！`,
|
|
|
+ {
|
|
|
+ confirmButtonText: '是',
|
|
|
+ cancelButtonText: '否'
|
|
|
+ }
|
|
|
+ )
|
|
|
+ .then(() => {
|
|
|
+ resolve(obj);
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ resolve(false);
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ resolve(obj);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
},
|
|
|
pickingHandleScroll() {
|
|
|
if (this.showPackingList.length < this.packingList.length) {
|
|
|
@@ -2627,6 +2747,8 @@
|
|
|
categoryCode: item.code, // 物品编码
|
|
|
categoryModel: item.modelType, // 物品型号
|
|
|
specification: item.specification, // 规格
|
|
|
+ modelKey: item.modelKey ? item.modelKey.split(',') : '', // 机型
|
|
|
+ colorKey: item.colorKey ? item.colorKey.split(',') : '', // 颜色
|
|
|
brandNum: item.brandNum, // 牌号
|
|
|
batchNo: batchNo, // 批次号
|
|
|
supplierListOptions: supplierList[item.id], // 供应商列表
|
|
|
@@ -3456,7 +3578,8 @@
|
|
|
batchNo: row.batchNo, // 批次号
|
|
|
packageNo: packingCodeList[index]?.onlyCode, // 包装编码
|
|
|
packingQuantity: packingQuantity, // 包装数量
|
|
|
-
|
|
|
+ modelKey: row.modelKey, // 机型
|
|
|
+ colorKey: row.colorKey, //颜色
|
|
|
// packingUnit: row.isUnpack ? packingBoolen ? filterArr[0].conversionUnit : measureBoolen ? row.packingSpecificationOption[1]
|
|
|
// ? row.packingSpecificationOption[1].conversionUnit
|
|
|
// : row.packingSpecificationOption[0].conversionUnit
|
695593266@qq.com