diff --git a/env/.env b/env/.env
index 5d9b62c..4f10f14 100644
--- a/env/.env
+++ b/env/.env
@@ -1,7 +1,7 @@
VITE_APP_TITLE = '亚为mom小程序'
VITE_APP_PORT = 9000
-VITE_UNI_APPID = '__UNI__D1E5001'
+VITE_UNI_APPID = '__UNI__2EB12DE'
VITE_WX_APPID = 'wx1a832d51073d3a35'
# h5部署网站的base,配置到 manifest.config.ts 里的 h5.router.base
@@ -10,8 +10,8 @@ VITE_WX_APPID = 'wx1a832d51073d3a35'
VITE_APP_PUBLIC_BASE=/
# 后台请求地址
-VITE_SERVER_BASEURL = 'http://localhost:48080/admin-api'
-VITE_UPLOAD_BASEURL = 'http://localhost:48080/upload'
+VITE_SERVER_BASEURL = 'http://192.168.1.107:48080/admin-api'
+VITE_UPLOAD_BASEURL = 'http://192.168.1.107:48080/upload'
# 备注:如果后台带统一前缀,则也要加到后面,eg: https://ukw0y1.laf.run/api
# 注意,如果是微信小程序,还有一套请求地址的配置,根据 develop、trial、release 分别设置上传地址,见 `src/utils/index.ts`。
diff --git a/env/.env.development b/env/.env.development
index 496bbe1..1d2dabf 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -6,4 +6,4 @@ VITE_DELETE_CONSOLE = false
VITE_SHOW_SOURCEMAP = false
# 后台请求地址
-# VITE_SERVER_BASEURL = 'http://localhost:48080'
+# VITE_SERVER_BASEURL = 'http://192.168.1.107:48080'
diff --git a/src/pages-erp/stock-out/index.vue b/src/pages-erp/stock-out/index.vue
index aff9aa8..8248249 100644
--- a/src/pages-erp/stock-out/index.vue
+++ b/src/pages-erp/stock-out/index.vue
@@ -131,6 +131,16 @@
@click="handleAdd"
/>
+
+
+
@@ -302,6 +312,11 @@ function handleAdd() {
uni.navigateTo({ url: '/pages-erp/stock-out/form/index' })
}
+/** 扫码出库 */
+function handleScanOut() {
+ uni.navigateTo({ url: '/pages-erp/stock-out/scan/index' })
+}
+
/** 编辑 */
function handleEdit(item: StockOut) {
uni.navigateTo({ url: `/pages-erp/stock-out/form/index?id=${item.id}` })
diff --git a/src/pages-erp/stock-out/scan/index.vue b/src/pages-erp/stock-out/scan/index.vue
new file mode 100644
index 0000000..642bc0a
--- /dev/null
+++ b/src/pages-erp/stock-out/scan/index.vue
@@ -0,0 +1,936 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+ 扫仓库
+
+
+
+ 2
+ 扫产品
+
+
+
+
+
+ 请扫描仓库条码
+ 产品已扫描,请确认出库
+
+
+
+
+ handleWarehouseScan(e.detail.value)"
+ >
+
+
+
+
+
+
+ 仓库
+
+ {{ currentWarehouse.name }}
+
+
+
+
+
+
+ handleProductScan(e.detail.value)"
+ >
+
+
+
+
+
+
+ 产品
+
+ {{ productPreview.name }}
+
+
+
+ 规格
+ {{ productPreview.standard || '-' }}
+
+
+ 条码
+ {{ productPreview.barCode || '-' }}
+
+
+
+ 数量
+
+ -
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/index/index.ts b/src/pages/index/index.ts
index 08d784b..b2a6bbf 100644
--- a/src/pages/index/index.ts
+++ b/src/pages/index/index.ts
@@ -154,6 +154,14 @@ const menuGroupsData: MenuGroup[] = [
iconColor: '#1890ff',
permission: 'erp:stock-in:create',
},
+ {
+ key: 'stockOutScan',
+ name: '扫码出库',
+ icon: 'scan',
+ url: '/pages-erp/stock-out/scan/index',
+ iconColor: '#ff4d4f',
+ permission: 'erp:stock-out:create',
+ },
{
key: 'stockOut',
name: '其他出库',