diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 71fe549b..00000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 46dbf2a7..6b2c3d42 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -3185,6 +3185,16 @@ if(UserPermissions.value == '仓库客服'){ //处理完毕菜单下面确定按 return } } + ElMessageBox.confirm( + '是否确定当前处理结果?', + 'Warning', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + } + ) + .then(() => { details.loadingObj.list = true; //开启加载效果 console.log(data, '处理好的数据'); $_updateWorkOrderStatus(data) @@ -3199,8 +3209,25 @@ if(UserPermissions.value == '仓库客服'){ //处理完毕菜单下面确定按 tabChenge(TabPermissions.value); }) .catch(res => { + console.log(res,'错误信息'); + }).finally(()=>{ details.loadingObj.list = false; //关闭加载效果 }); + }) + .catch(() => { + ElMessage({ + type: 'info', + message: '取消确定', + }) + }) + + + + + + + + }else{ let data = { assignList: [], @@ -3245,8 +3272,17 @@ if(UserPermissions.value == '仓库客服'){ //处理完毕菜单下面确定按 return } } - - details.loadingObj.list = true; //开启加载效果 + ElMessageBox.confirm( + '是否确定当前处理信息?', + 'Warning', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + } + ) + .then(() => { + details.loadingObj.list = true; //开启加载效果 // 完结结果确定 $_updateManagerConfirmed(data) .then(res => { @@ -3266,6 +3302,13 @@ if(UserPermissions.value == '仓库客服'){ //处理完毕菜单下面确定按 }) // 赔款方 console.log(data, '处理好的值'); + }) + .catch(() => { + ElMessage({ + type: 'info', + message: '已取消', + }) + }) } }; // 批量打回 diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue index 7d55c87f..5d9af79c 100644 --- a/src/views/warehouse/parcelList/distributionParcelList.vue +++ b/src/views/warehouse/parcelList/distributionParcelList.vue @@ -642,7 +642,7 @@ export default { // 是否显示查询 search: true, // 加载中 - loading: true, + loading: false, // 是否为查看模式 view: false, // 查询信息 @@ -672,7 +672,7 @@ export default { }, mounted() { this.init(); - this.onLoad(this.page); + // this.onLoad(this.page); /** * 初始化获取本地缓存的编辑隐藏的列表 * 固定搭配,不能更改 diff --git a/vite.config.js b/vite.config.js index 25e8913b..58d5f122 100644 --- a/vite.config.js +++ b/vite.config.js @@ -23,9 +23,9 @@ export default ({ mode, command }) => { // 新zyc // target: 'http://192.168.6.116:8777', // target: 'http://192.168.6.122:8777', - // target: 'http://192.168.10.25:13000', + target: 'http://192.168.10.25:13000', // target: 'http://192.168.10.25:2888', - target: 'http://192.168.6.169:9777',//CYZ + // target: 'http://192.168.6.169:9777',//CYZ // target: 'http://192.168.10.57:13000', // target: 'http://192.168.10.200:13000', // target: 'http://192.168.10.29:13000',