diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index e43fa022..6c6d2bc6 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -73,6 +73,7 @@ li.is-active { font-weight: normal !important; } + .el-tag { --el-tag-bg-color: #d3832a !important; --el-tag-text-color: #fff !important; @@ -82,3 +83,22 @@ li.is-active { .el-select__tags .el-tag--info { --el-tag-text-color: var(--el-color-info) !important; } + +// 表单错误提示 +.el-form-item__error { + z-index: 99; + --el-color-danger: #f00 !important; +} + +.el-form-item.is-error .el-input__wrapper { + --el-color-danger: #f00 !important; +} + +// :deep( +// .el-form-item.is-required:not(.is-no-asterisk).asterisk-left > .el-form-item__label:before, +// .el-form-item.is-required:not(.is-no-asterisk).asterisk-left +// > .el-form-item__label-wrap +// > .el-form-item__label:before +// ) { +// --el-color-danger: #f00; +// } diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index a402f8ac..bb8ea629 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -478,13 +478,13 @@ --> - + 批量签收 - 批量计划取消 {}); }, + +// 客户包件批量取消 +PackBatchcancellation(){ + if (!this.selectionList.length) { + ElMessage({ + message: '请勾选需要计划取消的数据', + type: 'warning', + }); + return; + } + let result = this.selectionList.every(item => item.orderPackageStatus == !70 || item.orderPackageLoadingStatus !=20); + console.log(result,'result'); + if(!result){ + ElMessage({ + message: '有已经存在签收的订单或已装车,不满足批量签收条件', + type: 'warning', + }); + return + } + this.$confirm('是否进行批量计划取消?') + .then(() => { + this.loading = true; //开启加载 + let data = { + deliveryId: this.deliveryId, + reservationId: this.wid, + type: 1, + packageIds: this.selectionList.map(item => item.id).join(','), + }; + this.loading = true; + cancelReservationPackage(data) + .then(res => { + if (res.data.code === 200) { + this.$message.success(res.data.msg); + this.getWrapdetails(this.page); + } + this.selectionList = []; //清空选择 + this.loading = false; + }) + .catch(res => { + + }).finally(()=>{ + this.loading = false; + }); + }) + .catch(() => {}); +}, + + // 批量签收 Batchsigning() { console.log(this.selectionList, 'this.selectionList');