From b89a3aaee19359069577ff45842454cabf933f7a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 07 十月 2023 09:36:41 +0800
Subject: [PATCH] #
---
/dev/null | 550 --------------------------------------------------
pages/home/home.vue | 23 -
pages/mat/matSelected.vue | 2
pages.json | 7
pages/pakin/pakin.vue | 32 +-
5 files changed, 29 insertions(+), 585 deletions(-)
diff --git a/pages.json b/pages.json
index 1d6996c..456d4f2 100644
--- a/pages.json
+++ b/pages.json
@@ -36,12 +36,7 @@
"navigationBarTitleText": "璁㈠崟缁勬墭"
}
},
- {
- "path": "pages/order/createOrder",
- "style": {
- "navigationBarTitleText": "鐢熸垚璁㈠崟"
- }
- },
+
{
"path": "pages/order/orderPutOn",
"style": {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index adf7b0c..9a58162 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,13 +24,13 @@
icon: '',
elements: [],
elements2: [
- // {
- // title: '缁勬墭鍏ュ簱',
- // name: 'pakin',
- // color: 'orange',
- // cuIcon: 'pullup',
- // url: '/pakin/pakin'
- // },
+ {
+ title: '缁勬墭鍏ュ簱',
+ name: 'pakin',
+ color: 'orange',
+ cuIcon: 'pullup',
+ url: '/pakin/pakin'
+ },
// {
// title: '璁㈠崟缁勬墭',
// name: 'orderPakin',
@@ -66,14 +66,7 @@
// color: 'purple',
// cuIcon: 'text',
// url: '/print/print'
- // },
- {
- title: '鐢熸垚璁㈠崟',
- name: 'orderPutOn',
- color: 'mauve',
- cuIcon: 'pullup',
- url: '/order/createOrder'
- },
+ // },
// {
// title: '璁㈠崟涓婃灦',
// name: 'orderPutOn',
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index 3598b4a..cb43608 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -11,7 +11,7 @@
</view>
<view class="form-item">
<view class="form-item-desc"><text>鐗╂祦鏂瑰悜</text></view>
- <view class="form-item-content"><text>{{mat.string1}}</text></view>
+ <view class="form-item-content"><text>{{mat.logisticsTo}}</text></view>
</view>
<view class="form-item">
<view class="form-item-desc"><text>鍒嗙被</text></view>
diff --git a/pages/order/createOrder.vue b/pages/order/createOrder.vue
deleted file mode 100644
index ced5467..0000000
--- a/pages/order/createOrder.vue
+++ /dev/null
@@ -1,550 +0,0 @@
-<template>
- <view>
- <view class="code">
- <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>
- </view>
- </view>
- <!-- <view class="item">
- <view class="code-decs">搴撲綅鍙�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus">
- <button v-show="recommendLocs.length" size="mini" type="primary" @click="toggle('right')">鎺ㄨ崘</button>
- </view> -->
- </view>
- <view class="mat-list-title">
- 鍟嗗搧鍒楄〃
- </view>
- <scroll-view>
- <view class="list" v-for="(item,i) in dataList" :key="i">
- <view class="list-left">
- <view class="list-left-item">
- <view class="desc">No锛�</view>
- <view class="left-item">{{i + 1}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">璁㈠崟鍙凤細</view>
- <view class="left-item">
- <uni-tag :text="item.orderNo" type="primary"></uni-tag>
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">鍒嗗寘鐮侊細</view>
- <view class="left-item">
- <uni-tag :text="item.matnr" type="primary"></uni-tag>
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">鐗╂祦鏂瑰悜锛�</view>
- <view class="left-item">{{item.string1}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">鍒嗙被锛�</view>
- <view class="left-item">{{item.tag}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">灏哄锛�</view>
- <view class="left-item">
- <uni-tag :text="item.size" type="warning"></uni-tag>
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">浣撶Н锛�</view>
- <view class="left-item">
- <uni-tag :text="item.volume" type="warning"></uni-tag>
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">鏁伴噺锛�</view>
- <view class="left-item">{{item.anfme}}</view>
- </view>
- </view>
- <view class="list-right">
- <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
- <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
- </view>
- </view>
- </scroll-view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">纭畾</button>
- </view>
- <!-- 寮圭獥 -->
- <!-- 淇敼鏁伴噺 -->
- <view>
- <uni-popup ref="revise" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">淇敼</view>
- <view class="popup-item">
- <view class="popup-item-left">鏂欏彿:</view>
- <view class="popup-item-right">
- <input type="text" v-model="matnr1" disabled="true"
- style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
- </view>
- </view>
- <!-- <view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view> -->
- <view class="popup-item">
- <view class="popup-item-left">閲嶉噺:</view>
- <view class="popup-item-right"><input type="text" v-model="weight"></view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">鏁伴噺:</view>
- <view class="popup-item-right" style="border: none;justify-content: center;">
- <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
- </view>
- </view>
- <view class="btn">
- <view class="btn-left" @click="reviseClose">鍙栨秷</view>
- <view class="btn-right" @click="reviseConfirm()">淇敼</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 绉婚櫎纭 -->
- <view>
- <!-- 鎻愮ず绐楃ず渚� -->
- <uni-popup ref="alertDialog" type="dialog">
- <uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
- @confirm="removeConfirm" @close="removeClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <view>
- <!-- 鎻愮ず淇℃伅寮圭獥 -->
- <uni-popup ref="message" type="message">
- <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
- </uni-popup>
- </view>
- <!-- 纭涓婃灦 -->
- <view>
- <uni-popup ref="combConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="comb" @close="combClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <!-- 纭閲嶇疆 -->
- <view>
- <uni-popup ref="resetConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <view>
- <!-- 鎻愮ず淇℃伅寮圭獥 -->
- <uni-popup ref="message" type="message">
- <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
- </uni-popup>
- </view>
- <view>
- <!-- 鏅�氬脊绐� -->
- <uni-popup ref="popup" background-color="#fff">
- <scroll-view scroll-y="true" class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
- <view class="recommend" v-for="item in recommendLocs" @click="chose(item)"> {{ item }}</view>
- </scroll-view>
- </uni-popup>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data () {
- return {
- baseUrl: '',
- token: '',
- order: '',
- barcode: '',
- barcodeFocus: '',
- dataList: [],
- count: 0,
- rowNum: '',
- matnr: '',
- matnr1: '',
- batch: '',
- weight: '',
- msgType1: 'success',
- msgType: 'success',
- messageText: '',
- title: '',
- content: '',
- barcodeFocus: false,
- matFocus: true,
- matData: '',
- removeNum: 0,
- type: 'center',
- recommendLocs: [],
- code:''
- }
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- },
- methods: {
- chose(item) {
- this.barcode = item
- this.$refs.popup.close()
- },
- toggle(type) {
- this.type = type
- // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦� uni-popup 缁勪欢涓婄粦瀹� type灞炴��
- this.$refs.popup.open(type)
- },
- messageToggle(type) {
- this.msgType1 = type
- this.$refs.message.open()
- },
- matnrInput() {
- setTimeout(() => {
- this.focuss()
- }, 200)
- },
- // 鎵樼洏鐮佹湁璇噸缃�
- barcodeFocuss() {
- let that = this;
- that.barcodeFocus = false;
- setTimeout(() => {
- that.barcode = '';
- that.barcodeFocus = true;
- }, 100);
- },
- // 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
- focuss() {
- setTimeout(() => {
- this.matnr = '';
- this.matFocus = true;
- }, 100);
- },
- // 鎼滅储鐗╂枡
- findMat() {
- let that = this
- var matnr = that.matnr
-
- uni.request({
- url: that.baseUrl + '/order/createOrder',
- data: {
- matnr: that.matnr
- },
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- result = result.data
- if (result.code === 200 && result.data) {
- that.matData = result.data
- that.matData['batch'] = ''
- result.data.batch = matnr[2]
- uni.navigateTo({
- url: "../mat/matSelected",
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- success: function(res) {
- res.eventChannel.emit('mat', {
-
- data: result.data
- })
- },
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- events: {
- matList: function(data) {
- that.recommendLoc()
- that.checkMat(data.data)
- console.log(data.data)
- that.focuss()
- },
- },
- });
- } else if (result.code == 403) {
- uni.showToast({
- title: result.msg,
- icon: "none",
- position: 'top'
- })
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.showToast({
- title: result.msg,
- icon: "none",
- position: 'top'
- })
- }
-
- }
- });
-
- },
- // 鎺ㄨ崘搴撲綅
- recommendLoc() {
- let that = this
- that.recommendLocs = []
- uni.request({
- url: that.baseUrl + '/node/recommendLoc',
- data: {matnr: that.matnr},
- header: {'token': uni.getStorageSync('token')},
- success(res) {
- res = res.data
- if (res.code == 200 && res.data) {
- that.recommendLocs = res.data
- }
- }
-
- })
- },
- checkMat(mat) {
- // mat['orderNo'] = this.order
- var len = this.dataList.length
- var add = true ,sameItem = false
- for (var i = 0; i < len; i++) {
- if (mat.orderNo != this.dataList[i].orderNo) {
- add = true
- break;
- } else {
- if (mat.matnr == this.dataList[i].matnr) {
- for (var j = 0; j < len; j++) {
- if (mat.batch == this.dataList[j].batch) {
- sameItem = true
- }
- }
- // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.batch != this.dataList[i].batch) {
- this.$forceUpdate() // 寮哄埗鍒锋柊
- if (sameItem) {
- add = false
- } else {
- add = true
- }
-
- } else {
- // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
- this.dataList[i].anfme += mat.anfme
- this.$forceUpdate() // 寮哄埗鍒锋柊
- add = false
- }
- }
- }
-
- }
- if (add) {
- this.dataList.unshift(mat)
- }
- },
- combConfirm(type) {
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪涓婃灦!'
- this.$refs.combConfirm.open()
- },
- comb() {
- uni.vibrateShort();
- let that = this;
- if (that.barcode === '') {
- this.messageText = "璇锋坊鍔犲簱浣嶇爜"
- this.messageToggle('error')
- return;
- }
- if (that.dataList.length === 0) {
- this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
- this.messageToggle('error')
- return;
- }
- for (var i = 0; i < that.dataList.length; i++) {
- if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
- this.messageText = that.dataList[i].matnr + '涓婃灦鏁伴噺涓嶈兘涓�0'
- this.messageToggle('error')
- return;
- }
- }
- uni.request({
- url: that.baseUrl + '/mobile/manDetl/in',
- data: JSON.stringify({
- locNo: that.barcode,
- combMats: that.dataList
- }),
- method: 'POST',
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.resst();
- that.messageText = "涓婃灦鎴愬姛"
- that.messageToggle('success')
- } else if (res.code == 403) {
- that.messageText = res.msg
- that.messageToggle('error')
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- that.messageText = res.msg
- that.messageToggle('error')
- }
- }
- });
- },
- reset(type) {
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁閲嶇疆!'
- this.$refs.resetConfirm.open()
- },
- // 纭閲嶇疆
- resetConfirm() {
- this.dataList = []
- this.order = ''
- this.barcode = ''
- this.messageText = "閲嶇疆瀹屾垚"
- this.messageToggle('success')
- },
- // 鍙栨秷閲嶇疆
- resetClose() {
-
- },
- // 淇敼鎵瑰彿
- revise(item, i) {
- this.matnr1 = this.dataList[i].matnr
- this.count = this.dataList[i].anfme
- this.batch = this.dataList[i].batch
- this.weight = this.dataList[i].weight
- this.rowNum = i
- this.eject()
- },
- eject(type) {
- this.type = type
- this.$refs.revise.open(type)
- },
- // 鍒楄〃绉婚櫎鎸夐挳
- remove(item, i, type) {
- this.removeNum = i
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
- this.$refs.alertDialog.open(i)
- },
- // 纭绉婚櫎
- removeConfirm(i) {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
- this.dataList.splice(this.removeNum, 1)
- },
- reviseConfirm() {
- this.dataList[this.rowNum].anfme = this.count
- this.dataList[this.rowNum].batch = this.batch
- this.dataList[this.rowNum].weight = this.weight
- this.messageText = "淇敼鎴愬姛"
- this.messageToggle('success')
- this.$refs.revise.close()
- this.$forceUpdate() // 寮哄埗鍒锋柊
- },
- reviseClose() {
- this.$refs.revise.close()
- },
- changeValue(value) {
- this.count = value
- },
- // 娓呯┖
- resst() {
- this.dataList = []
- this.barcode = ''
- this.recommendLocs = []
- this.barcodeFocuss()
- },
- combClose() {
- this.$refs.combConfirm.close()
- },
- // 鍙栨秷绉婚櫎
- removeClose() {
- this.$refs.alertDialog.close()
- },
- }
- }
-</script>
-
-<style>
- @import url('../../static/css/wms.css/wms.css');
- .popup-content {
- /* height: 90vh; */
- height: 90vh;
- width: 200px;
- }
- .recommend {
- width: 300rpx;
- height: 100rpx;
- text-align: center;
- line-height: 100rpx;
- }
- .list {
- display: flex;
- min-height: 80rpx;
- background-color: #FFF;
- margin: auto 20rpx;
- border-radius: 20rpx;
- box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
- }
- .list:first-child {
- margin-top: 410rpx;
- }
- .list:last-child {
- margin-bottom: 120rpx;
- }
- .code {
- width: 100%;
- position: fixed;
- min-height: 100rpx;
- background-color: #FFF;
- z-index: 10;
- }
- .item {
- display: flex;
- align-items: center;
- height: 100rpx;
- margin-left: 20rpx;
- border-bottom: 1px solid #DCDFE6;
- }
-
- .item input {
- height: 50rpx;
- line-height: 50rpx;
- /* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
- font-size: 36upx;
- font-family: PingFang SC;
- width: 55vw;
-
- }
-
- .code-decs {
- width: 20vw;
- font-size: 18px;
- color: #303133;
- }
-
- .item-right {
- margin-left: auto;
- margin-right: 20rpx;
- }
-
- .mat-list-title {
- height: 80rpx;
- line-height: 80rpx;
- width: 100%;
- background-color: white;
- position: fixed;
- margin-top: 100rpx;
- z-index: 9;
- /* border-top: 1px solid #DCDFE6; */
- text-align: center;
- box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
- }
-</style>
\ No newline at end of file
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 456e187..46a7040 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -7,13 +7,13 @@
@input="barcodeInput()">
</view>
<view class="item">
- <view class="code-decs">鐗╂枡鐮�:</view>
+ <view class="code-decs">鍒嗗寘鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
- <view class="item-right">
+ <!-- <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>
<view class="mat-list-title">
@@ -27,29 +27,35 @@
<view class="left-item">{{i + 1}}</view>
</view>
<view class="list-left-item">
- <view class="desc">缂栫爜锛�</view>
+ <view class="desc">璁㈠崟鍙凤細</view>
+ <view class="left-item">
+ <uni-tag :text="item.orderNo" type="primary"></uni-tag>
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">鍒嗗寘鐮侊細</view>
<view class="left-item">
<uni-tag :text="item.matnr" type="primary"></uni-tag>
</view>
</view>
<view class="list-left-item">
- <view class="desc">鍝佸悕锛�</view>
- <view class="left-item">{{item.maktx}}</view>
+ <view class="desc">鐗╂祦鏂瑰悜锛�</view>
+ <view class="left-item">{{item.logisticsTo}}</view>
</view>
<view class="list-left-item">
- <view class="desc">瑙勬牸锛�</view>
- <view class="left-item">{{item.specs}}</view>
+ <view class="desc">鍒嗙被锛�</view>
+ <view class="left-item">{{item.tag}}</view>
</view>
<view class="list-left-item">
- <view class="desc">鎵瑰彿锛�</view>
+ <view class="desc">灏哄锛�</view>
<view class="left-item">
- <uni-tag :text="item.batch" type="warning"></uni-tag>
+ {{item.size}}
</view>
</view>
<view class="list-left-item">
- <view class="desc">閲嶉噺锛�</view>
+ <view class="desc">浣撶Н锛�</view>
<view class="left-item">
- <uni-tag :text="item.weight" type="warning"></uni-tag>
+ {{item.volume}}
</view>
</view>
<view class="list-left-item">
@@ -208,7 +214,7 @@
findMat() {
let that = this
uni.request({
- url: that.baseUrl + '/mat/auth',
+ url: that.baseUrl + '/order/createOrder',
data: {
matnr: that.matnr
},
--
Gitblit v1.9.1