From 21ad7745a981656da1be4c1f63644c707be9153c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 29 七月 2024 13:36:09 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 158 +++++++++++++++++++-------------------
pages/login/login.vue | 24 +++---
static/img/logo2.png | 0
pages.json | 4
static/img/logo1.png | 0
pages/login/logOut.vue | 2
pages/pakin/pakin.vue | 44 +++++-----
App.vue | 4
8 files changed, 118 insertions(+), 118 deletions(-)
diff --git a/App.vue b/App.vue
index 8147dc3..ca950a0 100644
--- a/App.vue
+++ b/App.vue
@@ -125,7 +125,7 @@
.nav-list {
display: flex;
flex-wrap: wrap;
- padding: 0px 40upx 0px;
+ padding: 0px 80upx 0px;
justify-content: space-between;
margin-top: 20px;
}
@@ -133,7 +133,7 @@
.nav-li {
padding: 30upx;
border-radius: 12upx;
- width: 36%;
+ width: 90%;
margin: 0 2.5% 40upx;
/* background-image: url(https://cdn.nlark.com/yuque/0/2019/png/280374/1552996358352-assets/web-upload/cc3b1807-c684-4b83-8f80-80e5b8a6b975.png); */
background-size: cover;
diff --git a/pages.json b/pages.json
index be5a1d9..8bcc981 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,7 @@
{
"path": "pages/login/login",
"style": {
- "navigationBarTitleText": "鐧� 褰�"
+ "navigationBarTitleText": "鐧� 閷�"
}
},
{
@@ -33,7 +33,7 @@
{
"path": "pages/pakin/pakin",
"style": {
- "navigationBarTitleText": "缁� 鎵�"
+ "navigationBarTitleText": "绲� 鎵�"
}
},
{
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 93ba3aa..a6b96b7 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -25,7 +25,7 @@
elements: [],
elements2: [
{
- title: '缁勬墭鍏ュ簱',
+ title: '绲勬墭鍏ュ韩',
name: 'pakin',
color: 'cyan',
cuIcon: 'pullup',
@@ -38,85 +38,85 @@
// cuIcon: 'order',
// url: '/pakin/pickAgain'
// },
+ // {
+ // title: '璁㈠崟鍏ュ簱',
+ // name: 'orderPakin',
+ // color: 'red',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPakin'
+ // },
+ // {
+ // title: '缁勬墭涓婃灦',
+ // name: 'putOn',
+ // color: 'orange',
+ // cuIcon: 'pullup',
+ // url: '/pakin/putOn'
+ // },
+ // {
+ // title: '鎵撳嵃',
+ // name: 'print',
+ // color: 'purple',
+ // cuIcon: 'text',
+ // url: '/print/print'
+ // },
+ // {
+ // title: '璁㈠崟涓婃灦',
+ // name: 'orderPutOn',
+ // color: 'yellow',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPutOn'
+ // },
+ // {
+ // title: '璁㈠崟涓嬫灦',
+ // name: 'orderPutDown',
+ // color: 'olive',
+ // cuIcon: 'pulldown',
+ // url: '/order/orderPutDown'
+ // },
+ // {
+ // title: '搴撳瓨鏌ヨ',
+ // name: 'stockQuery',
+ // color: 'green',
+ // cuIcon: 'check',
+ // url: '/stock/stockQuery'
+ // },
+ // {
+ // title: '鐩樼偣',
+ // name: 'stockCheck',
+ // color: 'red',
+ // cuIcon: 'post',
+ // url: '/stock/stockCheck'
+ // },
+ // {
+ // title: '鍟嗗搧鎵撳嵃',
+ // name: 'matList',
+ // color: 'orange',
+ // cuIcon: 'post',
+ // url: '/mat/matList'
+ // },
+ // {
+ // title: '琛ヨ揣',
+ // name: 'restock',
+ // color: 'yellow',
+ // cuIcon: 'punch',
+ // url: '/stock/restock'
+ // },
+ // {
+ // title: '杞叏鏉�',
+ // name: 'piking',
+ // color: 'olive',
+ // cuIcon: 'order',
+ // url: '/pakin/piking'
+ // },
+ // {
+ // title: '鎹㈡澘缁戝畾',
+ // name: 'changePallet',
+ // color: 'green',
+ // cuIcon: 'order',
+ // url: '/stock/changePallet'
+ // },
{
- title: '璁㈠崟鍏ュ簱',
- name: 'orderPakin',
- color: 'red',
- cuIcon: 'pullup',
- url: '/order/orderPakin'
- },
- {
- title: '缁勬墭涓婃灦',
- name: 'putOn',
- color: 'orange',
- cuIcon: 'pullup',
- url: '/pakin/putOn'
- },
- {
- title: '鎵撳嵃',
- name: 'print',
- color: 'purple',
- cuIcon: 'text',
- url: '/print/print'
- },
- {
- title: '璁㈠崟涓婃灦',
- name: 'orderPutOn',
- color: 'yellow',
- cuIcon: 'pullup',
- url: '/order/orderPutOn'
- },
- {
- title: '璁㈠崟涓嬫灦',
- name: 'orderPutDown',
- color: 'olive',
- cuIcon: 'pulldown',
- url: '/order/orderPutDown'
- },
- {
- title: '搴撳瓨鏌ヨ',
- name: 'stockQuery',
- color: 'green',
- cuIcon: 'check',
- url: '/stock/stockQuery'
- },
- {
- title: '鐩樼偣',
- name: 'stockCheck',
- color: 'red',
- cuIcon: 'post',
- url: '/stock/stockCheck'
- },
- {
- title: '鍟嗗搧鎵撳嵃',
- name: 'matList',
- color: 'orange',
- cuIcon: 'post',
- url: '/mat/matList'
- },
- {
- title: '琛ヨ揣',
- name: 'restock',
- color: 'yellow',
- cuIcon: 'punch',
- url: '/stock/restock'
- },
- {
- title: '杞叏鏉�',
- name: 'piking',
- color: 'olive',
- cuIcon: 'order',
- url: '/pakin/piking'
- },
- {
- title: '鎹㈡澘缁戝畾',
- name: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/stock/changePallet'
- },
- {
- title: '閫�鍑虹櫥褰�',
+ title: '閫�鍑虹櫥閷�',
name: 'logOut',
color: 'grey',
cuIcon: 'exit',
diff --git a/pages/login/logOut.vue b/pages/login/logOut.vue
index b2dc7e6..fdf711b 100644
--- a/pages/login/logOut.vue
+++ b/pages/login/logOut.vue
@@ -5,7 +5,7 @@
export default {
mounted() {
uni.showToast({
- title: '娉ㄩ攢鎴愬姛',
+ title: '瑷婚姺鎴愬姛',
duration: 1000
})
setTimeout(() => {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 78e9ddc..574902a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -9,7 +9,7 @@
<!-- logo -->
<view class="logo">
<view class="logo-box">
- <image src="../../static/img/logo.png" mode="aspectFit"></image>
+ <image src="../../static/img/logo1.png" mode="aspectFit"></image>
</view>
</view>
<view class="content">
@@ -18,7 +18,7 @@
<view class="box-icon">
<uni-icons type="person" size="20" color="#707070"></uni-icons>
</view>
- <view class="box-text">璐﹀彿:</view>
+ <view class="box-text">璩櫉:</view>
<view class="box-input">
<input type="text" placeholder="璇疯緭鍏ヨ处鍙�" v-model="user.userName"
placeholder-style="font-size:14px;color:#ccc;">
@@ -30,7 +30,7 @@
<view class="box-icon">
<uni-icons type="locked" size="20" color="#707070"></uni-icons>
</view>
- <view class="box-text">瀵嗙爜:</view>
+ <view class="box-text">瀵嗙⒓:</view>
<view class="box-input">
<input :password="!showPassword" placeholder="璇疯緭鍏ュ瘑鐮�" v-model="user.password"
placeholder-style="font-size:14px;color:#ccc;" >
@@ -43,7 +43,7 @@
<!-- 璁颁綇瀵嗙爜 -->
<view class="check">
<view class="check-left">
- <view>璁颁綇瀵嗙爜</view>
+ <view>瑷樹綇瀵嗙⒓</view>
</view>
<view class="check-right">
<switch :checked='remberPassword' color="#FFCC33" style="zoom:.5" @change="remberChange"/>
@@ -73,12 +73,12 @@
<view class="popup-item-right"><input type="text" v-model="url.port"></view>
</view>
<view class="popup-item">
- <view class="popup-item-left">椤圭洰:</view>
+ <view class="popup-item-left">URL:</view>
<view class="popup-item-right"><input type="text" v-model="url.project"></view>
</view>
<view class="btn">
<view class="btn-left" @click="close">鍙栨秷</view>
- <view class="btn-right" @click="settingConfirm">纭</view>
+ <view class="btn-right" @click="settingConfirm">纰鸿獚</view>
</view>
</view>
</uni-popup>
@@ -122,7 +122,7 @@
},
load: {
loading: false,
- btnText: '鐧诲綍'
+ btnText: '鐧婚寗'
},
msgType: 'success',
filename: '',
@@ -177,7 +177,7 @@
fail(result) {
uni.showToast({
icon: 'error',
- title: '璇锋眰澶辫触'
+ title: '璜嬫眰澶辨晽'
})
},
data: {
@@ -190,7 +190,7 @@
success(result) {
if (result.statusCode === 404) {
uni.showToast({
- title: '鐧诲綍澶辫触',
+ title: '鐧婚寗澶辨晽',
icon: "error"
})
return
@@ -198,7 +198,7 @@
let res = result.data
if (res.code === 200) {
that.load.loading = true;
- that.load.btnText = '鐧诲綍涓�';
+ that.load.btnText = '鐧婚寗涓�';
uni.setStorageSync('token', res.data.token);
if(that.remberPassword){
uni.setStorageSync('user', that.user);
@@ -207,7 +207,7 @@
}
setTimeout(() => {
uni.showToast({
- title: '鐧诲綍鎴愬姛'
+ title: '鐧婚寗鎴愬姛'
})
setTimeout(() => {
uni.reLaunch({
@@ -261,7 +261,7 @@
var res = res.data
if (res.data) {
that.filename = res.data.path
- that.dialogContent = '鍙戠幇鏂扮増鏈�:' + res.data.version + ', 鏄惁绔嬪嵆鏇存柊'
+ that.dialogContent = '鐧肩従鏂扮増鏈�:' + res.data.version + ', 鏄惁绔嬪嵆鏇存柊'
that.$refs.upVersion.open()
} else {
uni.showToast({
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 8af03fd..4b00253 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -2,12 +2,12 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">鎵樼洏鐮�:</view>
+ <view class="code-decs">鎵樼洡纰�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
<view class="item">
- <view class="code-decs">鐗╂枡鐮�:</view>
+ <view class="code-decs">鐗╂枡纰�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
<view class="item-right">
<button></button>
@@ -27,7 +27,7 @@
<view class="left-item">{{i + 1}}</view>
</view>
<view class="list-left-item">
- <view class="desc">缂栫爜锛�</view>
+ <view class="desc">绶ㄧ⒓锛�</view>
<view class="left-item">
<uni-tag :text="item.matnr" type="primary"></uni-tag>
</view>
@@ -37,11 +37,11 @@
<view class="left-item">{{item.maktx}}</view>
</view>
<view class="list-left-item">
- <view class="desc">瑙勬牸锛�</view>
+ <view class="desc">瑕忔牸锛�</view>
<view class="left-item">{{item.specs}}</view>
</view>
<view class="list-left-item">
- <view class="desc">鎵瑰彿锛�</view>
+ <view class="desc">鎵硅櫉锛�</view>
<view class="left-item">
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
@@ -53,7 +53,7 @@
</view>
</view> -->
<view class="list-left-item">
- <view class="desc">鏁伴噺锛�</view>
+ <view class="desc">鏁搁噺锛�</view>
<view class="left-item">{{item.anfme}}</view>
</view>
</view>
@@ -66,7 +66,7 @@
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
<button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+ <button size="mini" type="primary" @click="combConfirm('warn')">绲勬墭</button>
</view>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -76,14 +76,14 @@
<!-- 鏍囬 -->
<view class="title">淇敼</view>
<view class="popup-item">
- <view class="popup-item-left">缂栫爜:</view>
+ <view class="popup-item-left">绶ㄧ⒓:</view>
<view class="popup-item-right">
<input type="text" v-model="matnr" disabled="true"
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
<view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
+ <view class="popup-item-left">鎵硅櫉:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
</view>
<!-- <view class="popup-item">
@@ -91,7 +91,7 @@
<view class="popup-item-right"><input type="text" v-model="weight"></view>
</view> -->
<view class="popup-item">
- <view class="popup-item-left">鏁伴噺:</view>
+ <view class="popup-item-left">鏁搁噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
</view>
@@ -120,14 +120,14 @@
<!-- 纭缁勬墭 -->
<view>
<uni-popup ref="combConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+ <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纰鸿獚" :title="title" :content="content"
@confirm="comb" @close="combClose"></uni-popup-dialog>
</uni-popup>
</view>
<!-- 纭閲嶇疆 -->
<view>
<uni-popup ref="resetConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+ <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纰鸿獚" :title="title" :content="content"
@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
</uni-popup>
</view>
@@ -177,7 +177,7 @@
var len = this.barcode.length
if (len != 8) {
uni.showToast({
- title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ title: '鎵樼洡纰兼湁瑾よ珛閲嶈│',
icon: "none",
position: 'top'
});
@@ -331,7 +331,7 @@
this.removeNum = i
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
+ this.content = '鏄惁绉婚櫎鐣跺墠鍟嗗搧!'
this.$refs.alertDialog.open(i)
},
// 纭绉婚櫎
@@ -362,7 +362,7 @@
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
+ this.content = '鏄惁鐝惧湪绲勬墭!'
this.$refs.combConfirm.open()
},
combClose() {
@@ -372,18 +372,18 @@
uni.vibrateShort();
let that = this;
if (that.barcode === '') {
- this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+ this.messageText = "璜嬫巸鎻忔墭鐩ゆ纰�"
this.messageToggle('error')
return;
}
if (that.dataList.length === 0) {
- this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
+ this.messageText = "璜嬫坊鍔犲晢鍝佸垪琛�"
this.messageToggle('error')
return;
}
for (var i = 0; i < that.dataList.length; i++) {
if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
- this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+ this.messageText = that.dataList[i].matnr + '绲勬墭鏁搁噺涓嶈兘鐐�0'
this.messageToggle('error')
return;
}
@@ -402,11 +402,11 @@
var res = result.data
if (res.code === 200) {
that.resst();
- that.messageText = "缁勬墭鎴愬姛"
+ that.messageText = "绲勬墭鎴愬姛"
that.messageToggle('success')
- const innerAudioContext = uni.createInnerAudioContext();
- innerAudioContext.src = '/static/music/pakinOk.mp3';
- innerAudioContext.play()
+ // const innerAudioContext = uni.createInnerAudioContext();
+ // innerAudioContext.src = '/static/music/pakinOk.mp3';
+ // innerAudioContext.play()
} else if (res.code == 403) {
that.messageText = res.msg
that.messageToggle('error')
diff --git a/static/img/logo1.png b/static/img/logo1.png
new file mode 100644
index 0000000..2fb7ab0
--- /dev/null
+++ b/static/img/logo1.png
Binary files differ
diff --git a/static/img/logo2.png b/static/img/logo2.png
new file mode 100644
index 0000000..ddd1853
--- /dev/null
+++ b/static/img/logo2.png
Binary files differ
--
Gitblit v1.9.1