From 2b94c7e54b5ce6f094b58aa3dc7142fb037f64f7 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 15 九月 2023 11:13:03 +0800
Subject: [PATCH] #
---
pages/mat/matSelected.vue | 13 +-
pages.json | 6 +
pages/pakin/pakin.vue | 12 +-
pages/mat/matList_noTag.vue | 237 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 256 insertions(+), 12 deletions(-)
diff --git a/pages.json b/pages.json
index 36a6b07..cf3aa4b 100644
--- a/pages.json
+++ b/pages.json
@@ -177,6 +177,12 @@
}
},
{
+ "path": "pages/mat/matList_noTag",
+ "style": {
+ "navigationBarTitleText": "鐗╂枡"
+ }
+ },
+ {
"path": "pages/login/logOut",
"style": {
"navigationBarTitleText": "閫�鍑虹櫥褰�"
diff --git a/pages/mat/matList_noTag.vue b/pages/mat/matList_noTag.vue
new file mode 100644
index 0000000..e3713f5
--- /dev/null
+++ b/pages/mat/matList_noTag.vue
@@ -0,0 +1,237 @@
+<template>
+ <view>
+ <!-- 鎼滅储妗� -->
+ <view class="search-bar">
+ <uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
+ </view>
+ <scroll-view>
+ <view class="tag-list" v-for="(item,i) in tagList" :key="i" @click="showTag(item.id)">
+ <view class="tag">
+ <view style="display: flex;">
+ <view class="wms-tag" :style="baColor" >鍒嗙被</view>
+ </view>
+ </view>
+ <view class="tag-item">{{item.name}}</view>
+ </view>
+ </scroll-view>
+ <view>
+ <view class="tag-list" v-for="(item,i) in matList" :key="i" @click="findBySelect(item.matnr)">
+ <view class="tag">
+ <view style="display: flex;">
+ <view class="wms-tag" :style="baColor" >鍟嗗搧</view>
+ </view>
+ </view>
+ <view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matnr}}</view>
+ <view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx ? item.maktx : '--'}}</view>
+ <view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs ? item.specs : '--'}}</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';
+ if (this.tagList == null) {
+ 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.showTag(1)
+ },
+ methods: {
+ search() {
+ let that = this
+ that.tagList = []
+ that.matList = []
+ uni.request({
+ url: that.baseUrl + '/mat/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.tagList = []
+ that.showMat(parentId)
+ }
+ } 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
+ that.tagIdNow = tagId
+ if (tagId == null || tagId == '' || tagId == undefined) {
+ return;
+ }
+ uni.request({
+ url: that.baseUrl + '/mat/list/pda/page/auth',
+ data: {
+ curr:that.curr,
+ limit: 20,
+ 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'})
+ }
+
+ }
+ });
+ },
+ findBySelect(matnr) {
+ this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: matnr});
+ uni.navigateBack({
+
+ })
+
+ }
+ }
+ }
+</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/mat/matSelected.vue b/pages/mat/matSelected.vue
index a0d2b69..b50fbbd 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -3,15 +3,15 @@
<view class="form">
<view class="form-item">
<view class="form-item-desc"><text>鍟嗗搧缂栫爜</text></view>
- <view class="form-item-content"><text>{{mat.matnr}}</text></view>
+ <view class="form-item-content"><text>{{mat.matNo}}</text></view>
</view>
<view class="form-item">
<view class="form-item-desc"><text>鍟嗗搧鍚嶇О</text></view>
- <view class="form-item-content"><text>{{mat.maktx}}</text></view>
+ <view class="form-item-content"><text>{{mat.matName}}</text></view>
</view>
<view class="form-item">
<view class="form-item-desc"><text>瑙勬牸</text></view>
- <view class="form-item-content"><text>{{mat.specs}}</text></view>
+ <view class="form-item-content"><text>{{mat.str2}}</text></view>
</view>
<view class="form-item">
<view class="form-item-desc"><text>鎵瑰彿</text></view>
@@ -40,9 +40,9 @@
data() {
return {
mat: {
- matnr: null,
- maktx: null,
- specs: null,
+ matNo: null,
+ matName: null,
+ str2: null,
batch: null,
anfme: 0,
},
@@ -61,6 +61,7 @@
// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
eventChannel.on('mat', function(data) {
+ console.log(data.data);
that.mat = data.data
that.mat.anfme = 0
})
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 1035979..a4fdd2f 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -29,16 +29,16 @@
<view class="list-left-item">
<view class="desc">缂栫爜锛�</view>
<view class="left-item">
- <uni-tag :text="item.matnr" type="primary"></uni-tag>
+ <uni-tag :text="item.matNo" type="primary"></uni-tag>
</view>
</view>
<view class="list-left-item">
<view class="desc">鍝佸悕锛�</view>
- <view class="left-item">{{item.maktx}}</view>
+ <view class="left-item">{{item.matName}}</view>
</view>
<view class="list-left-item">
<view class="desc">瑙勬牸锛�</view>
- <view class="left-item">{{item.specs}}</view>
+ <view class="left-item">{{item.str2}}</view>
</view>
<view class="list-left-item">
<view class="desc">鎵瑰彿锛�</view>
@@ -208,9 +208,9 @@
findMat() {
let that = this
uni.request({
- url: that.baseUrl + '/mat/auth',
+ url: that.baseUrl + '/matCode/list/auth',
data: {
- matnr: that.matnr
+ mat_no: that.matnr
},
header: {
'token': uni.getStorageSync('token')
@@ -226,7 +226,7 @@
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
success: function(res) {
res.eventChannel.emit('mat', {
- data: result.data
+ data: result.data.records[0]
})
},
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
--
Gitblit v1.9.1