From af9cc77ed65541d6d48967b2298ac8cb59ad1779 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 27 七月 2023 10:05:15 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 153 ++++++++++++++++++++++++++------------------------
pages/order/orderPutOn2.vue | 2
pages.json | 18 ++++++
pages/mat/matQuery.vue | 1
pages/pakin/pakin.vue | 2
5 files changed, 100 insertions(+), 76 deletions(-)
diff --git a/pages.json b/pages.json
index 0ad18ff..e6057ec 100644
--- a/pages.json
+++ b/pages.json
@@ -97,6 +97,24 @@
}
},
{
+ "path": "pages/order/orderPutOn3",
+ "style": {
+ "navigationBarTitleText": "璁㈠崟缁勬墭3"
+ }
+ },
+ {
+ "path": "pages/order/orderList",
+ "style": {
+ "navigationBarTitleText": "璁㈠崟鍒楄〃"
+ }
+ },
+ {
+ "path": "pages/order/orderDetil",
+ "style": {
+ "navigationBarTitleText": "璁㈠崟璇︽儏"
+ }
+ },
+ {
"path": "pages/stock/changePallet",
"style": {
"navigationBarTitleText": "鎹㈡澘缁戝畾"
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 67f9fc4..3b9b912 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,33 +24,40 @@
icon: '',
elements: [],
elements2: [
+ {
+ title: '缁勬墭鍏ュ簱',
+ name: 'pakin',
+ color: 'orange',
+ cuIcon: 'pullup',
+ url: '/pakin/pakin'
+ },
// {
- // title: '缁勬墭鍏ュ簱',
- // name: 'pakin',
+ // title: '璁㈠崟缁勬墭',
+ // name: 'orderPakin',
+ // color: 'blue',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPakin'
+ // },
+ // {
+ // title: '缁勬墭涓婃灦',
+ // name: 'putOn',
// color: 'cyan',
// cuIcon: 'pullup',
- // url: '/pakin/pakin'
+ // url: '/pakin/putOn'
// },
- {
- title: '璁㈠崟缁勬墭',
- name: 'orderPakin',
- color: 'blue',
- cuIcon: 'pullup',
- url: '/order/orderPakin'
- },
- {
- title: '缁勬墭涓婃灦',
- name: 'putOn',
- color: 'cyan',
- cuIcon: 'pullup',
- url: '/pakin/putOn'
- },
{
title: '璁㈠崟缁勬墭2',
name: 'putOn',
color: 'cyan',
cuIcon: 'pullup',
url: '/order/orderPutOn2'
+ },
+ {
+ title: '璁㈠崟缁勬墭3',
+ name: 'putOn',
+ color: 'cyan',
+ cuIcon: 'pullup',
+ url: '/order/orderPutOn3'
},
// {
// title: '鎵撳嵃',
@@ -59,62 +66,62 @@
// 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',
- color: 'brown',
- 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: 'orderPutOn',
+ // color: 'mauve',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPutOn'
+ // },
+ // {
+ // title: '璁㈠崟涓嬫灦',
+ // name: 'orderPutDown',
+ // color: 'pink',
+ // cuIcon: 'pulldown',
+ // url: '/order/orderPutDown'
+ // },
+ // {
+ // title: '搴撳瓨鏌ヨ',
+ // name: 'stockQuery',
+ // color: 'brown',
+ // 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: 'logOut',
diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index e3713f5..7f48ff1 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -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
diff --git a/pages/order/orderPutOn2.vue b/pages/order/orderPutOn2.vue
index 8da6f90..18582a4 100644
--- a/pages/order/orderPutOn2.vue
+++ b/pages/order/orderPutOn2.vue
@@ -156,7 +156,7 @@
order: '',
barcode: '',
barcodeFocus: '',
- dataList: [],
+ dataList: [{}],
checkedDataList: [],
count: 0,
rowNum: '',
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 456e187..483aa1d 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -141,7 +141,7 @@
baseUrl: '',
token: '',
barcode: '',
- dataList: [],
+ dataList: [{}],
count: 0,
rowNum: '',
matnr: '',
--
Gitblit v1.9.1