From fcf2a06fe9e39d8f365fbbc1679b2e39b002b055 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 28 Dec 2023 12:10:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=AC=A6=E5=90=88=E7=AD=BE?=
=?UTF-8?q?=E6=94=B6=E5=9B=BE=E7=89=87=E5=9B=9E=E6=98=BE=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../aftersales/aftersalesWorkOrderend.vue | 6 +-
.../distributionDeliveryListedt.vue | 59 ++++++++++++++++---
vite.config.js | 4 +-
3 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index 8693c81e..07f8ae0a 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -1032,8 +1032,8 @@ const onLoad = () => {
res.data.data.processorVOList.forEach(item => {
if (item.typesOf == 2) {
// 处理方
- endFrom.value.processor.push(item.businessId);
- //MessageResponsibility.value.push(item.businessId)
+ endFrom.value.processor.push(item.businessId);
+ MessageResponsibility.value.push(item.businessId)
}
});
console.log(endFrom.value.processor, ' endFrom.value.processor');
@@ -1068,7 +1068,7 @@ const onLoad = () => {
item.responsibilityRatio = item.responsibilityRatio + '%';
});
companyProportion.value = 100 - sum;
- if (res.data.data.processingResultsVO.processingMoneyEntityList.length) {
+ if (res.data.data.processingResultsVO.processingMoneyEntityList) {
ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map(
item => {
endFrom.value.result.push(item.resultType);
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index d358f4ee..58a2d8e0 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -555,13 +555,18 @@
:headers="headers"
multiple
>
+
+
+
+
+
![IMG]()
-
+
堆码照
+
+
+
易碎照
+
+
-
+
签收照
this.signtitle', this.signtitle);
// console.log('--------------->this.signtitle', this.submitForm);
let row = {};
@@ -3330,22 +3341,21 @@ export default {
// }
const pushPhotoToRow = (photoArray, photoType) => {
+
photoArray.forEach(item => {
row.map[photoType].push({
- name: item.response.data.originalName,
+ name: item.response && item.response.data ? item.response.data.originalName : '',
reservationId: this.reservationId,
type: photoType,
- urlRoute: item.response.data.link,
+ urlRoute: item.response && item.response.data ? item.response.data.link : item.url,
});
});
};
-
- pushPhotoToRow(this.DoorstepPhoto, 'photo_1');
+ pushPhotoToRow(this.DoorstepPhoto, 'photo_1');
pushPhotoToRow(this.StackingPhoto, 'photo_2');
pushPhotoToRow(this.FragilePhotos, 'photo_3');
pushPhotoToRow(this.HomePhotos, 'photo_4');
pushPhotoToRow(this.SignForPhotos, 'photo_5');
- console.log(row, '准备提交的参数');
this.TCloading = true; //禁止确定
this.signBox = false;
getOneclickq(row)
@@ -3538,10 +3548,42 @@ export default {
handleSign(row) {
console.log('签收>>>>>>>>>>', row);
console.log(row.signId, '复合签收');
+ this.reservationId =row.id
$_getDetail({ id: row.signId }).then(res => {
console.log(res, '复合返回值');
if(res.data.data){
this.CheckStore=res.data.data
+
+ if(res.data.data.printVOList){
+ // DoorstepPhoto 上门照片
+ // StackingPhoto 堆码照片
+ // FragilePhotos 易碎照
+ // HomePhotos 家配照
+ // SignForPhotos 签收照
+ this.DoorstepPhoto=[]
+ this.StackingPhoto=[]
+ this.FragilePhotos=[]
+ this.HomePhotos=[]
+ this.SignForPhotos=[]
+ res.data.data.printVOList.forEach(item=>{
+ if(item.type =='photo_1'){
+ this.DoorstepPhoto.push({name:'',url:item.urlRoute})
+ }
+ if(item.type =='photo_2'){
+ this.StackingPhoto.push({name:'',url:item.urlRoute})
+ }
+ if(item.type =='photo_3'){
+ this.FragilePhotos.push({name:'',url:item.urlRoute})
+ }
+ if(item.type =='photo_4'){
+ this.HomePhotos.push({name:'',url:item.urlRoute})
+ }
+ if(item.type =='photo_5'){
+ this.SignForPhotos.push({name:'',url:item.urlRoute})
+ }
+
+ })
+ }
console.log(this.CheckStore,'data');
console.log(res.data.data,'res');
}
@@ -3590,6 +3632,7 @@ export default {
return;
}
this.reservationId = row.reservationId; //存储当前行的ID
+ console.log(row,'当前行数据');
this.signtitle = '一键签收';
this.signform = row;
this.TcForm = row;
diff --git a/vite.config.js b/vite.config.js
index 54806b8c..1aa6fd3f 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.148:9777',//CYZ
+ // target: 'http://192.168.6.148:9777',//CYZ
// target: 'http://192.168.10.57:13000',
// target: 'http://192.168.10.200:13000',
// target: 'http://192.168.10.29:13000',