wms_app.git - Gitblit

parent: 9b37d74d | 补丁 | 提交 | ignore whitespace

whycq

2025-02-05 13b2f5bba08f898db67dd13d94ae8e558ed06244

5个文件已修改

	pages/phyz/comOrder/checkOut.vue	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/phyz/order/preview.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/phyz/orderOut/orderCheck.vue	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/phyz/processOrder/orderCheck.vue	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/phyz/stationManage/confirmProcessed.vue	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pages/phyz/comOrder/checkOut.vue

@@ -1,6 +1,6 @@
<template>
    <view>
        <view class="list shop-car" v-for="item in dataList">
        <view class="list shop-car" v-for="(item,index) in dataList" :key="index">
            <view class="list-left">
                <view class="detl-threeCode" style="padding: 16rpx 0;">{{item.csocode}}</view>
                <view>库位：{{item.locNo}}</view>
@@ -18,13 +18,14 @@
                </view>
                
                <view class="detl-threeCode" style="display: flex;padding: 0 0 32rpx 0;font-size: 24px;">出库站：
                    <view class="dropdown" @click="toggleDropdown(item)">
                        <!-- @click="toggleDropdown(item)" -->
                    <view class="dropdown" >
                        <!-- <view style="height: 100%;width: 100%; position: fixed;background-color: rgba(0,0,0,.4);left:0;top:0" v-if = "item.isOpen"></view> -->
                        <input type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="请选择出库站" placeholder-style="color: #fff">
                        <input @input="staInput(item.agvStaNo,item.agvStaNos,index)" type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="请选择出库站" placeholder-style="color: #fff">
                        <uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons>
                        <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
                        <!-- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
                            <view class="dropdown-item" v-for="option in options" @click="selected(option,item)">{{option}}</view>
                        </scroll-view>
                        </scroll-view> -->
                    </view>
                </view>
                <button @click="combConfirm(item)" :disabled="combDis">立即出库</button>
