~jhz/STUWMS.git

parent: c98e485f | 补丁 | 提交 | show whitespace

chenhaozhe

2025-07-21 396f6abb986cb97b99c5f7c069280d514eff3f3f

修改页面退出逻辑

10个文件已修改

	pages/caigourukujiaoyan/form.vue	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/caigourukujiaoyan/table.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/qitarukujiaoyan/form.vue	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/qitarukujiaoyan/table.vue	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/shengchanbuliaojiaoyan/CacheList.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/shengchanbuliaojiaoyan/form.vue	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/weiwaibuliaojiaoyan/form.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/weiwailingliaojiaoyan/form.vue	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/weiwailingliaojiaoyan/table.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/xiaoshouchukujiaoyan/form.vue	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pages/caigourukujiaoyan/form.vue

@@ -84,10 +84,10 @@
                    <uni-card :title="item.物料名称" :extra="'数量:'+item.数量" style="margin: 10px;" @tap="delMater(item)">
                        <view class="card-detail">
                            <view class="detail">
                                <text>单据号：</text>{{item.单据号}}
                                <text>物料代码：</text>{{item.物料代码}}
                            </view>
                            <view class="detail">
                                <text>物料代码：</text>{{item.物料代码}}
                                <text>单据数量：</text>{{item.单据数量}}
                            </view>
                            <view class="detail" v-if="item.规格型号">
                                <text>规格型号：</text>{{item.规格型号}}
@@ -98,10 +98,13 @@
                            <view class="detail" v-if="item.辅助属性">
                                <text>辅助属性：</text>{{item.辅助属性}}
                            </view>
                            <view class="detail" v-if="item.单据数量">
                                <text>单据数量：</text>{{item.单据数量}}
                            <view class="detail" v-if="item.仓库">
                                <text>仓库：</text>{{item.仓库}}
                            </view>
                            <view class="detail" v-if="item.条码个数">
                            <view class="detail" v-if="item.仓位">
                                <text>仓位：</text>{{item.仓位}}
                            </view>
                            <view class="detail" >
                                <text>条码个数：</text>{{item.条码个数}}
                            </view>
                        </view>
