Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

chenhaozhe

7 天以前 df528b419a881d401bf038fa5ed3b3f25d2958e6

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

 pages/gongxuOut/Cj_StationOutBillList.vue

@@ -215,10 +215,10 @@
                </view>
                
                <view class="op" v-if="operations == index">
<!--                     <button class="op1" size="mini" plain @tap.stop="check(item)">审核</button>
                    <button class="op2" size="mini" plain @tap.stop="antiCheck(item)">反审核</button> -->
                    <button class="op1" size="mini" plain @tap.stop="check(item)">审核</button>
                    <!-- <button class="op2" size="mini" plain @tap.stop="antiCheck(item)">反审核</button> -->
                    <!-- <button class="op1" size="mini" plain @tap.stop="qcCheck(item)">工序检</button> -->
                    <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="false">编辑</button>
                    <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="true">编辑</button>
                    <button class="op4" size="mini" plain @tap.stop="del(item)" v-if="false">删除</button>
                    <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
                </view>

 pages/gongxuOut/Cj_StationOutBill_Standard.vue

@@ -1794,22 +1794,22 @@
                                } else {
                                    uni.showModal({
                                        title: '提示',
                                        content: res.data.Message + '。是否继续新增下一道工序？(点击取消返回新增页面)',
                                        content: res.data.Message + '。是否继续新增',
                                        success: (res) => {
                                            if (res.confirm) {
                                                console.log('用户点击确定');
                                                this.getNextProc()
                                                // uni.redirectTo({
                                                //     url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
                                                // })
                                                uni.redirectTo({
                                                    url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
                                                })
                                            } else if (res.cancel) {
                                                console.log('用户点击取消');
                                                // setTimeout(() => {
                                                //     uni.navigateBack();
                                                // }, 50)
                                                uni.redirectTo({
                                                    url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
                                                })
                                                setTimeout(() => {
                                                    uni.navigateBack();
                                                }, 50)
                                                // uni.redirectTo({
                                                //     url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
                                                // })
                                            }
                                        }
                                    });
@@ -1943,64 +1943,6 @@
                    }
                });
            },
            getNextProc(){
                uni.request({
                    url: this.serverUrl + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
                    method: 'GET',
                    dataType: "json",
                    data: {
                        sWhere:this.hform.HProcExchHinteID
                    },
                    success: (res) => {
                        console.log(1, res);
                        if (res.data.count == 1) {
                            let processList = res.data.data
                            let self = this;
                            console.log(this.hform)
                            console.log(self.hform)
                            // 1. 先过滤出 HSEQNumber === 'N' 的数据
                            processList = processList.filter(item => item.HSEQNumber === this.hform.HSEQNumber);
							
                            //当前工序编号
                            const currentIndex = processList.findIndex(item => item["工序号"] == this.hform.HProcNo);
                            // 获取下一个工序（如果存在）
                            const nextProcess = currentIndex !== -1 && currentIndex < processList.length - 1 
                              ? processList[currentIndex + 1] : null;
                             console.log(currentIndex,nextProcess,processList);
							 
                            if(!nextProcess){
                                uni.showToast({
                                    title: '没有下一道工序即将跳转新增页面',
                                    icon: 'none'
                                })
                                uni.redirectTo({
                                    url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
                                })
                            }else{
                                this.hform.HProcNo=nextProcess["工序号"];
                                const HNextBarCode = this.hform.HBarCode+"@"+this.hform.HProcNo+"@"+this.hform.HSEQNumber
                                uni.redirectTo({
                                    url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1&HBarCode='+HNextBarCode
                                })
                            }
                        }else{
                            console.log(res);
                            uni.showToast({
                                title: '获取下一道工序失败',
                                icon: 'none'
                            })
                        }
				        
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            }
        }
    }
</script>

 pages/weiwaigxIn/Cj_StationEntrustInBillList.vue

@@ -169,10 +169,10 @@
                </view>
                
                <view class="op" v-if="operations == index">
<!--                     <button class="op1" size="mini" plain @tap.stop="check(item)">审核</button>
                    <button class="op2" size="mini" plain @tap.stop="antiCheck(item)">反审核</button> -->
                    <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="false">编辑</button>
                    <button class="op4" size="mini" plain @tap.stop="del(item)">删除</button>
                    <button class="op1" size="mini" plain @tap.stop="check(item)">审核</button>
                    <!-- <button class="op2" size="mini" plain @tap.stop="antiCheck(item)">反审核</button> -->
                    <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="true">编辑</button>
                    <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">删除</button> -->
                    <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
                </view>
            </uni-card>

 pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue

@@ -208,10 +208,10 @@
                </view>
                
                <view class="op" v-if="operations == index">
<!--                     <button class="op1" size="mini" plain @tap.stop="check(item)">审核</button>
                    <button class="op2" size="mini" plain @tap.stop="antiCheck(item)">反审核</button> -->
                    <button class="op1" size="mini" plain @tap.stop="check(item)">审核</button>
                    <!-- <button class="op2" size="mini" plain @tap.stop="antiCheck(item)">反审核</button> -->
                    <button class="op1" size="mini" plain @tap.stop="firstCheck(item)" v-if="false">首检</button>
                    <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="false">编辑</button>
                    <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="true">编辑</button>
                    <button class="op4" size="mini" plain @tap.stop="del(item)" v-if="false">删除</button>
                    <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
                </view>