From 65256395588a29f150b41576fbeece0de533e288 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 02 十二月 2024 08:18:09 +0800
Subject: [PATCH] 项目框架搭建完成
---
pages/pakin/WarehouseIn.vue | 1
pages/home/home.vue | 99 +++++++++++++++++++++++++------------------------
pages/login/login.vue | 12 +++---
pages/warehouse/outMats.vue | 5 +-
4 files changed, 59 insertions(+), 58 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 76a342f..7ce7cc5 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -69,55 +69,56 @@
cuIcon: 'pullup',
url: '/warehouse/orderList'
},
- {
- title: '璁㈠崟缁勬墭',
- name: 'orderComb',
- color: 'olive',
- cuIcon: 'pulldown',
- url: '/order/orderComb'
- },
- {
- title: '骞舵澘鍏ュ簱',
- name: 'orderPickConfirm',
- color: 'green',
- cuIcon: 'pulldown',
- url: '/order/orderPickConfirm2'
- },
- {
- title: '骞舵澘閫斾腑鎷ｆ枡',
- name: 'ParallelBoard',
- color: 'green',
- cuIcon: 'pulldown',
- url: '/order/orderListParallelBoard'
- },
- {
- title: '鎷ｆ枡閫斾腑骞舵澘',
- name: 'PickBoard',
- color: 'orange',
- cuIcon: 'pulldown',
- url: '/order/orderListPickBoard'
- },
- {
- title: '澶氭骞舵澘',
- name: 'BoardMany',
- color: 'yellow',
- cuIcon: 'pulldown',
- url: '/order/mergeBoardManyTimes'
- },
- {
- title: '鍒朵护鍏ュ簱',
- name: 'pakin',
- color: 'green',
- cuIcon: 'pulldown',
- url: '/order/zlOrderPakin'
- },
- {
- title: '鍟嗗搧淇℃伅鏌ヨ',
- name: 'MatInformation',
- color: 'red',
- cuIcon: 'pulldown',
- url: '/mat/matInformation'
- },
+ // {
+ // title: '璁㈠崟缁勬墭',
+ // name: 'orderComb',
+ // color: 'olive',
+ // cuIcon: 'pulldown',
+ // url: '/order/orderComb'
+ // }
+ // ,
+ // {
+ // title: '骞舵澘鍏ュ簱',
+ // name: 'orderPickConfirm',
+ // color: 'green',
+ // cuIcon: 'pulldown',
+ // url: '/order/orderPickConfirm2'
+ // },
+ // {
+ // title: '骞舵澘閫斾腑鎷ｆ枡',
+ // name: 'ParallelBoard',
+ // color: 'green',
+ // cuIcon: 'pulldown',
+ // url: '/order/orderListParallelBoard'
+ // },
+ // {
+ // title: '鎷ｆ枡閫斾腑骞舵澘',
+ // name: 'PickBoard',
+ // color: 'orange',
+ // cuIcon: 'pulldown',
+ // url: '/order/orderListPickBoard'
+ // },
+ // {
+ // title: '澶氭骞舵澘',
+ // name: 'BoardMany',
+ // color: 'yellow',
+ // cuIcon: 'pulldown',
+ // url: '/order/mergeBoardManyTimes'
+ // },
+ // {
+ // title: '鍒朵护鍏ュ簱',
+ // name: 'pakin',
+ // color: 'green',
+ // cuIcon: 'pulldown',
+ // url: '/order/zlOrderPakin'
+ // },
+ // {
+ // title: '鍟嗗搧淇℃伅鏌ヨ',
+ // name: 'MatInformation',
+ // color: 'red',
+ // cuIcon: 'pulldown',
+ // url: '/mat/matInformation'
+ // },
// {
// title: '搴撳瓨鏌ヨ',
// name: 'stockQuery',
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 4c0c546..d5a1290 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -76,13 +76,13 @@
<view class="popup-item-left">椤圭洰:</view>
<view class="popup-item-right"><input type="text" v-model="url.project"></view>
</view>
- <view class="popup-item">
+<!-- <view class="popup-item">
<view class="popup-item-left">浠撳簱:</view>
<view class="popup-item-right" style="border:none;padding: 0;">
<uni-combox style="height: 34rpx;" :candidates="storeList" placeholder="閫夋嫨浠撳簱" v-model="store"
@input="getStore" />
</view>
- </view>
+ </view> -->
<view class="btn">
<view class="btn-left" @click="close">鍙栨秷</view>
<view class="btn-right" @click="settingConfirm">纭</view>
@@ -201,10 +201,10 @@
},
onLogin() {
let that = this
- if (that.url.storeId == null) {
- uni.showToast({ icon: 'error', title: '璇烽�夋嫨浠撳簱' })
- return
- }
+ // if (that.url.storeId == null) {
+ // uni.showToast({ icon: 'error', title: '璇烽�夋嫨浠撳簱' })
+ // return
+ // }
uni.request({
url: that.baseUrl + '/login.action',
fail(result) {
diff --git a/pages/pakin/WarehouseIn.vue b/pages/pakin/WarehouseIn.vue
index ed23e47..416b3b0 100644
--- a/pages/pakin/WarehouseIn.vue
+++ b/pages/pakin/WarehouseIn.vue
@@ -212,6 +212,7 @@
var res = result.data
if (res.code === 200) {
that.dataList = res.data;
+ console.log(res);
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'center' })
setTimeout(() => {
diff --git a/pages/warehouse/outMats.vue b/pages/warehouse/outMats.vue
index a9a1b1e..e022139 100644
--- a/pages/warehouse/outMats.vue
+++ b/pages/warehouse/outMats.vue
@@ -44,8 +44,8 @@
<text class="desc_connect">{{item.maktx}}</text>
</view>
<view>
- <text class="desc_name">璁㈠崟鍙凤細</text>
- <text class="desc_connect">{{item.orderNo}}</text>
+ <text class="desc_name">鎵规锛�</text>
+ <text class="desc_connect">{{item.batch}}</text>
</view>
<view style="display: flex;">
<text class="desc_name">鏁伴噺锛�</text>
@@ -196,7 +196,6 @@
}
let optDataList = []
for (let k of that.dataList) {
- console.log(k);
if (k.checked) {
optDataList.push(k)
}
--
Gitblit v1.9.1