From 4c94dc71afd85a903ebed62db99b4ca11a2cd46d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 17:15:55 +0800
Subject: [PATCH] no message
---
pages/listing/upper.vue | 2
pages/listing/disc.vue | 29 +++++++-------
pages/listing/labour.vue | 7 ---
main.js | 2
common/request.js | 4 +-
pages/rece/standard.vue | 22 +++++------
6 files changed, 29 insertions(+), 37 deletions(-)
diff --git a/common/request.js b/common/request.js
index 2b08766..08c572f 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://192.168.4.24: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/main.js b/main.js
index e40b387..1f4d062 100644
--- a/main.js
+++ b/main.js
@@ -8,7 +8,7 @@
//鍏ㄥ眬鏁版嵁鐘舵�佺鐞� vuex
import store from '@/store/index.js';
Vue.prototype.$store = store;
-//鍏ㄥ眬鍏敤闈欐�佹暟鎹�
+//鍏ㄥ眬鍏敤闈欐�佹暟鎹甪
import Mock from '@/common/mock/index.js';
Vue.prototype.$Mock = Mock;
diff --git a/pages/listing/disc.vue b/pages/listing/disc.vue
index bbd4641..07f23f6 100644
--- a/pages/listing/disc.vue
+++ b/pages/listing/disc.vue
@@ -88,29 +88,29 @@
<view class="content">
<text class="text-black">搴撳瓨鍗曚綅: <text class="text-grey ">{{item.stockUnit}}</text></text>
</view>
-
- <!-- <view class="content">
- <text class="text-black">璁″垝鏀惰揣鏁�: <text class="text-grey ">{{item.anfme}}</text></text>
- </view> -->
+ <view class="content">
+ <text class="text-black">鏀惰揣鏁伴噺: <text class="text-grey ">{{item.anfme}}</text></text>
+ </view>
+ <view class="content">
+ <text class="text-black">宸蹭笂鏋舵暟閲�: <text class="text-grey ">{{item.workQty + item.qty}}</text></text>
+ </view>
</view>
-
- <view class="cu-item">
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">鍙粍鐩樻暟閲�: <text class="text-grey ">{{item.anfme - item.workQty}}</text></text>
+ </view>
<view class="content">
<view class="cu-form-group padding-lr-0">
<view class="title text-blue"><text
class="text-red text-xl vertical-middle">*</text>缁勭洏鏁伴噺:
</view>
- <input type="number" placeholder="璇疯緭鍏ョ粍鐩樻暟閲�" v-model="item.anfme"></input>
+ <input type="number" placeholder="璇疯緭鍏ョ粍鐩樻暟閲�" v-model="megreQty"></input>
</view>
</view>
</view>
-
</view>
</block>
-
</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>
@@ -133,7 +133,8 @@
data() {
return {
barcode: '',
- container: '',
+ container: '',
+ megreQty: '',
list: [],
range: [],
isconfirm: false
@@ -217,8 +218,8 @@
const newArr = this.list.map(item => {
return {
...item,
- anfme: item.anfme === null ? 0 : + item.anfme,
- receiptQty: item.anfme === null ? 0 : + item.anfme
+ anfme: item.anfme === null ? 0 : +item.anfme,
+ receiptQty: this.megreQty,
};
});
diff --git a/pages/listing/labour.vue b/pages/listing/labour.vue
index 6c7eeb2..65d16ca 100644
--- a/pages/listing/labour.vue
+++ b/pages/listing/labour.vue
@@ -17,9 +17,6 @@
<text class='cuIcon-search text-blue' @click="search"></text>
</view>
</form>
-
-
-
<view class="cu-list det menu sm-border padding">
<block v-for="(item, index) in list" :key="index">
<view class="cu-bar bg-white solid-bottom margin-top-sm">
@@ -53,7 +50,6 @@
<text class="text-grey ">{{item.barcode}}</text>
</view>
</view>
-
<view class="cu-item">
<view class="content">
<text class="text-black">渚涘簲鍟嗘壒娆�:</text>
@@ -62,7 +58,6 @@
<text class="text-grey ">{{item.splrBatch}}</text>
</view>
</view>
-
<view class="cu-item">
<view class="content">
<text class="text-black">搴撳瓨鎵规:</text>
@@ -71,8 +66,6 @@
<text class="text-grey ">{{item.batch}}</text>
</view>
</view>
-
-
<view class="cu-item">
<view class="content">
<text class="text-black">鏀惰揣鏁伴噺:</text>
diff --git a/pages/listing/upper.vue b/pages/listing/upper.vue
index 8e1804c..c2ddaab 100644
--- a/pages/listing/upper.vue
+++ b/pages/listing/upper.vue
@@ -9,7 +9,7 @@
<view class="cu-form-group ">
<view class="title">鐩爣搴撳尯</view>
- <input placeholder="璇锋壂鎻忕洰鏍囧簱鍖�" v-model="areaName" disabled></input>
+ <input placeholder="璇锋壂鎻忕洰鏍囧簱鍖�" v-model="areaName" ></input>
</view>
<view class="cu-form-group ">
diff --git a/pages/rece/standard.vue b/pages/rece/standard.vue
index 496ceed..e8beae2 100644
--- a/pages/rece/standard.vue
+++ b/pages/rece/standard.vue
@@ -52,9 +52,6 @@
<text class="text-black">瀹炴椂搴撳瓨: <text class="text-grey ">{{item.stockQty}}</text></text>
</view>
</view>
-
-
-
<view class="cu-item">
<view class="content">
<text class="text-black">骞冲彴琛屽彿: <text class="text-grey ">{{item.platformId}}</text></text>
@@ -63,7 +60,6 @@
<text class="text-black">璐ㄦ缁撴灉: <text class="text-grey ">{{item.inspect}}</text></text>
</view>
</view>
-
<view class="cu-item">
<view class="content">
<text class="text-black">閲囪喘鍗曚綅:<text class="text-grey ">{{item.purUnit}}</text></text>
@@ -72,13 +68,15 @@
<text class="text-black">搴撳瓨鍗曚綅: <text class="text-grey ">{{item.stockUnit}}</text></text>
</view>
</view>
-
<view class="cu-item">
<view class="content">
<text class="text-blue">璁″垝鏀惰揣鏁伴噺:<text class="text-grey ">{{item.anfme}}</text></text>
- </view>
+ </view>
+ <view class="content">
+ <text class="text-black">宸叉敹鏁伴噺:<text class="text-grey ">{{item.qty}}</text></text>
+ </view>
</view>
- <view class="cu-item">
+ <view class="cu-item">
<view class="content" v-if="!isconfirm">
<view class="cu-form-group padding-lr-0">
<view class="title text-blue">鏀惰揣鏁伴噺:</view>
@@ -200,8 +198,8 @@
data,
msg
} = await request('/orders/' + this.barcode, {}, "get")
- if (code === 200) {
- if (Object.keys(data).length === 0){
+ if (code === 200) {
+ if (Object.keys(data).length === 0) {
uni.showToast({
title: "璇ユ爣绛炬湭鏌ヨ鍒版暟鎹�",
icon: "none",
@@ -209,15 +207,15 @@
})
}
this.list.push(...data)
-
- }else if(code == 401){
+
+ } else if (code == 401) {
setTimeout(() => {
uni.removeStorageSync('token');
uni.reLaunch({
url: "/pages/login/login"
});
}, 1000);
- }else {
+ } else {
uni.showToast({
title: msg,
icon: "none",
--
Gitblit v1.9.1