From bd259119cd14eff50b84a8471198ba35cba649ba Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 04 十二月 2024 09:11:36 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 7 +
pages/out/orderGift.vue | 127 +++++++++++++++++++++++++
pages/out/checkOut.vue | 6
pages/out/orderGiftDetls.vue | 95 +++++++++++++++++++
manifest.json | 4
pages.json | 18 +++
6 files changed, 252 insertions(+), 5 deletions(-)
diff --git a/manifest.json b/manifest.json
index 4dbed0f..d03a6a1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "涓壃WMS",
"appid" : "__UNI__DA5854D",
"description" : "",
- "versionName" : "2024072201",
- "versionCode" : 103,
+ "versionName" : "20241203A",
+ "versionCode" : 111,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 53d28a9..4d010d1 100644
--- a/pages.json
+++ b/pages.json
@@ -233,6 +233,24 @@
"enablePullDownRefresh" : false
}
}
+ ,{
+ "path" : "pages/out/orderGift",
+ "style" :
+ {
+ "navigationBarTitleText": "鏍稿鍗曟嵁绠＄悊",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
+ "path" : "pages/out/orderGiftDetls",
+ "style" :
+ {
+ "navigationBarTitleText": "鍗曟嵁鏄庣粏",
+ "enablePullDownRefresh": false
+ }
+
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index ac199e1..39ae362 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -59,6 +59,13 @@
cuIcon: 'pullup',
url: '/out/handIn'
},
+ {
+ title: '鏍稿鍗曟嵁',
+ name: 'orderGift',
+ color: 'orange',
+ cuIcon: 'pullup',
+ url: '/out/orderGift'
+ },
// {
// title: '缁勬墭鍏ュ簱',
// name: 'pakin',
diff --git a/pages/out/checkOut.vue b/pages/out/checkOut.vue
index 12f0565..e486e64 100644
--- a/pages/out/checkOut.vue
+++ b/pages/out/checkOut.vue
@@ -2,7 +2,7 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">绠卞彿:</view>
+ <view class="code-decs">鏉＄爜:</view>
<textarea style="background-color: #f0f0f0;max-height: 100rpx;padding: 4px;margin: 4px;"
type="textarea" placeholder=" 鎵爜 / 杈撳叆" maxlength="1000" v-model="barcode" :focus="barcodeFocus"
@input="analysis()" />
@@ -513,7 +513,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 130rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -545,7 +545,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 100rpx;
+ margin-top: 130rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/out/orderGift.vue b/pages/out/orderGift.vue
new file mode 100644
index 0000000..cded45e
--- /dev/null
+++ b/pages/out/orderGift.vue
@@ -0,0 +1,127 @@
+<template>
+ <view>
+ <view class="code">
+ <uni-search-bar :focus="searchValueFocus" v-model="searchValue"
+ maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
+ </uni-search-bar>
+ <view class="list" v-for="(item,index) in dataList">
+ <view class="list-left">
+ <view >
+ <text style="">鍗曟嵁缂栧彿锛�</text>
+ <text style="font-size: 18px;font-weight: 600;color: #333;">{{item.orderNo}}</text>
+ </view>
+ <view>绫诲瀷锛歿{item.docType$}}</view>
+ <view>鍒涘缓鏃堕棿锛歿{item.createTime$}}</view>
+ </view>
+ <view class="list-right" @click="toDetls(index)">
+ <uni-icons type="right" size="25" color="#55aaff"></uni-icons>
+ </view>
+ </view>
+ </view>
+ <view style="height: 20px;"></view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ baseUrl: '',
+ token: '',
+ searchValue: '',
+ searchValueFocus: false,
+ dataList: [],
+ data: {
+ curr: 1,
+ limit: 10,
+ order_no: '',
+
+ }
+ }
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.getOrder()
+ },
+ // 涓嬫媺鍒锋柊
+ onReachBottom() {
+ this.status = 'more';
+ this.getOrder(this.searchValue,10);
+ },
+ methods: {
+ getOrder(threeCode,limit) {
+ let _this = this
+ _this.data.order_no = threeCode
+ _this.data.limit = limit
+ uni.request({
+ url: `${_this.baseUrl}/orderGift/head/page/auth`,
+ header: {'token': uni.getStorageSync('token')},
+ data: _this.data,
+ method:'GET',
+ success(res) {
+ res = res.data
+ console.log(res);
+ if (res.code === 200) {
+ let list = res.data.records
+ _this.dataList = _this.dataList.concat(list);
+ _this.data.curr = _this.data.curr + 1
+ }
+ }
+ })
+ },
+ searchValueInput2() {
+ this.dataList = []
+ this.data.curr = 1
+ if (this.searchValue.length == 0) {
+ this.getOrder(this.searchValue,10)
+ } else {
+ this.getOrder(this.searchValue,10)
+ }
+
+ },
+ clear() {
+ this.dataList = []
+ this.data.curr = 1
+ setTimeout(()=> {
+ this.getOrder(this.searchValue,10)
+ },300)
+ },
+ toDetls(index) {
+ let _this = this
+ uni.navigateTo({
+ url: './orderGiftDetls',
+ success(res) {
+ res.eventChannel.emit('item', {
+ item: _this.dataList[index]
+ })
+ },
+ })
+ }
+ }
+ }
+</script>
+
+<style>
+ .list {
+ margin: 20rpx;
+ font-size: 14px;
+ background-color: #fff;
+ border-radius: 20rpx;
+ border: 1px solid #eeeeee;
+ display: flex;
+ position: relative;
+ }
+ .list-left {
+ flex: 1;
+ padding: 20rpx;
+ position: relative;
+ }
+ .list-right {
+ width: 70rpx;
+ border-left: 1px solid #eeeeee;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+</style>
diff --git a/pages/out/orderGiftDetls.vue b/pages/out/orderGiftDetls.vue
new file mode 100644
index 0000000..c8d895f
--- /dev/null
+++ b/pages/out/orderGiftDetls.vue
@@ -0,0 +1,95 @@
+<template>
+ <view>
+ <view class="list" v-for="(item,index) in detls">
+ <view class="list-left">
+ <view>瑙勬牸锛歿{item.matnr}}</view>
+ <view>绠卞彿锛歿{item.batch}}</view>
+ <view>鍗峰彿锛歿{item.model}}</view>
+ <view>闀垮害锛歿{item.price}}</view>
+ <view>鍑�閲嶏細{{item.weight}}</view>
+ <view>姣涢噸锛歿{item.volume}}</view>
+ <view>鎺ュご锛歿{item.specs}}</view>
+ <view>鏄惁纭锛�<uni-tag :text="item.source$" :type="item.deadTimeType"></uni-tag></view>
+ </view>
+ </view>
+ <view style="height: 20rpx;"></view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ baseUrl: '',
+ token: '',
+ detls: [],
+ deadTimeType: 'primary'
+ }
+ },
+ onShow() {
+ let _this = this
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ // const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+ const eventChannel = this.getOpenerEventChannel();
+ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ eventChannel.on('item', function(data) {
+ console.log(data.item);
+ _this.getDetls(data.item.id)
+ })
+ },
+ methods: {
+ getDetls(id) {
+ let _this = this
+ let data = {
+ curr: 1,
+ limit: 9999,
+ order_id: id
+ }
+ uni.request({
+ url: `${_this.baseUrl}/orderDetlGift/list/auth`,
+ header: {'token': uni.getStorageSync('token')},
+ data: data,
+ method:'GET',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ for (let k of res.data.records) {
+ if (k.source === 1) {
+ k['deadTimeType'] = "primary"
+ } else {
+ k['deadTimeType'] = "error"
+ }
+ }
+ _this.detls = res.data.records
+ }
+ }
+ })
+ }
+ }
+ }
+</script>
+
+<style>
+ .list {
+ margin: 20rpx;
+ font-size: 14px;
+ background-color: #fff;
+ border-radius: 20rpx;
+ border: 1px solid #eeeeee;
+ display: flex;
+ position: relative;
+ }
+ .list-left {
+ flex: 1;
+ padding: 20rpx;
+ position: relative;
+ }
+ .list-right {
+ width: 70rpx;
+ border-left: 1px solid #eeeeee;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+</style>
--
Gitblit v1.9.1