From 85591def01e426eb3e9ae5881a8414979317383d Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 19 Dec 2024 18:06:36 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=88=90=E6=9C=AC?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=B8=E6=9C=BA=E5=92=8C=E5=A4=87=E6=B3=A8?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/option/storagecost/Traincostbreakdown.js | 23 ++++++
.../aftersales/aftersalesWorkOrderInfo.vue | 66 +++++++++++------
.../aftersales/aftersalesWorkOrderend.vue | 73 +++++++++++++------
3 files changed, 115 insertions(+), 47 deletions(-)
diff --git a/src/option/storagecost/Traincostbreakdown.js b/src/option/storagecost/Traincostbreakdown.js
index aff0d3cc..133c1698 100644
--- a/src/option/storagecost/Traincostbreakdown.js
+++ b/src/option/storagecost/Traincostbreakdown.js
@@ -25,6 +25,17 @@ export const columnList = [
sortable: true,
head: false,
},
+ {
+ prop: 'deliveryDriver',
+ label: '配送司机',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
{
prop: 'distributionModel',
label: '配送车型',
@@ -327,6 +338,18 @@ export const columnList = [
head: false,
isshowSummary: true,
},
+ {
+ prop: 'deliveryRemark',
+ label: '配送备注',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ isshowSummary: true,
+ },
{
prop: 'changeAmount',
label: '异动金额',
diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index 56e0aecb..bcc0fe0a 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -246,6 +246,7 @@
label="调查经过"
v-if="displaySettings.investigationPocess"
>
+
+
+
-
+
@@ -534,7 +537,20 @@
-
+
@@ -699,14 +715,15 @@
-->
@@ -1179,6 +1196,9 @@ const Completionpermissions = computed(() => {
if (myDataStr) {
Mydata.value = JSON.parse(myDataStr);
}
+ console.log(CompensationParty.value,'CompensationParty.value');
+ console.log(CompletedView.value,'CompletedView.value');
+
if (CompensationParty.value && CompensationParty.value.length) {
if (CompletedView.value.includes(Mydata.value.id) || UserPermissions.value != '仓库客服') {
return true;
@@ -1965,18 +1985,10 @@ const ResultDetermination = () => {
}
}
-.Transport_damage_photos {
- display: flex;
- margin-top: 20px;
- flex-direction: column;
-
- .title {
- width: 100px;
- display: block;
- margin-bottom: 10px;
- font-size: 14px;
- font-weight: bold;
- color: #5b5b5b;
+:deep(.Transport_damage_photos) {
+ margin-top: 3px;
+ .el-image-viewer__wrapper {
+ z-index: 999999999999999999 !important;
}
}
@@ -2483,7 +2495,11 @@ const ResultDetermination = () => {
display: flex;
justify-content: space-between;
align-items: center;
- height: auto;
+ height: 20px;
+ h4 {
+ padding: 0;
+ margin: 0;
+ }
.el-tag {
width: 70px;
}
@@ -2569,7 +2585,6 @@ const ResultDetermination = () => {
span {
width: 40px;
}
-
:deep(.el-select) {
width: 100%;
}
@@ -2603,8 +2618,8 @@ const ResultDetermination = () => {
height: 20%;
overflow: scroll;
.el-image {
- width: 20%;
- height: 100%;
+ width: 50px;
+ height:50px;
margin: 4px;
}
@@ -2937,7 +2952,10 @@ const ResultDetermination = () => {
:deep(.el-upload-list__item-thumbnail) {
object-fit: inherit;
}
-:deep(.el-tabs__header){
+:deep(.el-tabs__header) {
background-color: #fdfdfd;
}
+:deep(.el-image-viewer__wrapper) {
+ z-index: 999999999999999 !important;
+}
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index a6d2c0c3..83404a38 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -160,7 +160,9 @@
-
+
+
+
@@ -229,7 +231,7 @@
class="inpuit_Investigationprocess"
v-if="displaySettings.investigationProcess"
>
-
+
@@ -585,7 +587,21 @@
v-if="endFrom.packageImage.length"
>
-
+
+
@@ -669,7 +685,7 @@
>
修改内部责任划分
@@ -787,14 +803,15 @@
@@ -1262,15 +1279,16 @@ const Completedsubmission = () => {
//已经完结了的，可以给仓库客服展示
return true;
}
- // 否则只能总部客服和经理展示
- if (
- UserPermissions.value == Useridentity.Headquarters_customer_service ||
- UserPermissions.value == Useridentity.Headquarters_Manager
- ) {
- return true;
- }
+ // // 否则只能总部客服和经理展示
+ // if (
+ // UserPermissions.value == Useridentity.Headquarters_customer_service ||
+ // UserPermissions.value == Useridentity.Headquarters_Manager
+ // ) {
+ // return true;
+ // }
return false;
};
+
const CompletedPresentation = () => {
if (
UserPermissions.value == Useridentity.Headquarters_customer_service ||
@@ -3077,7 +3095,7 @@ const AppealEstablished = () => {
justify-content: flex-start;
}
:deep(.el-tabs__content) {
- padding: 0 10px;
+ padding: 4px 10px;
}
}
.payanindemnity {
@@ -3353,9 +3371,8 @@ const AppealEstablished = () => {
height: 20%;
overflow: scroll;
.el-image {
- width: 20%;
- height: 100%;
-
+ width:50px;
+ height:50px;
margin: 4px;
}
img {
@@ -3388,7 +3405,11 @@ const AppealEstablished = () => {
display: flex;
align-items: center;
justify-content: space-between;
- height: auto;
+ height: 20px;
+ h4 {
+ padding: 0;
+ margin: 0;
+ }
:deep(.el-tag) {
width: 70px;
}
@@ -3600,6 +3621,9 @@ const AppealEstablished = () => {
.is-active {
font-weight: bold;
}
+ .el-image-viewer__wrapper {
+ z-index: 99999999999999999999 !important;
+ }
}
:deep(.topClass) {
border-bottom: none;
@@ -3830,7 +3854,10 @@ const AppealEstablished = () => {
top: 0;
}
}
-:deep(.el-tabs__header){
+:deep(.el-tabs__header) {
background-color: #fdfdfd;
}
+:deep(.el-image-viewer__wrapper) {
+ z-index: 999999999999999 !important;
+}
From d620af9e418428f34defbd5f81366c1c993dfecd Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 19 Dec 2024 18:30:26 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=80=E5=8D=95?=
=?UTF-8?q?=E9=83=A8=E5=88=86=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/distribution/AddVehicleStowage.js | 2 +-
src/views/distribution/artery/AddVehicleStowage.vue | 10 ++++++++++
src/views/distribution/inventory/CreateOrder.vue | 5 +++++
src/views/waybill/CreateZeroOrder.vue | 5 +++++
4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/api/distribution/AddVehicleStowage.js b/src/api/distribution/AddVehicleStowage.js
index b1f96a2c..1af48c9b 100644
--- a/src/api/distribution/AddVehicleStowage.js
+++ b/src/api/distribution/AddVehicleStowage.js
@@ -144,7 +144,7 @@ export const postAddOrderToFinalNodeId = data => {
};
/**
- * 新增调度池订单
+ * 编辑配载计划
*/
export const postUpdateCarsLoadBasicData = data => {
return request({
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index d769cbe2..01e7514f 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -164,6 +164,16 @@
+
+
+
+
+
+
+
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index f43ba8e2..637db8c2 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -3777,6 +3777,11 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
const timer = setTimeout(async () => {
try {
+ if (!details.query.shipperId)
+ return ElMessage.warning('未选择系统内维护的发货单位，请选择或维护');
+ if (!details.query.consigneeId)
+ return ElMessage.warning('未选择系统内维护的收货单位，请选择或维护');
+
// 检测货物名称和件数是否正确填写
for (let i = 0; i < details.goodsList.length; i++) {
const val = details.goodsList[i];
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index bdd58526..971527b0 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -2945,6 +2945,11 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
const timer = setTimeout(async () => {
try {
+ if (!details.query.shipperId)
+ return ElMessage.warning('请选择系统内维护的发货单位，请选择或维护');
+ if (!details.query.consigneeId)
+ return ElMessage.warning('请选择系统内维护的收货单位，请选择或维护');
+
let _arr = [];
for (let i = 0; i < details.goodsList.length; i++) {
From 5958931732bb1169e6984aee784105151922f1f8 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 19 Dec 2024 19:05:58 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E8=BD=BD?=
=?UTF-8?q?=E5=8F=96=E6=B6=88=E5=A4=96=E8=AF=B7=E7=AB=99=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/distribution/artery/AddVehicleStowage.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 01e7514f..d945415f 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -164,15 +164,15 @@
-
-
+
From e0bb9d742c56208e676387a6e2baaeb284947e79 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 20 Dec 2024 09:39:13 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=A7=A3=E9=99=A4=E5=BD=95=E5=8D=95?=
=?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/waybill/CreateZeroOrder.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 971527b0..e2f15e16 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -2945,10 +2945,10 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
const timer = setTimeout(async () => {
try {
- if (!details.query.shipperId)
- return ElMessage.warning('请选择系统内维护的发货单位，请选择或维护');
- if (!details.query.consigneeId)
- return ElMessage.warning('请选择系统内维护的收货单位，请选择或维护');
+ // if (!details.query.shipperId)
+ // return ElMessage.warning('请选择系统内维护的发货单位，请选择或维护');
+ // if (!details.query.consigneeId)
+ // return ElMessage.warning('请选择系统内维护的收货单位，请选择或维护');
let _arr = [];
From ba4213acfc6602cd6cf6a2a3cc2021881ce68b90 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 20 Dec 2024 09:53:51 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=85=B3=E9=97=AD=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/distribution/inventory/CreateOrder.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 637db8c2..9f151306 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -3777,10 +3777,10 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
const timer = setTimeout(async () => {
try {
- if (!details.query.shipperId)
- return ElMessage.warning('未选择系统内维护的发货单位，请选择或维护');
- if (!details.query.consigneeId)
- return ElMessage.warning('未选择系统内维护的收货单位，请选择或维护');
+ // if (!details.query.shipperId)
+ // return ElMessage.warning('未选择系统内维护的发货单位，请选择或维护');
+ // if (!details.query.consigneeId)
+ // return ElMessage.warning('未选择系统内维护的收货单位，请选择或维护');
// 检测货物名称和件数是否正确填写
for (let i = 0; i < details.goodsList.length; i++) {