From 16c680523e29618dd6c63278fbc0e6d7f252d20b Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 22 Dec 2023 17:30:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E6=98=8E=E7=BB=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artery/addTripartiteTransfer.vue | 102 ++++++++------- .../distributionStockArticleDetails.vue | 24 ++-- .../parcelList/distributionParcelList.vue | 119 +++++++++++------- 3 files changed, 144 insertions(+), 101 deletions(-) diff --git a/src/views/distribution/artery/addTripartiteTransfer.vue b/src/views/distribution/artery/addTripartiteTransfer.vue index c817bac6..5c2f7e2a 100644 --- a/src/views/distribution/artery/addTripartiteTransfer.vue +++ b/src/views/distribution/artery/addTripartiteTransfer.vue @@ -298,7 +298,6 @@
+
共 {{ details.newData.length }} 条
@@ -400,6 +400,7 @@ class="submitButton" icon="Promotion" type="primary" + :loading="details.loadingObj.submitLoading" @click="handleSubmit(ruleFormRef)" > 提交 @@ -566,6 +567,8 @@ const details = reactive({ carrierName: false, /** 司机 */ driverName: false, + /** 提交 */ + submitLoading: false, }, /** 列表复选框选中的数据 */ selectionList: [], @@ -636,7 +639,7 @@ onMounted(() => { }); /** 请求页面数据 */ -const onLoad = async (page: any) => { +const onLoad = async () => { const res = await postloadFindLoadInitData(); const { code, data } = res.data; if (code !== 200) return; @@ -672,7 +675,7 @@ const initOriginWarehouseOrder = async (params = {}) => { const { code, data } = res.data; if (code !== 200) return; details.oldData = data.records; - details.page.total = data.total; + details.oldPage.total = data.total; } catch (error) { console.log('error :>> ', error); } finally { @@ -854,11 +857,10 @@ const setnewcolum = (newarr, headarr, type) => { /** 加入调度池 */ const handleAddWaybill = () => { - details.newData = details.selectionList.map(val => { + details.selectionList.forEach(val => { val.planNum = val.stockNum; val.loadingNum = 0; - - return val; + details.newData.push(val); }); details.orderCodeList = [ ...new Set([ @@ -928,46 +930,54 @@ const handleSubmit = (formEl: FormInstance | undefined) => { formEl.validate(async (valid, fields) => { if (valid) { console.log('details.pageInfo :>> ', details.pageInfo); - const submitData = { - ...form.value, - carsLoadLineList: [ - { - nodeType: '1', - nodeName: details.pageInfo.startWarehouseInfo.warehouseName, - nodeId: details.pageInfo.startWarehouseInfo.warehouseId, - linkAddress: details.pageInfo.startWarehouseInfo.linkAddress, - linkMan: details.pageInfo.startWarehouseInfo.linkMan, - linkMobile: details.pageInfo.startWarehouseInfo.linkMobile, - sort: '1', - - lineCarsOrderList: JSON.parse(JSON.stringify(details.newData)).map(value => { - value.nodeId = details.pageInfo.startWarehouseInfo.warehouseId; - value.nodeName = details.pageInfo.startWarehouseInfo.warehouseName; - value.finalNodeId = details.pageInfo.startWarehouseInfo.warehouseId; - value.totalNum = 20; - return value; - }), - }, - ], - }; - - submitData.customerType = submitData.customerType.join(','); - - if (submitData.carrierTimeStr) - submitData.carrierTimeStr = dayjs(submitData.carrierTimeStr).format('YYYY-MM-DD'); - if (submitData.receivingTimeStr) - submitData.receivingTimeStr = dayjs(submitData.receivingTimeStr).format('YYYY-MM-DD'); - console.log('submitData :>> ', submitData); - - const res = await postSaveNewTripartiteTransfer(submitData); - const { code, msg } = res.data; - if (code !== 200) return; - ElMessage({ - message: msg, - type: 'success', - }); - back(); - console.log('res :>> ', res); + details.loadingObj.submitLoading = true; + + try { + const submitData = { + ...form.value, + carsLoadLineList: [ + { + nodeType: '1', + nodeName: details.pageInfo.startWarehouseInfo.warehouseName, + nodeId: details.pageInfo.startWarehouseInfo.warehouseId, + linkAddress: details.pageInfo.startWarehouseInfo.linkAddress, + linkMan: details.pageInfo.startWarehouseInfo.linkMan, + linkMobile: details.pageInfo.startWarehouseInfo.linkMobile, + sort: '1', + + lineCarsOrderList: JSON.parse(JSON.stringify(details.newData)).map(value => { + value.nodeId = details.pageInfo.startWarehouseInfo.warehouseId; + value.nodeName = details.pageInfo.startWarehouseInfo.warehouseName; + value.finalNodeId = details.pageInfo.startWarehouseInfo.warehouseId; + value.totalNum = 20; + return value; + }), + }, + ], + }; + + submitData.customerType = submitData.customerType.join(','); + + if (submitData.carrierTimeStr) + submitData.carrierTimeStr = dayjs(submitData.carrierTimeStr).format('YYYY-MM-DD'); + if (submitData.receivingTimeStr) + submitData.receivingTimeStr = dayjs(submitData.receivingTimeStr).format('YYYY-MM-DD'); + console.log('submitData :>> ', submitData); + + const res = await postSaveNewTripartiteTransfer(submitData); + const { code, msg } = res.data; + if (code !== 200) return; + ElMessage({ + message: msg, + type: 'success', + }); + back(); + console.log('res :>> ', res); + } catch (error) { + console.log('error :>> ', error); + } finally { + details.loadingObj.submitLoading = false; + } } else { console.log('error submit!', fields); } diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue index 73bd8425..88f65461 100644 --- a/src/views/distribution/inventory/distributionStockArticleDetails.vue +++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue @@ -106,9 +106,7 @@

包件信息

批量查看二维码 - 补充物料信息 + 补充物料信息
@@ -144,7 +142,7 @@ text icon="el-icon-view" v-if="!slotProps.scope.row.materialId" - @click="handleMaterial(slotProps.scope.row,'1')" + @click="handleMaterial(slotProps.scope.row, '1')" >补充物料信息 修改物料信息 @@ -1234,28 +1232,28 @@ export default { this.form = res.data.data; }); }, - async handleMaterial(row,index) { + async handleMaterial(row, index) { // console.log('row>>>', row); - if(index === "2"){ + if (index === '2') { this.titleMaterial = '修改物料'; this.formMaterial = row; this.loading = true; getListMaterial(this.page.currentPage, this.page.pageSize, { productCode: row.materialCode, - }).then(res =>{ + }).then(res => { // console.log('物料编号信息', res.data.data.records[0].sku); - this.formMaterial.sku = res.data.data.records[0].sku; + this.formMaterial.sku = res.data.data.records[0].sku; }); this.loading = false; - this.optionsName = [{id: row.materialId,name: row.materialName}] - this.optionsCode = [{id: row.materialId,productCode: row.materialCode}] + this.optionsName = [{ id: row.materialId, name: row.materialName }]; + this.optionsCode = [{ id: row.materialId, productCode: row.materialCode }]; // console.log("333333",this.optionsCode[0]); - }else{ + } else { this.titleMaterial = '补充物料'; this.formMaterial.id = row.id; } this.materialBox = true; - console.log("_+_+_+_+_+_+_",index); + console.log('_+_+_+_+_+_+_', index); }, allhandleQRCode() { console.log(this.selectionList); diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue index 5bbde338..6994791a 100644 --- a/src/views/warehouse/parcelList/distributionParcelList.vue +++ b/src/views/warehouse/parcelList/distributionParcelList.vue @@ -34,7 +34,7 @@ @selection="selectionChange" > @@ -130,22 +130,16 @@ :columnList="columnList" > - +
- - 打 印 - 取 消 - + + 打 印 + 取 消 + -