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/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/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/page/index/index.vue b/src/page/index/index.vue
index 89d9df49..48644bd3 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -206,4 +206,7 @@ export default {
#avue-view {
position: relative;
}
+.el-popup-parent--hidden{
+ width: 100% !important;
+}
diff --git a/src/views/aftersales/aftersalesWorkOrderInfoEnxt.vue b/src/views/aftersales/aftersalesWorkOrderInfoEnxt.vue
index 349bbd7c..5fcbefa0 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfoEnxt.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfoEnxt.vue
@@ -928,8 +928,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/aftersales/aftersalesWorkOrderInfoTemp.vue b/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue
index 3ef7a285..fb93ac76 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue
@@ -903,8 +903,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/aftersales/aftersalesWorkOrdermodifyTemp.vue b/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue
index 977e5471..2a9490a5 100644
--- a/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue
+++ b/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue
@@ -1023,8 +1023,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/aftersales/customerService.vue b/src/views/aftersales/customerService.vue
index ba420c91..b38e0dd2 100644
--- a/src/views/aftersales/customerService.vue
+++ b/src/views/aftersales/customerService.vue
@@ -227,8 +227,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/basic/pda/basicPdatt.vue b/src/views/basic/pda/basicPdatt.vue
index 96e5a7df..5896711c 100644
--- a/src/views/basic/pda/basicPdatt.vue
+++ b/src/views/basic/pda/basicPdatt.vue
@@ -800,8 +800,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/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index 1b2093c1..d7fac011 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -108,6 +108,15 @@
一键下架
+
+
+
@@ -181,6 +190,7 @@ import {
disable,
enable,
getNode,
+ $_updateDefault,
downAllocation,
} from '@/api/basicdata/basicdataGoodsAllocation';
@@ -559,6 +569,38 @@ const handleView = ({ row }) => {
},
});
};
+const handleMakeCargo = async row => {
+ return
+ 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');
+
+ });
+};