From c0010c1135298e1b7422af4ce1747a7f3ce86978 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 12 十月 2022 19:28:59 +0800
Subject: [PATCH] #
---
pages/login/login.vue | 2
pages/basics/startPakin.vue | 336 ++++++++++++++++++++++++++++++++++++++++++
manifest.json | 2
pages/basics/order.vue | 13 -
pages.json | 9 +
pages/index/index.vue | 72 ++++----
6 files changed, 387 insertions(+), 47 deletions(-)
diff --git a/manifest.json b/manifest.json
index 5c955a5..1a61894 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "涓壃WMS",
"appid" : "__UNI__DA5854D",
"description" : "",
- "versionName" : "20220821A",
+ "versionName" : "20221012A",
"versionCode" : 103,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/pages.json b/pages.json
index 6e31da3..b700d37 100644
--- a/pages.json
+++ b/pages.json
@@ -168,6 +168,15 @@
"enablePullDownRefresh": false
}
+ },
+ {
+ "path" : "pages/basics/startPakin",
+ "style" :
+ {
+ "navigationBarTitleText": "鍚姩鍏ュ簱",
+ "enablePullDownRefresh": false
+
+ }
}
diff --git a/pages/basics/order.vue b/pages/basics/order.vue
index 952c5fb..541320f 100644
--- a/pages/basics/order.vue
+++ b/pages/basics/order.vue
@@ -33,17 +33,6 @@
<view class="square-title">
<view class="title-sign"><view class="sign"></view></view>
<view class="title-text"><text>鍟嗗搧鍒楄〃</text></view>
- <view v-show="matList.length != 0" class="lable">
- <label class="label-btn" style="width: 170rpx;line-height: 95rpx;" >
- <checkbox :checked="check" @click="allChecked()">{{checkText}}</checkbox>
- </label>
- <label class="label-btn" >
- <text @click="reChecked()">鍙嶉��</text>
- </label>
- <label >
- <uni-icons type="trash" size="25" color="#a5a5a5" @click="remove()"></uni-icons>
- </label>
- </view>
</view>
</view>
@@ -299,7 +288,7 @@
}),
method: 'POST',
header: {
- 'token':uni.getStorageSync('token')
+ 'token':uni.getStorageSync('token'),
},
success(result) {
uni.showLoading();
diff --git a/pages/basics/startPakin.vue b/pages/basics/startPakin.vue
new file mode 100644
index 0000000..0850ba6
--- /dev/null
+++ b/pages/basics/startPakin.vue
@@ -0,0 +1,336 @@
+<template>
+ <view>
+ <scroll-view scroll-y>
+ <!-- 鎵樼洏鐮佺獥鍙� -->
+ <view class="square-2">
+ <view class="square-title">
+ <view class="title-sign"><view class="sign"></view></view>
+ <view class="title-text"><text>鎵樼洏鏉＄爜</text></view>
+ </view>
+ <view class="square-content">
+ <view class="content-input">
+ <input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆"
+ :focus="barcodeFocus" @input="barcodeInput()" placeholder-style="line-height: 85rpx;">
+ <uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
+ </view>
+ </view>
+ </view>
+ <!-- 鍏ュ簱鍙ｇ獥鍙� -->
+ <view class="square-2">
+ <view class="square-title">
+ <view class="title-sign"><view class="sign"></view></view>
+ <view class="title-text"><text>鍏ュ簱鍙�</text></view>
+
+ </view>
+ <view class="content-combox">
+ <uni-combox emptyTips="鏆傛棤鏁版嵁"
+ :candidates="sites" v-model="siteId" @click="staNoSelect()" placeholder="璇烽�夋嫨鍏ュ簱绔欑偣">
+ </uni-combox>
+ </view>
+ </view>
+ <!-- 鍟嗗搧鍒楄〃绐楀彛 -->
+ <view class="square-1">
+ <view class="square-title">
+ <view class="title-sign"><view class="sign"></view></view>
+ <view class="title-text"><text>鍟嗗搧鍒楄〃</text></view>
+ </view>
+ </view>
+ <view class="square-none" v-show="matList.length === 0">
+ <view class="v-show">鏆傛棤鏇村鏁版嵁...</view>
+ </view>
+ <!-- 鍟嗗搧鍒楄〃 -->
+ <checkbox-group @change="checkbox">
+ <view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
+ <view class="data-list-left">
+ <!-- <view>
+ <checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
+ </view> -->
+ <view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
+ <view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
+ <view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
+ <view>
+ <text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
+ </view>
+ </view>
+ </view>
+ </checkbox-group>
+ </scroll-view>
+ <!-- 搴曢儴鎸夐挳 -->
+ <view class="footer flex justify-around">
+ <label class="label-btn" style="width: 150rpx;">
+ <button class="cu-btn" @click="resst()">閲嶇疆</button>
+ </label>
+ <label class="label-btn">
+ <button class="cu-btn bg-blue " @click="startPakin()">鍚姩鍏ュ簱</button>
+ </label>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ barcode: null,
+ barcodeFocus: true,
+ matList:[],
+ sites: [1,3,5,7,9,11,13,15],
+ siteId: '',
+ }
+ },
+ mounted(){
+ const UIP = uni.getStorageSync('UIP');
+ this.baseIP = UIP;
+ const UPORT = uni.getStorageSync('UPORT');
+ this.basePORT = UPORT
+ const PROJ = uni.getStorageSync('UPROJ');
+ this.baseUrl = PROJ
+ this.getUrl()
+ },
+ methods: {
+ // 鑾峰彇url
+ getUrl() {
+ this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
+ },
+ // barcode input 浜嬩欢
+ barcodeInput() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + "/waitPakin/list/auth",
+ header: {'token':uni.getStorageSync('token'),
+ 'appkey':'ea1f0459efc02a79f046f982767939ae'},
+ method:'GET',
+ data: {zpallet:that.barcode},
+ success(result) {
+ var res = result.data
+ if (res.code == 200) {
+ that.matList = res.data.records
+ } else if (res.code == 403) {
+ uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ uni.showToast({title: res.msg, icon: "none",position: 'top'})
+ }
+ }
+ })
+ },
+ // 鎵樼洏鐮佹湁璇噸缃�
+ barcodeFocuss() {
+ let that = this;
+ that.barcodeFocus = false;
+ setTimeout(()=>{
+ that.barcode = '';
+ that.barcodeFocus = true;
+ }, 100);
+ },
+ // 娓呯┖杈撳叆妗�
+ removeBarcode() {
+ this.barcode = ''
+ },
+ // 閲嶇疆
+ resst() {
+ this.barcodeFocuss()
+ this.matList = []
+ this.siteId = ''
+ },
+ // 鍚姩鍏ュ簱
+ startPakin() {
+ let that = this
+ if (that.barcode === '') {
+ uni.showToast({title: '璇锋壂鎻忔墭鐩樻潯鐮侊紒', icon: "none", position: 'top'});
+ return;
+ }
+ if (that.siteId === '') {
+ uni.showToast({title: '璇烽�夋嫨鍏ュ簱鍙ｏ紒', icon: "none", position: 'top'});
+ return;
+ }
+ if (that.matList.length == 0 ) {
+ uni.showToast({title: '璇风‘璁ゅ叆搴撳晢鍝侊紒', icon: "none", position: 'top'});
+ return;
+ }
+ uni.request({
+ url: that.commonUrl + "open/asrs/pakin/start/default/v1",
+ header: {'token':uni.getStorageSync('token'),
+ },
+ method:'POST',
+ data: {startInItems:[{
+ 聽聽聽聽聽聽聽聽聽聽聽聽inSite:聽that.siteId,
+ 聽聽聽聽聽聽聽聽聽聽聽聽barcode:聽that.barcode
+ 聽聽聽聽聽聽聽聽}]},
+ success(result) {
+ console.log(result);
+ }
+ })
+ }
+ }
+ }
+</script>
+
+<style>
+ .revise-box {
+ position: relative;
+ width: 500rpx;
+ height: 400rpx;
+ border-radius: 25px;
+ }
+ .revise-box-top {
+ width: 400rpx;
+ height: 120rpx;
+ border-radius: 25px;
+ }
+ .changeBox {
+ width: 400rpx;
+ height: 100rpx;
+ }
+ .num-box {
+ margin-left: 100rpx;
+ }
+ .revise-box-buttom{
+ margin-left: 190rpx;
+ }
+ .pak-seach-box {
+ background-color: #FFFFFF;
+ margin: 15rpx 15rpx 0rpx 15rpx;
+ width: 96%;
+ height: 150rpx;
+ border-radius: 20rpx;
+ }
+ .box-top{
+ display: block;
+ height: 60rpx;
+ width: 720rpx;
+ }
+ .color-block-blue {
+ background-color: #1E9FFF;
+ display: inline-block;
+ float: left;
+ margin: 15rpx 15rpx 0 15rpx;
+ width: 12rpx;
+ height: 40rpx;
+ border: 5rpx solid #1E9FFF;
+ border-radius: 20rpx;
+ }
+ .title {
+ display: inline-block;
+ float: left;
+ font-size: 34rpx;
+ font-weight: 700;
+ height: 50rpx;
+ line-height: 50rpx;
+ margin-top: 10rpx;
+ }
+ .box-buttom {
+ display: inline-block;
+ background-color: #ededed;
+ width: 65%;
+ height: 60rpx;
+ border-radius: 20rpx;
+ margin: 15rpx 15rpx 0rpx 15rpx;
+ }
+ .box-buttom input {
+ width: 75%;
+ float: left;
+ margin: 8rpx 10rpx 0rpx 25rpx;
+ }
+ .box-buttom .search-icon{
+ width: 60rpx;
+ height: 60rpx;
+ float: right;
+ margin-top: 5rpx;
+ margin-right: 10rpx;
+ }
+ /* .pak-seach-box input {
+ background-color: #ededed;
+ border: 1rpx solid #d8d8d8;
+ display: inline-block;
+ border-radius: 20rpx;
+ float: left;
+ width: 70%;
+ height: 60rpx;
+ line-height: 60rpx;
+ margin: 15rpx 15rpx 0rpx 15rpx;
+ padding-left: 20rpx;
+ } */
+ .pak-seach-box button {
+ background-color: #1E9FFF;
+ color: #ffffff;
+ display: inline-block;
+ float: right;
+ width: 180rpx;
+ height: 60rpx;
+ margin: 15rpx 15rpx 0rpx 15rpx;
+ line-height: 60rpx;
+ }
+ .pakin-btn {
+ background-color: #1E9FFF;
+ }
+ .pak-data-box {
+ background-color: #F1F1F1;
+ margin: 15rpx 15rpx 0rpx 15rpx;
+ width: 96%;
+ height: 70rpx;
+ border-radius: 20rpx;
+ }
+ .pak-data-box .box-top {
+ background-color: #FFFFFF;
+ height: 70rpx;
+ border-radius: 20rpx 20rpx 20rpx 20rpx;
+ }
+ .bg-false {
+ background-color: #FFFFFF;
+ }
+ .bg-true {
+ background-color: #ebebeb;
+ }
+ .data-list {
+ border-bottom: 1px solid #d8d8d8;
+ height: 180rpx;
+ margin: 15rpx;
+ border-radius: 20rpx;
+ }
+ .data-list:first-child {
+ margin-top: 20rpx;
+ }
+ .data-list:last-child {
+ margin-bottom: 160rpx;
+ }
+ /* .data-list-left {
+ display: inline-block;
+ float: left;
+ text-align: center;
+ width: 100rpx;
+ height: 180rpx;
+ line-height: 180rpx;
+ } */
+ .data-list-left {
+ display: inline-block;
+ float: left;
+ margin-left: 6%;
+ height: 180rpx;
+ color: #676767;
+ }
+ .matnr {
+ padding-top: 10rpx;
+ }
+ .data-list-right {
+ display: inline-block;
+ float: right;
+ height: 180rpx;
+ line-height: 180rpx;
+ }
+ /* display: inline-block;
+ float: right;
+ width: 200rpx;
+ height: 180rpx;
+ line-height: 180rpx; */
+ .data-list-right label {
+ display: inline-block;
+ float: left;
+ width: 80rpx;
+ height: 180rpx;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 01c6c0e..0bc6bfc 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -23,36 +23,42 @@
data() {
return {
elements:[
- {
- title: '涓婃灦绠＄悊',
- name: 'putOnSale',
- color: 'blue',
- cuIcon: 'video'
- },
- {
- title: '涓嬫灦绠＄悊',
- name: 'offLines',
- color: 'blue',
- cuIcon: 'copy'
- },
+ // {
+ // title: '涓婃灦绠＄悊',
+ // name: 'putOnSale',
+ // color: 'blue',
+ // cuIcon: 'video'
+ // },
+ // {
+ // title: '涓嬫灦绠＄悊',
+ // name: 'offLines',
+ // color: 'blue',
+ // cuIcon: 'copy'
+ // },
{
title: '缁勬墭鍏ュ簱',
name: 'pakin',
color: 'blue',
cuIcon: 'copy'
},
- // {
- // title: '璁㈠崟缁勬墭',
- // name: 'order',
- // color: 'blue',
- // cuIcon: 'goods'
- // },
{
- title: '搴撳瓨鏌ヨ',
- name: 'stockQuery',
+ title: '璁㈠崟缁勬墭',
+ name: 'order',
color: 'blue',
- cuIcon: 'searchlist'
+ cuIcon: 'goods'
},
+ {
+ title: '鍚姩鍏ュ簱',
+ name: 'startPakin',
+ color: 'blue',
+ cuIcon: 'goods'
+ },
+ // {
+ // title: '搴撳瓨鏌ヨ',
+ // name: 'stockQuery',
+ // color: 'blue',
+ // cuIcon: 'searchlist'
+ // },
// {
// title: '鍗曟嵁鍑哄簱',
@@ -72,18 +78,18 @@
// color: 'blue',
// cuIcon: 'video'
// },
- {
- title: '搴撳瓨鐩樼偣',
- name: 'stoCheck',
- color: 'blue',
- cuIcon: 'safe'
- },
- {
- title: '骞充粨搴撳瓨鐩樼偣',
- name: 'manStoCheck',
- color: 'blue',
- cuIcon: 'safe'
- },
+ // {
+ // title: '搴撳瓨鐩樼偣',
+ // name: 'stoCheck',
+ // color: 'blue',
+ // cuIcon: 'safe'
+ // },
+ // {
+ // title: '骞充粨搴撳瓨鐩樼偣',
+ // name: 'manStoCheck',
+ // color: 'blue',
+ // cuIcon: 'safe'
+ // },
// {
// title: '骞充粨搴撳瓨鐩樼偣',
// name: 'manStoCheck',
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 809a8c7..618a2bf 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -294,7 +294,7 @@
}
uni.setStorageSync('token', res.data.token);
setTimeout(() => {
- uni.navigateBack(); // 灏忕▼搴忕敤杩欎釜 鎶婇椤佃矾鐢辨斁绗竴涓�
+ //uni.navigateBack(); // 灏忕▼搴忕敤杩欎釜 鎶婇椤佃矾鐢辨斁绗竴涓�
uni.reLaunch({
url: '../index/index'
});
--
Gitblit v1.9.1