From b4416d1e1c0c292875820a3a510a1bc3488cb1f7 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 10 十一月 2022 12:37:41 +0800
Subject: [PATCH] #
---
manifest.json | 2
pages.json | 9 +++
pages/basics/pickOffLines.vue | 38 ++++++++++++
pages/basics/pickOffLinesList.vue | 79 ++++++++++++++++++++++++++
4 files changed, 126 insertions(+), 2 deletions(-)
diff --git a/manifest.json b/manifest.json
index eaa8629..4098678 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "涓壃WMS",
"appid" : "__UNI__DA5854D",
"description" : "",
- "versionName" : "20221011A",
+ "versionName" : "20221110A",
"versionCode" : 103,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/pages.json b/pages.json
index 860d843..fd721e9 100644
--- a/pages.json
+++ b/pages.json
@@ -186,6 +186,15 @@
"enablePullDownRefresh": false
}
+ },
+ {
+ "path" : "pages/basics/pickOffLinesList",
+ "style" :
+ {
+ "navigationBarTitleText": "鍗曟嵁鍒楄〃",
+ "enablePullDownRefresh": false
+
+ }
}
diff --git a/pages/basics/pickOffLines.vue b/pages/basics/pickOffLines.vue
index 11786b0..63cceff 100644
--- a/pages/basics/pickOffLines.vue
+++ b/pages/basics/pickOffLines.vue
@@ -1,7 +1,7 @@
<template>
<view>
<scroll-view scroll-y class="scroll-Y">
- <view class="square-2">
+ <!-- <view class="square-2">
<view class="square-title">
<view class="title-sign"><view class="sign"></view></view>
<view class="title-text"><text>鎷ｈ揣鍗曟潯鐮�</text></view>
@@ -11,6 +11,22 @@
<input readonly="value" v-model="doc_num" type="text" placeholder="鎵爜 / 杈撳叆"
:focus="barcodeFocus" @input="nextInput">
<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="square-content">
+ <view class="content-input-btn">
+ <input v-model="doc_num" type="text" placeholder="鎵爜 / 杈撳叆"
+ :focus="barcodeFocus" @input="nextInput" placeholder-style="line-height: 85rpx;">
+ <uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
+ </view>
+ <view class="content-btn">
+ <button class="cu-btn bg-blue pda-btn" @click="selectPakin()">+鎻愬彇</button>
</view>
</view>
</view>
@@ -123,6 +139,26 @@
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
},
+ // 閫夋嫨璁㈠崟
+ selectPakin() {
+ let that = this
+ uni.vibrateShort();
+ uni.navigateTo({
+ url: "pickOffLinesList",
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ that.doc_num = data.data
+ that.nextInput(that.doc_num)
+ },
+ },
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('commonUrl', {commonUrl:that.commonUrl })
+ },
+
+ });
+ },
nextInput() {
let that = this
uni.request({
diff --git a/pages/basics/pickOffLinesList.vue b/pages/basics/pickOffLinesList.vue
new file mode 100644
index 0000000..b0921ad
--- /dev/null
+++ b/pages/basics/pickOffLinesList.vue
@@ -0,0 +1,79 @@
+<template>
+ <view>
+ <view class="list" v-for="(item,index) in matList" :key="index" @click="chose(item.orderNo)">
+ <view class="item">
+ <view class="title">鍗曟嵁绫诲瀷锛�</view>
+ <view class="context">{{item.docType$}}</view>
+ </view>
+ <view class="item">
+ <view class="title">鍗曞彿锛�</view>
+ <view class="context">{{item.orderNo}}</view>
+ </view>
+ <view class="item">
+ <view class="title">璁㈠崟鐘舵�侊細</view>
+ <view class="context">{{item.settle$}}</view>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ commonUrl: null,
+ matList: [],
+
+ }
+ },
+ onLoad() {
+ let that = this
+ // const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+ const eventChannel = this.getOpenerEventChannel();
+
+ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ eventChannel.on('commonUrl', function(data) {
+ that.commonUrl = data.commonUrl
+ that.getList()
+ })
+ },
+ methods: {
+ getList() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + '/manPakOut/notIssued',
+ header: {'token':uni.getStorageSync('token')},
+ method: 'GET',
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.matList = res.data
+ }
+ }
+ })
+ },
+ chose(orderNo) {
+ this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: orderNo});
+ uni.navigateBack({
+
+ })
+ }
+ }
+ }
+</script>
+
+<style>
+ .list {
+ width: 96%;
+ min-height: 100rpx;
+ background-color: #FFF;
+ margin: 15rpx 2% 0 2%;
+ border-radius: 15rpx;
+ }
+ .item {
+ display: flex;
+ flex-direction: row;
+ padding: 4rpx;
+ font-size: 16px;
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.1