diff --git a/api/user.js b/api/user.js index 0d3e5ea..49cf064 100644 --- a/api/user.js +++ b/api/user.js @@ -232,7 +232,7 @@ export function signfororder(data) { }); } /** - * 签收详情 + * 签收订制品详情 * @param {Object} data */ export function signforwrap(data) { @@ -243,6 +243,18 @@ export function signforwrap(data) { data }); } +/** + * 签收库存品详情 + * @param {Object} data + */ +export function signforwrapIn(data) { + + return request({ + url: `logpm-distribution/app/signfor/wrapIn`, + method: "get", + data + }); +} /** * 客户查看库存品 * @param {Object} data @@ -279,27 +291,111 @@ export function deliveryloadinginventory(data) { data }); } -// /** -// * 配车明细订制品扫描 -// * @param {Object} data -// */ -// export function deliveryloadinginventory(data) { - -// return request({ -// url: `logpm-distribution/app/delivery/loadinginventory`, -// method: "post", -// data -// }); -// } -// /** -// * 配车明细库存品扫描 -// * @param {Object} data -// */ -// export function deliveryloadinginventory(data) { - -// return request({ -// url: `logpm-distribution/app/delivery/loadinginventory`, -// method: "post", -// data -// }); -// } \ No newline at end of file +/** + * 客户签收订制品扫描 + * @param {Object} data + */ +export function signforsignfor(data) { + + return request({ + url: `logpm-distribution/app/signfor/signfor`, + method: "post", + data + }); +} +/** + * 客户签收库存品扫描 + * @param {Object} data + */ +export function signforsignforIn(data) { + + return request({ + url: `logpm-distribution/app/signfor/signforIn`, + method: "post", + data + }); +} +/** + * 不在配送单签收 + * @param {Object} data + */ +export function signforsignforcontinue(data) { + + return request({ + url: `logpm-distribution/app/signfor/signforcontinue`, + method: "post", + data + }); +} +/** + * 司机确认签收 + * @param {Object} data + */ +export function signforsignforack(data) { + + return request({ + url: `logpm-distribution/app/signfor/signforack`, + method: "post", + data + }); +} +/** + * 定位打卡 + * @param {Object} data + */ +export function signforpositioning(data) { + + return request({ + url: `logpm-distribution/app/signfor/positioning`, + method: "post", + data + }); +} +/** + * 司机批量签收 + * @param {Object} data + */ +export function signforoneclick(data) { + + return request({ + url: `logpm-distribution/app/signfor/oneclick`, + method: "post", + data + }); +} +/** + * 自提列表库存品 + * @param {Object} data + */ +export function billLadinggetInventory(data) { + + return request({ + url: `logpm-distribution/app/billLading/getInventory`, + method: "get", + data + }); +} +/** + * 自提详情库存品 + * @param {Object} data + */ +export function billLadinggetInventoryNum(data) { + + return request({ + url: `logpm-distribution/app/billLading/getInventoryNum`, + method: "get", + data + }); +} +/** + * 自提扫描 + * @param {Object} data + */ +export function billLadingscan(data) { + + return request({ + url: `logpm-distribution/app/billLading/scan`, + method: "get", + data + }); +} diff --git a/compoment/tiplist/tiplist.vue b/compoment/tiplist/tiplist.vue index f7af17c..623a9ba 100644 --- a/compoment/tiplist/tiplist.vue +++ b/compoment/tiplist/tiplist.vue @@ -33,10 +33,34 @@ {{confirmTxt||'确认'}} + + + {{title||'提示'}} + + + + + + + + + + + + + + + {{cancelTxt||'取消'}} + {{confirmTxt||'确认'}} + + diff --git a/pagesHome/pages/SelfPScanList/SelfPScanList.vue b/pagesHome/pages/SelfPScanList/SelfPScanList.vue index 28c7f6e..0520aeb 100644 --- a/pagesHome/pages/SelfPScanList/SelfPScanList.vue +++ b/pagesHome/pages/SelfPScanList/SelfPScanList.vue @@ -28,9 +28,17 @@ 查询 + + + 定制品 + + + 库存品 + + - + 订单编号:{{item.orderCode}} @@ -40,8 +48,28 @@ {{item.orderStatusStr}} + + + SKU:{{item.sku}} + + + 物品:{{item.descriptionGoods}} + 规格:{{item.specification}} + + + 单位:{{item.cargoUnit}} + 自提数:{{item.quantity}} + + + + + + + + +