From 294ad35e2c00f54025c1a8c8db49bc278b161a67 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 31 七月 2023 10:54:55 +0800
Subject: [PATCH] #
---
pages/stock/mergeOut.vue | 456 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pages/pakin/pakin.vue | 2
2 files changed, 457 insertions(+), 1 deletions(-)
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 483aa1d..456e187 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -141,7 +141,7 @@
baseUrl: '',
token: '',
barcode: '',
- dataList: [{}],
+ dataList: [],
count: 0,
rowNum: '',
matnr: '',
diff --git a/pages/stock/mergeOut.vue b/pages/stock/mergeOut.vue
new file mode 100644
index 0000000..dcfcef1
--- /dev/null
+++ b/pages/stock/mergeOut.vue
@@ -0,0 +1,456 @@
+<template>
+ <view>
+ <view class="code">
+ <view class="item">
+ <view class="code-decs">搴撲綅鍙�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo" :focus="locNoFocus"
+ @input="findLocno()">
+ </view>
+ <view class="item">
+ <view class="code-decs">鍑哄簱鍙�:</view>
+ <uni-combox :candidates="siteNos" placeholder="璇烽�夋嫨鍑哄簱鍙�" v-model="siteNo"></uni-combox>
+ </view>
+ </view>
+ <view class="mat-list-title">
+ 鍟嗗搧鍒楄〃
+ </view>
+ <scroll-view>
+ <view class="" style="margin-bottom: 240rpx;">
+ <view class="list" v-for="(item,i) in dataList" :key="i" :class="'bg-'+item.color_new">
+ <view class="list-left">
+ <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">
+ <uni-tag :text="item.orderNo" type="primary"></uni-tag>
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">鍝佸悕锛�</view>
+ <view class="left-item">{{item.maktx}}</view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">瑙勬牸锛�</view>
+ <view class="left-item">{{item.specs}}</view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">鎵瑰彿锛�</view>
+ <view class="left-item">
+ <uni-tag :text="item.batch" type="warning"></uni-tag>
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">閲嶉噺锛�</view>
+ <view class="left-item">
+ <uni-tag :text="item.weight" 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" v-show="item.color_new">
+ <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 class="index-no">{{i + 1}}</view>
+ </view>
+
+ <view style="text-align: center;">
+ <button size="mini" type="primary" @click="addMat()">鏂板鐗╂枡</button>
+ </view>
+ </view>
+
+ </scroll-view>
+ <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+ <view class="buttom">
+ <button size="mini" @click="reset('warn')">閲嶇疆</button>
+ <button size="mini" type="primary" @click="mergeOut()">骞舵澘鍑哄簱</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="matnr" 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" 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="message" type="message">
+ <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
+ </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="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>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ baseUrl: '',
+ token: '',
+ locNo: '',
+ locNoFocus:true,
+ dataList: [],
+ siteNo: '',
+ siteNos: [],
+ orderNo: '',
+ count: 0,
+ batch: '',
+ matnr: '',
+ msgType1: '',
+ messageText: '',
+ content: '',
+ msgType: '',
+ title: ''
+ }
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.getOutBound();
+ this.locNoFocus = false
+ setTimeout(()=>{
+ this.locNoFocus = true
+ },100)
+ },
+ methods: {
+ // 鑾峰彇鍑哄簱鍙�
+ getOutBound() { // 鑾峰彇鍑哄簱鍙�
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/available/take/check/site',
+ method: 'POST',
+ header: {'token':uni.getStorageSync('token')},
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.siteNos = res.data
+ } 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'})
+ }
+ },
+ });
+ }, // getOutBound
+ findLocno() {
+ let that = this
+ that.dataList = []
+ uni.request({
+ url: that.baseUrl + '/locDetl/list/auth',
+ header:{'token':uni.getStorageSync('token')},
+ data: {
+ curr: 1,
+ limit: 100,
+ loc_no: that.locNo,
+ zpallet: that.barcode,
+ matnr: that.matnr
+ },
+ method:"GET",
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ var item
+ for (item in res.data.records) {
+ that.dataList.push(res.data.records[item])
+ }
+ }
+ }
+ })
+
+ },
+ addMat() {
+ 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.findOrder(that.orderNo)
+ },
+ },
+ });
+ },
+ findOrder() {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/order/list/orderNo',
+ data: {orderNo: that.orderNo} ,
+ method: 'GET',
+ success(res) {
+ res = res.data;
+ if (res.code === 200) {
+ uni.navigateTo({
+ url: "../order/orderDetil",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('orderNo', {
+ orderNo: that.orderNo
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ orderList: function(data) {
+ for(var item in data.data) {
+ data.data[item]['color_new'] = 'new'
+ that.dataList.push(data.data[item])
+ }
+ that.orderNo = ''
+ },
+ },
+ });
+ }
+ }
+ })
+ },
+ // 骞舵澘鍑哄簱
+ mergeOut() {
+ let that = this
+ let newList = []
+ // that.siteNo = Number(that.siteNo)
+ for (var k in that.dataList) {
+ if (that.dataList[k].color_new) {
+ that.dataList[k].count = that.dataList[k].anfme
+ newList.push(that.dataList[k])
+ }
+ }
+ uni.request({
+ url: that.baseUrl + '/mobile/bin/comb/auth',
+ header: {'token':uni.getStorageSync('token')},
+ data: JSON.stringify({
+ locno: that.locNo,
+ evp: that.siteNo,
+ combMats: newList
+ }),
+ method: 'POST',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ this.resst()
+ this.messageText = "鍑哄簱鎴愬姛"
+ this.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')
+ }
+ }
+
+ })
+ },
+ // 鍒楄〃淇敼
+ revise(item, i) {
+ this.matnr = 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)
+ },
+ changeValue(value) {
+ this.count = value
+ },
+ // 纭淇敼
+ reviseConfirm() {
+ this.dataList[this.rowNum].anfme = this.count
+ this.dataList[this.rowNum].batch = this.batch
+ this.dataList[this.rowNum].weight = this.weight
+ this.matnr = ''
+ this.messageText = "淇敼鎴愬姛"
+ this.messageToggle('success')
+ this.$refs.revise.close()
+ },
+ // 鍙栨秷淇敼
+ reviseClose() {
+ this.$refs.revise.close()
+ },
+ messageToggle(type) {
+ this.msgType1 = type
+ this.$refs.message.open()
+ },
+ // 鍒楄〃绉婚櫎鎸夐挳
+ remove(item, i, type) {
+ this.removeNum = i
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
+ this.$refs.alertDialog.open(i)
+ },
+ // 纭绉婚櫎
+ removeConfirm() {
+ this.messageText = "绉婚櫎鎴愬姛"
+ this.messageToggle('success')
+ this.dataList.splice(this.removeNum, 1)
+ },
+ reset(type) {
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁閲嶇疆!'
+ this.$refs.resetConfirm.open()
+ },
+ // 纭閲嶇疆
+ resetConfirm() {
+ this.dataList = []
+ this.locNo = ''
+ this.siteNo = ''
+ this.locNoFocus = false
+ setTimeout(()=>{
+ this.locNoFocus = true
+ },100)
+ this.messageText = "閲嶇疆瀹屾垚"
+ this.messageToggle('success')
+ },
+ // 鍙栨秷閲嶇疆
+ resetClose() {
+
+ },
+ // 娓呯┖
+ resst() {
+ this.dataList = []
+ this.locNo = ''
+ this.siteNo = ''
+ this.locNoFocus = false
+ setTimeout(()=>{
+ this.locNoFocus = true
+ },100)
+ },
+ }
+ }
+</script>
+
+<style>
+ @import url('../../static/css/wms.css/wms.css');
+ .code {
+ width: 100%;
+ position: fixed;
+ min-height: 100rpx;
+ background-color: #FFF;
+ z-index: 10;
+ }
+ .list:first-child {
+ margin-top: 320rpx;
+ }
+ .list:last-child {
+ margin-bottom: 420rpx;
+ }
+ .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: 200rpx;
+ z-index: 9;
+ /* border-top: 1px solid #DCDFE6; */
+ text-align: center;
+ box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.5);
+ }
+ .index-no {
+ position: relative;
+ right: 15px;
+ top: 10px;
+ font-size: 1em;
+ color: #909399;
+ }
+ .bg-new {
+ background-color: #fdffe0;
+
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.1