diff --git a/src/api/warehouse/warehouseUpdownGoodsLog.js b/src/api/warehouse/warehouseUpdownGoodsLog.js
index b107151b..15f807ef 100644
--- a/src/api/warehouse/warehouseUpdownGoodsLog.js
+++ b/src/api/warehouse/warehouseUpdownGoodsLog.js
@@ -12,6 +12,29 @@ export const getpage = (current, size, params) => {
})
}
+export const getinventorypage = (current, size, params) => {
+ return request({
+ url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/inventorypage',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+export const gettruckloadpage = (current, size, params) => {
+ return request({
+ url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/truckloadpage',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
export const getDetail = (id) => {
return request({
url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/detail',
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index d336e472..fc3adea4 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -551,10 +551,10 @@ async function searchbuts() {
break;
case 3:
- url = 'selectWrap';
+ url = 'wrap';
data = {
// warehouseId: details.arrlist[details.checkindex]?.id || '',
- orderCode: details.inputtxts,
+ orderPackageCode: details.inputtxts,
// serviceNumber: details.inputtxts,
current: details.currentPage,
size: details.pageSize,
@@ -721,7 +721,7 @@ const showupt = value => {
label: '服务号',
type: 1,
values: '',
- width: '240',
+ width: '150',
checkarr: [],
fixed: true,
sortable: true,
@@ -811,7 +811,7 @@ const showupt = value => {
label: '服务号',
type: 1,
values: '',
- width: '240',
+ width: '150',
checkarr: [],
fixed: false,
sortable: true,
@@ -874,14 +874,25 @@ const showupt = value => {
checkarr: [],
fixed: true,
},
+ {
+ prop: 'orderPackageCode',
+ label: '包条码',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
{
prop: 'serviceNumber',
label: '服务号',
type: 1,
values: '',
- width: '240',
+ width: '150',
checkarr: [],
- fixed: true,
+ fixed: false,
sortable: true,
head: false,
},
@@ -912,7 +923,7 @@ const showupt = value => {
label: '顾客电话',
type: 1,
values: '',
- width: '260',
+ width: '150',
checkarr: [],
fixed: false,
sortable: true,
@@ -958,7 +969,7 @@ const showupt = value => {
label: '服务号',
type: 1,
values: '',
- width: '240',
+ width: '150',
checkarr: [],
fixed: true,
sortable: true,
@@ -1037,7 +1048,7 @@ const showupt = value => {
label: '物料名称',
type: 1,
values: '',
- width: '200',
+ width: '150',
checkarr: [],
fixed: true,
sortable: true,
@@ -1048,7 +1059,7 @@ const showupt = value => {
label: '订单自编号',
type: 1,
values: '',
- width: '170',
+ width: '150',
checkarr: [],
fixed: false,
sortable: true,
@@ -1059,7 +1070,7 @@ const showupt = value => {
label: 'SKU',
type: 1,
values: '',
- width: '170',
+ width: '150',
checkarr: [],
fixed: false,
sortable: true,
@@ -1076,6 +1087,17 @@ const showupt = value => {
sortable: true,
head: false,
},
+ {
+ prop: 'residueNumber',
+ label: '在库数',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
{
prop: 'enterNum',
label: '上架数',
@@ -1494,7 +1516,7 @@ const showdown = async value => {
label: '服务号',
type: 1,
values: '',
- width: '240',
+ width: '150',
checkarr: [],
fixed: false,
sortable: true,
@@ -1569,9 +1591,9 @@ const showdown = async value => {
head: false,
},
{
- prop: 'enterNum',
- label: '下架数',
- type: 10,
+ prop: 'descriptionGoods',
+ label: '物料名称',
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -1580,19 +1602,19 @@ const showdown = async value => {
head: false,
},
{
- prop: 'descriptionGoods',
- label: '物料名称',
- type: 1,
+ prop: 'enterNum',
+ label: '下架数',
+ type: 10,
values: '',
width: '150',
checkarr: [],
- fixed: false,
+ fixed: true,
sortable: true,
head: false,
},
{
- prop: 'customerName',
- label: '顾客名字',
+ prop: 'num',
+ label: '货位剩余数',
type: 1,
values: '',
width: '150',
@@ -1625,7 +1647,7 @@ const showdown = async value => {
},
{
prop: 'cargoUnit',
- label: '单位',
+ label: '物料单位',
type: 1,
values: '',
width: '150',
@@ -1663,7 +1685,7 @@ const showdown = async value => {
label: '服务号',
type: 1,
values: '',
- width: '240',
+ width: '150',
checkarr: [],
fixed: true,
sortable: true,
@@ -1748,8 +1770,8 @@ const addhuoj = async scope => {
data.upShelfOrderList = [scope.row];
break;
case 3:
- url = 'upSelectWrap';
- data.upShelfOrderList = [scope.row];
+ url = 'upPackage';
+ data.upShelfPackageList = [scope.row];
break;
case 4:
url = 'upTray';
@@ -1801,8 +1823,8 @@ async function allup() {
data.upShelfOrderList = details.checkselectchangearr;
break;
case 3:
- url = 'upSelectWrap';
- data.upShelfOrderList = details.checkselectchangearr;
+ url = 'upPackage';
+ data.upShelfPackageList = details.checkselectchangearr;
break;
case 4:
url = 'upTray';
@@ -1832,7 +1854,7 @@ async function allup() {
console.log(response.data);
proxy.$message({
type: 'success',
- message: '上架成功!',
+ message: response.data.msg,
});
searchbuts()
// details.tablistarr = response.data.data.records;
diff --git a/src/views/distribution/reservation/atlas1.vue b/src/views/distribution/reservation/atlas1.vue
index 42035294..dc34661b 100644
--- a/src/views/distribution/reservation/atlas1.vue
+++ b/src/views/distribution/reservation/atlas1.vue
@@ -9,7 +9,9 @@
{{item.content}}--时间:{{item.time}}--距离:{{item.distance}}公里
+ {{item.content}}--时间:{{item.time}}--距离:{{item.distance}}公里({{item.items.handQuantity}}件)
+
@@ -109,7 +111,7 @@ function init(data) {
details.mapLoc.setCenter([result.geocodes[0].location.lng, result.geocodes[0].location.lat])
geocodess.push({
pontion: result.geocodes[0].location,
- content: item.customerName + '--' + item.customerAddress + '--' + item.customerTelephone,
+ content: item.customerName + '--' + item.customerAddress+'' + '--' + item.customerTelephone,
items: item,
});
if (index + 1 == data.length) {
@@ -132,7 +134,7 @@ function maker(geocodess) {
});
marker.setMap(details.mapLoc);
marker.setLabel({
- offset: new AMap.Pixel(0, -30), //设置文本标注偏移量
+ offset: new AMap.Pixel(0, -5), //设置文本标注偏移量
content: `${item.content}
`, //设置文本标注内容
direction: 'top', //设置文本标注方位
});
@@ -156,6 +158,7 @@ function Driving(geocodess) {
// console.log(result.routes[0]);
item.time=formatSeconds(result.routes[0].time)
item.distance=result.routes[0].distance/1000
+ // item.distance=result.routes[0].distance/1000
details.datalists.push(item)
} else {
console.log('获取驾车数据失败：'+ result)
@@ -205,6 +208,8 @@ const { datalists } = toRefs(details);
.mbx {
display: flex;
flex-direction: column;
+ align-items: flex-start;
+
}
}
}
@@ -214,5 +219,6 @@ const { datalists } = toRefs(details);
.txbx {
padding: 5px 0px;
box-sizing: border-box;
+ width: 100%;
}
diff --git a/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue b/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
index 6d88afba..856a6536 100644
--- a/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
+++ b/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
@@ -1,42 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-