@@ -777,8 +780,8 @@
                    success: (res) => {
                        if (res.confirm) {
                            console.log('用户点击确定');
                            uni.redirectTo({
                                url: '/pages/qitachukujiaoyan/qitachukujiaoyan'
                            uni.navigateBack({
                                url: '/pages/caigourukujiaoyan/table'
                            })
                        } else if (res.cancel) {
                            console.log('用户点击取消');

 pages/caigourukujiaoyan/table.vue

@@ -133,6 +133,12 @@
            }
        },
        onLoad() {
            // //用户模块权限判断
            // this.CheckModRight()
            // this.changeTab(0)
            // console.log(this.userInfo, uni.getStorageSync('HUserName'))
        },
        onShow() {
            //用户模块权限判断
            this.CheckModRight()
            this.changeTab(0)

 pages/qitarukujiaoyan/form.vue

@@ -86,6 +86,9 @@
                            <view class="detail">
                                <text>物料代码：</text>{{item.物料代码}}
                            </view>
                            <view class="detail">
                                <text>单据数量：</text>{{item.单据数量}}
                            </view>
                            <view class="detail" v-if="item.规格型号">
                                <text>规格型号：</text>{{item.规格型号}}
                            </view>
@@ -94,6 +97,15 @@
                            </view>
                            <view class="detail" v-if="item.辅助属性">
                                <text>辅助属性：</text>{{item.辅助属性}}
                            </view>
                            <view class="detail" v-if="item.仓库">
                                <text>仓库：</text>{{item.仓库}}
                            </view>
                            <view class="detail" v-if="item.仓位">
                                <text>仓位：</text>{{item.仓位}}
                            </view>
                            <view class="detail" >
                                <text>条码个数：</text>{{item.条码个数}}
                            </view>
                        </view>
                    </uni-card>
@@ -943,6 +955,7 @@
                text-align: center;
            }
        }

        .checkbox{
            color: #888;
            font-size: 28rpx;

 pages/qitarukujiaoyan/table.vue

@@ -128,12 +128,12 @@
                page:1,
            }
        },
        onLoad() {
            //用户模块权限判断
            this.CheckModRight()
            this.changeTab(0)
            console.log(this.userInfo,uni.getStorageSync('HUserName'))
        },
        // onLoad() {
        //     //用户模块权限判断
        //     this.CheckModRight()
        //     this.changeTab(0)
        //     console.log(this.userInfo,uni.getStorageSync('HUserName'))
        // },
        onShow() {
            this.CheckModRight()
            this.changeTab(0)

 pages/shengchanbuliaojiaoyan/CacheList.vue

@@ -128,7 +128,13 @@
                page:1,
            }
        },
        onLoad() {
        // onLoad() {
        //     //用户模块权限判断
        //     this.CheckModRight()
        //     this.changeTab(0)
        //     console.log(this.userInfo,uni.getStorageSync('HUserName'))
        // },
        onShow() {
            //用户模块权限判断
            this.CheckModRight()
            this.changeTab(0)

 pages/shengchanbuliaojiaoyan/form.vue

@@ -229,6 +229,18 @@
            }
        },
        onLoad(e) {
            console.log(e, this.userInfo)
            this.OperationType = e.OperationType
            if (e.HBillNo) {
                this.hform.HBillNo = e.HBillNo
                this.GetMeesageByBillNo(e.HBillNo)
            } else {
                // this.getNewData()
            }
			
			
            this.getHBaseList()
        },onLoad(e) {
            console.log(e, this.userInfo)
            this.OperationType = e.OperationType
            if (e.HBillNo) {

 pages/weiwaibuliaojiaoyan/form.vue

@@ -86,6 +86,9 @@
                            <view class="detail">
                                <text>物料代码：</text>{{item.物料代码}}
                            </view>
                            <view class="detail">
                                <text>单据数量：</text>{{item.单据数量}}
                            </view>
                            <view class="detail" v-if="item.规格型号">
                                <text>规格型号：</text>{{item.规格型号}}
                            </view>
@@ -95,6 +98,9 @@
                            <view class="detail" v-if="item.辅助属性">
                                <text>辅助属性：</text>{{item.辅助属性}}
                            </view>
                            <view class="detail">
                                <text>条码个数：</text>{{item.条码个数}}
                            </view>
                        </view>
                    </uni-card>
                </view>

 pages/weiwailingliaojiaoyan/form.vue

@@ -87,6 +87,9 @@
                            <view class="detail">
                                <text>物料代码：</text>{{item.物料代码}}
                            </view>
                            <view class="detail">
                                <text>单据数量：</text>{{item.单据数量}}
                            </view>
                            <view class="detail" v-if="item.规格型号">
                                <text>规格型号：</text>{{item.规格型号}}
                            </view>
@@ -96,6 +99,15 @@
                            <view class="detail" v-if="item.辅助属性">
                                <text>辅助属性：</text>{{item.辅助属性}}
                            </view>
                            <view class="detail" v-if="item.仓库">
                                <text>仓库：</text>{{item.仓库}}
                            </view>
                            <view class="detail" v-if="item.仓位">
                                <text>仓位：</text>{{item.仓位}}
                            </view>
                            <view class="detail" >
                                <text>条码个数：</text>{{item.条码个数}}
                            </view>
                        </view>
                    </uni-card>
                </view>

 pages/weiwailingliaojiaoyan/table.vue

@@ -133,6 +133,12 @@
            }
        },
        onLoad() {
            // //用户模块权限判断
            // this.CheckModRight()
            // this.changeTab(0)
            // console.log(this.userInfo, uni.getStorageSync('HUserName'))
        },
        onShow() {
            //用户模块权限判断
            this.CheckModRight()
            this.changeTab(0)

 pages/xiaoshouchukujiaoyan/form.vue

@@ -86,6 +86,9 @@
                            <view class="detail">
                                <text>物料代码：</text>{{item.物料代码}}
                            </view>
                            <view class="detail">
                                <text>单据数量：</text>{{item.单据数量}}
                            </view>
                            <view class="detail" v-if="item.规格型号">
                                <text>规格型号：</text>{{item.规格型号}}
                            </view>
@@ -94,6 +97,15 @@
                            </view>
                            <view class="detail" v-if="item.辅助属性">
                                <text>辅助属性：</text>{{item.辅助属性}}
                            </view>
                            <view class="detail" v-if="item.仓库">
                                <text>仓库：</text>{{item.仓库}}
                            </view>
                            <view class="detail" v-if="item.仓位">
                                <text>仓位：</text>{{item.仓位}}
                            </view>
                            <view class="detail" >
                                <text>条码个数：</text>{{item.条码个数}}
                            </view>
                        </view>
                    </uni-card>
@@ -768,8 +780,8 @@
                    success: (res) => {
                        if (res.confirm) {
                            console.log('用户点击确定');
                            uni.redirectTo({
                                url: '/pages/qitachukujiaoyan/qitachukujiaoyan'
                            uni.navigateBack({
                                url: '/pages/xiaoshouchukujiaoyan/table'
                            })
                        } else if (res.cancel) {
                            console.log('用户点击取消');

			@@ -84,10 +84,10 @@
			<uni-card :title="item.物料名称" :extra="'数量:'+item.数量" style="margin: 10px;" @tap="delMater(item)">
			<view class="card-detail">
			<view class="detail">
			<text>单据号：</text>{{item.单据号}}
			<text>物料代码：</text>{{item.物料代码}}
			</view>
			<view class="detail">
			<text>物料代码：</text>{{item.物料代码}}
			<text>单据数量：</text>{{item.单据数量}}
			</view>
			<view class="detail" v-if="item.规格型号">
			<text>规格型号：</text>{{item.规格型号}}
			@@ -98,10 +98,13 @@
			<view class="detail" v-if="item.辅助属性">
			<text>辅助属性：</text>{{item.辅助属性}}
			</view>
			<view class="detail" v-if="item.单据数量">
			<text>单据数量：</text>{{item.单据数量}}
			<view class="detail" v-if="item.仓库">
			<text>仓库：</text>{{item.仓库}}
			</view>
			<view class="detail" v-if="item.条码个数">
			<view class="detail" v-if="item.仓位">
			<text>仓位：</text>{{item.仓位}}
			</view>
			<view class="detail" >
			<text>条码个数：</text>{{item.条码个数}}
			</view>
			</view>
			@@ -777,8 +780,8 @@
			success: (res) => {
			if (res.confirm) {
			console.log('用户点击确定');
			uni.redirectTo({
			url: '/pages/qitachukujiaoyan/qitachukujiaoyan'
			uni.navigateBack({
			url: '/pages/caigourukujiaoyan/table'
			})
			} else if (res.cancel) {
			console.log('用户点击取消');

			@@ -133,6 +133,12 @@
			}
			},
			onLoad() {
			// //用户模块权限判断
			// this.CheckModRight()
			// this.changeTab(0)
			// console.log(this.userInfo, uni.getStorageSync('HUserName'))
			},
			onShow() {
			//用户模块权限判断
			this.CheckModRight()
			this.changeTab(0)

			@@ -86,6 +86,9 @@
			<view class="detail">
			<text>物料代码：</text>{{item.物料代码}}
			</view>
			<view class="detail">
			<text>单据数量：</text>{{item.单据数量}}
			</view>
			<view class="detail" v-if="item.规格型号">
			<text>规格型号：</text>{{item.规格型号}}
			</view>
			@@ -94,6 +97,15 @@
			</view>
			<view class="detail" v-if="item.辅助属性">
			<text>辅助属性：</text>{{item.辅助属性}}
			</view>
			<view class="detail" v-if="item.仓库">
			<text>仓库：</text>{{item.仓库}}
			</view>
			<view class="detail" v-if="item.仓位">
			<text>仓位：</text>{{item.仓位}}
			</view>
			<view class="detail" >
			<text>条码个数：</text>{{item.条码个数}}
			</view>
			</view>
			</uni-card>
			@@ -943,6 +955,7 @@
			text-align: center;
			}
			}

			.checkbox{
			color: #888;
			font-size: 28rpx;

			@@ -128,12 +128,12 @@
			page:1,
			}
			},
			onLoad() {
			//用户模块权限判断
			this.CheckModRight()
			this.changeTab(0)
			console.log(this.userInfo,uni.getStorageSync('HUserName'))
			},
			// onLoad() {
			// //用户模块权限判断
			// this.CheckModRight()
			// this.changeTab(0)
			// console.log(this.userInfo,uni.getStorageSync('HUserName'))
			// },
			onShow() {
			this.CheckModRight()
			this.changeTab(0)

			@@ -128,7 +128,13 @@
			page:1,
			}
			},
			onLoad() {
			// onLoad() {
			// //用户模块权限判断
			// this.CheckModRight()
			// this.changeTab(0)
			// console.log(this.userInfo,uni.getStorageSync('HUserName'))
			// },
			onShow() {
			//用户模块权限判断
			this.CheckModRight()
			this.changeTab(0)

			@@ -229,6 +229,18 @@
			}
			},
			onLoad(e) {
			console.log(e, this.userInfo)
			this.OperationType = e.OperationType
			if (e.HBillNo) {
			this.hform.HBillNo = e.HBillNo
			this.GetMeesageByBillNo(e.HBillNo)
			} else {
			// this.getNewData()
			}


			this.getHBaseList()
			},onLoad(e) {
			console.log(e, this.userInfo)
			this.OperationType = e.OperationType
			if (e.HBillNo) {

			@@ -87,6 +87,9 @@
			<view class="detail">
			<text>物料代码：</text>{{item.物料代码}}
			</view>
			<view class="detail">
			<text>单据数量：</text>{{item.单据数量}}
			</view>
			<view class="detail" v-if="item.规格型号">
			<text>规格型号：</text>{{item.规格型号}}
			</view>
			@@ -96,6 +99,15 @@
			<view class="detail" v-if="item.辅助属性">
			<text>辅助属性：</text>{{item.辅助属性}}
			</view>
			<view class="detail" v-if="item.仓库">
			<text>仓库：</text>{{item.仓库}}
			</view>
			<view class="detail" v-if="item.仓位">
			<text>仓位：</text>{{item.仓位}}
			</view>
			<view class="detail" >
			<text>条码个数：</text>{{item.条码个数}}
			</view>
			</view>
			</uni-card>
			</view>