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

chenhaozhe

2025-10-21 fd1b170bde962990fd0926776139ec94a85052a2

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

 .hbuilderx/launch.json

@@ -25,7 +25,7 @@
            "localRepoPath" : "D:/WorkBench/ZY_APP_Dev/STUWMS/unpackage/debug",
            "openVueDevtools" : true,
            "packageName" : "com.shebeiguanli.www",
            "playground" : "custom",
            "playground" : "standard",
            "type" : "uni-app:app-android"
        }
    ]

 components/ProcListPopup/ProcListPopup.vue

New file
@@ -0,0 +1,209 @@
<template>
    <view>
        <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
            <view class="content">
                <scroll-view id="#BillListPanel" scroll-y="true" style="height: 55vh;">
                    <view class="options-wrapper" v-show="HBillList.length != 0">
                        <uni-card :is-active="bill.isActive" :class="bill.isActive?'uni-card--is-active':''"
                            v-for="(bill, index) in HBillList[curPage-1]" :key="index" :title="bill['工序名称']"
                             @tap="clickCard(bill['流水号'],bill['序列号'], index)">
                            <view class="item">
                                <view class="left">流水号: </view>
                                <view class="right">{{bill['流水号']}}</view>
                            </view>
                            <view class="item">
                                <view class="left">工序代码: </view>
                                <view class="right">{{bill['工序代码']}}</view>
                            </view>
                            
                        </uni-card>
                    </view>
                    <view class="over" v-show="HBillList.length == 0">暂无数据</view>
                </scroll-view>
                <uni-pagination id="#pagination" title="标题文字" v-model="curPage" :pageSize="size"
                    :total="length"></uni-pagination>
            </view>

        </uni-popup>
    </view>
</template>

<script>
    import {
        CommonUtils
    } from '../../utils/common';
    import {
        getUserInfo
    } from "@/utils/auth.js";
    export default {
        name: "BillListPopup_Check",
        data() {
            return {
                userInfo: getUserInfo(),
                size: 20,
                curPage: 1,
                length: 0,
                page: 0,
                // HMater: this.HMater,
                HCustom: '',
                HBillList: [],
                panelHeight: 0,

            };
        },
        props: {
            HProcExchHBillNo: {
                type: [String, String],
                required: true
            },
            HProcExchHInteID: {
                type: [String, Number],
                required: true
            },
        },
        methods: {
            popupChangeHandler(e) {
                if (e.show === true) {
                    this.getBillList()
                }
            },
            async exit() {
                this.size = 20
                this.curPage = 1
                this.length = 0
                this.page = 0
                this.HBillList = []
                // 需要等待页面内的数据赋值完毕
                await this.$nextTick()
                this.$refs.popup.close();
            },
            search() {
                this.getBillList()
            },
            
            showPopup() {
                this.$refs.popup.open();
            },
            clickCard(procNo,seqNumber, index) {
                uni.$emit('HProcNoSelectComplete', {
                    HProcNo:procNo,
                    HSEQNumber:seqNumber
                })
                // this.exit()
            },
            getBillList() {
                this.HBillList = []
                this.length = 0
                this.page = 0
                this.curPage = 1
                CommonUtils.doRequest(
                    "/Web/GetProcNoList", {
                        HInterID: this.HProcExchHInteID,
                        sWhere: 0,
                        UserID: this.userInfo["Czybm"],
                    },
                    (res) => {
                        let {
                            data,
                            count,
                            Message
                        } = res.data
                        if (count == 1) {
                            this.length = Array.from(data).length
                            const result = [];
                            for (let i = 0; i < data.length; i += this.size) {
                                result.push(data.slice(i, i + this.size));
                            }
                            this.HBillList = result
                            this.page = result.length
                            
                        } else {
                            
                            uni.showToast({
                                icon: 'none',
                                title: Message
                            })
                        }
                    }
                )
            },
        },
    }
</script>

