diff --git a/src/api/distribution/distributionParcelList.js b/src/api/distribution/distributionParcelList.js index fcdba127..d489bc5b 100644 --- a/src/api/distribution/distributionParcelList.js +++ b/src/api/distribution/distributionParcelList.js @@ -157,3 +157,12 @@ export const $_distributionParcelList = params => { responseType: 'blob', }); }; + +// 移除包件判断 +export const $_judgmentRemove = params => { + return request({ + url: '/api/logpm-distribution/distrilbutionBillStock/judgmentRemove', + method: 'get', + params, + }); +}; \ No newline at end of file diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 89bce218..d589e7ec 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -2372,6 +2372,16 @@ const appealAll = () => { }; // 确定理赔金额 const DetermineClaims = val => { + ElMessageBox.confirm( + '是否确认理赔金额?', + '提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + } + ) + .then(() => { console.log(val.row); let data = { id: val.row.lawoId, @@ -2391,6 +2401,8 @@ const DetermineClaims = val => { details.loadingObj.list = false; //关闭动画加载 pageLoad.value=false }); + }) + .catch(() => {}) }; // 理赔金额未出编辑操作 const Resultediting = val => { @@ -3350,7 +3362,7 @@ const fellSuccess = (response, uploadFile) => { KFfeel.value = response.data.link; } }; -// 处理结果和理赔确定 +//批量审核（由客服经理批量审核确定） const DetermineStorage = val => { if (!details.selectionList.length) { ElMessage({ @@ -3359,14 +3371,24 @@ const DetermineStorage = val => { }); return; } - let data = { + ElMessageBox.confirm( + '是否确定确定批量审核?', + '提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + } + ) + .then(() => { + let data = { assignList: [], }; data['assignList'] = details.selectionList.map(item => item.id); - details.loadingObj.list = true; //开启加载效果 pageLoad.value=true // 完结结果确定 + console.log(data, '处理好的值'); $_updateManagerConfirmed(data) .then(res => { if (res.data.code == 200) { @@ -3385,8 +3407,8 @@ const DetermineStorage = val => { details.loadingObj.list = false; //关闭加载效果 pageLoad.value=false }); - // 赔款方 - console.log(data, '处理好的值'); + }) + .catch(() => { }) }; // 完结里面确定按钮 diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue index e29009ed..9d368a6d 100644 --- a/src/views/basicdata/brand/basicClient.vue +++ b/src/views/basicdata/brand/basicClient.vue @@ -1675,9 +1675,9 @@ export default { handleClose(res) { this.loadingObj.UploadLoadong = false; // UploadAjaxError - const msg = res.msg ? res.data.msg || '上传失败' : '上传失败'; - - this.$message.warning(res.msg || '上传失败'); + let msgData = JSON.parse(res['message']) + console.log(msgData,'msgData'); + this.$message.warning(msgData.msg || '上传失败'); }, }, }; diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue index 3d189430..d1cc71e6 100644 --- a/src/views/distribution/inventory/distributionStockListDetails.vue +++ b/src/views/distribution/inventory/distributionStockListDetails.vue @@ -440,6 +440,18 @@ export default { sortable: true, head: false, }, + { + prop: 'storageLocation', + label: '存放位置', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { prop: '', label: '操作', diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index 702fdf9c..54d682de 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -640,9 +640,14 @@ import { remove, zeroMaterial, zeroUpdateMaterial, + $_distrilbutionBillLading } from '@/api/distribution/distrilbutionBillLading'; -import { ElMessage } from 'element-plus'; -import { getListOwn, getList, getEditList ,$_getBillLadingPackageIds} from '@/api/distribution/distributionParcelList'; + + + + +import { ElMessage, ElMessageBox } from 'element-plus' +import { getListOwn, getList, getEditList ,$_getBillLadingPackageIds,$_judgmentRemove} from '@/api/distribution/distributionParcelList'; import option from '@/option/distribution/distrilbutionBillLading'; import { mapGetters } from 'vuex'; import { getDictionaryBiz } from '@/api/system/dict'; @@ -654,6 +659,7 @@ import { detail } from '@/api/flow/flow'; import { nextTick, ref } from 'vue'; import { useStore } from 'vuex'; import { setNodeHeight } from '@/utils/util.js'; +import error from '@/error'; const $store = useStore(); export default { name: '/distribution/inventory/distrilbutionBillLading', @@ -2214,6 +2220,9 @@ export default { }, //移除数据 rowOrder(row) { + + + this.dataList.forEach(i => { if (i.id === row.id) { this.dataList; @@ -2223,8 +2232,41 @@ export default { if (item.id == row.id) { return true; } - }); - this.dataList.splice(id1, 1); + }) + if(this.$route.query.id){ + let data={ + billLadingId:this.$route.query.id, + orderId:this.dataList[id1].id + } + $_judgmentRemove(data).then(res=>{ + console.log(res); + if(res.data.code == 200){ + if(res.data.data){ + ElMessageBox.confirm( + '是否移除该订单?', + '提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + } + ) + .then(() => { + this.dataList.splice(id1, 1); + }) + .catch(() => {}) + }else{ + ElMessage({ + message: '存在签收数据,无法移除该订单', + type: 'warning', + plain: true, + }) + } + } + }) + }else{ + this.dataList.splice(id1, 1); + } }, //订单选择确定 callFordeliveryOrder() { @@ -2740,6 +2782,62 @@ console.log('删除的数据对象:', deletedObjects); }, // 最后提交 async handleSubmit() { + + if(!this.$route.query.id){ + if(!this.dataList.length && !this.data.length){ + ElMessage({ + message: '不能做空计划，请选择定制品或者库存品', + type: 'warning', + }) + return + } + } + + + if(this.$route.query.id){ + if(!this.dataList.length && !this.data.length){ + await ElMessageBox.confirm( + '没有选择订单，是否移除该自提任务?', + '提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + } + ) + .then(() => { + let data={ + billLodingIds:this.$route.query.id + } + this.Selfpickuploading = true; //关闭加载效果 + $_distrilbutionBillLading(data).then(res=>{ + console.log(res); + if(res.data.code == 200){ + ElMessage({ + message: res.data.msg, + type: 'success', + }) + } + this.Selfpickuploading = false; //关闭加载效果 + this.$store.commit('DEL_TAG_CURRENT'); + this.$store.commit('EDIT_REFRESHITEM', { + title: 'distrilbutionBillLadingList', + status: true, + }); + this.$router.push('/distribution/inventory/distrilbutionBillLadingList'); + }).catch(error=>{ + console.log(error,'error'); + this.Selfpickuploading = false; //关闭加载效果 + }) + + }) + .catch(() => {}) + return + } + } + + + // console.log(this.dataList,'this.dataList'); // if (this.$route.query.type !== '2') { diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue index 51a4191d..6b3f986f 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue @@ -55,8 +55,9 @@ 订单列表 + + 导出 - 导出 diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue index ae6ca327..e693a624 100644 --- a/src/views/distribution/signfor/distributionSignforedt.vue +++ b/src/views/distribution/signfor/distributionSignforedt.vue @@ -370,8 +370,8 @@ - - + 导出 + - 导出 +