From 89a9b8919dc00cbced57d5ccc299a08bdcf700a6 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 26 Jul 2024 17:48:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basicdata/brand/basicBrand.vue | 2 +- src/views/distribution/signfor/asurcharge.vue | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/basicdata/brand/basicBrand.vue b/src/views/basicdata/brand/basicBrand.vue index df323454..9c27ddba 100644 --- a/src/views/basicdata/brand/basicBrand.vue +++ b/src/views/basicdata/brand/basicBrand.vue @@ -121,7 +121,7 @@ - + { if (res.data.code == 200) { if (res.data.data == null || !res.data.data?.addvalueDetailId) { details.data = []; + TcZcInput.value.floolNum = 0; //上楼费 + TcZcInput.value.distance = 0; //平移距离 addvalueDetailId.value = null; return; } @@ -624,7 +626,7 @@ const preservation = () => { addvalueType: tabName.value, //类型 deliveryId: $route.query.id, reservationId: $route.query.reservationId, - packageEntityList: [], + packageEntityList: details.data || [], }; if (tabName.value == 2) { From 715abad8bdf0c33edc26dfb0b48b9469ff41c931 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 29 Jul 2024 09:41:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=93=81=E7=89=8C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=9B=BE=E7=89=87=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tablecmt/tablecmt.vue | 12 +++++++++++- src/views/basicdata/brand/basicBrand.vue | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index 3ac5c95b..764eebee 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -142,7 +142,7 @@ > - --> + diff --git a/src/views/basicdata/brand/basicBrand.vue b/src/views/basicdata/brand/basicBrand.vue index 9c27ddba..414ba379 100644 --- a/src/views/basicdata/brand/basicBrand.vue +++ b/src/views/basicdata/brand/basicBrand.vue @@ -330,7 +330,7 @@ export default { // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } ], brandCode: [{ required: true, message: '请输入品牌编号', trigger: 'change' }], - brandIcon: [{ required: true, message: '请上传图标', trigger: 'blur' }], + brandIcon: [{ required: false, message: '请上传图标', trigger: 'blur' }], acceptanceTime: [{ required: true, message: '请选择承接时间', trigger: 'blur' }], }, loadingObj: { From e1fd79266bd0f77d02e96116835dfa5a69f5cd08 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 29 Jul 2024 10:31:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=85=E7=AD=BE=E6=94=B6=EF=BC=8C?= =?UTF-8?q?=E5=95=86=E9=85=8D=E5=A2=9E=E5=8A=A0=E6=BB=9E=E7=95=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/distributionDeliveryList.js | 4 +- src/api/distribution/distributionSignfor.js | 8 +++ .../distribution/DeliveryExceptionReview.js | 2 +- .../distributionDeliveryListedt.vue | 44 +++++++++++++++-- .../signfor/distributionSignfortreat.vue | 49 ++++++++++++++++--- 5 files changed, 94 insertions(+), 13 deletions(-) diff --git a/src/api/distribution/distributionDeliveryList.js b/src/api/distribution/distributionDeliveryList.js index f00a0635..fbf7ed66 100644 --- a/src/api/distribution/distributionDeliveryList.js +++ b/src/api/distribution/distributionDeliveryList.js @@ -389,11 +389,11 @@ export const $_retentionScan = data => { }); }; -//滞留 +//滞留(已弃用！) export const $_retentionSave = data => { return request({ url: '/api/logpm-distribution/deliveryList/retentionSave', method: 'post', data, }); -}; \ No newline at end of file +}; diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js index 2b9385cb..fc4f661d 100644 --- a/src/api/distribution/distributionSignfor.js +++ b/src/api/distribution/distributionSignfor.js @@ -383,3 +383,11 @@ export const postPageCount = params => { params, }); }; + //滞留 +export const $_retentionScan = data => { + return request({ + url: '/api/logpm-distribution/deliveryList/retentionPC', + method: 'post', + data, + }); + }; \ No newline at end of file diff --git a/src/option/distribution/DeliveryExceptionReview.js b/src/option/distribution/DeliveryExceptionReview.js index 45ec126f..4a95df0d 100644 --- a/src/option/distribution/DeliveryExceptionReview.js +++ b/src/option/distribution/DeliveryExceptionReview.js @@ -452,7 +452,7 @@ export const AbnormalReview = [ label: '操作', type: 6, values: '', - width: '80', + width: '120', checkarr: [], fixed: 'right', sortable: false, diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 7d3468bd..c839ee8e 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -883,7 +883,7 @@ 驳回 + 滞留 + @@ -980,7 +985,6 @@ import { $_showInventoryPackgeCode, $_loadingAbnormalPackageListTurnDown, $_retentionScan, - $_retentionSave, } from '@/api/distribution/distributionDeliveryList'; import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; import { exportBlob } from '@/api/common'; @@ -4030,7 +4034,7 @@ export default { }); this.AbnormalReviewloading = false; //关闭加载 console.log(); - this.viewAbnormalLoading(this.toexamineID); //审核完成更新数据 + this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据 } }); }, @@ -4647,6 +4651,40 @@ export default { }) .catch(() => {}); }, + + // 异常审核滞留 + abnormalretention(row) { + + ElMessageBox.confirm('是否确认滞留操作?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }) + .then(() => { + let data = { + barcode: row.packageCode, + deliveryId: row.deliveryListId, + retentionType: '1', + }; + this.loading = true; + $_retentionScan(data) + .then(res => { + console.log(res, 'res'); + if (res.data.code == 200) { + ElMessage({ + message: '滞留成功', + type: 'success', + }); + this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据 + } + }) + .catch(() => { + this.loading = false; + }); + }) + .catch(() => {}); + }, + // 包件批量签收 Batchpackages() { if (!this.selectionList.length) { diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index baa38d2b..4a628236 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -176,11 +176,7 @@ @click="handleSign(slotProps.scope.row)" >复 核 - 附加费 + 附加费 @@ -447,6 +443,13 @@ size="small" >审 核 + 滞 留 @@ -515,6 +518,7 @@ import { getSignforExport, numberDetail, $_isSignt, + $_retentionScan, } from '@/api/distribution/distributionSignfor'; import { update as updatesign } from '@/api/distribution/distributionSignfor'; import option from '@/option/distribution/distributionSignfor'; @@ -1839,8 +1843,8 @@ export default { } }, // 附加费 - asurcharge(row){ - console.log(row,'附加费'); + asurcharge(row) { + console.log(row, '附加费'); this.$router.push({ path: '/distribution/signfor/asurcharge', query: { @@ -1989,6 +1993,37 @@ export default { const { row } = scope; console.log(row); }, + // 滞留 + retention(row) { + ElMessageBox.confirm('是否确认滞留操作?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }) + .then(() => { + let data = { + barcode: row.packageCode, + deliveryId: row.deliveryListId, + retentionType: '1', + }; + this.loading = true; + $_retentionScan(data) + .then(res => { + console.log(res, 'res'); + if (res.data.code == 200) { + ElMessage({ + message: '滞留成功', + type: 'success', + }); + this.AbnormalreviewFn(this.abnormalReview); + } + }) + .catch(() => { + this.loading = false; + }); + }) + .catch(() => {}); + }, //审批异常装车包件 auditing(row) { this.Abnormalloading = true;