<style lang="scss">
    .content {
        box-sizing: border-box;
        border-radius: 15rpx 15rpx 0 0;
        padding: 20rpx 20rpx 40rpx 20rpx;
        background-color: #fff;
        display: flex;
        flex-direction: column;
        gap: 10rpx;

        .search-condition {
            display: flex;
            flex-direction: row;
            align-items: center;
            gap: 20rpx;

            .title {
                width: 5rem;
                text-align: right;
            }

            .right {
                flex: 1;
                border-radius: 22rpx;
                border: 1px solid #acacac;
                height: auto;

                input {
                    width: 100%;
                    padding: 8rpx 20rpx;
                    font-size: 24rpx;
                }
            }
        }

        .buttons {
            display: flex;
            flex-direction: row;
            gap: 20rpx;
            justify-content: flex-end;

            >button {
                display: inline-flex;
                width: 4rem;
            }
        }

        .options-wrapper {
            padding: 20rpx;
            display: grid;
            grid-template-columns: repeat(1, 1fr);
            gap: 20rpx;

            >view {
                margin: 0 !important;
                box-sizing: border-box;

            }

            .item {
                .left {
                    display: inline-block;
                    width: 6rem;
                }

                .right {
                    display: inline-block;
                }
            }
        }

        .uni-card--is-active {
            background-color: rgba(0, 122, 255, 0.2);
        }
    }
</style>

 components/StationOutBillPopup/StationOutBillPopup.vue

File was renamed from pages/gongxuOutSendWork/form.vue
@@ -1,7 +1,8 @@
<template>
    <view>
        <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
        <view class="form">
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title"><text>*</text>条形码:</view>
                <view class="right" style="width: 380rpx;">
                    <input name="HBarCode" v-model="hform.HBarCode" placeholder="请扫描条码" @confirm="toInCode(e)" />
@@ -10,14 +11,14 @@
                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
                    size="20" @click="toScanCode"></uni-icons>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">序列号:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHSEQName" placeholder="请选择序列" v-model="hform.HSEQName"
                        @input="HSEQNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title"><text>*</text>流水号:</view>
                <view class="right" style="width: 380rpx;">
                    <input v-model="hform.HProcNo" placeholder="请输入(或扫描)流水号"
@@ -57,21 +58,21 @@
                    <input v-model="hform.HWasterQty" placeholder="请输入报废数量" />
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">生产资源:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHSourceName" placeholder="请选择生产资源" v-model="hform.HSourceName"
                        @input="HSourceNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title"><text>*</text>工作中心:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHCenterName" placeholder="请选择工作中心" v-model="hform.HCenterName"
                        @input="HCenterNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">生产班组:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHGroupName" placeholder="请选择生产班组" v-model="hform.HGroupName"
@@ -145,56 +146,56 @@

            <view class="tab_area"></view>

            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">单据号:</view>
                <view class="righton">
                    <input name="HBillNo" disabled v-model="hform.HBillNo" />
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false" >
                <view class="title">生产订单:</view>
                <view class="righton">
                    <input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">流转卡:</view>
                <view class="righton">
                    <input disabled v-model="hform.HProcExchBillNo" />
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">物料代码:</view>
                <view class="righton">
                    <input disabled v-model="hform.HMaterNumber" />
                    <!-- <uni-combox :candidates="arrayHMaterNumber" placeholder="请选择产品代码" v-model="hform.HMaterNumber" @input="HMaterNumberChange"></uni-combox> -->
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">物料名称:</view>
                <view class="righton">
                    <input v-model="hform.HMaterName" disabled />
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">规格型号:</view>
                <view class="righton">
                    <input v-model="hform.HMaterModel" disabled />
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">款号:</view>
                <view class="righton">
                    <input v-model="hform.HStyleNumber" disabled />
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">计量单位:</view>
                <view class="righton">
                    <input v-model="hform.单位" disabled />
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">工序:</view>
                <!--                 <view class="right">
                    <uni-combox :candidates="arrayHProcName" placeholder="请选择当前工序" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
@@ -203,7 +204,7 @@
                    <input v-model="hform.HProcName" disabled />
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">生产组织:</view>
                <view class="righton">
                    <input v-model="hform.HPRDOrg" disabled />
