{
//页面初始化方法
PageOnload();
// 价格配置提交
-const Priceconfigurationsubmission = () => {
+const Priceconfigurationsubmission = async () => {
+ const _flag = await ruleFormRef.value.validate();
+ if (!_flag) {
+ return;
+ }
+ const categoryMap = new Map(details.data.map(item => [item.driverId, item]));
+ //这里查找是否已经存在添加过的品类（只能查询当前页）
+ if (categoryMap.has(form.value.driverId)) {
+ ElMessage({
+ message: '司机已经存在',
+ type: 'warning',
+ });
+ return;
+ }
let data = {
warehouseName:
ServiceWarehouse.value.find(res => res.value == form.value.warehouseId)?.label || '', //仓库名称
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index c162ec9d..339a8aee 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -438,7 +438,7 @@
@click="signingReservationPackage(slotProps.scope.row)"
>PC签收
- 滞留
+ > -->
@@ -770,7 +770,8 @@
@close="Abnormalshutdown"
class="el_abnormalBox"
>
- 批量查看二维码
+ 批量取消
+ 批量查看二维码
驳回
-
+ 取消
+
+
-
+
@@ -889,6 +896,7 @@ import {
$_showInventoryPackgeCode,
$_loadingAbnormalPackageListTurnDown,
$_retentionScan,
+ $_cancelLoadingAbnormal,
} from '@/api/distribution/distributionDeliveryList';
import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
@@ -3281,7 +3289,7 @@ export default {
const element = data.moldList[i];
this.html += element;
}
- this.isShowPrint = true;//开启二维码弹出框
+ this.isShowPrint = true; //开启二维码弹出框
} catch (error) {
console.log('error :>> ', error);
} finally {
@@ -3333,41 +3341,47 @@ export default {
};
this.AbnormalReviewloading = true; //开启加载
this.dialogViReject = false;
- $_loadingAbnormalPackageListTurnDown(data).then(res => {
- if (res.data.code == 200) {
- console.log(res, '驳回成功返回值');
- ElMessage({
- message: res.data.msg,
- type: 'success',
+ $_loadingAbnormalPackageListTurnDown(data)
+ .then(res => {
+ if (res.data.code == 200) {
+ console.log(res, '驳回成功返回值');
+ ElMessage({
+ message: res.data.msg,
+ type: 'success',
+ });
+ this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
+ }
})
- this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
- }
- }).catch(error=>{
- console.log(error,'error');
- }).finally(()=>{
- this.AbnormalReviewloading = false; //关闭加载
- });
+ .catch(error => {
+ console.log(error, 'error');
+ })
+ .finally(() => {
+ this.AbnormalReviewloading = false; //关闭加载
+ });
},
//审批异常装车包件
auditing(row) {
this.AbnormalReviewloading = true; //开启加载
console.log('----------->row', row);
- loadingAbnormalPackageListAuditing(row.id).then(res => {
- console.log('res-------->', res);
- if (res.data.code == 200) {
- this.$message({
- type: 'success',
- message: '操作成功!',
- });
+ loadingAbnormalPackageListAuditing(row.id)
+ .then(res => {
+ console.log('res-------->', res);
+ if (res.data.code == 200) {
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ this.AbnormalReviewloading = false; //关闭加载
+ console.log();
+ this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
+ }
+ })
+ .catch(error => {
+ console.log(error, 'error');
+ })
+ .finally(() => {
this.AbnormalReviewloading = false; //关闭加载
- console.log();
- this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
- }
- }).catch(error=>{
- console.log(error,'error');
- }).finally(()=>{
- this.AbnormalReviewloading = false; //关闭加载
- });
+ });
},
// 一键审核
allauditing() {
@@ -3842,6 +3856,88 @@ export default {
this.loadingObj.pageLoading = false;
}
},
+ // 批量异常取消
+ BatchcancellationAll() {
+ if (!this.selectionList.length) {
+ ElMessage({
+ message: '请勾选要取消的数据，【审核状态】必须为待审核，斌且【异常类型】状态只能为装车异常',
+ type: 'warning',
+ });
+ return;
+ }
+ let _state = this.selectionList.every(item => item.auditingStatusName =='待审核' && item.abnormalTypeName == '装车异常' );
+ console.log(_state);
+ if (!_state) {
+ ElMessage({
+ message: '勾选数据【审核状态】必须全部为待审核，并且【异常类型】必须全部满足:装车异常,',
+ type: 'warning',
+ });
+ return;
+ }
+
+ ElMessageBox.confirm(`当前已经勾选${this.selectionList.length}条数据，是否确认取消`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(async () => {
+ try {
+ let data = {
+ deliveryId: this.selectionList[0].deliveryListId,
+ reservationId: this.selectionList[0].reservationId,
+ loadingAbnormalIds: this.selectionList.map(item => item.id).join(','),
+ };
+ this.AbnormalReviewloading = true;
+ let _res = await $_cancelLoadingAbnormal(data);
+ if (_res.data.code == 200) {
+ ElMessage({
+ message: _res.data.msg,
+ type: 'success',
+ });
+ this.viewAbnormalLoading(this.toexamineID); //取消完成更新数据
+ }
+ } catch (error) {
+ console.log(error, 'error');
+ } finally {
+ this.AbnormalReviewloading = false;
+ }
+ })
+ .catch(() => {});
+ },
+ // 异常包件取消
+ async Canceldelivery(row) {
+ console.log(row);
+
+ ElMessageBox.confirm('是否确认取消配送?', '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(async () => {
+ try {
+ let data = {
+ deliveryId: row.deliveryListId,
+ reservationId: row.reservationId,
+ loadingAbnormalIds: row.id,
+ };
+ this.AbnormalReviewloading = true;
+ let _res = await $_cancelLoadingAbnormal(data);
+ if (_res.data.code == 200) {
+ ElMessage({
+ message: _res.data.msg,
+ type: 'success',
+ });
+ this.viewAbnormalLoading(this.toexamineID); //取消完成更新数据
+ }
+ console.log(_res);
+ } catch (error) {
+ console.log(error, 'error');
+ } finally {
+ this.AbnormalReviewloading = false;
+ }
+ })
+ .catch(() => {});
+ },
// 库存品查看二维码
async handleStockQRCode(row) {
try {
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 8264f67c..d9144185 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -297,7 +297,7 @@
-
+
@@ -312,16 +312,16 @@
名称：{{ item.firsts }}
-
-
-
+
+
冻结数量：{{ item.deliveryQuantity }}
-
+
出库数量：{{ item.outboundQuantity }}
-
+
+
-
+
@@ -227,6 +237,14 @@ initOnLoad();
/** 搜索 */
const searchChange = () => {
+ const { time } = details.query;
+ if (time?.length) {
+ [details.query.taskTimeStart, details.query.taskTimeEnd] = time;
+ } else {
+ delete details.query.taskTimeStart;
+ delete details.query.taskTimeEnd;
+ }
+
initOnLoad();
};