From ddaa291cce4bb580563827ca3d40b7afd46b15ec Mon Sep 17 00:00:00 2001
From: ljx120 <10717296+ljx120@user.noreply.gitee.com>
Date: Wed, 22 Jan 2025 17:28:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BD=E8=83=9A=E5=85=A5?=
=?UTF-8?q?=E5=BA=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/http/config.ts | 16 ++++++++--------
pages/whiteEmbryo/listSearch.vue | 8 +++++---
pages/whiteEmbryo/w-list.vue | 12 ++++++++++--
pages/whiteEmbryo/w-scanCode.vue | 12 +++++++++++-
4 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/common/http/config.ts b/common/http/config.ts
index c45f4b3..9c85c16 100644
--- a/common/http/config.ts
+++ b/common/http/config.ts
@@ -1,17 +1,17 @@
export default {
//正式接口
- base_scm:'/api',
- base_auth:'',//登录
- base_mes:'/mes',//面料
- base_process:'/mes',//工艺
+ // base_scm:'/api',
+ // base_auth:'',//登录
+ // base_mes:'/mes',//面料
+ // base_process:'/mes',//工艺
//本地服务
- // base_scm: 'http://192.168.1.222:7002',
- // base_auth:'https://oauth.goodsilk.cn/api',//登录
- // base_mes:'https://scm.goodsilk.cn/mes',//面料
- // base_process:'https://scm.goodsilk.cn/mes',//工艺
+ base_scm: 'http://192.168.1.222:7002',
+ base_auth:'https://oauth.goodsilk.cn/api',//登录
+ base_mes:'https://scm.goodsilk.cn/mes',//面料
+ base_process:'https://scm.goodsilk.cn/mes',//工艺
}
\ No newline at end of file
diff --git a/pages/whiteEmbryo/listSearch.vue b/pages/whiteEmbryo/listSearch.vue
index 6b41121..33e5b9b 100644
--- a/pages/whiteEmbryo/listSearch.vue
+++ b/pages/whiteEmbryo/listSearch.vue
@@ -55,7 +55,9 @@ import { getAction, postAction } from '../../common/http';
}
const toDetile = (item:any) =>{
- console.log(item);
+ uni.navigateTo({
+ url:'/pages/whiteEmbryo/warehouse-in-out?category='+item.category
+ })
}
@@ -73,11 +75,11 @@ import { getAction, postAction } from '../../common/http';
操作
-
+
{{item.category}}
{{item.count}}
{{item.len}}
- 查看
+ 查看
diff --git a/pages/whiteEmbryo/w-list.vue b/pages/whiteEmbryo/w-list.vue
index cc5df18..0a1f3ea 100644
--- a/pages/whiteEmbryo/w-list.vue
+++ b/pages/whiteEmbryo/w-list.vue
@@ -86,9 +86,11 @@ const msps = ref({})
a[i] = form.value[i]
}
}
+ let location = form.value.shelve+'-'+form.value.column+'-'+form.value.row
let param = {
page: currentPage.value,
size: 30,
+ location:form.value.shelve?location:null,
...a
}
getAction('/rawFabric/search', param).then((res : any) => {
@@ -350,9 +352,15 @@ const msps = ref({})
@click="selectChoose('form')" />
+
-
-
+
+
+ —
+ —
+
+
+
扫码出库
diff --git a/pages/whiteEmbryo/w-scanCode.vue b/pages/whiteEmbryo/w-scanCode.vue
index cef0e8f..8e8f6a5 100644
--- a/pages/whiteEmbryo/w-scanCode.vue
+++ b/pages/whiteEmbryo/w-scanCode.vue
@@ -2,7 +2,15 @@
扫描库位码
- 当前库位码：{{location}}
+
+
+
+ —
+ —
+
+
+
+
扫描面料编号
@@ -17,6 +25,8 @@
onMounted(() => {
})
+const form = ref({} as any)
+
const onClickLeft = () => {
window.history.back()
}