diff --git a/src/pages.json b/src/pages.json
index f14fa81..8c25288 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -130,19 +130,19 @@
"navigationBarTitleText": "出库详情"
}
},
+ {
+ "path": "pages/picking/outbound/inner-detail",
+ "style": {
+ "navigationBarTitleText": "出库详情"
+ }
+ },
// 3. 编码出库
{
"path": "pages/picking/outbound/code-outbound",
"style": {
"navigationBarTitleText": "编码出库"
}
- }, // 3. 编码出库
- {
- "path": "pages/picking/outbound/code-outScan",
- "style": {
- "navigationBarTitleText": "编码出库"
- }
- },
+ }, // 3. 编码出库
{
"path": "pages/picking/outbound/codeOutScan",
"style": {
diff --git a/src/pages/picking/outbound/code-outScan.vue b/src/pages/picking/outbound/code-outScan.vue
deleted file mode 100644
index 6b9f02b..0000000
--- a/src/pages/picking/outbound/code-outScan.vue
+++ /dev/null
@@ -1,381 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/picking/outbound/code-outbound.vue b/src/pages/picking/outbound/code-outbound.vue
index efd2ef4..9e40566 100644
--- a/src/pages/picking/outbound/code-outbound.vue
+++ b/src/pages/picking/outbound/code-outbound.vue
@@ -123,7 +123,7 @@
diff --git a/src/pages/picking/outbound/num-outbound.vue b/src/pages/picking/outbound/num-outbound.vue
index c8ccaf0..484dd23 100644
--- a/src/pages/picking/outbound/num-outbound.vue
+++ b/src/pages/picking/outbound/num-outbound.vue
@@ -124,14 +124,11 @@ const onHandleOutbound = async () => {
title: '出库成功！',
icon: 'none',
})
-
setTimeout(() => {
// 返回上一个页面
uni.navigateBack({
delta: 1,
- success() {
- uni.$emit('onUpdate')
- },
+ success() {},
})
}, 500)
}
diff --git a/src/pages/standardBox/codeList.vue b/src/pages/standardBox/codeList.vue
index f70d4d9..cf1def6 100644
--- a/src/pages/standardBox/codeList.vue
+++ b/src/pages/standardBox/codeList.vue
@@ -176,6 +176,9 @@ const bindMa = (qrCode) => {
if(res.code==200){
uni.showToast({ title: '绑定成功', icon: 'none' })
getCodeList()
+ setTimeout(()=>{
+ scanStart()
+ },500)
}else{
uni.showToast({ title: '绑定失败', icon: 'none' })
}
diff --git a/src/services/picking/outbound.js b/src/services/picking/outbound.js
index e33214b..bde13a6 100644
--- a/src/services/picking/outbound.js
+++ b/src/services/picking/outbound.js
@@ -11,7 +11,7 @@ export const getPickingOutboundListAPI = (data) => {
})
}
/**
- * 领料出库 ---- 列表详情
+ * 领料出库 ---- 任务详情
*/
export const getOutboundDetailsAPI = (id) => {
return http({
@@ -20,7 +20,28 @@ export const getOutboundDetailsAPI = (id) => {
})
}
/**
- * 领料出库 ---- 数量出库
+ * 领料出库 ---- 物资详情
+ */
+export const getCodeDetailAPI = (data) => {
+ return http({
+ method: 'GET',
+ url: `/material/lease_apply_info/getInnerById`,
+ data
+ })
+}
+/**
+ * 领料出库 ---- 查看详情
+ */
+export const getDetailsByIdApi = (data) => {
+ return http({
+ method: 'GET',
+ url: `/material/lease_apply_info/getDetailsById`,
+ data
+ })
+}
+
+/**
+ * 领料出库 ---- 出库
*/
export const setOutboundNumAPI = (data) => {
return http({
@@ -39,6 +60,7 @@ export const getCodeDeviceListAPI = (data) => {
data,
})
}
+//
export const getCodeScanAPI = (data) => {
return http({
method: 'GET',
@@ -46,3 +68,11 @@ export const getCodeScanAPI = (data) => {
data,
})
}
+//出库退回
+export const leaseOutBackApi = (data) => {
+ return http({
+ method: 'POSt',
+ url: '/material/lease_apply_info/leaseOutBack',
+ data,
+ })
+}
diff --git a/src/utils/http.js b/src/utils/http.js
index 67e38b4..1c31b01 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -6,10 +6,10 @@ import { useMemberStore } from '@/stores'
* baseURL 设置请求ip地址和端口
*/
const ENV = process.env.NODE_ENV
-export const baseURL = ENV === 'development' ? 'http://192.168.0.244:18580' : 'http://192.168.0.244:18580'//测试
+// export const baseURL = ENV === 'development' ? 'http://192.168.0.244:18580' : 'http://192.168.0.244:18580'//测试
// export const baseURL = ENV === 'development' ? 'http://36.33.26.201:19988/prod-api/' : 'http://36.33.26.201:19988/prod-api/'//生产
// export const baseURL = ENV === 'development' ? 'http://192.168.0.234:18080' : '***'
-// export const baseURL = ENV === 'development' ? 'http://192.168.2.248:18080' : '***'
+export const baseURL = ENV === 'development' ? 'http://192.168.2.246:18080' : 'http://192.168.2.246:18080'//马
// export const baseURL = ENV === 'development' ? '/api' : '***'
/**
* httpInterceptor 分别拦截 request 和 uploadFile 请求