From c1f8b1a3d163e002bc4075aa5b2db4fda8d8cf67 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 12 五月 2025 13:55:48 +0800
Subject: [PATCH] #
---
manifest.json | 263 ++++++++++++++++++------------------
pages/home/index.vue | 4
pages/listing/labour.vue | 115 +++++++---------
pages/listing/unPakin.vue | 4
common/request.js | 4
5 files changed, 189 insertions(+), 201 deletions(-)
diff --git a/common/request.js b/common/request.js
index 08c572f..53b11d5 100644
--- a/common/request.js
+++ b/common/request.js
@@ -15,8 +15,8 @@
return new Promise((resolve, reject) => {
const token = uni.getStorageSync('token');
// const URL = 'http://47.76.147.249:8080/rsf-server/pda' + url;
- const URL = 'http://test.zoneyung.net:8080/rsf-server/pda' + url;
- // const URL = 'http://127.0.0.1:8080/rsf-server/pda' + url;
+ // const URL = 'http://test.zoneyung.net:8080/rsf-server/pda' + url;
+ const URL = 'http://127.0.0.1:8080/rsf-server/pda' + url;
uni.request({
url: URL,
data: postData,
diff --git a/manifest.json b/manifest.json
index 794f485..572efcc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,131 +1,132 @@
-{
- "name": "涓壃WMS",
- "appid": "__UNI__DA5854D",
- "description": "",
- "versionName": "20250225A",
- "versionCode": 146,
- "transformPx": false,
- /* 5+App鐗规湁鐩稿叧 */
- "app-plus": {
- "usingComponents": true,
- "nvueStyleCompiler": "uni-app",
- "compilerVersion": 3,
- "splashscreen": {
- "alwaysShowBeforeRender": true,
- "waiting": true,
- "autoclose": true,
- "delay": 0
- },
- /* 妯″潡閰嶇疆 */
- "modules": {
- "Bluetooth": {}
- },
- /* 搴旂敤鍙戝竷淇℃伅 */
- "distribute": {
- /* android鎵撳寘閰嶇疆 */
- "android": {
- "permissions": [
- "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
- "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
- "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
- "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CAMERA\"/>",
- "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
- "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
- "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
- "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
- "<uses-feature android:name=\"android.hardware.camera\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
- ]
- },
- /* ios鎵撳寘閰嶇疆 */
- "ios": {
- "dSYMs": false
- },
- /* SDK閰嶇疆 */
- "sdkConfigs": {
- "ad": {}
- },
- "icons": {
- "android": {
- "hdpi": "unpackage/res/icons/72x72.png",
- "xhdpi": "unpackage/res/icons/96x96.png",
- "xxhdpi": "unpackage/res/icons/144x144.png",
- "xxxhdpi": "unpackage/res/icons/192x192.png"
- },
- "ios": {
- "appstore": "unpackage/res/icons/1024x1024.png",
- "ipad": {
- "app": "unpackage/res/icons/76x76.png",
- "app@2x": "unpackage/res/icons/152x152.png",
- "notification": "unpackage/res/icons/20x20.png",
- "notification@2x": "unpackage/res/icons/40x40.png",
- "proapp@2x": "unpackage/res/icons/167x167.png",
- "settings": "unpackage/res/icons/29x29.png",
- "settings@2x": "unpackage/res/icons/58x58.png",
- "spotlight": "unpackage/res/icons/40x40.png",
- "spotlight@2x": "unpackage/res/icons/80x80.png"
- },
- "iphone": {
- "app@2x": "unpackage/res/icons/120x120.png",
- "app@3x": "unpackage/res/icons/180x180.png",
- "notification@2x": "unpackage/res/icons/40x40.png",
- "notification@3x": "unpackage/res/icons/60x60.png",
- "settings@2x": "unpackage/res/icons/58x58.png",
- "settings@3x": "unpackage/res/icons/87x87.png",
- "spotlight@2x": "unpackage/res/icons/80x80.png",
- "spotlight@3x": "unpackage/res/icons/120x120.png"
- }
- }
- }
- },
- "nativePlugins": {
- "Hanyin-Plugin": {
- "__plugin_info__": {
- "name": "钃濈墮杩炴帴姹夊嵃渚挎惡寮忔墦鍗版満",
- "description": "app钃濈墮杩炴帴姹夊嵃渚挎惡寮忔墦鍗版満闈㈠崟鎵撳嵃-----娴嬭瘯鍨嬪彿: HM-A300",
- "platforms": "Android",
- "url": "https://ext.dcloud.net.cn/plugin?id=2731",
- "android_package_name": "uni.UNIDA5854D",
- "ios_bundle_id": "",
- "isCloud": true,
- "bought": 1,
- "pid": "2731",
- "parameters": {}
- }
- }
- }
- },
- /* 蹇簲鐢ㄧ壒鏈夌浉鍏� */
- "quickapp": {},
- /* 灏忕▼搴忕壒鏈夌浉鍏� */
- "mp-weixin": {
- "appid": "",
- "setting": {
- "urlCheck": false
- },
- "usingComponents": true
- },
- "mp-alipay": {
- "usingComponents": true
- },
- "mp-baidu": {
- "usingComponents": true
- },
- "mp-toutiao": {
- "usingComponents": true
- },
- "uniStatistics": {
- "enable": false
- },
- "vueVersion": "2",
- "h5": {
- "devServer": {
- "port": 8133
- }
- }
-}
\ No newline at end of file
+{
+ "name" : "涓壃WMS",
+ "appid" : "__UNI__DA5854D",
+ "description" : "",
+ "versionName" : "20250225A",
+ "versionCode" : 146,
+ "transformPx" : false,
+ /* 5+App鐗规湁鐩稿叧 */
+ "app-plus" : {
+ "usingComponents" : true,
+ "nvueStyleCompiler" : "uni-app",
+ "compilerVersion" : 3,
+ "splashscreen" : {
+ "alwaysShowBeforeRender" : true,
+ "waiting" : true,
+ "autoclose" : true,
+ "delay" : 0
+ },
+ /* 妯″潡閰嶇疆 */
+ "modules" : {
+ "Bluetooth" : {}
+ },
+ /* 搴旂敤鍙戝竷淇℃伅 */
+ "distribute" : {
+ /* android鎵撳寘閰嶇疆 */
+ "android" : {
+ "permissions" : [
+ "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+ "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+ "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+ "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+ "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+ "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+ "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+ "<uses-feature android:name=\"android.hardware.camera\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+ ],
+ "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+ },
+ /* ios鎵撳寘閰嶇疆 */
+ "ios" : {
+ "dSYMs" : false
+ },
+ /* SDK閰嶇疆 */
+ "sdkConfigs" : {
+ "ad" : {}
+ },
+ "icons" : {
+ "android" : {
+ "hdpi" : "unpackage/res/icons/72x72.png",
+ "xhdpi" : "unpackage/res/icons/96x96.png",
+ "xxhdpi" : "unpackage/res/icons/144x144.png",
+ "xxxhdpi" : "unpackage/res/icons/192x192.png"
+ },
+ "ios" : {
+ "appstore" : "unpackage/res/icons/1024x1024.png",
+ "ipad" : {
+ "app" : "unpackage/res/icons/76x76.png",
+ "app@2x" : "unpackage/res/icons/152x152.png",
+ "notification" : "unpackage/res/icons/20x20.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "proapp@2x" : "unpackage/res/icons/167x167.png",
+ "settings" : "unpackage/res/icons/29x29.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "spotlight" : "unpackage/res/icons/40x40.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png"
+ },
+ "iphone" : {
+ "app@2x" : "unpackage/res/icons/120x120.png",
+ "app@3x" : "unpackage/res/icons/180x180.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "notification@3x" : "unpackage/res/icons/60x60.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "settings@3x" : "unpackage/res/icons/87x87.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png",
+ "spotlight@3x" : "unpackage/res/icons/120x120.png"
+ }
+ }
+ }
+ },
+ "nativePlugins" : {
+ "Hanyin-Plugin" : {
+ "__plugin_info__" : {
+ "name" : "钃濈墮杩炴帴姹夊嵃渚挎惡寮忔墦鍗版満",
+ "description" : "app钃濈墮杩炴帴姹夊嵃渚挎惡寮忔墦鍗版満闈㈠崟鎵撳嵃-----娴嬭瘯鍨嬪彿: HM-A300",
+ "platforms" : "Android",
+ "url" : "https://ext.dcloud.net.cn/plugin?id=2731",
+ "android_package_name" : "uni.UNIDA5854D",
+ "ios_bundle_id" : "",
+ "isCloud" : true,
+ "bought" : 1,
+ "pid" : "2731",
+ "parameters" : {}
+ }
+ }
+ }
+ },
+ /* 蹇簲鐢ㄧ壒鏈夌浉鍏� */
+ "quickapp" : {},
+ /* 灏忕▼搴忕壒鏈夌浉鍏� */
+ "mp-weixin" : {
+ "appid" : "",
+ "setting" : {
+ "urlCheck" : false
+ },
+ "usingComponents" : true
+ },
+ "mp-alipay" : {
+ "usingComponents" : true
+ },
+ "mp-baidu" : {
+ "usingComponents" : true
+ },
+ "mp-toutiao" : {
+ "usingComponents" : true
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "vueVersion" : "2",
+ "h5" : {
+ "devServer" : {
+ "port" : 8133
+ }
+ }
+}
diff --git a/pages/home/index.vue b/pages/home/index.vue
index d33c961..88e8cb9 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -91,7 +91,7 @@
</navigator>
</view>
- <view class="cu-item">
+ <!-- <view class="cu-item">
<navigator hover-class='none' url="/pages/listing/upper" navigateTo>
<view class="cuIcon-punch text-blue">
</view>
@@ -104,7 +104,7 @@
</view>
<text>鍏ュ簱涓婃灦</text>
</navigator>
- </view>
+ </view> -->
</view>
<view class="cu-bar bg-white solid-bottom margin-top">
diff --git a/pages/listing/labour.vue b/pages/listing/labour.vue
index 65d16ca..c03eaa4 100644
--- a/pages/listing/labour.vue
+++ b/pages/listing/labour.vue
@@ -1,20 +1,14 @@
<template>
<view class="has-foot">
<form>
- <view class="cu-form-group margin-top">
- <view class="title">ASN鍗�</view>
- <input placeholder="璇锋壂鎻廇SN鍗�" v-model="asnCode" focus></input>
- </view>
-
<view class="cu-form-group ">
<view class="title">鎵樼洏</view>
<input placeholder="璇锋壂鎻忔墭鐩�" v-model="container"></input>
- </view>
-
- <view class="cu-form-group ">
- <view class="title">鐗╂枡鐮�</view>
- <input placeholder="璇锋壂鎻忕墿鏂欑爜" v-model="barcode"></input>
<text class='cuIcon-search text-blue' @click="search"></text>
+ </view>
+ <view class="cu-form-group">
+ <view class="title">搴撲綅鐮�</view>
+ <input placeholder="璇锋壂鎻忓簱浣嶇爜" v-model="locCode"></input>
</view>
</form>
<view class="cu-list det menu sm-border padding">
@@ -25,14 +19,18 @@
{{index+1}}
</view>
<view class="text-blue">
- {{`${item.maktx}`}}
+ 缂栫爜:{{`${item.matnrCode}`}}
</view>
</view>
- <view class="action">
- <text @click="remove(index)" class="cuIcon-close text-red" style="font-size: 24px;"></text>
- </view>
+
</view>
-
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">鍚嶇О:</text>
+ <text class="text-grey ">{{item.maktx}}</text>
+ </view>
+
+ </view>
<view class="cu-item">
<view class="content">
<text class="text-black">ASN:</text>
@@ -41,26 +39,9 @@
<text class="text-grey ">{{item.asnCode}}</text>
</view>
</view>
-
<view class="cu-item">
<view class="content">
- <text class="text-black">鎵樼洏:</text>
- </view>
- <view class="action">
- <text class="text-grey ">{{item.barcode}}</text>
- </view>
- </view>
- <view class="cu-item">
- <view class="content">
- <text class="text-black">渚涘簲鍟嗘壒娆�:</text>
- </view>
- <view class="action">
- <text class="text-grey ">{{item.splrBatch}}</text>
- </view>
- </view>
- <view class="cu-item">
- <view class="content">
- <text class="text-black">搴撳瓨鎵规:</text>
+ <text class="text-black">鎵规:</text>
</view>
<view class="action">
<text class="text-grey ">{{item.batch}}</text>
@@ -68,7 +49,7 @@
</view>
<view class="cu-item">
<view class="content">
- <text class="text-black">鏀惰揣鏁伴噺:</text>
+ <text class="text-black">鏁伴噺:</text>
</view>
<view class="action">
<text class="text-grey ">{{item.anfme}}</text>
@@ -78,10 +59,7 @@
</block>
</view>
- <view class="cu-form-group margin-bottom">
- <view class="title">搴撲綅鐮�</view>
- <input placeholder="璇锋壂鎻忓簱浣嶇爜" v-model="locCode"></input>
- </view>
+
<view class="cu-bar btn-group foot">
<button class="cu-btn text-blue line-blue shadow" @click="clear">娓呯┖</button>
<button class="cu-btn bg-blue shadow-blur" @click="confirm">涓婃灦</button>
@@ -119,15 +97,13 @@
code,
data,
msg
- } = await request('/stock/operate/list', {
- asnCode: this.asnCode,
- barcode: this.container,
- matnrCode: this.barcode
+ } = await request('/stock/operate/list', {
+ barcode: this.container,
})
if (code === 200) {
// const find = this.list.find(el => el.id === data.id);
// !find &&
- this.list.push(data)
+ this.list = data
} else {
uni.showToast({
title: msg,
@@ -145,33 +121,44 @@
},
async confirm() {
- if (this.locCode !== '') {
- const {
- code,
- data,
- msg
- } = await request('/stock/operate', {
- itemList: this.list,
- locCode: this.locCode
+ if (this.locCode === '' || this.locCode === null) {
+ uni.showToast({
+ title: '璇疯緭鍏ュ簱浣�',
+ icon: "none",
})
- if (code === 200) {
- uni.showToast({
- title: '涓婃灦鎴愬姛'
- })
- this.list = []
- this.barcode = ''
- } else {
- uni.showToast({
- title: msg,
- icon: "none",
- })
- }
+ return ;
+ }
+ if (this.container === '' || this.container === null) {
+ uni.showToast({
+ title: '璇疯緭鍏ユ墭鐩樼爜',
+ icon: "none",
+ })
+ return ;
+ }
+ const {
+ code,
+ data,
+ msg
+ } = await request('/stock/operate', {
+ itemList: this.list,
+ locCode: this.locCode,
+ barcode: this.container,
+
+ })
+ if (code === 200) {
+ uni.showToast({
+ title: '涓婃灦鎴愬姛'
+ })
+ this.list = []
+ this.locCode = ''
+ this.container = ''
} else {
uni.showToast({
- title: '璇烽�夋嫨搴撲綅',
+ title: msg,
icon: "none",
})
}
+
},
diff --git a/pages/listing/unPakin.vue b/pages/listing/unPakin.vue
index 34e616a..3de6d2b 100644
--- a/pages/listing/unPakin.vue
+++ b/pages/listing/unPakin.vue
@@ -45,8 +45,8 @@
</view>
<view class="cu-item">
<view class="content">
- <text class="text-black">渚涘簲鍟嗘壒娆�:</text>
- <text class="text-grey ">{{item.splrBatch}}</text>
+ <text class="text-black">鎵规:</text>
+ <text class="text-grey ">{{item.batch}}</text>
</view>
</view>
<view class="cu-item">
--
Gitblit v1.9.1