wms_app.git - Gitblit

parent: 176aa7e9 | 补丁 | 提交 | show whitespace

whycq

2024-04-03 55d6fd6841e1564e3b696d3e57b2765c9329fd45

5个文件已修改

2个文件已添加

	pages.json	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/home/inOutManage.vue	70 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/phyz/order/orderList.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/phyz/order/purchaseOrder.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/phyz/stationManage/stationManage.vue	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/phyz/wrkMast/waitPakinLog.vue	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/phyz/wrkMast/wrkMastLog.vue	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pages.json

@@ -535,6 +535,24 @@
            }
            
        }
        ,{
            "path" : "pages/phyz/wrkMast/wrkMastLog",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "工作历史档",
                "enablePullDownRefresh": false
            }
            
        }
        ,{
            "path" : "pages/phyz/wrkMast/waitPakinLog",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "入库通知历史档",
                "enablePullDownRefresh": false
            }
            
        }
    ],
    "globalStyle": {
        "navigationBarTextStyle": "black",

 pages/home/inOutManage.vue

@@ -39,13 +39,13 @@
                        // cuIcon: 'pullup',
                        url: `/phyz/AGV/emptyOut`
                    },
                    {
                        title: '组托',
                        name: 'pakin',
                        color: 'blue',
                        // cuIcon: 'pullup',
                        url: `/phyz/AGV/AGVPakin`
                    },
                    // {
                    //     title: '组托',
                    //     name: 'pakin',
                    //     color: 'blue',
                    //     // cuIcon: 'pullup',
                    //     url: `/phyz/AGV/AGVPakin`
                    // },
                    
                    {
                        title: 'AGV上架绑定',
@@ -54,34 +54,34 @@
                        // cuIcon: 'pullup',
                        url: '/tzsk/AGV/AGVPakinBing'
                    },
                    {
                        title: 'AGV启动入库',
                        name: 'AGVStart',
                        color: 'pink',
                        // cuIcon: 'pullup',
                        url: '/tzsk/AGV/AGVStart'
                    },
                    {
                        title: 'AGV上架组托',
                        name: 'AGVPakinOn',
                        color: 'brown',
                        // cuIcon: 'pullup',
                        url: '/tzsk/AGV/AGVPakinOn'
                    },
                    {
                        title: 'AGV容器离场',
                        name: 'AGVContainerMove',
                        color: 'cyan',
                        // cuIcon: 'pullup',
                        url: '/tzsk/AGV/AGVContainerMove'
                    },
                    {
                        title: 'AGV条码',
                        name: 'AGVCode',
                        color: 'cyan',
                        // cuIcon: 'pullup',
                        url: '/tzsk/AGV/AGVCode'
                    },
                    // {
                    //     title: 'AGV启动入库',
                    //     name: 'AGVStart',
                    //     color: 'pink',
                    //     // cuIcon: 'pullup',
                    //     url: '/tzsk/AGV/AGVStart'
                    // },
                    // {
                    //     title: 'AGV上架组托',
                    //     name: 'AGVPakinOn',
                    //     color: 'brown',
                    //     // cuIcon: 'pullup',
                    //     url: '/tzsk/AGV/AGVPakinOn'
                    // },
                    // {
                    //     title: 'AGV容器离场',
                    //     name: 'AGVContainerMove',
                    //     color: 'cyan',
                    //     // cuIcon: 'pullup',
                    //     url: '/tzsk/AGV/AGVContainerMove'
                    // },
                    // {
                    //     title: 'AGV条码',
                    //     name: 'AGVCode',
                    //     color: 'cyan',
                    //     // cuIcon: 'pullup',
                    //     url: '/tzsk/AGV/AGVCode'
                    // },
                ],
                colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
            };

 pages/phyz/order/orderList.vue