@@ -274,35 +275,35 @@
            <view class="tab_area"></view>


            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">操作员2:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHEmpName" placeholder="请选择操作员" v-model="hform.HEmpName2"
                        @input="HEmpName2Change"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">操作员3:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHEmpName" placeholder="请选择操作员" v-model="hform.HEmpName3"
                        @input="HEmpName3Change"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">操作员4:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHEmpName" placeholder="请选择操作员" v-model="hform.HEmpName4"
                        @input="HEmpName4Change"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title">操作员5:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHEmpName" placeholder="请选择操作员" v-model="hform.HEmpName5"
                        @input="HEmpName5Change"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="form-item" v-show="false">
                <view class="title"></view>
                <!--                 <view style="padding-top: 10rpx;" @tap="hform.HLastSubProc = hform.HLastSubProc==true?false:true">
                    <radio value="true" :checked="hform.HLastSubProc == true" style="transform:scale(1);"/>转下道
@@ -311,96 +312,9 @@
                    <radio value="true" :checked="hform.HLastSubProc == true" style="transform:scale(1);" />转下道
                </view>
            </view>
            <!--             <view class="form-item">
                <view class="title">出站时间:</view>
                <view class="right">
                     <uni-datetime-picker v-model="hform.HStationOutTime">
                         <input disabled v-model="hform.HStationOutTime" placeholder="请选择出站时间" />
                     </uni-datetime-picker>
                </view>
            </view>
            <view class="form-item">
                <view class="title">模穴号:</view>
                <view class="right">
                    <input v-model="hform.HMouldNum" placeholder="请输入模穴号" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">生产资源2:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHSourceName" placeholder="请选择生产资源" v-model="hform.HSourceName2" @input="HSourceName2Change"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">生产资源3:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHSourceName" placeholder="请选择生产资源" v-model="hform.HSourceName3" @input="HSourceName3Change"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">生产资源4:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHSourceName" placeholder="请选择生产资源" v-model="hform.HSourceName4" @input="HSourceName4Change"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">生产资源5:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHSourceName" placeholder="请选择生产资源" v-model="hform.HSourceName5" @input="HSourceName5Change"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">核算工序:</view>
                <view class="right">
                    <input v-model="hform.HPayProcID" placeholder="请输入核算工序" />
                </view>
            </view> -->

            <!--             <view class="form-item">
                <view class="title">设备清单:</view>
                <view class="right">
                    <input v-model="hform.HSourceNameList" placeholder="请输入设备清单" />
                </view>
            </view> -->
            <!--             <view class="form-item">
                <view class="title">供应商:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHSupName" placeholder="请选择供应商" v-model="hform.HSupName" @input="HSupNameChange"></uni-combox>
                </view>
            </view> -->
            <!-- 			
            <view class="form-item">
                <view class="title">进站时间:</view>
                <view class="right">
                     <uni-datetime-picker v-model="hform.HStationInTime">
                         <input disabled v-model="hform.HStationInTime" placeholder="请选择接收时间" />
                     </uni-datetime-picker>
                </view>
            </view> -->

            <!--             <view class="form-item">
                <view class="title">操作员:</view>
                <view class="right">
                    <input v-model="hform.HEmp" placeholder="请输入操作员" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">部门:</view>
                <view class="right">
                    <input v-model="hform.HDept" placeholder="请输入部门" />
                </view>
            </view> -->

            <!-- <view class="tab_area"></view> -->

            <!--             <view class="form-item">
                <view class="title">选择文件:</view>
                <view class="right">
                    1111
                </view>
            </view> -->

            <view v-if="showmore">
                <view v-if="showmore" v-show="false">
                <view class="form-item">
                    <view class="title">订单跟踪号:</view>
                    <view class="righton">
@@ -461,7 +375,7 @@
                </view>
            </view>

            <view class="tab_area"></view>
				

            <view class="other">
                <view v-if="!showmore" @tap="showmore = true">
