From 3d5efbc419d3ddff189d8d0c36cf743887d28eaa Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 29 七月 2024 13:43:44 +0800
Subject: [PATCH] #
---
unpackage/res/icons/80x80.png | 0
unpackage/res/icons/76x76.png | 0
unpackage/res/icons/120x120.png | 0
unpackage/res/icons/192x192.png | 0
unpackage/res/icons/152x152.png | 0
unpackage/res/icons/40x40.png | 0
pages/mat/matQuery.vue | 20 +++++++++-----------
unpackage/res/icons/96x96.png | 0
unpackage/res/icons/1024x1024.png | 0
pages/mat/matSelected.vue | 10 +++++-----
unpackage/res/icons/29x29.png | 0
manifest.json | 4 ++--
unpackage/res/icons/58x58.png | 0
pages/mat/matQuery2.vue | 18 +++++++++---------
unpackage/res/icons/60x60.png | 0
unpackage/res/icons/167x167.png | 0
unpackage/res/icons/20x20.png | 0
unpackage/res/icons/144x144.png | 0
unpackage/res/icons/87x87.png | 0
pages/pakin/pakin.vue | 4 ++--
unpackage/res/icons/180x180.png | 0
unpackage/res/icons/72x72.png | 0
22 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/manifest.json b/manifest.json
index 0120ced..11e4ae9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "涓壃WMS",
"appid" : "__UNI__DA5854D",
"description" : "",
- "versionName" : "2024031401",
- "versionCode" : "100",
+ "versionName" : "20240729A",
+ "versionCode" : 101,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index 127b892..3c894de 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -2,13 +2,13 @@
<view>
<!-- 鎼滅储妗� -->
<view class="search-bar">
- <uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
+ <uni-search-bar v-model="condition" placeholder=" 鎺冪⒓ / 杓稿叆" bgColor="#EEEEEE" @confirm="search" />
</view>
<scroll-view>
<view class="tag-list" v-for="(item,i) in tagList" :key="i" @click="showTag(item.id)">
<view class="tag">
<view style="display: flex;">
- <view class="wms-tag" :style="baColor" >鍒嗙被</view>
+ <view class="wms-tag" :style="baColor" >鍒嗛</view>
</view>
</view>
<view class="tag-item">{{item.name}}</view>
@@ -21,9 +21,9 @@
<view class="wms-tag" :style="baColor" >鍟嗗搧</view>
</view>
</view>
- <view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matnr}}</view>
- <view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx ? item.maktx : '--'}}</view>
- <view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs ? item.specs : '--'}}</view>
+ <view class="tag-item">鍟嗗搧绶ㄨ櫉锛� {{item.matnr}}</view>
+ <view class="tag-item">鍟嗗搧鍚嶇ū锛� {{item.maktx ? item.maktx : '--'}}</view>
+ <view class="tag-item">鍟嗗搧瑕忔牸锛� {{item.specs ? item.specs : '--'}}</view>
</view>
</view>
<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
@@ -41,14 +41,14 @@
curr:1,
tag: '鍒嗙被',
baColor: "background-color: #0081ff;",
- desc: '鍟嗗搧缂栧彿:',
+ desc: '鍟嗗搧绶ㄨ櫉:',
baseUrl: '',
token: '',
status: 'more',
contentText: {
- contentdown: '涓婃媺鍔犺浇鏇村',
- contentrefresh: '鍔犺浇涓�',
- contentnomore: '娌℃湁鏇村'
+ contentdown: '涓婃媺鍔犺級鏇村',
+ contentrefresh: '鍔犺級涓�',
+ contentnomore: '娌掓湁鏇村'
},
// 褰撳墠tagId
tagIdNow: 1
@@ -91,7 +91,6 @@
'token':uni.getStorageSync('token'),
},
success(result) {
- console.log(result);
var res = result.data
if (res.code === 200 ) {
that.matList = res.data
@@ -166,7 +165,6 @@
'token':uni.getStorageSync('token'),
},
success(result) {
- console.log(result);
that.tagList = null
var res = result.data
if (res.code === 200) {
diff --git a/pages/mat/matQuery2.vue b/pages/mat/matQuery2.vue
index c8316fb..c845f09 100644
--- a/pages/mat/matQuery2.vue
+++ b/pages/mat/matQuery2.vue
@@ -2,13 +2,13 @@
<view>
<!-- 鎼滅储妗� -->
<view class="search-bar">
- <uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
+ <uni-search-bar v-model="condition" placeholder=" 鎺冪⒓ / 杓稿叆" bgColor="#EEEEEE" @confirm="search" />
</view>
<scroll-view>
<view class="tag-list" v-for="(item,i) in tagList" :key="i" @click="showTag(item.id)">
<view class="tag">
<view style="display: flex;">
- <view class="wms-tag" :style="baColor" >鍒嗙被</view>
+ <view class="wms-tag" :style="baColor" >鍒嗛</view>
</view>
</view>
<view class="tag-item">{{item.name}}</view>
@@ -21,9 +21,9 @@
<view class="wms-tag" :style="baColor" >鍟嗗搧</view>
</view>
</view>
- <view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matnr}}</view>
- <view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx ? item.maktx : '--'}}</view>
- <view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs ? item.specs : '--'}}</view>
+ <view class="tag-item">鍟嗗搧绶ㄨ櫉锛� {{item.matnr}}</view>
+ <view class="tag-item">鍟嗗搧鍚嶇ū锛� {{item.maktx ? item.maktx : '--'}}</view>
+ <view class="tag-item">鍟嗗搧瑕忔牸锛� {{item.specs ? item.specs : '--'}}</view>
</view>
</view>
<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
@@ -41,14 +41,14 @@
curr:1,
tag: '鍒嗙被',
baColor: "background-color: #0081ff;",
- desc: '鍟嗗搧缂栧彿:',
+ desc: '鍟嗗搧绶ㄨ櫉:',
baseUrl: '',
token: '',
status: 'more',
contentText: {
- contentdown: '涓婃媺鍔犺浇鏇村',
- contentrefresh: '鍔犺浇涓�',
- contentnomore: '娌℃湁鏇村'
+ contentdown: '涓婃媺鍔犺級鏇村',
+ contentrefresh: '鍔犺級涓�',
+ contentnomore: '娌掓湁鏇村'
},
// 褰撳墠tagId
tagIdNow: 1
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index 6cbc97a..522686a 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -2,19 +2,19 @@
<view>
<view class="form">
<view class="form-item">
- <view class="form-item-desc"><text>鍟嗗搧缂栫爜</text></view>
+ <view class="form-item-desc"><text>鍟嗗搧绶ㄧ⒓</text></view>
<view class="form-item-content"><text>{{mat.matnr}}</text></view>
</view>
<view class="form-item">
- <view class="form-item-desc"><text>鍟嗗搧鍚嶇О</text></view>
+ <view class="form-item-desc"><text>鍟嗗搧鍚嶇ū</text></view>
<view class="form-item-content"><text style="word-wrap:break-word">{{mat.maktx}}</text></view>
</view>
<view class="form-item">
- <view class="form-item-desc"><text>瑙勬牸</text></view>
+ <view class="form-item-desc"><text>瑕忔牸</text></view>
<view class="form-item-content"><text>{{mat.specs}}</text></view>
</view>
<view class="form-item">
- <view class="form-item-desc"><text>鎵瑰彿</text></view>
+ <view class="form-item-desc"><text>鎵硅櫉</text></view>
<view class="form-item-content">
<view class="form-input">
<input type="text" v-model="mat.batch">
@@ -22,7 +22,7 @@
</view>
</view>
<view class="form-item">
- <view class="form-item-desc"><text>鏁伴噺</text></view>
+ <view class="form-item-desc"><text>鏁搁噺</text></view>
<view class="form-item-content">
<uni-number-box :value="mat.anfme" :max="99999999" :step='1' color="#747474" @change="changeValue" />
</view>
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 4b00253..1ee825c 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -3,12 +3,12 @@
<view class="code">
<view class="item">
<view class="code-decs">鎵樼洡纰�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
+ <input type="text" placeholder=" 鎺冪⒓ / 杓稿叆" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
<view class="item">
<view class="code-decs">鐗╂枡纰�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+ <input type="text" placeholder=" 鎺冪⒓ / 杓稿叆" v-model="matnr" :focus="matFocus" @input="findMat()">
<view class="item-right">
<button></button>
<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
diff --git a/unpackage/res/icons/1024x1024.png b/unpackage/res/icons/1024x1024.png
index 6c533a5..9786a76 100644
--- a/unpackage/res/icons/1024x1024.png
+++ b/unpackage/res/icons/1024x1024.png
Binary files differ
diff --git a/unpackage/res/icons/120x120.png b/unpackage/res/icons/120x120.png
index 22a77e9..2394127 100644
--- a/unpackage/res/icons/120x120.png
+++ b/unpackage/res/icons/120x120.png
Binary files differ
diff --git a/unpackage/res/icons/144x144.png b/unpackage/res/icons/144x144.png
index f09ba28..b8f6d4f 100644
--- a/unpackage/res/icons/144x144.png
+++ b/unpackage/res/icons/144x144.png
Binary files differ
diff --git a/unpackage/res/icons/152x152.png b/unpackage/res/icons/152x152.png
index 707f25f..563ac6c 100644
--- a/unpackage/res/icons/152x152.png
+++ b/unpackage/res/icons/152x152.png
Binary files differ
diff --git a/unpackage/res/icons/167x167.png b/unpackage/res/icons/167x167.png
index 16a4249..0f4cc39 100644
--- a/unpackage/res/icons/167x167.png
+++ b/unpackage/res/icons/167x167.png
Binary files differ
diff --git a/unpackage/res/icons/180x180.png b/unpackage/res/icons/180x180.png
index e3c8d00..f5d5577 100644
--- a/unpackage/res/icons/180x180.png
+++ b/unpackage/res/icons/180x180.png
Binary files differ
diff --git a/unpackage/res/icons/192x192.png b/unpackage/res/icons/192x192.png
index 656e8df..65d05e0 100644
--- a/unpackage/res/icons/192x192.png
+++ b/unpackage/res/icons/192x192.png
Binary files differ
diff --git a/unpackage/res/icons/20x20.png b/unpackage/res/icons/20x20.png
index cbf28bd..7d872af 100644
--- a/unpackage/res/icons/20x20.png
+++ b/unpackage/res/icons/20x20.png
Binary files differ
diff --git a/unpackage/res/icons/29x29.png b/unpackage/res/icons/29x29.png
index cb29ccd..2c008c0 100644
--- a/unpackage/res/icons/29x29.png
+++ b/unpackage/res/icons/29x29.png
Binary files differ
diff --git a/unpackage/res/icons/40x40.png b/unpackage/res/icons/40x40.png
index 22c9c05..5ad09fa 100644
--- a/unpackage/res/icons/40x40.png
+++ b/unpackage/res/icons/40x40.png
Binary files differ
diff --git a/unpackage/res/icons/58x58.png b/unpackage/res/icons/58x58.png
index 637650f..280f184 100644
--- a/unpackage/res/icons/58x58.png
+++ b/unpackage/res/icons/58x58.png
Binary files differ
diff --git a/unpackage/res/icons/60x60.png b/unpackage/res/icons/60x60.png
index 59cb790..18d59ae 100644
--- a/unpackage/res/icons/60x60.png
+++ b/unpackage/res/icons/60x60.png
Binary files differ
diff --git a/unpackage/res/icons/72x72.png b/unpackage/res/icons/72x72.png
index 60b3fed..a45607f 100644
--- a/unpackage/res/icons/72x72.png
+++ b/unpackage/res/icons/72x72.png
Binary files differ
diff --git a/unpackage/res/icons/76x76.png b/unpackage/res/icons/76x76.png
index acf1244..4ff82bb 100644
--- a/unpackage/res/icons/76x76.png
+++ b/unpackage/res/icons/76x76.png
Binary files differ
diff --git a/unpackage/res/icons/80x80.png b/unpackage/res/icons/80x80.png
index 19fb323..ac121cb 100644
--- a/unpackage/res/icons/80x80.png
+++ b/unpackage/res/icons/80x80.png
Binary files differ
diff --git a/unpackage/res/icons/87x87.png b/unpackage/res/icons/87x87.png
index 8ee704b..3429663 100644
--- a/unpackage/res/icons/87x87.png
+++ b/unpackage/res/icons/87x87.png
Binary files differ
diff --git a/unpackage/res/icons/96x96.png b/unpackage/res/icons/96x96.png
index 2d84b4e..19e9d1c 100644
--- a/unpackage/res/icons/96x96.png
+++ b/unpackage/res/icons/96x96.png
Binary files differ
--
Gitblit v1.9.1