From 24f8c69039edd1e07b8b0a5b5c2cb8d5c3c00e3d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 24 五月 2025 22:16:35 +0800
Subject: [PATCH] 888
---
pages/order/orderList.vue | 20 ++-
pages/order/orderList2.vue | 246 +++++++++++++++++++++++++++++++++++++++++
pages/order/orderDetlList.vue | 37 +++--
pages/pakin/pakin.vue | 33 +++++
4 files changed, 311 insertions(+), 25 deletions(-)
diff --git a/pages/order/orderDetlList.vue b/pages/order/orderDetlList.vue
index 85b849d..e22b40a 100644
--- a/pages/order/orderDetlList.vue
+++ b/pages/order/orderDetlList.vue
@@ -89,25 +89,28 @@
})
},
chose(item) {
- let that = this
- uni.navigateTo({
- url: "../order/orderPakin2",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('orderItem', {
- item: item
- })
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- // that.matnr = data.data
- // that.input(that.matnr)
- },
- },
+ // let that = this
+ // uni.navigateTo({
+ // url: "../order/orderPakin2",
+ // success: function(res) {
+ // // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ // res.eventChannel.emit('orderItem', {
+ // item: item
+ // })
+ // },
+ // events: {
+ // // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ // acceptDataFromOpenedPage: function(data) {
+ // // that.matnr = data.data
+ // // that.input(that.matnr)
+ // },
+ // },
- });
+ // });
+ uni.navigateBack({
+
+ })
}
}
}
diff --git a/pages/order/orderList.vue b/pages/order/orderList.vue
index d123abf..394d936 100644
--- a/pages/order/orderList.vue
+++ b/pages/order/orderList.vue
@@ -5,16 +5,16 @@
<uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
</view>
<view>
- <view class="tag-list" v-for="(item,i) in matList" :key="i" @click="toPrint(item)">
+ <view class="tag-list" v-for="(item,i) in matList" :key="i" >
<view class="tag">
<view style="display: flex;">
- <view class="wms-tag" :style="baColor" >鍗曟嵁</view>
+ <view class="wms-tag" :style="baColor" @click="findBySelect(item.orderNo)">閫夋嫨鍗曟嵁</view>
</view>
</view>
- <view class="tag-item">鍗曟嵁鍙凤細 {{item.orderNo}}</view>
- <view class="tag-item">鍗曟嵁绫诲瀷锛� {{item.docType$}}</view>
- <view class="tag-item">鍗曟嵁鐘舵�侊細 {{item.settle$}}</view>
- <view class="tag-item">浠撳簱锛� {{item.itemName}}</view>
+ <view class="tag-item" @click="findBySelect(item.orderNo)">鍗曟嵁鍙凤細 {{item.orderNo}}</view>
+ <view class="tag-item" @click="findBySelect(item.orderNo)">鍗曟嵁绫诲瀷锛� {{item.docType$}}</view>
+ <view class="tag-item" @click="findBySelect(item.orderNo)">鍗曟嵁鐘舵�侊細 {{item.settle$}}</view>
+ <view class="tag-item" @click="toPrint(item)"><a >璇� 鎯�</a></view>
</view>
</view>
<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
@@ -206,6 +206,14 @@
});
+ },
+
+ findBySelect(matnr) {
+ this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: matnr});
+ uni.navigateBack({
+
+ })
+
}
}
}
diff --git a/pages/order/orderList2.vue b/pages/order/orderList2.vue
new file mode 100644
index 0000000..d123abf
--- /dev/null
+++ b/pages/order/orderList2.vue
@@ -0,0 +1,246 @@
+<template>
+ <view>
+ <!-- 鎼滅储妗� -->
+ <view class="search-bar">
+ <uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
+ </view>
+ <view>
+ <view class="tag-list" v-for="(item,i) in matList" :key="i" @click="toPrint(item)">
+ <view class="tag">
+ <view style="display: flex;">
+ <view class="wms-tag" :style="baColor" >鍗曟嵁</view>
+ </view>
+ </view>
+ <view class="tag-item">鍗曟嵁鍙凤細 {{item.orderNo}}</view>
+ <view class="tag-item">鍗曟嵁绫诲瀷锛� {{item.docType$}}</view>
+ <view class="tag-item">鍗曟嵁鐘舵�侊細 {{item.settle$}}</view>
+ <view class="tag-item">浠撳簱锛� {{item.itemName}}</view>
+ </view>
+ </view>
+ <uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ tagList: [],
+ matList: [],
+ condition: '',
+ reload: false,
+ curr:1,
+ tag: '鍒嗙被',
+ baColor: "background-color: #0081ff;",
+ desc: '鍟嗗搧缂栧彿:',
+ baseUrl: '',
+ token: '',
+ status: 'more',
+ contentText: {
+ contentdown: '涓婃媺鍔犺浇鏇村',
+ contentrefresh: '鍔犺浇涓�',
+ contentnomore: '娌℃湁鏇村'
+ },
+ // 褰撳墠tagId
+ tagIdNow: 1,
+
+ }
+ },
+ onReachBottom() {
+ this.status = 'more';
+ this.showMat(this.tagIdNow);
+ },
+ 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
+ })
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.showMat(1)
+ },
+ methods: {
+ search() {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/order/search/pda/auth',
+ data: {
+ condition: that.condition
+ },
+ method:"GET",
+ header: {
+ 'token':uni.getStorageSync('token'),
+ },
+ success(result) {
+ console.log(result);
+ var res = result.data
+ if (res.code === 200 ) {
+ that.matList = res.data
+ // that.save()
+ } 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'})
+ }
+ }
+ });
+ },
+ showTag(parentId) {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/tag/list/pda/auth',
+ header: {
+ 'token':uni.getStorageSync('token'),
+ },
+ data: {
+ limit: 100000,
+ parentId: parentId
+ },
+ header: {
+ 'token':uni.getStorageSync('token'),
+ },
+ success(result) {
+ that.tagList = null
+ that.matList = []
+ var res = result.data
+ if (res.code === 200) {
+ if (res.data != null && res.data.length > 0) {
+ that.tagList = res.data
+ } else {
+ that.showMat(parentId)
+ }
+ that.baColor = "background-color: #0081ff;"
+ } 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'})
+ }
+ }
+ });
+ },
+ showMat(tagId) {
+ let that = this
+ // wms绔� 琛ユ帴鍙�
+ // @RequestMapping(value = "/mat/list/pda/page/auth")
+ // @ManagerAuth
+ // public R pdaPageList(@RequestParam(required = true)Long tagId,
+ // @RequestParam(defaultValue = "1")Integer curr,
+ // @RequestParam(defaultValue = "10")Integer limit){
+ // EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+ // wrapper.eq("tag_id", tagId);
+ // wrapper.orderBy("create_time", false);
+ // return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
+ // }
+ uni.request({
+ url: that.baseUrl + '/order/list/pda/page/auth',
+ data: {
+ curr:that.curr,
+ limit: 100,
+ tagId: tagId
+ },
+ method:"GET",
+ header: {
+ 'token':uni.getStorageSync('token'),
+ },
+ success(result) {
+ that.tagList = null
+ var res = result.data
+ if (res.code === 200) {
+ if (res.data.records != null && res.data.records.length > 0) {
+ let list = res.data.records
+ that.matList = that.reload ? list : that.matList.concat(list);
+ that.curr = that.curr + 1
+ }
+ if (res.data.records.length == 0) {
+ that.status = 'noMore'
+ }
+ that.baColor = "background-color: #1cbbb4;"
+ } 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'})
+ }
+
+ }
+ });
+ },
+ toPrint(item) {
+ let that = this
+ uni.navigateTo({
+ url: "../order/orderDetlList",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('data', {
+ data: item
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ that.matnr = data.data
+ that.findMat(that.matnr)
+ },
+ },
+
+
+ });
+ }
+ }
+ }
+</script>
+
+<style>
+ @import url('../../static/css/wms.css/wms.css');
+ .tag-list {
+ width: 94%;
+ min-height: 160rpx;
+ margin: 10px auto;
+ background-color: #FFF;
+ border-radius: 5px;
+ box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
+ }
+ .tag {
+ display: flex;
+ flex-direction: column;
+ min-height: 80rpx;
+ border-bottom: 1px solid #e2e2e2;
+ }
+ .wms-tag {
+ min-width: 60rpx;
+ margin-left: 50rpx;
+ margin-top: 30rpx;
+ color: #FFF;
+ font-size: 14px;
+ padding: 4rpx 12rpx;
+ }
+ .tag-item {
+ width: 100%;
+ min-height: 60rpx;
+ line-height: 2;
+ padding-left: 50rpx;
+ color: #606266;
+ font-size: 14px;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index fce68bf..418a445 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -5,6 +5,11 @@
<view class="code-decs">鍗曟嵁缂栧彿:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo"
@input="barcodeInput()">
+ <view class="item-right">
+ <button></button>
+ <text style="text-align: right;color: #409EFF;" @click="selectOrder()">鎻愬彇+</text>
+ <uni-icons type="right" color="#c1c1c1"></uni-icons>
+ </view>
</view>
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
@@ -16,8 +21,8 @@
<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>
+ <!-- <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text> -->
+ <!-- <uni-icons type="right" color="#c1c1c1"></uni-icons> -->
</view>
</view>
<!-- <view class="item">
@@ -164,6 +169,8 @@
dataList: [],
count: 0,
rowNum: '',
+ orderNo: '',
+ matnr: '',
matnr: '',
batch: '',
weight: '',
@@ -320,6 +327,28 @@
});
that.matnr = ''
},
+ selectOrder() {
+ let that = this
+ uni.navigateTo({
+ url: "../order/orderList",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('commonUrl', {
+ commonUrl: ''
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ that.orderNo = data.data
+ //that.findMat(that.matnr)
+ },
+ },
+
+
+ });
+ that.orderNo = ''
+ },
checkMat(mat) {
var len = this.dataList.length
var add = true ,sameItem = false
--
Gitblit v1.9.1