From 881616e9071567ab24ba0c590dd8a2e59b6c307c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 22 五月 2023 08:40:27 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 126 +++++++++++++++++++++---------------------
pages/mat/matSelected.vue | 4
pages/order/orderPutDown.vue | 14 ++--
pages/order/orderPakin.vue | 14 ++--
pages/order/orderPutOn.vue | 4
pages/pakin/pakin.vue | 6 +-
6 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index aae41d9..7f03271 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -26,34 +26,34 @@
cuIcon: 'pullup',
url: '/pakin/pakin'
},
- // {
- // title: '璁㈠崟鍏ュ簱',
- // name: 'orderPakin',
- // color: 'blue',
- // cuIcon: 'pullup',
- // url: '/order/orderPakin'
- // },
- // {
- // title: '鎵撳嵃',
- // name: 'print',
- // color: 'purple',
- // cuIcon: 'text',
- // url: '/print/print'
- // },
- // {
- // title: '璁㈠崟涓婃灦',
- // name: 'orderPutOn',
- // color: 'mauve',
- // cuIcon: 'pullup',
- // url: '/order/orderPutOn'
- // },
- // {
- // title: '璁㈠崟涓嬫灦',
- // name: 'orderPutDown',
- // color: 'pink',
- // cuIcon: 'pulldown',
- // url: '/order/orderPutDown'
- // },
+ {
+ title: '璁㈠崟鍏ュ簱',
+ name: 'orderPakin',
+ color: 'blue',
+ cuIcon: 'pullup',
+ url: '/order/orderPakin'
+ },
+ {
+ title: '鎵撳嵃',
+ name: 'print',
+ color: 'purple',
+ cuIcon: 'text',
+ url: '/print/print'
+ },
+ {
+ title: '璁㈠崟涓婃灦',
+ name: 'orderPutOn',
+ color: 'mauve',
+ cuIcon: 'pullup',
+ url: '/order/orderPutOn'
+ },
+ {
+ title: '璁㈠崟涓嬫灦',
+ name: 'orderPutDown',
+ color: 'pink',
+ cuIcon: 'pulldown',
+ url: '/order/orderPutDown'
+ },
{
title: '搴撳瓨鏌ヨ',
name: 'stockQuery',
@@ -61,41 +61,41 @@
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: '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: 'logOut',
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index a0d2b69..2c8db02 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -13,14 +13,14 @@
<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">
<view class="form-item-desc"><text>鎵瑰彿</text></view>
<view class="form-item-content">
<view class="form-input">
<input type="text" v-model="mat.batch">
</view>
</view>
- </view>
+ </view> -->
<view class="form-item">
<view class="form-item-desc"><text>鏁伴噺</text></view>
<view class="form-item-content">
diff --git a/pages/order/orderPakin.vue b/pages/order/orderPakin.vue
index 54522dd..bda94f7 100644
--- a/pages/order/orderPakin.vue
+++ b/pages/order/orderPakin.vue
@@ -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>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -82,10 +82,10 @@
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
- <view class="popup-item">
+ <!-- <view class="popup-item">
<view class="popup-item-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view>
+ </view> -->
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -113,7 +113,7 @@
<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
</uni-popup>
</view>
- <!-- 纭缁勬墭 -->
+ <!-- 纭鍏ュ簱 -->
<view>
<uni-popup ref="combConfirm" type="dialog">
<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
@@ -273,7 +273,7 @@
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
+ this.content = '鏄惁鐜板湪鍏ュ簱!'
this.$refs.combConfirm.open()
},
comb() {
@@ -291,7 +291,7 @@
}
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;
}
@@ -310,7 +310,7 @@
var res = result.data
if (res.code === 200) {
that.resst();
- that.messageText = "缁勬墭鎴愬姛"
+ that.messageText = "鍏ュ簱鎴愬姛"
that.messageToggle('success')
} else if (res.code == 403) {
that.messageText = res.msg
diff --git a/pages/order/orderPutDown.vue b/pages/order/orderPutDown.vue
index 3094c4f..30c8ef3 100644
--- a/pages/order/orderPutDown.vue
+++ b/pages/order/orderPutDown.vue
@@ -64,7 +64,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>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -80,10 +80,10 @@
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
- <view class="popup-item">
+ <!-- <view class="popup-item">
<view class="popup-item-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view>
+ </view> -->
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -111,7 +111,7 @@
<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
</uni-popup>
</view>
- <!-- 纭缁勬墭 -->
+ <!-- 纭涓嬫灦 -->
<view>
<uni-popup ref="combConfirm" type="dialog">
<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
@@ -292,7 +292,7 @@
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
+ this.content = '鏄惁鐜板湪涓嬫灦!'
this.$refs.combConfirm.open()
},
comb() {
@@ -310,7 +310,7 @@
}
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;
}
@@ -329,7 +329,7 @@
var res = result.data
if (res.code === 200) {
that.resst();
- that.messageText = "缁勬墭鎴愬姛"
+ that.messageText = "涓嬫灦鎴愬姛"
that.messageToggle('success')
} else if (res.code == 403) {
that.messageText = res.msg
diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue
index ad4a1a2..4469957 100644
--- a/pages/order/orderPutOn.vue
+++ b/pages/order/orderPutOn.vue
@@ -80,10 +80,10 @@
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
- <view class="popup-item">
+ <!-- <view class="popup-item">
<view class="popup-item-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view>
+ </view> -->
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 1b57437..116e5c1 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -76,10 +76,10 @@
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
- <view class="popup-item">
- <view class="popup-item-left">鍚堝悓鍙�:</view>
+ <!-- <view class="popup-item">
+ <view class="popup-item-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view>
+ </view> -->
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
--
Gitblit v1.9.1