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;