From 8d10ec14a9cd5c7a4b8de9643d3fad03760f8de2 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 14 Oct 2024 10:46:16 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A6=96=E9=A1=B5?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/wel/index.vue | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 71595bf3..4671421d 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -28,6 +28,11 @@
{{ details.openOrderDataInfo.totalNum || 0 }}
单
+
+
-
- 全部
- 临期
- 到期
-
-
-
- 新 增
- 批量删除
-
-
-
-
-
+
+ 全部
+ 临期
+ 到期
+
+
+
+
+ 新 增
+ 批量删除
+
+
+
+
+
+
-
-
-
-
-
-
-
- 扩展配置
- 查看
- 编辑
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 扩展配置
+ 查看
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
@@ -1082,8 +1080,10 @@ const beforeAvatarUpload = async rawFile => {
const _whiteArr = ['png', 'jpg', 'jpeg'];
- if (!_whiteArr.includes(_name.toLocaleLowerCase()))
- return ElMessage.warning('请上传png、jpg、jpeg的类型图片');
+ if (!_whiteArr.includes(_name.toLocaleLowerCase())) {
+ ElMessage.warning('请上传png、jpg、jpeg的类型图片');
+ return false;
+ }
const res = await compressImageBlob(rawFile);
return res;
};
diff --git a/src/views/datadetail/ToolUpdate.vue b/src/views/datadetail/ToolUpdate.vue
index 35e62cf3..c0392b72 100644
--- a/src/views/datadetail/ToolUpdate.vue
+++ b/src/views/datadetail/ToolUpdate.vue
@@ -312,8 +312,10 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = async rawFile => {
const _whiteArr = ['png', 'jpg', 'jpeg'];
- if (!_whiteArr.includes(_name.toLocaleLowerCase()))
- return ElMessage.warning('请上传png、jpg、jpeg的类型图片');
+ if (!_whiteArr.includes(_name.toLocaleLowerCase())) {
+ ElMessage.warning('请上传png、jpg、jpeg的类型图片');
+ return false;
+ }
const res = await compressImageBlob(rawFile);
return res;
};
diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue
index 616f2d00..65aa515b 100644
--- a/src/views/distribution/artery/TripartiteTransfer.vue
+++ b/src/views/distribution/artery/TripartiteTransfer.vue
@@ -1393,8 +1393,10 @@ const handleBeforeUpload = async (rawFile: UploadRawFile) => {
const _whiteArr = ['png', 'jpg', 'jpeg'];
- if (!_whiteArr.includes(_name.toLocaleLowerCase()))
- return ElMessage.warning('请上传png、jpg、jpeg的类型图片');
+ if (!_whiteArr.includes(_name.toLocaleLowerCase())) {
+ ElMessage.warning('请上传png、jpg、jpeg的类型图片');
+ return false;
+ }
const res = await compressImageBlob(rawFile);
return res;
diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue
index b238dc5f..c556154a 100644
--- a/src/views/distribution/artery/VehicleArrivalManagement.vue
+++ b/src/views/distribution/artery/VehicleArrivalManagement.vue
@@ -1359,13 +1359,15 @@ const handleUnloadByLoadId = async (type: 1 | 2) => {
details.loadingObj.pageLoading = true;
const item = details.selectionList[0];
- const res = await postUnloadByLoadIdBefore({ loadId: item.id });
+ const res = await postUnloadByLoadIdBefore({ loadId: item.id, unloadType: type });
const { code, data } = res.data;
if (code !== 200) return;
ElMessageBox.confirm(
- '请确认卸车数据是否完成,未卸车数据将进入异常列表。',
+ `${
+ data && Number(data.status) === 0 ? '存在直发商家数据还未卸车,' : ''
+ }请确认卸车数据是否完成,未卸车数据将进入异常列表。`,
type === 1 ? '中途卸车确认' : '终点卸车确认',
{
confirmButtonText: '确认',
diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue
index 771b7346..448a2233 100644
--- a/src/views/distribution/artery/VehicleStowageDetails.vue
+++ b/src/views/distribution/artery/VehicleStowageDetails.vue
@@ -731,7 +731,7 @@ const initOriginWarehouseOrder = async () => {
};
/** 上传前类型检测 */
-const handleBeforeUpload = async (rawFile: UploadRawFile) => {
+const handleBeforeUpload = async rawFile => {
console.log('rawFile :>> ', rawFile);
const _nameArr = rawFile.name.split('.');
@@ -744,8 +744,10 @@ const handleBeforeUpload = async (rawFile: UploadRawFile) => {
const _whiteArr = ['png', 'jpg', 'jpeg'];
- if (!_whiteArr.includes(_name.toLocaleLowerCase()))
- return ElMessage.warning('请上传png、jpg、jpeg的类型图片');
+ if (!_whiteArr.includes(_name.toLocaleLowerCase())) {
+ ElMessage.warning('请上传png、jpg、jpeg的类型图片');
+ return false;
+ }
const res = await compressImageBlob(rawFile);
return res;
diff --git a/src/views/distribution/artery/directGoMarketDetails.vue b/src/views/distribution/artery/directGoMarketDetails.vue
index b8c911ab..0e33cc0a 100644
--- a/src/views/distribution/artery/directGoMarketDetails.vue
+++ b/src/views/distribution/artery/directGoMarketDetails.vue
@@ -1115,8 +1115,10 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = async rawFile => {
const _whiteArr = ['png', 'jpg', 'jpeg'];
- if (!_whiteArr.includes(_name.toLocaleLowerCase()))
- return ElMessage.warning('请上传png、jpg、jpeg的类型图片');
+ if (!_whiteArr.includes(_name.toLocaleLowerCase())) {
+ ElMessage.warning('请上传png、jpg、jpeg的类型图片');
+ return false;
+ }
const res = await compressImageBlob(rawFile);
return res;
};
From 9b0325c0573010ca8e59d6feb593ace7df744bb8 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 14 Oct 2024 14:52:56 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E4=B8=8A=E6=9E=B6=E5=BC=80?=
=?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BB=93=E5=BA=93=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E8=87=AA=E5=8A=A8?=
=?UTF-8?q?=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/basicdata/basicdataGoodsAllocation.js | 9 ++++-
.../basicdata/basicdataGoodsAllocation.js | 12 ++++++
.../BasicdataGoodsAllocation.vue | 40 +++++++++++++++++++
.../warehouse/basicdataWarehouse.vue | 18 ++++++++-
.../Traincostbreakdown.vue | 4 +-
5 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/src/api/basicdata/basicdataGoodsAllocation.js b/src/api/basicdata/basicdataGoodsAllocation.js
index 78b09d87..1797d765 100644
--- a/src/api/basicdata/basicdataGoodsAllocation.js
+++ b/src/api/basicdata/basicdataGoodsAllocation.js
@@ -8,7 +8,14 @@ export const getList = params => {
params,
});
};
-
+/** 是否自动上架 */
+export const $_updateDefault = data => {
+ return request({
+ url: '/api/logpm-basicdata/goodsAllocation/updateDefault',
+ method: 'post',
+ data,
+ });
+};
export const getDetail = id => {
return request({
url: '/api/logpm-basicdata/goodsAllocation/detail',
diff --git a/src/option/basicdata/basicdataGoodsAllocation.js b/src/option/basicdata/basicdataGoodsAllocation.js
index 5553d26b..b2852322 100644
--- a/src/option/basicdata/basicdataGoodsAllocation.js
+++ b/src/option/basicdata/basicdataGoodsAllocation.js
@@ -25,6 +25,18 @@ export const columnList = [
sortable: true,
head: false,
},
+
+ {
+ prop: 'isDefault',
+ label: '是否自动上架',
+ type: 6,
+ values: '',
+ width: '130',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
{
prop: 'goodsAreaName',
label: '货区名称',
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index 1b2093c1..d0c5524e 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -108,6 +108,14 @@
handleDownAllocation(false, slotProps.scope)">一键下架
+
+
+
@@ -181,6 +189,7 @@ import {
disable,
enable,
getNode,
+ $_updateDefault,
downAllocation,
} from '@/api/basicdata/basicdataGoodsAllocation';
@@ -559,6 +568,37 @@ const handleView = ({ row }) => {
},
});
};
+const handleMakeCargo = async row => {
+ row.isDefault = !row.isDefault ? 1 : 0;
+ ElMessageBox.confirm(`是否确认${row.isDefault ? '关闭' : '开启'}{操作?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(async () => {
+ try {
+ details.loadingObj.list = true;
+ let data = {
+ id: row.id,
+ isDefault: !row.isDefault ? 1 : 0,
+ };
+ await $_updateDefault(data).then(res => {
+ if (res.data.code == 200) {
+ ElMessage.success(res.data.msg);
+ }
+ });
+ } catch (e) {
+ console.log(e);
+ } finally {
+ details.loadingObj.list = false;
+ onLoad();
+ }
+ })
+ .catch(() => {
+ console.log(row,'row');
+
+ });
+};
From b3fef4c06090f12f5e2aeb46bca310dfc3a5c54e Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 14 Oct 2024 17:58:28 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/distribution/distributionStockList.js | 9 +-
.../BasicdataGoodsAllocation.vue | 2 +
.../warehouse/basicdataWarehouse.vue | 15 +-
.../distributionStockListDetails.vue | 333 ++++++++++--------
4 files changed, 209 insertions(+), 150 deletions(-)
diff --git a/src/api/distribution/distributionStockList.js b/src/api/distribution/distributionStockList.js
index 3ac90c0c..c6b25039 100644
--- a/src/api/distribution/distributionStockList.js
+++ b/src/api/distribution/distributionStockList.js
@@ -23,7 +23,14 @@ export const getListAllocation = (current, size, params) => {
}
})
}
-
+// 出库明细查看二维码
+export const $_showInventoryPackgeCodes = params => {
+ return request({
+ url: '/api/logpm-distribution/distributionStockList/showInventoryPackgeCodes',
+ method: 'get',
+ params,
+ });
+};
export const getStockListOwn = (current, size, params) => {
return request({
url: '/api/logpm-distribution/distributionStockList/listOwn',
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index d0c5524e..d7fac011 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -114,6 +114,7 @@
v-model="slotProps.scope.row.isDefault"
:active-value="1"
:inactive-value="0"
+ disabled
/>
@@ -569,6 +570,7 @@ const handleView = ({ row }) => {
});
};
const handleMakeCargo = async row => {
+ return
row.isDefault = !row.isDefault ? 1 : 0;
ElMessageBox.confirm(`是否确认${row.isDefault ? '关闭' : '开启'}{操作?`, '提示', {
confirmButtonText: '确定',
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index 38ccff03..fd32ce66 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -41,8 +41,10 @@
+
+
+
扩展配置
@@ -482,6 +484,9 @@
/>
+
+
+