From ab55ed08f14b370f572ed39aad4a69ac7e26bc60 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Wed, 17 Jan 2024 17:46:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=95=86=E9=85=8D=E9=85=8D=E9=80=81?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E9=80=81?= =?UTF-8?q?=E8=B4=A7=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distributionDeliveryListedt.vue | 267 +++++++++--------- 1 file changed, 135 insertions(+), 132 deletions(-) diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 95f8f3a7..c6e47b1a 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -177,47 +177,47 @@ v-if="slotProps.scope.row.driverSigning === '未完成'" >图片上传 - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + 复核签收 - - - - - - - - - - - - + + + + + + + + + + + + @@ -253,20 +253,20 @@
- - - -
+ + + + @@ -596,12 +596,12 @@
------------------------------
-->
- + - + @@ -774,7 +774,12 @@ import { } from '@/api/distribution/distributionDeliveryList'; import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList'; -import { update as updatesign, getOneclickq, deliveryPicture,recheck } from '@/api/distribution/distributionSignfor'; +import { + update as updatesign, + getOneclickq, + deliveryPicture, + recheck, +} from '@/api/distribution/distributionSignfor'; import option from '@/option/basic/basicPdarecords'; import { mapGetters } from 'vuex'; import { getDictionaryBiz } from '@/api/system/dict'; @@ -2145,7 +2150,7 @@ export default { clientQuery: {}, inventoryQuery: {}, packageQuery: {}, - formCustomer: {}, + formCustomer: { deliveryWay: '10' }, formCustomerRolus: { consignee: [{ required: true, message: '请输入姓名', trigger: 'blur' }], isUrgent: [{ required: true, message: '请选择是否加急', trigger: 'change' }], @@ -3603,7 +3608,7 @@ export default { this.formCustomer.deliveryAddress = row.deliveryAddress; this.formCustomer.remarks = row.remarks; this.formCustomer.otherFee = row.otherFee; - this.formCustomer.deliveryWay = row.deliveryWay; + this.formCustomer.deliveryWay = row.deliveryWay || '10'; if (row.isUrgentName === '否' || row.isUrgentName === '1') { this.formCustomer.isUrgent = '1'; } else { @@ -3619,8 +3624,8 @@ export default { this.FragilePhotos = []; this.HomePhotos = []; this.SignForPhotos = []; - this.signBox = true; - this.reservationId = row.id; + this.signBox = true; + this.reservationId = row.id; }, beforeOpen(done, type) { if (['edit', 'view'].includes(type)) { @@ -4086,26 +4091,26 @@ export default { }, // 复核签收确认弹窗 submitForm() { - if(!this.DoorstepPhoto.length){ + if (!this.DoorstepPhoto.length) { ElMessage({ - message: '至少上传一张上门照片', - type: 'warning', - }) - return + message: '至少上传一张上门照片', + type: 'warning', + }); + return; } - if(!this.StackingPhoto.length){ + if (!this.StackingPhoto.length) { ElMessage({ - message: '至少上传一张堆码照片', - type: 'warning', - }) - return + message: '至少上传一张堆码照片', + type: 'warning', + }); + return; } - if(!this.SignForPhotos.length){ + if (!this.SignForPhotos.length) { ElMessage({ - message: '至少上传一张签收照片', - type: 'warning', - }) - return + message: '至少上传一张签收照片', + type: 'warning', + }); + return; } console.log(this.reservationId); console.log(this.CheckStore, '要处理的值'); @@ -4159,66 +4164,64 @@ export default { pushPhotoToRow(this.SignForPhotos, 'photo_5'); this.TCloading = true; //禁止确定 this.signBox = false; - if (this.signtitle ==='图片上传'){ - console.log('图片上传',row); + if (this.signtitle === '图片上传') { + console.log('图片上传', row); deliveryPicture(row) - .then(res => { - this.checkloading = false; //关闭复核签收加载效果 - if (res.data.code == 200) { - this.TCloading = false; //取消限制 - ElMessage({ - message: '操作成功', - type: 'success', - }); - this.onLoad(); - } else { + .then(res => { + this.checkloading = false; //关闭复核签收加载效果 + if (res.data.code == 200) { + this.TCloading = false; //取消限制 + ElMessage({ + message: '操作成功', + type: 'success', + }); + this.onLoad(); + } else { + this.checkloading = false; //取消限制 + ElMessage.error('操作失败'); + } + }) + .catch(() => { this.checkloading = false; //取消限制 - ElMessage.error('操作失败'); - } - }) - .catch(() => { - this.checkloading = false; //取消限制 - this.TCloading = false; //取消限制 - }); - - }else if (this.signtitle ==='复核签收'){ + this.TCloading = false; //取消限制 + }); + } else if (this.signtitle === '复核签收') { recheck(row) - .then(res => { - this.checkloading = false; //关闭复核签收加载效果 - if (res.data.code == 200) { - this.TCloading = false; //取消限制 - ElMessage({ - message: '操作成功', - type: 'success', - }); - this.onLoad(); - } else { - - ElMessage.error('操作失败'); - } - }) - .catch(() => { - this.TCloading = false; //取消限制 - this.checkloading = false; //取消限制 - }); - }else { + .then(res => { + this.checkloading = false; //关闭复核签收加载效果 + if (res.data.code == 200) { + this.TCloading = false; //取消限制 + ElMessage({ + message: '操作成功', + type: 'success', + }); + this.onLoad(); + } else { + ElMessage.error('操作失败'); + } + }) + .catch(() => { + this.TCloading = false; //取消限制 + this.checkloading = false; //取消限制 + }); + } else { getOneclickq(row) - .then(res => { - this.checkloading = false; //关闭复核签收加载效果 - if (res.data.code == 200) { - this.TCloading = false; //取消限制 - ElMessage({ - message: '操作成功', - type: 'success', - }); - this.onLoad(); - } else { - ElMessage.error('操作失败'); - } - }) - .catch(() => { - this.TCloading = false; //取消限制 - }); + .then(res => { + this.checkloading = false; //关闭复核签收加载效果 + if (res.data.code == 200) { + this.TCloading = false; //取消限制 + ElMessage({ + message: '操作成功', + type: 'success', + }); + this.onLoad(); + } else { + ElMessage.error('操作失败'); + } + }) + .catch(() => { + this.TCloading = false; //取消限制 + }); } // 本身图片处理结束 @@ -4330,21 +4333,21 @@ export default { this.loading = true; console.log(this.loading, 'this.loading'); params.deliveryId = this.deliverydata.id; - getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.packageQuery)).then( - res => { + getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.packageQuery)) + .then(res => { console.log(res); this.loading = false; console.log('查看>>>>>包间>>', res.data.data.records); if (res.data.data.records) { const data = res.data.data.records; - this.packpage.total= res.data.data.total + this.packpage.total = res.data.data.total; this.packdata = data; // this.packpage.total = data.length; } - } - ).catch(res=>{ - this.loading = false; - }); + }) + .catch(res => { + this.loading = false; + }); }, //库存列表 handleInventory(page) { From 9c84af00faac4351caba6ce473a8092aeb99a103 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 17 Jan 2024 18:06:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=A0=87=E9=A2=98admin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/website.js | 2 +- .../aftersales/aftersalesWorkOrderInfo.vue | 257 +++++++++++++++--- .../aftersales/aftersalesWorkOrderend.vue | 4 +- .../distributionDeliveryListedt.vue | 13 + 4 files changed, 237 insertions(+), 39 deletions(-) diff --git a/src/config/website.js b/src/config/website.js index 3b87363c..8980301d 100644 --- a/src/config/website.js +++ b/src/config/website.js @@ -5,7 +5,7 @@ export default { title: '货无忧物流信息平台', logo: 'S', key: 'TWMS', //配置主键,目前用于存储 - indexTitle: '货无忧 Admin', + indexTitle: '货无忧', clientId: 'saber', // 客户端id clientSecret: 'saber_secret', // 客户端密钥 tenantMode: true, // 是否开启租户模式 diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index 79c51068..8f5c43ae 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -1,5 +1,5 @@