diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index ff9f3c83..69636ac7 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -293,7 +293,8 @@ let props = defineProps({ }, loading: { type: Boolean as PropType, - required: true, + required: false, + default: false, }, //回显勾选的数据列表 checkselect: { diff --git a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue index a1086362..1593e3c2 100644 --- a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue @@ -238,10 +238,12 @@
+ 运单池 +
@@ -253,6 +255,7 @@
+
+ 调度池 + +
@@ -304,19 +310,24 @@
+ + + +
-
合计: 选择数: {{ details.addInfo.oldSelectionList.length }}
+
合计: 总数: {{ details.addInfo.newData.length }}
+
选择数: {{ details.addInfo.newSelectionList.length }}
@@ -325,7 +336,12 @@
取 消 - + 提 交
@@ -418,7 +434,8 @@ const details = reactive({ /** 调度池 */ newlistLoading: false, /** 节点下拉框 */ - nodeLoading: false, + nodeLoading: false,, + submitBtnLoading: false }, // 是否为查看模式 view: false, @@ -473,8 +490,6 @@ const details = reactive({ /** 是否是新增 */ isNew: true, }, - /** 节点信息 */ - nodeInfoData: [{ nodeName: '' }, { nodeName: '' }], /** 字典 */ clientType: [], /** 时间 */ @@ -519,6 +534,7 @@ const details = reactive({ waybillNosList: [], }); +/** 节点信息 */ const nodeInfoData = reactive([{ nodeName: '' }, { nodeName: '' }]); /** 激活位置 */ @@ -531,12 +547,16 @@ const initData = async () => { nodeInfoData[0] = { nodeName: data.startWarehouseInfo.warehouseName, nodeId: data.startWarehouseInfo.warehouseId, + clientId: data.startWarehouseInfo.warehouseId, + clientName: data.startWarehouseInfo.warehouseName, ...data.startWarehouseInfo, }; nodeInfoData[nodeInfoData.length - 1] = { nodeName: data.startWarehouseInfo.warehouseName, nodeId: data.startWarehouseInfo.warehouseId, + clientId: data.startWarehouseInfo.warehouseId, + clientName: data.startWarehouseInfo.warehouseName, ...data.startWarehouseInfo, }; @@ -659,6 +679,8 @@ const searchReset = () => { const handleRefresh = type => { if (type === 1) onLoad(true); else { + details.addInfo.newData = []; + details.waybillNosList = []; onLoad(true); } }; @@ -796,7 +818,16 @@ const handleCarrierChange = () => { }; /** 选择节点 */ -const destinationWarehouseNameChange = (val, index) => {}; +const destinationWarehouseNameChange = (val, index) => { + const _node = nodeInfoData[index]; + const _value = details.options.find(value => value.clientId === val); + + _node.clientId = _value ? _value.clientId : ''; + _node.clientName = _value ? _value.clientName : ''; + _node.linkMan = _value ? _value.linkMan : ''; + _node.linkPhone = _value ? _value.linkPhone : ''; + _node.linkAddress = _value ? _value.linkAddress : ''; +}; /** 关闭页面 */ const back = () => { @@ -826,7 +857,22 @@ const handleAddWaybill = () => { }; /** 从调度池中移除运单 */ -const handleRemoveWaybill = () => {}; +const handleRemoveWaybill = () => { + if (details.addInfo.newSelectionList.length === 0) return ElMessage.warning('请选择运单'); + const _copyNewData = details.addInfo.newData; + + for (let item of details.addInfo.newSelectionList) { + const _itemIndex = _copyNewData.indexOf(item); + const _index = details.waybillNosList.indexOf(item.waybillNo); + + if (_index !== -1) details.waybillNosList.splice(_index, 1); + if (_itemIndex !== -1) _copyNewData.splice(_itemIndex, 1); + } + + details.addInfo.newData = _copyNewData; + + onLoad(true); +}; /** 新增节点 */ const handleAddNode = index => { @@ -838,27 +884,55 @@ const handleDelNode = index => { nodeInfoData.splice(index, 1); }; -/** 新增提交 */ -const addSubmit = async () => { - const _submitData = { +/** 新增提交 + * 节点数组 + */ +const addSubmit = async nodeArr => { + try { + details.loadingObj.submitBtnLoading = true; + + const _submitData = { ...details.form, billladingWaybillList: [], billladingLineList: [], }; - _submitData.billladingLineList = details.nodeInfoData.map((value, index) => { - return { - clientId: 31231312, - clientName: 'adasdasda', - clientType: '1', - linkMan: 'dsadasda', - linkPhone: 'dsadadas', - linkAddress: 'adsdadada', - sort: 1, - }; - }); + let _flag = false; + + // 节点信息 + for (let i = 0; i < nodeArr.length; i++) { + const item = nodeArr[i]; + + if (!item.clientId && item.clientId !== 0) { + ElMessage.warning('存在有误节点, 请选择节点'); + _flag = true; + break; + } + _submitData.billladingLineList.push({ + clientType: '2', + ...item, + sort: i + 1, + }); + } + + for (let item of details.addInfo.newData) { + _submitData.billladingWaybillList.push({ + waybillId: item.id, + waybillNo: item.waybillNo, + }); + } + + // 运单 + if (_flag) return; + + const res = await postSaveNew(_submitData); console.log('_submitData :>> ', _submitData); + } catch (error) { + console.log('error :>> ', error); + } finally { + details.loadingObj.submitBtnLoading = false; + } }; /** 修改提交 */ @@ -869,8 +943,12 @@ const handleSubmit = async (formEl: FormInstance | undefined) => { if (!formEl) return; await formEl.validate((valid, fields) => { if (valid) { + const _nodeArr = nodeInfoData.slice(1, nodeInfoData.length - 1); + + if (_nodeArr.length === 0) return ElMessage.warning('请添加路线节点'); + console.log('submit!'); - addSubmit(); + addSubmit(_nodeArr); } else { console.log('error submit!', fields); } @@ -1037,27 +1115,30 @@ const handleSubmit = async (formEl: FormInstance | undefined) => { :deep(.el-step__title.is-process) { font-weight: bold; - --el-text-color-primary: #60df54; + --el-text-color-primary: #1a3061; } :deep(.el-step__head.is-process) { - --el-text-color-primary: #60df54; + --el-text-color-primary: #1a3061; } -:deep(.el-step__title.is-process .count_icon) { - background: #60df54; -} +// :deep(.el-step__title.is-process .count_icon) { +// // background: #1a3061; +// } .count_icon { --width: 25px; margin-right: 20px; width: var(--width); height: var(--width); - background: var(--el-color-primary); + // background: var(--el-color-primary); color: #fff; border-radius: 50%; text-align: center; + font-weight: bold; line-height: var(--width); + border: 1px solid var(--el-color-primary); + color: var(--el-color-primary); } .steps_title { @@ -1066,6 +1147,10 @@ const handleSubmit = async (formEl: FormInstance | undefined) => { align-items: center; } +:deep(.el-step) { + max-width: none !important; +} + // 步骤条 :deep(.el-steps) { flex-wrap: wrap; diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index 5de97d6d..6db5c7d2 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -703,10 +703,10 @@ export default { ], pickUpPlate: [{ required: true, message: '请输入提货车牌号', trigger: 'change' }], deliveryDocument: [ - { required: true, message: '请输入提货证件码', trigger: 'change' }, + { required: false, message: '请输入提货证件码', trigger: 'change' }, // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } ], - certificateType: [{ required: true, message: '请选择证件类型', trigger: 'change' }], + certificateType: [{ required: false, message: '请选择证件类型', trigger: 'change' }], freightMark: [{ required: true, message: '请选择费用', trigger: 'change' }], totalCost: [{ required: true, message: '请输入费用合计', trigger: 'change' }], deliveryDocuments: [{ required: true, message: '请上传提货证件', trigger: 'change' }], diff --git a/src/views/distribution/stockup/distributionStockupDetails.vue b/src/views/distribution/stockup/distributionStockupDetails.vue index 5d46e19c..4d581a16 100644 --- a/src/views/distribution/stockup/distributionStockupDetails.vue +++ b/src/views/distribution/stockup/distributionStockupDetails.vue @@ -1,7 +1,6 @@
@@ -277,10 +315,13 @@ import { update, remove, getDetailStockupOwn, - getDetailReservationOwn, getDetailOrderOwn, getDetailInventoryOwn, getListUser + getDetailReservationOwn, + getDetailOrderOwn, + getDetailInventoryOwn, + getListUser, } from '@/api/distribution/distributionStockup'; -import option from "@/option/distribution/distributionStockup"; -import { mapGetters } from "vuex"; +import option from '@/option/distribution/distributionStockup'; +import { mapGetters } from 'vuex'; import { getDictionaryBiz } from '@/api/system/dict'; import { getParcelListOwn } from '@/api/distribution/distributionParcelList'; import { stockUp } from '@/api/basicdata/basicdataGoodsArea'; @@ -288,568 +329,566 @@ import { getStockDetail } from '@/api/distribution/distributionStock'; import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; import { getLodop } from '@/utils/LodopFuncs'; import dayjs from 'dayjs'; -import { getDisStockList,getPrintDetail } from '@/api/distribution/disStockListDetail'; +import { getDisStockList, getPrintDetail } from '@/api/distribution/disStockListDetail'; export default { - data () { + data() { return { - dialogVisible:false, - dialogPack:false, - html:'', - columnListarrs:{ - columnReservation:[ - { - prop: 'consignee', - label: '收货人', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: true, - sortable: true, - head: false, - }, - { - prop: 'deliveryPhone', - label: '收货电话', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'deliveryAddress', - label: '收货地址', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'mallName', - label: '收货单位', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'stockArticleId', - label: '订单自编号', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'stockupStatusName', - label: '备货状态', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'pallet', - label: '托盘码', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'goodsAllocation', - label: '货位信息', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - ], - columnStockOrder:[ - // { - // prop: '', - // label: '序号', - // type: 0, - // values: '', - // width: 55, - // checkarr: [], - // fixed: true, - // }, - { - prop: 'orderCode', - label: '订单自编号', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: true, - sortable: true, - head: false, - }, - { - prop: 'descriptionGoods', - label: '货物名称', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'reservationNum', - label: '备货件数', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'number', - label: '已备数量', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'stockupStatusName', - label: '备货状态', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'stockupDate', - label: '备货时间', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'goodsAllocation', - label: '库位信息', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'stockupArea', - label: '备货区', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - ], - columnStockingBag:[ - { - prop: '', - label: '序号', - type: 0, - values: '', - width: '50', - checkarr: [], - fixed: true, - sortable: true, - head: false, - }, - { - prop: 'orderPackageCode', - label: '包条码', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: true, - sortable: true, - head: false, - }, - { - prop: 'firsts', - label: '一级品', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'second', - label: '二级品', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'thirdProduct', - label: '三级品', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'materialName', - label: '物料名称', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'stockupStatusName', - label: '备货状态', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'stockupDate', - label: '备货时间', - type: 5, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'pallet', - label: '托盘码', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'goodsAllocation', - label: '库位信息', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'stockupArea', - label: '备货区', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: '', - label: '操作', - type: 6, - values: '', - width: '150', - checkarr: [], - fixed: 'right', - hide: true, - }, - ], - columnInventory:[ - { - prop: '', - label: '序号', - type: 0, - values: '', - width: 55, - checkarr: [], - fixed: true, - }, - { - prop: 'sku', - label: 'SKU', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: true, - sortable: true, - head: false, - }, - { - prop: 'orderCode', - label: '订单编号', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'descriptionGoods', - label: '物料名称', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'cargoUnit', - label: '单位', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'reservationNum', - label: '备货数', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'number', - label: '已备数量', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'stockupStatusName', - label: '备货状态', - type: 5, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'stockupDate', - label: '备货时间', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'pallet', - label: '托盘码', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'goodsAllocation', - label: '库位信息', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'stockupArea', - label: '备货区', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: '', - label: '操作', - type: 6, - values: '', - width: '230', - checkarr: [], - fixed: 'right', - hide: true, - }, - - ], - columnInventoryBatch:[ - { - prop: '', - label: '序号', - type: 0, - values: '', - width: 55, - checkarr: [], - fixed: true, - }, - { - prop: 'sku', - label: 'SKU', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: true, - sortable: true, - head: false, - }, - { - prop: 'orderCode', - label: '订单编号', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'descriptionGoods', - label: '物料名称', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'cargoUnit', - label: '单位', - type: 1, - values: '', - width: '100', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'stockPackageCode', - label: '包条码', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'brandName', - label: '品牌', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: '', - label: '操作', - type: 6, - values: '', - width: '230', - checkarr: [], - fixed: 'right', - hide: true, - }, - - ], + dialogVisible: false, + dialogPack: false, + html: '', + columnListarrs: { + columnReservation: [ + { + prop: 'consignee', + label: '收货人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'deliveryPhone', + label: '收货电话', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryAddress', + label: '收货地址', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'mallName', + label: '收货单位', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockArticleId', + label: '订单自编号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockupStatusName', + label: '备货状态', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'pallet', + label: '托盘码', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'goodsAllocation', + label: '货位信息', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + ], + columnStockOrder: [ + // { + // prop: '', + // label: '序号', + // type: 0, + // values: '', + // width: 55, + // checkarr: [], + // fixed: true, + // }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'descriptionGoods', + label: '货物名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reservationNum', + label: '备货件数', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'number', + label: '已备数量', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockupStatusName', + label: '备货状态', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockupDate', + label: '备货时间', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'goodsAllocation', + label: '库位信息', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockupArea', + label: '备货区', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + ], + columnStockingBag: [ + { + prop: '', + label: '序号', + type: 0, + values: '', + width: '50', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'orderPackageCode', + label: '包条码', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'firsts', + label: '一级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'second', + label: '二级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'thirdProduct', + label: '三级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'materialName', + label: '物料名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockupStatusName', + label: '备货状态', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockupDate', + label: '备货时间', + type: 5, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'pallet', + label: '托盘码', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'goodsAllocation', + label: '库位信息', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockupArea', + label: '备货区', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '150', + checkarr: [], + fixed: 'right', + hide: true, + }, + ], + columnInventory: [ + { + prop: '', + label: '序号', + type: 0, + values: '', + width: 55, + checkarr: [], + fixed: true, + }, + { + prop: 'sku', + label: 'SKU', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单编号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'descriptionGoods', + label: '物料名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'cargoUnit', + label: '单位', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reservationNum', + label: '备货数', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'number', + label: '已备数量', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockupStatusName', + label: '备货状态', + type: 5, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockupDate', + label: '备货时间', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'pallet', + label: '托盘码', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'goodsAllocation', + label: '库位信息', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockupArea', + label: '备货区', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '230', + checkarr: [], + fixed: 'right', + hide: true, + }, + ], + columnInventoryBatch: [ + { + prop: '', + label: '序号', + type: 0, + values: '', + width: 55, + checkarr: [], + fixed: true, + }, + { + prop: 'sku', + label: 'SKU', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单编号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'descriptionGoods', + label: '物料名称', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'cargoUnit', + label: '单位', + type: 1, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockPackageCode', + label: '包条码', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'brandName', + label: '品牌', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '230', + checkarr: [], + fixed: 'right', + hide: true, + }, + ], }, height: 0, activeName: 'reservation', @@ -870,29 +909,29 @@ export default { page: { currentPage: 1, pageSize: 30, - total: 40 + total: 40, }, // 分页信息 page1: { currentPage: 1, pageSize: 30, - total: 40 + total: 40, }, // 分页信息 page2: { currentPage: 1, pageSize: 30, - total: 40 + total: 40, }, // 分页信息 page3: { currentPage: 1, pageSize: 30, - total: 40 + total: 40, }, // 表单数据 form: {}, - formCall: {},// 通知 + formCall: {}, // 通知 formService: {}, // 服务 formCustomer: {}, // 客户 // 选择行 @@ -917,124 +956,121 @@ export default { deptId: '', //部门id dialogFormService: false, formLabelWidth: '120px', - handler:true, //首次 - trade:false, // 商 - municipal:true, // 市 - taker:true, // 自提 + handler: true, //首次 + trade: false, // 商 + municipal: true, // 市 + taker: true, // 自提 packageCodeList: [], // 自提 - } + }; }, - mounted () { - this.init(); + // created () { + // this.init(); - }, - watch:{ - '$route.query.id':{ + // }, + watch: { + '$route.query.id': { handler(newVal, oldVal) { // console.log(newVal, oldVal); this.init(); }, deep: true, - immediate: true - } + immediate: true, + }, }, computed: { - ...mapGetters(["permission"]), + ...mapGetters(['permission']), permissionList() { return { addBtn: this.validData(this.permission.basicdataBrandCategory_add, false), viewBtn: this.validData(this.permission.basicdataBrandCategory_view, false), delBtn: this.validData(this.permission.basicdataBrandCategory_delete, false), - editBtn: this.validData(this.permission.basicdataBrandCategory_edit, false) + editBtn: this.validData(this.permission.basicdataBrandCategory_edit, false), }; }, - ids () { + ids() { let ids = []; this.selectionList.forEach(ele => { ids.push(ele.id); }); - return ids.join(","); - } + return ids.join(','); + }, }, methods: { //批量打印 - handleBatchDetail(type){ - console.log("selectionList",this.selectionList); - if(this.selectionList.length == 0){ - this.$message.warning("至少选择一条数据！！") - return ; + handleBatchDetail(type) { + console.log('selectionList', this.selectionList); + if (this.selectionList.length == 0) { + this.$message.warning('至少选择一条数据！！'); + return; } - const _flag = this.selectionList.every(val => !(val.stockupStatusName === '待备货')) + const _flag = this.selectionList.every(val => !(val.stockupStatusName === '待备货')); - if (_flag) return this.$message.warning('有待备货数据, 无法打印') + if (_flag) return this.$message.warning('有待备货数据, 无法打印'); - if(type== '1'){ + if (type == '1') { //包条码批量 - let checkcode=[] - this.selectionList.map(item=>{ - checkcode.push(item.id) - }) + let checkcode = []; + this.selectionList.map(item => { + checkcode.push(item.id); + }); let qr = { ids: checkcode.join(','), - type: "2" + type: '2', }; - this.html='' - getPrintDetail(qr).then( res =>{ - console.log(",./"); + this.html = ''; + getPrintDetail(qr).then(res => { + console.log(',./'); this.dialogVisible = true; - this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml) - }) - }else if(type== '2'){ + this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml); + }); + } else if (type == '2') { //包条码批量 let myMap = []; - this.selectionList.map(item=>{ - if(!!item.stocklist){ - myMap.push(item.stocklist); - } - }) + this.selectionList.map(item => { + if (!!item.stocklist) { + myMap.push(item.stocklist); + } + }); let qr = { - ids: myMap.join(","), - type: "3" + ids: myMap.join(','), + type: '3', }; - console.log("><><>>",qr); + console.log('><><>>', qr); //库存品订单批量 - this.html='' - getPrintDetail(qr).then( res =>{ + this.html = ''; + getPrintDetail(qr).then(res => { // console.log(",./"); this.dialogVisible = true; - this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml) - }) - + this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml); + }); } - }, //单独打印 - handlePrintDetail(row){ - console.log("单个答应》》》",row); - row.type = "1"; - this.html='' - getPrintDetail(row).then( res =>{ - console.log(",./"); + handlePrintDetail(row) { + console.log('单个答应》》》', row); + row.type = '1'; + this.html = ''; + getPrintDetail(row).then(res => { + console.log(',./'); this.dialogVisible = true; - this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml) - }) - + this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml); + }); }, //查看库存品明细 - handleDetail(row){ - console.log("row>><><><",row); + handleDetail(row) { + console.log('row>><><><', row); this.dialogPack = true; //查询信息 let po = { stockListId: row.stockListId, reservationId: row.reservationId, - } - let s =[]; - getDisStockList(po).then( res =>{ - console.log("res>>>>库存包件码",res.data.data); + }; + let s = []; + getDisStockList(po).then(res => { + console.log('res>>>>库存包件码', res.data.data); res.data.data.forEach(i => { - if(!!i){ + if (!!i) { let a = {}; a.sku = i.sku; a.id = i.id; @@ -1049,28 +1085,27 @@ export default { } }); this.packageCodeList = s; - }) + }); }, - showdrawer(value){ - this.drawerShow=value + showdrawer(value) { + this.drawerShow = value; }, /** * 弹窗的勾选回调，用于更改头部数组 * 固定搭配，只需要更换 columnList */ - setnewcolum(newarr, headarr,type) { + setnewcolum(newarr, headarr, type) { // console.log(newarr,'+++++++++++') - if(type==1){ + if (type == 1) { this.columnList = newarr; - this.$functions.setStorage(window.location.pathname+'checkList', headarr); - }else if(type==2){ + this.$functions.setStorage(window.location.pathname + 'checkList', headarr); + } else if (type == 2) { this.columnList = newarr; - this.$functions.setStorage(window.location.pathname+'flexList', headarr); - }else if(type==3){ + this.$functions.setStorage(window.location.pathname + 'flexList', headarr); + } else if (type == 3) { this.columnList = newarr; - this.$functions.setStorage(window.location.pathname+'sortlist', headarr); + this.$functions.setStorage(window.location.pathname + 'sortlist', headarr); } - }, selectionsc(value) { console.log(value); @@ -1102,12 +1137,12 @@ export default { }, timesc(index, row) { console.log(index, row); - if (!!index){ + if (!!index) { index = dayjs(index).format('YYYY-MM-DD'); } - this.query[row.prop] = index - if (!index){ - delete this.query[row.prop] + this.query[row.prop] = index; + if (!index) { + delete this.query[row.prop]; } this.onLoad(this.page); }, @@ -1129,7 +1164,7 @@ export default { //打印 printTemplate() { let LODOP = getLodop(); - console.log("LODOP>>>>>",LODOP); + console.log('LODOP>>>>>', LODOP); // console.log("this.ids>>>>>",this.selectionList); // if (this.selectionList.length === 0){ // this.$message.warning("请选择至少一条数据"); @@ -1142,7 +1177,7 @@ export default { // console.log(templateData); LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能'); LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500'); - LODOP.SET_PRINT_STYLEA(0,"TextNeatRow",true);//允许标点溢出，且英文单词拆开 + LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开 // // 设置打印整宽且不变形 LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width'); // // 设置打印后自动关闭 @@ -1151,7 +1186,6 @@ export default { LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData); // LODOP.PREVIEW(); //预览(预览打印无脚标) LODOP.PRINT(); //直接打印 - }); }, //查看包条码 @@ -1164,157 +1198,159 @@ export default { let qr = { ids: row.id, }; - this.html='' + this.html = ''; showOrderPackgeCode(qr).then(res => { // this.orderPackageCode = res.data console.log(res.data); - this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml) - + this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml); }); this.dialogVisible = true; }, //系统备货确定 - callFordelivery(){ + callFordelivery() { let c = false; if (this.selectionList.length > 0) { let ids = this.selectionList.map(i => i.id).join(','); - this.selectionList.forEach( i =>{ - if(!!i.stockupStatus){ + this.selectionList.forEach(i => { + if (!!i.stockupStatus) { c = true; } - }) - this.form.ids = ids.split(","); - }else{ - this.form.ids =this.form.ids.split(","); + }); + this.form.ids = ids.split(','); + } else { + this.form.ids = this.form.ids.split(','); } - if(c){ - this.$message.warning("有已备货的数据！！") - return ; + if (c) { + this.$message.warning('有已备货的数据！！'); + return; } this.form.stockupId = this.$route.query.id; - getStockDetail( Object.assign(this.form)).then(res =>{ + getStockDetail(Object.assign(this.form)).then(res => { this.$message({ - type: "success", - message: "操作成功!" + type: 'success', + message: '操作成功!', }); this.getStockUpParcelsList(this.page1); this.form = {}; this.dialogHand = false; }); - }, //选择 - getForklift(row,ty){ - switch (ty){ + getForklift(row, ty) { + switch (ty) { case '3': - let f = this.goodsAreaIdData.find(i =>i.dictKey == row) + let f = this.goodsAreaIdData.find(i => i.dictKey == row); this.form.stockupArea = f.dictValue; break; } }, //备货区 - async getStorageArea(){ - let params ={ - department: this.deptId - } - stockUp(params).then(res =>{ + async getStorageArea() { + let params = { + department: this.deptId, + }; + stockUp(params).then(res => { // console.log("res>>>",res.data.data); - let fo =[]; - res.data.data.forEach(i =>{ + let fo = []; + res.data.data.forEach(i => { let v = { dictKey: i.id, - dictValue: i.name +'-'+i.headline - } - fo.push(v) - }) + dictValue: i.name + '-' + i.headline, + }; + fo.push(v); + }); this.goodsAreaIdData = fo; - }) + }); }, - handleStockUp(row,type){ - getListUser().then(res =>{ //查询当前人信息 - console.log("res>>>",res.data.data); + handleStockUp(row, type) { + getListUser().then(res => { + //查询当前人信息 + console.log('res>>>', res.data.data); this.deptId = res.data.data.deptId; this.getStorageArea(); - }) - console.log("备货数据！！",row); - switch (type){ - case '1': - if(this.selectionList.length === 0){ - this.$message.warning("至少选择一条数据！！！"); - return; - } - let a = false; - this.selectionList.some( i =>{ - if(!!i.stockupStatus){ - a=true; - return ; + }); + console.log('备货数据！！', row); + switch (type) { + case '1': + if (this.selectionList.length === 0) { + this.$message.warning('至少选择一条数据！！！'); + return; } - }); - if(a){ - this.$message.warning("有已备货数据！！！"); - return ; - } - break; - case '2': - this.form.ids = row.id; - break; - } + let a = false; + this.selectionList.some(i => { + if (!!i.stockupStatus) { + a = true; + return; + } + }); + if (a) { + this.$message.warning('有已备货数据！！！'); + return; + } + break; + case '2': + this.form.ids = row.id; + break; + } this.dialogHand = true; }, - handleClick (tab, event) { - console.log(tab, event) + handleClick(tab, event) { + console.log(tab, event); console.log(tab.props.name); this.leibiao = tab.props.name; - if( this.leibiao == 'library'){ + if (this.leibiao == 'library') { //订单 this.getOrderList(this.page); - }else if( this.leibiao == 'outbound'){ + } else if (this.leibiao == 'outbound') { //包件 this.getStockUpParcelsList(this.page1); - }else if( this.leibiao == 'enter'){ + } else if (this.leibiao == 'enter') { //库存品 this.getInventoryList(this.page2); } }, - init () { + init() { this.height = this.setPx(document.body.clientHeight - 570); - getDictionaryBiz('distribution_type').then(res => { //配送类型 + getDictionaryBiz('distribution_type').then(res => { + //配送类型 this.distributionType = res.data.data; }); // console.log("配送方式123", this.deliveryWayList); - getDictionaryBiz('delivery_way').then(res => { //配送方式 + getDictionaryBiz('delivery_way').then(res => { + //配送方式 this.deliveryWayList = res.data.data; - console.log("配送方式123", this.deliveryWayList); + console.log('配送方式123', this.deliveryWayList); }); - getDictionaryBiz('stockup_status').then(res => { //配送方式 + getDictionaryBiz('stockup_status').then(res => { + //配送方式 this.stockupStatusList = res.data.data; }); - getDictionaryBiz('addvalue_serve_type').then(res => { //服务类型 + getDictionaryBiz('addvalue_serve_type').then(res => { + //服务类型 this.serveTypeList = res.data.data; }); this.onLoad(this.page); - }, - searchHide () { + searchHide() { this.search = !this.search; }, - searchChange () { + searchChange() { this.onLoad(this.page); }, - searchReset () { + searchReset() { this.query = {}; this.page.currentPage = 1; this.onLoad(this.page); }, - handleSubmit () { + handleSubmit() { if (!this.form.id) { add(this.form).then(() => { this.box = false; this.onLoad(this.page); this.$message({ - type: "success", - message: "操作成功!" + type: 'success', + message: '操作成功!', }); }); } else { @@ -1322,48 +1358,48 @@ export default { this.box = false; this.onLoad(this.page); this.$message({ - type: "success", - message: "操作成功!" + type: 'success', + message: '操作成功!', }); - }) + }); } }, //全部 - handleEntire(){ + handleEntire() { this.handler = true; this.taker = true; this.trade = false; - }, //商配 - handleTrade(){ + handleTrade() { // this.handler = true; this.trade = true; }, //商配 - handleMunicipal(){ + handleMunicipal() { // this.handler = true; // this.taker = true; }, //自提 - handlePickUpStore(){ + handlePickUpStore() { this.loading = true; // console.log("this.query",this.query); let params = {}; this.query.typeService = '1'; - getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => { - const data = res.data.data; - this.page.total = data.total; - this.data = data.records; - this.loading = false; - this.selectionClear(); - this.handler = false; - this.taker = false; - }); + getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then( + res => { + const data = res.data.data; + this.page.total = data.total; + this.data = data.records; + this.loading = false; + this.selectionClear(); + this.handler = false; + this.taker = false; + } + ); }, //自提的通知 - handleInform(index){ - + handleInform(index) { this.loading = true; // console.log("this.query",this.query); let params = {}; @@ -1377,45 +1413,47 @@ export default { break; } this.query.typeService = '1'; - getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => { - const data = res.data.data; - this.page.total = data.total; - this.data = data.records; - this.loading = false; - this.selectionClear(); - this.handler = false; - this.taker = false; - }); + getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then( + res => { + const data = res.data.data; + this.page.total = data.total; + this.data = data.records; + this.loading = false; + this.selectionClear(); + this.handler = false; + this.taker = false; + } + ); }, - handleAdd () { - this.title = '新增' - this.form = {} - this.box = true + handleAdd() { + this.title = '新增'; + this.form = {}; + this.box = true; }, - handleEdit (row) { - this.title = '编辑' - this.box = true + handleEdit(row) { + this.title = '编辑'; + this.box = true; getDetail(row.id).then(res => { this.form = res.data.data; }); }, - handleView (row) { - this.title = '查看' + handleView(row) { + this.title = '查看'; this.view = true; this.box = true; getDetail(row.id).then(res => { this.form = res.data.data; }); }, - handleDelete () { + handleDelete() { if (this.selectionList.length === 0) { - this.$message.warning("请选择至少一条数据"); + this.$message.warning('请选择至少一条数据'); return; } - this.$confirm("确定将选择数据删除?", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" + this.$confirm('确定将选择数据删除?', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', }) .then(() => { return remove(this.ids); @@ -1424,16 +1462,16 @@ export default { this.selectionClear(); this.onLoad(this.page); this.$message({ - type: "success", - message: "操作成功!" + type: 'success', + message: '操作成功!', }); }); }, - rowDel (row) { - this.$confirm("确定将选择数据删除?", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" + rowDel(row) { + this.$confirm('确定将选择数据删除?', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', }) .then(() => { return remove(row.id); @@ -1441,62 +1479,55 @@ export default { .then(() => { this.onLoad(this.page); this.$message({ - type: "success", - message: "操作成功!" + type: 'success', + message: '操作成功!', }); }); }, - beforeClose (done) { - done() + beforeClose(done) { + done(); this.form = {}; this.view = false; }, - selectionChange (list) { + selectionChange(list) { // console.log("添加阿斯顿发生",list); this.selectionList = list; }, - selectionClear () { + selectionClear() { this.selectionList = []; // this.$refs.table.clearSelection(); }, - currentChange (currentPage) { - if(!!this.leibiao && this.leibiao == 'library'){ + currentChange(currentPage) { + if (!!this.leibiao && this.leibiao == 'library') { this.page.currentPage = currentPage; this.getOrderList(this.page); - - }else if(!!this.leibiao && this.leibiao == 'outbound'){ + } else if (!!this.leibiao && this.leibiao == 'outbound') { this.page1.currentPage = currentPage; this.getStockUpParcelsList(this.page1); - } - else if(!!this.leibiao && this.leibiao == 'enter'){ + } else if (!!this.leibiao && this.leibiao == 'enter') { this.page2.currentPage = currentPage; this.getInventoryList(this.page2); - } - else { + } else { this.page3.currentPage = currentPage; this.getReservationList(this.page3); } }, - sizeChange (pageSize) { - if(!!this.leibiao && this.leibiao == 'library'){ + sizeChange(pageSize) { + if (!!this.leibiao && this.leibiao == 'library') { this.page.pageSize = pageSize; this.getOrderList(this.page); - - }else if(!!this.leibiao && this.leibiao == 'outbound'){ + } else if (!!this.leibiao && this.leibiao == 'outbound') { this.page1.pageSize = pageSize; this.getStockUpParcelsList(this.page1); - } - else if(!!this.leibiao && this.leibiao == 'enter'){ + } else if (!!this.leibiao && this.leibiao == 'enter') { this.page2.pageSize = pageSize; this.getInventoryList(this.page2); - } - else{ + } else { this.page3.pageSize = pageSize; this.getReservationList(this.page3); } - }, - onLoad (page, params = {}) { + onLoad(page, params = {}) { this.loading = true; this.query.id = this.$route.query.id; // getDetailStockupOwn(this.$route.query.id).then(res => { @@ -1524,11 +1555,13 @@ export default { this.getReservationList(page); this.loading = false; - } , + }, //查询预约列表 - async getReservationList(page){ - let a =await getDetailReservationOwn(page.currentPage,page.pageSize,{id :this.$route.query.id}); - console.log("......",a.data); + async getReservationList(page) { + let a = await getDetailReservationOwn(page.currentPage, page.pageSize, { + id: this.$route.query.id, + }); + console.log('......', a.data); const data = a.data.data; this.data3 = data.records; // if(!!this.data3 && this.data3.length > 0){ @@ -1540,90 +1573,93 @@ export default { // }) // } - this.page3.total = a.data.data.total; - this.loading = false; - this.selectionClear(); + this.page3.total = a.data.data.total; + this.loading = false; + this.selectionClear(); }, //查询包件列表 - async getStockUpParcelsList(page){ - let a = await getParcelListOwn(page.currentPage,page.pageSize,{id :this.$route.query.id}); - // console.log("包件...",a.data.data); - const data = a.data.data; - if(data.records.length > 0){ - // console.log("数据》《》《",data.records[0]); - if(!!data.records[0]){ - this.data1 = data.records; - // console.log("数据》《》《》",this.data1); - if(this.data1[0] != null ){ - this.data1.forEach(i =>{ - if(i != null ){ - console.log("><><><>>>",i); - if(!i.stockupStatus){ - i.stockupStatusName = "待备货"; - this.isStockUp = true; - }else{ - i.stockupStatusName = "已备货"; - } - } - }) - } - } + async getStockUpParcelsList(page) { + let a = await getParcelListOwn(page.currentPage, page.pageSize, { id: this.$route.query.id }); + // console.log("包件...",a.data.data); + const data = a.data.data; + if (data.records.length > 0) { + // console.log("数据》《》《",data.records[0]); + if (!!data.records[0]) { + this.data1 = data.records; + // console.log("数据》《》《》",this.data1); + if (this.data1[0] != null) { + this.data1.forEach(i => { + if (i != null) { + console.log('><><><>>>', i); + if (!i.stockupStatus) { + i.stockupStatusName = '待备货'; + this.isStockUp = true; + } else { + i.stockupStatusName = '已备货'; + } + } + }); + } + } - this.page1.total = a.data.data.total; - } - this.loading = false; - this.selectionClear(); + this.page1.total = a.data.data.total; + } + this.loading = false; + this.selectionClear(); }, //查询订单列表 - async getOrderList(page){ - let a =await getDetailOrderOwn(page.currentPage,page.pageSize,{id :this.$route.query.id}); - // console.log("订单...",a.data); + async getOrderList(page) { + let a = await getDetailOrderOwn(page.currentPage, page.pageSize, { + id: this.$route.query.id, + }); + // console.log("订单...",a.data); const data = a.data.data; this.dataPare = data.records; - this.dataPare.forEach(i =>{ - let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus); - if(!!b){ + this.dataPare.forEach(i => { + let b = this.stockupStatusList.find(a => a.dictKey == i.stockupStatus); + if (!!b) { i.stockupStatusName = b.dictValue; } - }) - this.page.total = a.data.data.total; - this.loading = false; - this.selectionClear(); + }); + this.page.total = a.data.data.total; + this.loading = false; + this.selectionClear(); }, //查询库存品列表 - async getInventoryList(page){ - let a =await getDetailInventoryOwn(page.currentPage,page.pageSize,{id :this.$route.query.id}); - // console.log("库存品...",a.data); + async getInventoryList(page) { + let a = await getDetailInventoryOwn(page.currentPage, page.pageSize, { + id: this.$route.query.id, + }); + // console.log("库存品...",a.data); const data = a.data.data; this.data2 = data.records; - this.data2.forEach(i =>{ - let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus); - if(!!b){ + this.data2.forEach(i => { + let b = this.stockupStatusList.find(a => a.dictKey == i.stockupStatus); + if (!!b) { i.stockupStatusName = b.dictValue; } - }) - this.page2.total = a.data.data.total; - this.loading = false; - this.selectionClear(); + }); + this.page2.total = a.data.data.total; + this.loading = false; + this.selectionClear(); }, //转换类型 - getOwnServer(row,name,list){ + getOwnServer(row, name, list) { // console.log(">>>>>",row,name,list); // console.log(">>>>>",row); // console.log(">>>>>",name); // console.log(">>>>>",list); - row.forEach( i =>{ + row.forEach(i => { // console.log(i,"-=-=-=-"); - let a = list.find( s => s.dictKey == i); + let a = list.find(s => s.dictKey == i); // console.log("aaaa",a); - if(!!a){ + if (!!a) { name += a.dictValue; } - }); return name; }, - } + }, }; -