@@ -115,6 +116,17 @@
            selected(option,item) {
                item.agvStaNo = option
            },
            staInput(item,items,index) {
                var flag = false
                for (let k of items) {
                    if (k == item) flag = true 
                }
                if(!flag) {
                    setTimeout(() => {
                        this.dataList[index].agvStaNo = ''
                    }, 100);
                }
            },
            // 订单明细
            getPakoutList(ids,locNo) {
                let _this = this
@@ -130,6 +142,7 @@
                                if (k.locNo != null) {
                                    k['isOpen'] = false
                                    k['count'] = k.anfme
                                    k.agvStaNo = ''
                                    k.anfme = 0
                                    if (_this.orderType == 'bcp') {
                                        if (k.locNo.substring(k.locNo.length - 1, k.locNo.length) == 1) {

 pages/phyz/order/preview.vue

@@ -22,7 +22,7 @@
                <view class="card-id">{{i + 1}}</view>
                <view>货位：{{item.locNo}}</view>
                <view style="display: flex;">出库站：
                    <view class="dropdown" @click="toggleDropdown(item)">
                    <view class="dropdown" >
                        <input type="text" style="width: 270rpx;" v-model="item.agvStaNo" placeholder="请选择出库站">
                        <uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
                        <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">

 pages/phyz/orderOut/orderCheck.vue

@@ -1,6 +1,6 @@
<template>
    <view>
        <view class="list shop-car" v-for="item in dataList">
        <view class="list shop-car" v-for="(item,index) in dataList" :key="index">
            <view class="list-left">
                <view class="detl-threeCode" style="padding: 16rpx 0;">{{item.csocode}}</view>
                <view>库位：{{item.locNo}}</view>
@@ -18,13 +18,14 @@
                </view>
                
                <view class="detl-threeCode" style="display: flex;padding: 0 0 32rpx 0;font-size: 24px;">出库站：
                    <view class="dropdown" @click="toggleDropdown(item)">
                        <!-- @click="toggleDropdown(item)" -->
                    <view class="dropdown" >
                        <!-- <view style="height: 100%;width: 100%; position: fixed;background-color: rgba(0,0,0,.4);left:0;top:0" v-if = "item.isOpen"></view> -->
                        <input type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="请选择出库站" placeholder-style="color: #fff">
                        <input @input="staInput(item.agvStaNo,item.agvStaNos,index)" type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="请选择出库站" placeholder-style="color: #fff">
                        <uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons>
                        <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
                        <!-- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
                            <view class="dropdown-item" v-for="option in options" @click="selected(option,item)">{{option}}</view>
                        </scroll-view>
                        </scroll-view> -->
                    </view>
                </view>
                <button @click="combConfirm(item)" :disabled="combDis">立即出库</button>
@@ -120,6 +121,17 @@
            selected(option,item) {
                item.agvStaNo = option
            },
            staInput(item,items,index) {
                var flag = false
                for (let k of items) {
                    if (k == item) flag = true 
                }
                if(!flag) {
                    setTimeout(() => {
                        this.dataList[index].agvStaNo = ''
                    }, 100);
                }
            },
            // 订单明细
            getPakoutList(ids,bcp) {
                let _this = this
@@ -135,6 +147,7 @@
                                if (k.locNo != null) {
                                    k['isOpen'] = false
                                    k['count'] = k.anfme
                                    k.agvStaNo = ''
                                    k.anfme = 0
                                    if (_this.orderType == 'bcp') {
                                        if (k.locNo.substring(k.locNo.length - 1, k.locNo.length) == 1) {

 pages/phyz/processOrder/orderCheck.vue

@@ -1,6 +1,6 @@
<template>
    <view>
        <view class="list shop-car" v-for="item in dataList">
        <view class="list shop-car" v-for="(item,index) in dataList" :key="index">
            <view class="list-left">
                <view class="detl-threeCode" style="padding: 16rpx 0;">{{item.csocode}}</view>
                <view>库位：{{item.locNo}}</view>
@@ -18,13 +18,14 @@
                </view>
                
                <view class="detl-threeCode" style="display: flex;padding: 0 0 32rpx 0;font-size: 24px;">出库站：
                    <view class="dropdown" @click="toggleDropdown(item)">
                        <!-- @click="toggleDropdown(item)" -->
                    <view class="dropdown" >
                        <!-- <view style="height: 100%;width: 100%; position: fixed;background-color: rgba(0,0,0,.4);left:0;top:0" v-if = "item.isOpen"></view> -->
                        <input type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="请选择出库站" placeholder-style="color: #fff">
                        <input @input="staInput(item.agvStaNo,item.agvStaNos,index)" type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="请选择出库站" placeholder-style="color: #fff">
                        <uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons>
                        <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
                        <!-- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
                            <view class="dropdown-item" v-for="option in options" @click="selected(option,item)">{{option}}</view>
                        </scroll-view>
                        </scroll-view> -->
                    </view>
                </view>
                <button @click="combConfirm(item)" :disabled="combDis">立即出库</button>
@@ -115,6 +116,17 @@
            selected(option,item) {
                item.agvStaNo = option
            },
            staInput(item,items,index) {
                var flag = false
                for (let k of items) {
                    if (k == item) flag = true 
                }
                if(!flag) {
                    setTimeout(() => {
                        this.dataList[index].agvStaNo = ''
                    }, 100);
                }
            },
            // 订单明细
            getPakoutList(ids,locNo) {
                let _this = this
@@ -130,6 +142,7 @@
                                if (k.locNo != null) {
                                    k['isOpen'] = false
                                    k['count'] = k.anfme
                                    k.agvStaNo = ''
                                    k.anfme = 0
                                    if (_this.orderType == 'bcp') {
                                        if (k.locNo.substring(k.locNo.length - 1, k.locNo.length) == 1) {

 pages/phyz/stationManage/confirmProcessed.vue

@@ -77,6 +77,12 @@
                        <view class="popup-item-left">站点号:</view>
                        <view class="popup-item-right"><input type="text" v-model="devNo"></view>
                    </view>
                    <view class="popup-item">
                        <view class="popup-item-left">目标楼层:</view>
                        <view class="popup-item-right" style="border: none;">
                            <uni-combox style="height: 50rpx;" :candidates="floorList" placeholder="请选择目标楼层" v-model="floor">
                        </uni-combox></view>
                    </view>
                    <view class="btn">
                        <button class="btn-left" @click="processedClose">取消</button>
                        <button class="btn-right" @click="processedConfirm()" :disabled="processedDis">加工完成</button>
@@ -99,6 +105,8 @@
                baseUrl: '',
                token: '',
                dataList: [],
                floorList:['二厂','三厂'],
                floor: '',
                count: 0,
                containerType: '',
                isOpen: true,
@@ -146,6 +154,15 @@
                        if (res.code === 200) {
                            for (let k of res.data.records) {
                                k['maxCount'] = k.anfme
                                if (k.threeCode) {
                                    if (k.threeCode.includes("B")) {
                                        _this.floor = '二厂'
                                    } else if (k.threeCode.includes("G")) {
                                        _this.floor = '三厂'
                                    } else {
                                        _this.floor = ''
                                    }
                                }
                            }
                            _this.dataList = res.data.records
                        } else if (res.code == 403) {
@@ -164,12 +181,22 @@
                this.$refs.process.close()
            },
            processedConfirm() {
                let factor = ''
                if (!this.floor) {
                    uni.showToast({ title: '请选择楼层', icon: "error", position: 'top' })
                    return
                }
                if (this.floor == '二厂') {
                    factor = 'B'
                } else if (this.floor == '三厂') {
                    factor = 'G'
                }
                this.processedDis = true
                let that = this
                uni.request({
                    url: that.baseUrl + '/agvMobile/hand/control/processed',
                    header: {'token': uni.getStorageSync('token')},
                    data: {devNo: that.devNo, barcode: that.barcode,wrkDetls:that.dataList},
                    data: {devNo: that.devNo, barcode: that.barcode,wrkDetls:that.dataList,factory: factor},
                    method: 'POST',
                    success(result) {
                        that.processedDis = false

			@@ -1,6 +1,6 @@
			<template>
			<view>
			<view class="list shop-car" v-for="item in dataList">
			<view class="list shop-car" v-for="(item,index) in dataList" :key="index">
			<view class="list-left">
			<view class="detl-threeCode" style="padding: 16rpx 0;">{{item.csocode}}</view>
			<view>库位：{{item.locNo}}</view>
			@@ -18,13 +18,14 @@
			</view>

			<view class="detl-threeCode" style="display: flex;padding: 0 0 32rpx 0;font-size: 24px;">出库站：
			<view class="dropdown" @click="toggleDropdown(item)">
			<!-- @click="toggleDropdown(item)" -->
			<view class="dropdown" >
			<!-- <view style="height: 100%;width: 100%; position: fixed;background-color: rgba(0,0,0,.4);left:0;top:0" v-if = "item.isOpen"></view> -->
			<input type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="请选择出库站" placeholder-style="color: #fff">
			<input @input="staInput(item.agvStaNo,item.agvStaNos,index)" type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="请选择出库站" placeholder-style="color: #fff">
			<uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons>
			<scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
			<!-- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
			<view class="dropdown-item" v-for="option in options" @click="selected(option,item)">{{option}}</view>
			</scroll-view>
			</scroll-view> -->
			</view>
			</view>
			<button @click="combConfirm(item)" :disabled="combDis">立即出库</button>
			@@ -115,6 +116,17 @@
			selected(option,item) {
			item.agvStaNo = option
			},
			staInput(item,items,index) {
			var flag = false
			for (let k of items) {
			if (k == item) flag = true
			}
			if(!flag) {
			setTimeout(() => {
			this.dataList[index].agvStaNo = ''
			}, 100);
			}
			},
			// 订单明细
			getPakoutList(ids,locNo) {
			let _this = this
			@@ -130,6 +142,7 @@
			if (k.locNo != null) {
			k['isOpen'] = false
			k['count'] = k.anfme
			k.agvStaNo = ''
			k.anfme = 0
			if (_this.orderType == 'bcp') {
			if (k.locNo.substring(k.locNo.length - 1, k.locNo.length) == 1) {

			@@ -22,7 +22,7 @@
			<view class="card-id">{{i + 1}}</view>
			<view>货位：{{item.locNo}}</view>
			<view style="display: flex;">出库站：
			<view class="dropdown" @click="toggleDropdown(item)">
			<view class="dropdown" >
			<input type="text" style="width: 270rpx;" v-model="item.agvStaNo" placeholder="请选择出库站">
			<uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
			<scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">

			@@ -77,6 +77,12 @@
			<view class="popup-item-left">站点号:</view>
			<view class="popup-item-right"><input type="text" v-model="devNo"></view>
			</view>
			<view class="popup-item">
			<view class="popup-item-left">目标楼层:</view>
			<view class="popup-item-right" style="border: none;">
			<uni-combox style="height: 50rpx;" :candidates="floorList" placeholder="请选择目标楼层" v-model="floor">
			</uni-combox></view>
			</view>
			<view class="btn">
			<button class="btn-left" @click="processedClose">取消</button>
			<button class="btn-right" @click="processedConfirm()" :disabled="processedDis">加工完成</button>
			@@ -99,6 +105,8 @@
			baseUrl: '',
			token: '',
			dataList: [],
			floorList:['二厂','三厂'],
			floor: '',
			count: 0,
			containerType: '',
			isOpen: true,
			@@ -146,6 +154,15 @@
			if (res.code === 200) {
			for (let k of res.data.records) {
			k['maxCount'] = k.anfme
			if (k.threeCode) {
			if (k.threeCode.includes("B")) {
			_this.floor = '二厂'
			} else if (k.threeCode.includes("G")) {
			_this.floor = '三厂'
			} else {
			_this.floor = ''
			}
			}
			}
			_this.dataList = res.data.records
			} else if (res.code == 403) {
			@@ -164,12 +181,22 @@
			this.$refs.process.close()
			},
			processedConfirm() {
			let factor = ''
			if (!this.floor) {
			uni.showToast({ title: '请选择楼层', icon: "error", position: 'top' })
			return
			}
			if (this.floor == '二厂') {
			factor = 'B'
			} else if (this.floor == '三厂') {
			factor = 'G'
			}
			this.processedDis = true
			let that = this
			uni.request({
			url: that.baseUrl + '/agvMobile/hand/control/processed',
			header: {'token': uni.getStorageSync('token')},
			data: {devNo: that.devNo, barcode: that.barcode,wrkDetls:that.dataList},
			data: {devNo: that.devNo, barcode: that.barcode,wrkDetls:that.dataList,factory: factor},
			method: 'POST',
			success(result) {
			that.processedDis = false