From a42b3936ec8b02ebdae624cc2e52a685775816c8 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 29 二月 2024 15:43:39 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 2
pages/pakin/goodsUp2.vue | 37 ++++++++++--------
pages.json | 8 ++++
pages/pakin/sourceMenu.vue | 68 ++++++++++++++++++++++++++++++++++
4 files changed, 98 insertions(+), 17 deletions(-)
diff --git a/pages.json b/pages.json
index a834aef..2e8fc0f 100644
--- a/pages.json
+++ b/pages.json
@@ -169,6 +169,14 @@
"style": {
"navigationBarTitleText": "閫�鍑虹櫥褰�"
}
+ },
+ {
+ "path" : "pages/pakin/sourceMenu",
+ "style" :
+ {
+ "navigationBarTitleText" : "鏉ユ簮鍦�",
+ "enablePullDownRefresh" : false
+ }
}
],
"globalStyle": {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 760ad7d..927981c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -36,7 +36,7 @@
name: 'GoodsUp',
color: 'cyan',
cuIcon: 'pullup',
- url: '/pakin/goodsUp2'
+ url: '/pakin/sourceMenu'
},
{
title: '骞冲簱涓嬫灦',
diff --git a/pages/pakin/goodsUp2.vue b/pages/pakin/goodsUp2.vue
index a9ca7f0..4bb326e 100644
--- a/pages/pakin/goodsUp2.vue
+++ b/pages/pakin/goodsUp2.vue
@@ -6,10 +6,6 @@
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="code" :focus="barcodeFocus" @input="findCode()">
</view>
<view class="item">
- <view class="code-decs">鏉ユ簮鍦�:</view>
- <uni-combox :candidates="orderNoList" placeholder="璇烽�夋嫨鏉ユ簮鍦�" v-model="origin"></uni-combox>
- </view>
- <view class="item">
<view class="code-decs">璐т富:</view>
<uni-combox :candidates="ownerList" placeholder="璇烽�夋嫨璐т富" v-model="owner"></uni-combox>
</view>
@@ -17,15 +13,15 @@
<view class="code-decs">搴撲綅鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo" >
</view>
- <view class="item">
+ <!-- <view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
- <view class="item-right">
- <button></button>
- <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
- <uni-icons type="right" color="#c1c1c1"></uni-icons>
- </view>
- </view>
+ <view class="item-right"> -->
+ <!-- <button></button> -->
+ <!-- <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text> -->
+ <!-- <uni-icons type="right" color="#c1c1c1"></uni-icons> -->
+ <!-- </view>
+ </view> -->
</view>
<view class="mat-list-title">
鍟嗗搧鍒楄〃
@@ -141,7 +137,7 @@
baseUrl: '',
token: '',
barcode: '',
- dataList: [],
+ dataList: [{}],
count: 0,
rowNum: '',
matnr: '',
@@ -164,7 +160,16 @@
}
},
onLoad() {
-
+ // 娌″暐鐢ㄤ簡
+ let that = this
+ // const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+ const eventChannel = this.getOpenerEventChannel();
+
+ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ eventChannel.on('item', function(data) {
+ // console.log(data.item);
+ that.origin = data.item
+ })
},
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
@@ -527,7 +532,7 @@
.code {
width: 100%;
position: fixed;
- min-height: 400rpx;
+ min-height: 300rpx;
background-color: #FFF;
z-index: 10;
}
@@ -567,7 +572,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 400rpx;
+ margin-top: 300rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
@@ -584,7 +589,7 @@
}
.list:first-child {
- margin-top: 500rpx;
+ margin-top: 440rpx;
}
.list:last-child {
diff --git a/pages/pakin/sourceMenu.vue b/pages/pakin/sourceMenu.vue
new file mode 100644
index 0000000..5af71ee
--- /dev/null
+++ b/pages/pakin/sourceMenu.vue
@@ -0,0 +1,68 @@
+<template>
+ <view>
+ <view class="card" v-for="item in menuList" @click="chose(item)">
+ {{item}}
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ baseUrl: '',
+ token: '',
+ menuList: []
+ }
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.getOrderNoList()
+ },
+ methods: {
+ getOrderNoList() {
+ let that = this
+ uni.request({
+ url: this.baseUrl + '/originRule/list/all',
+ method: 'POST',
+ success(res) {
+ res = res.data
+ that.menuList = res.data
+ }
+ })
+ },
+ chose(item) {
+ let that = this
+ uni.navigateTo({
+ url: "./goodsUp2",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('item', {
+ item: item
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ // that.matnr = data.data
+ that.input(that.matnr)
+ },
+ },
+
+
+ });
+ }
+ }
+ }
+</script>
+
+<style>
+ .card {
+ margin: 20rpx;
+ padding: 30rpx;
+ background-color: #157ec1;
+ border-radius: 20rpx;
+ color: #FFF;
+ }
+</style>
--
Gitblit v1.9.1