@@ -197,6 +197,7 @@
                let _this = this
                let combList = []
                for (let k of _this.dataList) {
                    k['csocode'] = k.threeCode
                    if (k.checked) {
                        combList.push(k)
                    }

 pages/phyz/order/purchaseOrder.vue

@@ -31,6 +31,11 @@
            </view>
        </view>
        <view style="height: 100rpx;"></view>
		
        <view style="position: fixed;bottom: 40px;padding: 10rpx;border-radius: 50%;
            left: 20px;background-color: #55aaff;box-shadow: 0px 0px 5px 5px #c8c8c8;">
            <uni-icons type="refreshempty" size="30" color="#FFF"  @click="reload()"/>
        </view>
    </view>
</template>

@@ -57,6 +62,9 @@
        },
        
        methods: {
            reload() {
                this.getOrderList()
            },
            searchValueInput() {
                let count = 0
                let sign = 0

 pages/phyz/stationManage/stationManage.vue

@@ -231,7 +231,11 @@
                        if (res.code === 200) {
                            _this.searchValue = ''
                            setTimeout(()=> {
                                _this.getBasDevp()
                                _this.searchValue = ''
                                _this.station = ''
                                _this.wrkMast = ''
                                _this.wrkDetls = []
                                _this.waitPakins = []
                            },100)  
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' }) 
@@ -257,7 +261,11 @@
                        if (res.code === 200) {
                            _this.searchValue = ''
                            setTimeout(()=> {
                                _this.getBasDevp()
                                _this.searchValue = ''
                                _this.station = ''
                                _this.wrkMast = ''
                                _this.wrkDetls = []
                                _this.waitPakins = []
                            },100)
                        } else {
                            uni.showToast({ title: res.msg, icon: "error", position: 'top' }) 
@@ -296,7 +304,10 @@
                        if (res.code === 200) {
                            setTimeout(()=> {
                                that.searchValue = ''
                                that.getBasDevp()
                                that.station = ''
                                that.wrkMast = ''
                                that.wrkDetls = []
                                that.waitPakins = []
                            },300)
                            uni.showToast({
                                title: res.msg,

 pages/phyz/wrkMast/waitPakinLog.vue

New file
@@ -0,0 +1,22 @@
<template>
    <view>
		
    </view>
</template>

<script>
    export default {
        data() {
            return {
				
            }
        },
        methods: {
			
        }
    }
</script>

<style>

</style>

 pages/phyz/wrkMast/wrkMastLog.vue

New file
@@ -0,0 +1,22 @@
<template>
    <view>
		
    </view>
</template>

<script>
    export default {
        data() {
            return {
				
            }
        },
        methods: {
			
        }
    }
</script>

<style>

</style>

			@@ -535,6 +535,24 @@
			}

			}
			,{
			"path" : "pages/phyz/wrkMast/wrkMastLog",
			"style" :
			{
			"navigationBarTitleText": "工作历史档",
			"enablePullDownRefresh": false
			}

			}
			,{
			"path" : "pages/phyz/wrkMast/waitPakinLog",
			"style" :
			{
			"navigationBarTitleText": "入库通知历史档",
			"enablePullDownRefresh": false
			}

			}
			],
			"globalStyle": {
			"navigationBarTextStyle": "black",

			@@ -39,13 +39,13 @@
			// cuIcon: 'pullup',
			url: `/phyz/AGV/emptyOut`
			},
			{
			title: '组托',
			name: 'pakin',
			color: 'blue',
			// cuIcon: 'pullup',
			url: `/phyz/AGV/AGVPakin`
			},
			// {
			// title: '组托',
			// name: 'pakin',
			// color: 'blue',
			// // cuIcon: 'pullup',
			// url: `/phyz/AGV/AGVPakin`
			// },

			{
			title: 'AGV上架绑定',
			@@ -54,34 +54,34 @@
			// cuIcon: 'pullup',
			url: '/tzsk/AGV/AGVPakinBing'
			},
			{
			title: 'AGV启动入库',
			name: 'AGVStart',
			color: 'pink',
			// cuIcon: 'pullup',
			url: '/tzsk/AGV/AGVStart'
			},
			{
			title: 'AGV上架组托',
			name: 'AGVPakinOn',
			color: 'brown',
			// cuIcon: 'pullup',
			url: '/tzsk/AGV/AGVPakinOn'
			},
			{
			title: 'AGV容器离场',
			name: 'AGVContainerMove',
			color: 'cyan',
			// cuIcon: 'pullup',
			url: '/tzsk/AGV/AGVContainerMove'
			},
			{
			title: 'AGV条码',
			name: 'AGVCode',
			color: 'cyan',
			// cuIcon: 'pullup',
			url: '/tzsk/AGV/AGVCode'
			},
			// {
			// title: 'AGV启动入库',
			// name: 'AGVStart',
			// color: 'pink',
			// // cuIcon: 'pullup',
			// url: '/tzsk/AGV/AGVStart'
			// },
			// {
			// title: 'AGV上架组托',
			// name: 'AGVPakinOn',
			// color: 'brown',
			// // cuIcon: 'pullup',
			// url: '/tzsk/AGV/AGVPakinOn'
			// },
			// {
			// title: 'AGV容器离场',
			// name: 'AGVContainerMove',
			// color: 'cyan',
			// // cuIcon: 'pullup',
			// url: '/tzsk/AGV/AGVContainerMove'
			// },
			// {
			// title: 'AGV条码',
			// name: 'AGVCode',
			// color: 'cyan',
			// // cuIcon: 'pullup',
			// url: '/tzsk/AGV/AGVCode'
			// },
			],
			colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
			};

			@@ -197,6 +197,7 @@
			let _this = this
			let combList = []
			for (let k of _this.dataList) {
			k['csocode'] = k.threeCode
			if (k.checked) {
			combList.push(k)
			}

			@@ -31,6 +31,11 @@
			</view>
			</view>
			<view style="height: 100rpx;"></view>

			<view style="position: fixed;bottom: 40px;padding: 10rpx;border-radius: 50%;
			left: 20px;background-color: #55aaff;box-shadow: 0px 0px 5px 5px #c8c8c8;">
			<uni-icons type="refreshempty" size="30" color="#FFF" @click="reload()"/>
			</view>
			</view>
			</template>

			@@ -57,6 +62,9 @@
			},

			methods: {
			reload() {
			this.getOrderList()
			},
			searchValueInput() {
			let count = 0
			let sign = 0

			@@ -231,7 +231,11 @@
			if (res.code === 200) {
			_this.searchValue = ''
			setTimeout(()=> {
			_this.getBasDevp()
			_this.searchValue = ''
			_this.station = ''
			_this.wrkMast = ''
			_this.wrkDetls = []
			_this.waitPakins = []
			},100)
			} else {
			uni.showToast({ title: res.msg, icon: "error", position: 'top' })
			@@ -257,7 +261,11 @@
			if (res.code === 200) {
			_this.searchValue = ''
			setTimeout(()=> {
			_this.getBasDevp()
			_this.searchValue = ''
			_this.station = ''
			_this.wrkMast = ''
			_this.wrkDetls = []
			_this.waitPakins = []
			},100)
			} else {
			uni.showToast({ title: res.msg, icon: "error", position: 'top' })
			@@ -296,7 +304,10 @@
			if (res.code === 200) {
			setTimeout(()=> {
			that.searchValue = ''
			that.getBasDevp()
			that.station = ''
			that.wrkMast = ''
			that.wrkDetls = []
			that.waitPakins = []
			},300)
			uni.showToast({
			title: res.msg,

New file
			@@ -0,0 +1,22 @@
			<template>
			<view>

			</view>
			</template>

			<script>
			export default {
			data() {
			return {

			}
			},
			methods: {

			}
			}
			</script>

			<style>

			</style>