@@ -472,7 +386,7 @@
                </view>
            </view>

            <view class="tab_area"></view>
				

            <!--             <view class="op">
                <button class="op1" size="mini" plain @tap="huibao">汇报</button>
@@ -488,11 +402,11 @@
                    @tap="check">审核</button>
                <button v-if="btnType != 0 && btnType == 3" class="btn-d" style="margin-left: 20rpx;" size="mini"
                    @tap="abandonCheck">反审核</button>
                <flex style="flex: 1;"></flex>
                <button class="btn-b" size="mini" @tap="addNew">新增</button>
                <button class="btn-c" size="mini" @tap="goBack">退出</button>
                    <!-- <button class="btn-b" size="mini" @tap="addNew">新增</button>
                    <button class="btn-c" size="mini" @tap="goBack">退出</button> -->
            </view>
        </view>
        </uni-popup>
    </view>
</template>
<script>
@@ -502,6 +416,7 @@
    } from "@/utils/auth.js";
import { CommonUtils } from '../../utils/common';
    export default {
        name: "BillListPopup_gongxuOut",
        data() {
            return {
                userInfo: getUserInfo(),
@@ -630,7 +545,8 @@
                }
            }
        },
        onLoad(e) {
        
        mounted(e) {
            // this.getEditData('1516','GXCZHB000000001290')
            console.log(e, this.userInfo)
            // this.hform.HEmpID = this.userInfo.Czybm
@@ -639,22 +555,23 @@
            this.hform.HMakeDate = getDateTime.dateTimeStr('y-m-d h:i:s')
            // this.hform.HDate = getDateTime.dateTimeStr('y-m-d')
            // this.hform.HStationOutTime = getDateTime.dateTimeStr('y-m-d h:i:s')
            if (e.linterid) {
                this.btnType = 1
                this.OperationType = 4
                this.linterid = e.linterid
                this.HBillNo = e.HBillNo
                this.getEditData(e.linterid, e.HBillNo)
            } else {
                this.getNewData()
                if(e.HBarCode){
                    this.hform.HBarCode=e.HBarCode
                    setTimeout(() => {
                        this.toInCode(e);
                    }, 1000)
                }
    //         if (e.linterid) {
    //             this.btnType = 1
    //             this.OperationType = 4
    //             this.linterid = e.linterid
    //             this.HBillNo = e.HBillNo
    //             this.getEditData(e.linterid, e.HBillNo)
    //         } else {
    //             this.getNewData()
                // if(e.HBarCode){
                //     this.hform.HBarCode=e.HBarCode
                //     setTimeout(() => {
                //         this.toInCode(e);
                //     }, 1000)
                // }
                
            }
    //         }
            this.getNewData()
            this.getHMaterList()
            this.getHProcList()
            this.getHSupList()
@@ -667,6 +584,21 @@
            
        },
        methods: {
            //打开时加载
            popupChangeHandler(e) {
                if (e.show === false) {
                    this.hform.HQty='';
                    this.hform.HBadCount=0;
                    this.hform.HWasterQty=0;
                    this.getNewData()
                }
            },
            //打开弹框
            showPopup(hBarCode) {
                this.hform.HBarCode=hBarCode;
                this.toInCode(hBarCode);
                this.$refs.popup.open();
            },
            //选中全部文本
            selectAllText(e) {
              console.log(e.target)
@@ -1192,10 +1124,15 @@
                                this.setMainHSEQ();
                            }
                        } else {
                            if(res.data.Message=="子序列缺失"){
                                this.getHProcNoData(this.hform.HBarCode,this.hform.HProcNo)
                            }else{
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                            }
				            
                        }
                    },
                    fail: (res) => {
@@ -1759,27 +1696,31 @@
                                        })
                                    }, 1000)
                                } else {
                                    uni.showModal({
                                        title: '提示',
                                        content: res.data.Message + '。是否继续新增下一道工序？(点击取消返回新增页面)',
                                        success: (res) => {
                                            if (res.confirm) {
                                                console.log('用户点击确定');
                                                this.getNextProc()
                                    uni.showToast({
                                        title: res.data.Message,
                                        icon: 'none'
                                    })
            //                         uni.showModal({
            //                             title: '提示',
            //                             content: res.data.Message + '。是否继续新增下一道工序？(点击取消返回新增页面)',
            //                             success: (res) => {
            //                                 if (res.confirm) {
            //                                     console.log('用户点击确定');
                                                // this.getNextProc()
            //                                     // uni.redirectTo({
            //                                     //     url: '/pages/gongxuOut/form?OperationType=1'
            //                                     // })
            //                                 } else if (res.cancel) {
            //                                     console.log('用户点击取消');
            //                                     // setTimeout(() => {
            //                                     //     uni.navigateBack();
            //                                     // }, 50)
                                                // uni.redirectTo({
                                                //     url: '/pages/gongxuOut/form?OperationType=1'
                                                // })
                                            } else if (res.cancel) {
                                                console.log('用户点击取消');
                                                // setTimeout(() => {
                                                //     uni.navigateBack();
                                                // }, 50)
                                                uni.redirectTo({
                                                    url: '/pages/gongxuOut/form?OperationType=1'
                                                })
                                            }
                                        }
                                    });
            //                                 }
            //                             }
            //                         });
                                }
                            } else {
                                uni.showToast({
@@ -1970,9 +1911,14 @@

<style lang="scss" scoped>
    .form {
        width: 668rpx;
        margin: 20rpx auto;
        padding-bottom: 240rpx;
        box-sizing: border-box;
        border-radius: 15rpx 15rpx 0 0;
        padding: 20rpx 20rpx 40rpx 20rpx;
        background-color: #fff;
        display: flex;
        flex-direction: column;
        gap: 10rpx;
        overflow-y: auto;
    }
    picker input{
        pointer-events: none;

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "1.0.99",
    "versionCode" : 199,
    "versionName" : "2.0.3",
    "versionCode" : 203,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
@@ -18,10 +18,10 @@
        },
        /* 模块配置 */
        "modules" : {
            "Barcode" : {},
            "Camera" : {},
            "Contacts" : {},
            "Bluetooth" : {}
            "Bluetooth" : {},
            "Barcode" : {}
        },
        /* 应用发布信息 */
        "distribute" : {
@@ -59,33 +59,33 @@
            },
            "icons" : {
                "android" : {
                    "hdpi" : "unpackage/res/icons/72x72.png",
                    "xhdpi" : "unpackage/res/icons/96x96.png",
                    "xxhdpi" : "unpackage/res/icons/144x144.png",
                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                    "hdpi" : "",
                    "xhdpi" : "",
                    "xxhdpi" : "",
                    "xxxhdpi" : ""
                },
                "ios" : {
                    "appstore" : "unpackage/res/icons/1024x1024.png",
                    "appstore" : "",
                    "ipad" : {
                        "app" : "unpackage/res/icons/76x76.png",
                        "app@2x" : "unpackage/res/icons/152x152.png",
                        "app" : "",
                        "app@2x" : "",
                        "notification" : "unpackage/res/icons/20x20.png",
                        "notification@2x" : "unpackage/res/icons/40x40.png",
                        "proapp@2x" : "unpackage/res/icons/167x167.png",
                        "proapp@2x" : "",
                        "settings" : "unpackage/res/icons/29x29.png",
                        "settings@2x" : "unpackage/res/icons/58x58.png",
                        "spotlight" : "unpackage/res/icons/40x40.png",
                        "spotlight" : "",
                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                    },
                    "iphone" : {
                        "app@2x" : "unpackage/res/icons/120x120.png",
                        "app@3x" : "unpackage/res/icons/180x180.png",
                        "notification@2x" : "unpackage/res/icons/40x40.png",
                        "notification@3x" : "unpackage/res/icons/60x60.png",
                        "settings@2x" : "unpackage/res/icons/58x58.png",
                        "settings@3x" : "unpackage/res/icons/87x87.png",
                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                        "app@2x" : "",
                        "app@3x" : "",
                        "notification@2x" : "",
                        "notification@3x" : "",
                        "settings@2x" : "",
                        "settings@3x" : "",
                        "spotlight@2x" : "",
                        "spotlight@3x" : ""
                    }
                }
            }

 pages.json

@@ -189,12 +189,6 @@
            }
        },
        {
            "path": "pages/gongxuOutSendWork/form",
            "style": {
                "navigationBarTitleText": "工序出站汇报单(派工)"
            }
        }, 
        {
            "path": "pages/gongxuOutSendWork/table",
            "style": {
                "navigationBarTitleText": "工序出站汇报单(派工)",

 pages/gongxuOut/form.vue

@@ -4,7 +4,7 @@
            <view class="form-item">
                <view class="title"><text>*</text>条形码:</view>
                <view class="right" style="width: 380rpx;">
                    <input name="HBarCode" v-model="hform.HBarCode" placeholder="请扫描条码" @confirm="toInCode(e)" />
                    <input name="HBarCode" v-model="hform.HBarCode" placeholder="请扫描条码" @confirm="toInCode" />
                </view>
                <uni-icons type="scan"
                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -23,9 +23,12 @@
                    <input v-model="hform.HProcNo" placeholder="请输入(或扫描)流水号"
                        @blur="getHProcNoData2(hform.HBarCode,hform.HProcNo,hform.HSEQNumber)" />
                </view>
                <uni-icons type="scan"
                <!-- <uni-icons type="scan"
                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
                    size="20" @click="toScanProcNo"></uni-icons>
                    size="20" @click="toScanProcNo"></uni-icons> -->
                <view class="icon-wrapper" >
                    <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
                </view>
            </view>
            <view class="form-item">
                <view class="title">工序编码:</view>
@@ -488,11 +491,13 @@
                    @tap="check">审核</button>
                <button v-if="btnType != 0 && btnType == 3" class="btn-d" style="margin-left: 20rpx;" size="mini"
                    @tap="abandonCheck">反审核</button>
                <flex style="flex: 1;"></flex>
                <!-- <flex style="flex: 1;"></flex> -->
                <button class="btn-b" size="mini" @tap="addNew">新增</button>
                <button class="btn-c" size="mini" @tap="goBack">退出</button>
            </view>
        </view>
        <ProcListPopupVue ref="billList" :HProcExchHBillNo="hform.HProcExchBillNo" :HProcExchHInteID="hform.HProcExchHinteID"
            ></ProcListPopupVue>
    </view>
</template>
<script>
@@ -501,7 +506,9 @@
        getUserInfo
    } from "@/utils/auth.js";
import { CommonUtils } from '../../utils/common';
import ProcListPopupVue from '../../components/ProcListPopup/ProcListPopup.vue';
    export default {
        components: { ProcListPopupVue },
        data() {
            return {
                userInfo: getUserInfo(),
@@ -648,10 +655,11 @@
            } else {
                this.getNewData()
                if(e.HBarCode){
                    console.log(e.HBarCode)
                    this.hform.HBarCode=e.HBarCode
                    setTimeout(() => {
                        this.toInCode(e);
                    }, 1000)
                        this.toInCode();
                    }, 500)
                }
                
            }
@@ -664,9 +672,30 @@
            this.getHCenterList()

            this.getDefValByUser()
			
            uni.$on('HProcNoSelectComplete', (e) => {
                console.log("接收到的消息: ", e.HProcNo)
                this.hform.HProcNo=e.HProcNo;
                this.hform.HSEQNumber = e.HSEQNumber;
                this.getHProcNoData2(this.hform.HBarCode,this.hform.HProcNo,this.hform.HSEQNumber)
                this.$refs.billList.exit()
            })
        },
        onUnload() {
            uni.$off('HProcNoSelectComplete')
        },
        methods: {
            //选择工序
            showBillList() {
                if(this.hform.HProcExchBillNo!=""){
                    this.$refs.billList.showPopup()
                }else{
                    uni.showToast({
                        title: '请先扫描流转卡',
                        icon: 'none'
                    })
                }
			    
            },
            //选中全部文本
            selectAllText(e) {
              console.log(e.target)
@@ -774,7 +803,7 @@
                //     }
                // });
            },
            toInCode(e) {
            toInCode() {
                var str = this.hform.HBarCode
                if (str.includes('@')) {
                    const parts = str.split('@');
@@ -1545,6 +1574,9 @@
                });
            },
            getHProcNoData2(HBarCode, HProcNo,HSEQNumber) {
                if(HProcNo==""){
                    return;
                }
                uni.request({
                    url: this.serverUrl + '/Cj_StationOutBill/txtHProcNo_KeyDown',
                    data: {
@@ -1922,15 +1954,19 @@
                        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 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: '没有下一道工序即将跳转新增页面',
@@ -1969,6 +2005,19 @@
</script>

<style lang="scss" scoped>
    .icon-wrapper {
        background-color: #3A78FF;
        border-radius: 100%;
        width: 52rpx;
        height: 52rpx;
        display: flex;
        justify-content: center;
        align-items: center;
	
        .uni-icons {
            color: #fff !important;
        }
    }
    .form {
        width: 668rpx;
        margin: 20rpx auto;

 pages/gongxuOutSendWork/table.vue

@@ -1,7 +1,11 @@
<template>
    <view class="content">
        <view class="list" v-for="(item,index) in showList" :key="index">
            <uni-card :title="item.任务单" :extra="item.单据号" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
            <uni-card :title="item.任务单号" 
            :extra="item.单据号" 
            style="margin: 10px;" 
            @tap="showDetail = showDetail==index?-1:index" 
            :id="'card-'+index">
                <view class="card-detail">
                    <view class="detail" v-if="item.工序流转卡号">
                        <text>流转卡号：</text>{{item.工序流转卡号}}
@@ -15,11 +19,14 @@
                    <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.当前工序代码">
                        <text>工序代码：</text>{{item.当前工序代码}}
                    <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.日期.substr(0,10)}}
@@ -32,69 +39,32 @@
                    <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.不良数量">
                        <text>不良数量：</text>{{item.不良数量}}
                    <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.包装标识">
                        <text>包装标识：</text>{{item.包装标识}}
                    </view>
                    <view class="detail" v-if="item.包装标识代码">
                        <text>包装标识代码：</text>{{item.包装标识代码}}
                    </view>
                    <view class="detail" v-if="item.出站时间">
                        <text>出站时间：</text>{{item.出站时间.substr(0,19)}}
                    </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 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 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.LOT数量">
                        <text>LOT数量：</text>{{item.LOT数量}}
                    <view class="detail" v-if="item.班组代码">
                        <text>生产班组代码：</text>{{item.班组代码}}
                    </view>
                    <view class="detail" v-if="item.制单人">
                        <text>制单人：</text>{{item.制单人}}
                        <text>派单人：</text>{{item.制单人}}
                    </view>
                    <view class="detail" v-if="item.制单日期">
                        <text>制单日期：</text>{{item.制单日期.substr(0,10)}}
                    </view>
                    <view class="detail" v-if="item.修改人">
                        <text>修改人：</text>{{item.修改人}}
                    </view>
                    <view class="detail" v-if="item.修改日期">
                        <text>修改日期：</text>{{item.修改日期.substr(0,10)}}
                    </view>
                    <view class="detail" v-if="item.审核人">
                        <text>审核人：</text>{{item.审核人}}
                    </view>
                    <view class="detail" v-if="item.审核日期">
                        <text>审核日期：</text>{{item.审核日期.substr(0,10)}}
                    </view>
                    <view class="detail" v-if="item.关闭人">
                        <text>关闭人：</text>{{item.关闭人}}
                    </view>
                    <view class="detail" v-if="item.关闭日期">
                        <text>关闭日期：</text>{{item.关闭日期.substr(0,10)}}
                    </view>
                    <view class="detail" v-if="item.备注">
                        <text>备注：</text>{{item.备注}}
@@ -105,7 +75,7 @@
                    <view class="part" style="border-right: 1px solid #eee;">
                        <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>收起
                    </view>
                    <view class="part" @tap.stop="operations = operations==index?-1:index">
                    <view class="part" @tap.stop="showStationOutBill(item,index)">
                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>报工
                    </view>
                </view>
@@ -113,32 +83,39 @@
                    <view class="part" style="border-right: 1px solid #eee;">
                        <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>更多信息
                    </view>
                    <view class="part" @tap.stop="operations = operations==index?-1:index">
                    <view class="part" @tap.stop="showStationOutBill(item,index)">
                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>报工
                    </view>
                </view>
            </uni-card>
        </view>
        
        <BillListPopupVue ref="billList"></BillListPopupVue>
        <view class="over" v-if="listData.length == 0">暂无数据</view>
        <view class="over" v-if="listData.length != 0 && listData.length != showList.length">加载中...</view>
        <view class="over" v-if="listData.length != 0 && listData.length == showList.length">已到底</view>
        <!-- 占位元素，确保页面可滚动 -->
        <view style="height: 75vh;"></view>
    </view>
</template>

<script>
    import { getUserInfo } from "@/utils/auth.js";
    import BillListPopupVue from '../../components/StationOutBillPopup/StationOutBillPopup.vue';
    export default {
        data() {
            return {
                userInfo:getUserInfo(),
                serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
                sWhere:'',
                sWhere:' and 1=1',
                listData:[],
                showList:[],
                showDetail:-1,
                page:1,
            }
        },
        components: {
            BillListPopupVue
        },
        onLoad() {
            this.getList()
@@ -157,6 +134,19 @@
            }, 1000);
        },
        methods: {
            //出站汇报显示
            showStationOutBill(e,index) {
                console.log(e);
                console.log(index);
                uni.pageScrollTo({
                    //scrollTop: 20,
                    selector:`#card-${index}`,
                    duration: 100,
                });
				
                const hBarCode = e.工序流转卡号+"@"+e.工序号+"@"+e.序列号;
                this.$refs.billList.showPopup(hBarCode);
            },
            getPage(page,list){
                let sindex = (parseInt(page) - 1) * 20
                let eindex = parseInt(page) * 20
@@ -171,17 +161,16 @@
                    })
                    return false;
                }
                this.sWhere += ` and HEmpID = ${this.userInfo.HEmpID} 
                and CONVERT(DATE, 日期) = CONVERT(DATE, GETDATE())`
                this.sWhere += ` and CONVERT(DATE, 日期) = CONVERT(DATE, GETDATE())`
                uni.showLoading({
                    title:'加载中...'
                })
                uni.request({
                    url: this.serverUrl + '/Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillList',
                    url: this.serverUrl + '/Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillListByEmp',
                    data:{ 
                        sWhere: this.sWhere,
                        user: uni.getStorageSync('HUserName'),
                        HBillSubType:'',
                        HEmpID:this.userInfo.HEmpID,
                    },
                    success: (res) => {
                        // console.log(1,res.data.data);
@@ -210,7 +199,16 @@
                });
                this.sWhere = ``
            },
            //重置
            clear(){
                this.listData = []
                this.page = 1
                this.showList = []
                this.sWhere = ' and 1=1'
                this.showDetail = -1,
            
                this.getList()
            },
        }
    }
</script>

 pages/index/login.vue

@@ -85,6 +85,7 @@
                    "温州海诚光学": 'http://122.228.39.234:7177/API/',
                    "宁波惠康工业": 'http://172.16.72.30:6699/API/',
                    "余姚兴达起动器": 'http://121.37.133.104/API/',
                    "翁涛涛本地测试": 'http://localhost:81/API/'
                },
                serverUrlName: '浙江智云迈思',


 pages/index/tab1.vue

@@ -141,6 +141,13 @@
                        url: '/pages/mujvzhuangtai/mujvzhuangtai',
                        id: 15,
                        hidden: true,
                    }, {
                        img: '../../static/icon/icon10.png',
                        text: '我的任务',
                        tip: '立即新增',
                        url: '/pages/gongxuOutSendWork/table',
                        id: 16,
                        hidden: false,
                    },
                ]
                // itemData: [{