From 4d74221dc717ab02153c9a4bcbf525f4fd308f4a Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 4 Jul 2024 15:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B4=E5=8F=91=E5=95=86?=
=?UTF-8?q?=E5=AE=B6=E7=AD=BE=E6=94=B6=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../artery/directGoMarketDetails.vue | 104 ++++++++++--------
.../artery/directMerchantSign.vue | 8 +-
2 files changed, 62 insertions(+), 50 deletions(-)
diff --git a/src/views/distribution/artery/directGoMarketDetails.vue b/src/views/distribution/artery/directGoMarketDetails.vue
index e73dd574..56327cc7 100644
--- a/src/views/distribution/artery/directGoMarketDetails.vue
+++ b/src/views/distribution/artery/directGoMarketDetails.vue
@@ -288,33 +288,6 @@
multiple
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -368,6 +341,7 @@ import {
postSignZero,
postUploadSignPhoto,
} from '@/api/distribution/directGoMarket';
+import { postFindSignPhotoList } from '@/api/distribution/directMerchantSign.js';
/** 获取字典 */
import { getDictionaryBiz } from '@/api/system/dict';
import {
@@ -952,11 +926,48 @@ const handleEditWarehouseInfo = async () => {
}
};
+/** 查看签收图片 */
+const handleShowSignImg = async row => {
+ try {
+ details.loadingObj.pageLoading = true;
+
+ const submitData = {
+ signOrderId: row.id,
+ };
+
+ const res = await postFindSignPhotoList(submitData);
+
+ const { code, data } = res.data;
+
+ if (code !== 200) return;
+
+ details.fileList = data || [];
+
+ for (let i = 0; i < details.fileList.length; i++) {
+ const item = details.fileList[i];
+
+ item.imgUrl = item.photoUrl;
+ item.reponse = { url: item.photoUrl };
+ item.url = item.photoUrl;
+ details.viewImgList.push(item.photoUrl);
+ }
+ } catch (error) {
+ console.log('error :>> ', error);
+ } finally {
+ details.loadingObj.pageLoading = false;
+ }
+};
+
/** 显示签收图片 */
-const handleShowSiginImg = () => {
- details.popUpShow.uploadSiginImg = true;
+const handleShowSiginImg = async () => {
+ if (details.selectionList.length > 1 || details.selectionList.length === 0)
+ return ElMessage.warning('请选择一条数据进行上传');
details.viewImgList = [];
details.fileList = [];
+
+ await handleShowSignImg(details.selectionList[0]);
+
+ details.popUpShow.uploadSiginImg = true;
details.viewImgIndex = 0;
};
@@ -990,27 +1001,28 @@ const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
/** 上传签收图片 */
const handleSubmitSiginImg = async () => {
if (details.fileList.length === 0) return ElMessage.warning('请上传签收图片');
- try {
- details.loadingObj.pageLoading = true;
- details.popUpShow.uploadSiginImg = false;
- const submitData = {
- signOrderId: $route.query.loadId,
- signPhotoList: [],
- };
+ const submitData = {
+ signOrderId: details.selectionList[0].id,
+ signPhotoList: [],
+ };
- for (let i = 0; i < details.fileList.length; i++) {
- const value = details.fileList[i];
+ for (let i = 0; i < details.fileList.length; i++) {
+ const value = details.fileList[i];
- // 存在id, 为已存在数据, 不做上传
- // if (value.id) continue
+ if (!value.imgUrl || /'blob'/.test(value.imgUrl))
+ return ElMessage.warning('存在异常图片，请等待上传完毕或移除');
- submitData.signPhotoList.push({
- signOrderId: $route.query.loadId,
- photoType: 1,
- photoUrl: value.imgUrl,
- });
- }
+ submitData.signPhotoList.push({
+ signOrderId: details.selectionList[0].id,
+ photoType: 1,
+ photoUrl: value.imgUrl,
+ });
+ }
+
+ try {
+ details.loadingObj.pageLoading = true;
+ details.popUpShow.uploadSiginImg = false;
console.log('submitData :>> ', submitData);
diff --git a/src/views/distribution/artery/directMerchantSign.vue b/src/views/distribution/artery/directMerchantSign.vue
index 4a4a1706..8cfc0089 100644
--- a/src/views/distribution/artery/directMerchantSign.vue
+++ b/src/views/distribution/artery/directMerchantSign.vue
@@ -96,13 +96,13 @@