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

llj

2026-03-04 5b8b0ba6ebbc1d400f480db7f00b12208927ec40

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

 components/StationOutBillPopup/StationOutBillPopup.vue

@@ -1,141 +1,145 @@
<template>
    <view>
        <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
            <view class="form">
                <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)" />
                    </view>
                    <uni-icons type="scan"
                        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" 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" v-show="false">
                    <view class="title"><text>*</text>流水号:</view>
                    <view class="right" style="width: 380rpx;">
                        <input v-model="hform.HProcNo" placeholder="请输入(或扫描)流水号"
                            @blur="getHProcNoData2(hform.HBarCode,hform.HProcNo,hform.HSEQNumber)" />
                    </view>
                    <uni-icons type="scan"
                        style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
                        size="20" @click="toScanProcNo"></uni-icons>
                </view>
                <view class="form-item">
                    <view class="title">工序编码:</view>
                    <view class="righton">
                        <input disabled v-model="hform.HProcNumber" placeholder="请输入工序编码" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">未报工数量:</view>
                    <view class="righton">
                        <input disabled v-model="hform.HNotReportQty" placeholder="请输入未报工数量" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">合格数量:</view>
                    <view class="right">
                        <input v-model="hform.HQty" placeholder="请输入合格数量" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">不良数量:</view>
                    <view class="right">
                        <input v-model="hform.HBadCount"  placeholder="请输入不良数量" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">报废数量:</view>
                    <view class="right">
                        <input v-model="hform.HWasterQty" placeholder="请输入报废数量" />
                    </view>
                </view>
                <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" 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" v-show="false">
                    <view class="title">生产班组:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHGroupName" placeholder="请选择生产班组" v-model="hform.HGroupName"
                            @input="HGroupNameChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title"><text>*</text>操作员:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHEmpName" placeholder="请选择操作员" v-model="hform.HEmpName"
                            @input="HEmpNameChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">备注:</view>
                    <view class="right">
                        <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="请输入备注"></textarea>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">单据日期:</view>
                    <view class="right">
                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
                            <input disabled v-model="hform.HDate" placeholder="请选择日期" />
                        </picker>
                    </view>
                </view>
        <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
            <view class="form">
                <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)" />
                    </view>
                    <uni-icons type="scan"
                        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" 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" v-show="false">
                    <view class="title"><text>*</text>流水号:</view>
                    <view class="right" style="width: 380rpx;">
                        <input v-model="hform.HProcNo" placeholder="请输入(或扫描)流水号"
                            @blur="getHProcNoData2(hform.HBarCode,hform.HProcNo,hform.HSEQNumber)" />
                    </view>
                    <uni-icons type="scan"
                        style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
                        size="20" @click="toScanProcNo"></uni-icons>
                </view>
                <view class="form-item">
                    <view class="title">工序编码:</view>
                    <view class="righton">
                        <input disabled v-model="hform.HProcNumber" placeholder="请输入工序编码" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">未报工数量:</view>
                    <view class="righton">
                        <input disabled v-model="hform.HNotReportQty" placeholder="请输入未报工数量" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">合格数量:</view>
                    <view class="right">
                        <input v-model="hform.HQty" placeholder="请输入合格数量" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">不良数量:</view>
                    <view class="right">
                        <input v-model="hform.HBadCount" placeholder="请输入不良数量" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">报废数量:</view>
                    <view class="right">
                        <input v-model="hform.HWasterQty" placeholder="请输入报废数量" />
                    </view>
                </view>
                <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" 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" v-show="false">
                    <view class="title">生产班组:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHGroupName" placeholder="请选择生产班组" v-model="hform.HGroupName"
                            @input="HGroupNameChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title"><text>*</text>操作员:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHEmpName" placeholder="请选择操作员" v-model="hform.HEmpName"
                            @input="HEmpNameChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">备注:</view>
                    <view class="right">
                        <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="请输入备注"></textarea>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">单据日期:</view>
                    <view class="right">
                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
                            <input disabled v-model="hform.HDate" placeholder="请选择日期" />
                        </picker>
                    </view>
                </view>



                <view class="tick-wrapper">
                    <view class="form-item">
                        <view class="title">工时:</view>
                        <view class="right">
                            <input v-model="hform.HWorkTimes" placeholder="请输入工时" @blur="HWorkTimesChange" :disabled="hform.HIsTimeFlag!=1"/>
                        </view>
                    </view>
                    <view class="form-item">
                        <checkbox-group name="checkboxGroup" @change="onCGChangeHandler">
                            <label>
                                <checkbox :checked="hform.HIsTimeFlag == 1" value="1" />
                                是否计时
                            </label>
                        </checkbox-group>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">开工时间:</view>
                    <view class="right">
                         <uni-datetime-picker v-model="hform.HRelBeginTime" @change="HRelBeginTimeChange" v-if="hform.HIsTimeFlag==1" :hide-second="true">
                             <input disabled v-model="hform.HRelBeginTime" placeholder="请选择开工时间"  style="pointer-events: none;"/>
                         </uni-datetime-picker>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">完工时间:</view>
                    <view class="right">
                         <uni-datetime-picker v-model="hform.HRelEndTime" @change="HRelEndTimeChange" v-if="hform.HIsTimeFlag==1" :hide-second="true">
                             <input disabled v-model="hform.HRelEndTime" placeholder="请选择完工时间" />
                         </uni-datetime-picker>
                    </view>
                </view>
                <!-- 
                <view class="tick-wrapper">
                    <view class="form-item">
                        <view class="title">工时:</view>
                        <view class="right">
                            <input v-model="hform.HWorkTimes" placeholder="请输入工时" @blur="HWorkTimesChange"
                                :disabled="hform.HIsTimeFlag!=1" />
                        </view>
                    </view>
                    <view class="form-item">
                        <checkbox-group name="checkboxGroup" @change="onCGChangeHandler">
                            <label>
                                <checkbox :checked="hform.HIsTimeFlag == 1" value="1" />
                                是否计时
                            </label>
                        </checkbox-group>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">开工时间:</view>
                    <view class="right">
                        <uni-datetime-picker v-model="hform.HRelBeginTime" @change="HRelBeginTimeChange"
                            v-if="hform.HIsTimeFlag==1" :hide-second="true">
                            <input disabled v-model="hform.HRelBeginTime" placeholder="请选择开工时间"
                                style="pointer-events: none;" />
                        </uni-datetime-picker>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">完工时间:</view>
                    <view class="right">
                        <uni-datetime-picker v-model="hform.HRelEndTime" @change="HRelEndTimeChange"
                            v-if="hform.HIsTimeFlag==1" :hide-second="true">
                            <input disabled v-model="hform.HRelEndTime" placeholder="请选择完工时间" />
                        </uni-datetime-picker>
                    </view>
                </view>
                <!-- 
                    <view class="title">是否计时</view>
                    <checkbox-group name="checkboxGroup" @change="onCGChangeHandler">
                        <label>
@@ -144,76 +148,76 @@
                    </checkbox-group>
                </view> -->

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

                <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" v-show="false" >
                    <view class="title">生产订单:</view>
                    <view class="righton">
                        <input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
                    </view>
                </view>
                <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" 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" v-show="false">
                    <view class="title">物料名称:</view>
                    <view class="righton">
                        <input v-model="hform.HMaterName" disabled />
                    </view>
                </view>
                <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" v-show="false">
                    <view class="title">款号:</view>
                    <view class="righton">
                        <input v-model="hform.HStyleNumber" disabled />
                    </view>
                </view>
                <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" v-show="false">
                    <view class="title">工序:</view>
                    <!--                 <view class="right">
                <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" v-show="false">
                    <view class="title">生产订单:</view>
                    <view class="righton">
                        <input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
                    </view>
                </view>
                <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" 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" v-show="false">
                    <view class="title">物料名称:</view>
                    <view class="righton">
                        <input v-model="hform.HMaterName" disabled />
                    </view>
                </view>
                <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" v-show="false">
                    <view class="title">款号:</view>
                    <view class="righton">
                        <input v-model="hform.HStyleNumber" disabled />
                    </view>
                </view>
                <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" v-show="false">
                    <view class="title">工序:</view>
                    <!--                 <view class="right">
                        <uni-combox :candidates="arrayHProcName" placeholder="请选择当前工序" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
                    </view> -->
                    <view class="righton">
                        <input v-model="hform.HProcName" disabled />
                    </view>
                </view>
                <view class="form-item" v-show="false">
                    <view class="title">生产组织:</view>
                    <view class="righton">
                        <input v-model="hform.HPRDOrg" disabled />
                    </view>
                </view>
				
                    <view class="righton">
                        <input v-model="hform.HProcName" disabled />
                    </view>
                </view>
                <view class="form-item" v-show="false">
                    <view class="title">生产组织:</view>
                    <view class="righton">
                        <input v-model="hform.HPRDOrg" disabled />
                    </view>
                </view>


                <!-- 			

                <!-- 			
                <view class="form-item">
                    <view class="title">订单数量:</view>
                    <view class="right">
@@ -272,151 +276,153 @@
                    </view>
                </view> -->

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


                <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" 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" 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" 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" v-show="false">
                    <view class="title"></view>
                    <!--                 <view style="padding-top: 10rpx;" @tap="hform.HLastSubProc = hform.HLastSubProc==true?false:true">
                <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" 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" 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" 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" 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);"/>转下道
                    </view> -->
                    <view style="padding-top: 10rpx;">
                        <radio value="true" :checked="hform.HLastSubProc == true" style="transform:scale(1);" />转下道
                    </view>
                </view>
				
                    <view style="padding-top: 10rpx;">
                        <radio value="true" :checked="hform.HLastSubProc == true" style="transform:scale(1);" />转下道
                    </view>
                </view>

                <view v-if="showmore" v-show="false">
                    <view class="form-item">
                        <view class="title">订单跟踪号:</view>
                        <view class="righton">
                            <input v-model="hform.HOrderProcNO" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">制单人:</view>
                        <view class="righton">
                            <input v-model="hform.HMaker" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">制单日期:</view>
                        <view class="righton">
                            <input v-if="hform.HMakeDate" v-model="hform.HMakeDate.substr(0,10)" disabled />
                            <input v-else v-model="hform.HMakeDate" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">修改人:</view>
                        <view class="righton">
                            <input v-model="hform.HUpDater" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">修改日期:</view>
                        <view class="righton">
                            <input v-if="hform.HUpDateDate" v-model="hform.HUpDateDate.substr(0,10)" disabled />
                            <input v-else v-model="hform.HUpDateDate" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">审核人:</view>
                        <view class="righton">
                            <input v-model="hform.HChecker" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">审核日期:</view>
                        <view class="righton">
                            <input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled />
                            <input v-else v-model="hform.HCheckDate" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">作废人:</view>
                        <view class="righton">
                            <input v-model="hform.HDeleteMan" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">作废日期:</view>
                        <view class="righton">
                            <input v-if="hform.HDeleteDate" v-model="hform.HDeleteDate.substr(0,10)" disabled />
                            <input v-else v-model="hform.HDeleteDate" disabled />
                        </view>
                    </view>
                </view>

				
                <view v-if="showmore" v-show="false">
                    <view class="form-item">
                        <view class="title">订单跟踪号:</view>
                        <view class="righton">
                            <input v-model="hform.HOrderProcNO" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">制单人:</view>
                        <view class="righton">
                            <input v-model="hform.HMaker" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">制单日期:</view>
                        <view class="righton">
                            <input v-if="hform.HMakeDate" v-model="hform.HMakeDate.substr(0,10)" disabled />
                            <input v-else v-model="hform.HMakeDate" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">修改人:</view>
                        <view class="righton">
                            <input v-model="hform.HUpDater" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">修改日期:</view>
                        <view class="righton">
                            <input v-if="hform.HUpDateDate" v-model="hform.HUpDateDate.substr(0,10)" disabled />
                            <input v-else v-model="hform.HUpDateDate" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">审核人:</view>
                        <view class="righton">
                            <input v-model="hform.HChecker" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">审核日期:</view>
                        <view class="righton">
                            <input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled />
                            <input v-else v-model="hform.HCheckDate" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">作废人:</view>
                        <view class="righton">
                            <input v-model="hform.HDeleteMan" disabled />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="title">作废日期:</view>
                        <view class="righton">
                            <input v-if="hform.HDeleteDate" v-model="hform.HDeleteDate.substr(0,10)" disabled />
                            <input v-else v-model="hform.HDeleteDate" disabled />
                        </view>
                    </view>
                </view>

                <view class="other">
                    <view v-if="!showmore" @tap="showmore = true">
                        展开其他信息<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
                    </view>
                    <view v-if="showmore" @tap="showmore = false">
                        折叠其他信息<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
                    </view>
                </view>

				

                <!--             <view class="op">
                <view class="other">
                    <view v-if="!showmore" @tap="showmore = true">
                        展开其他信息<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
                    </view>
                    <view v-if="showmore" @tap="showmore = false">
                        折叠其他信息<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
                    </view>
                </view>



                <!--             <view class="op">
                    <button class="op1" size="mini" plain @tap="huibao">汇报</button>
                    <button class="op2" size="mini" plain @tap="ruku">入库</button>
                    <button class="op3" size="mini" plain @tap="baofei">报废</button>
                </view> -->

                <view class="bottom-btn">
                    <button v-if="btnType == 0 && !isEdit" class="btn-a" size="mini" @tap="submit">提交</button>
                    <button v-if="btnType != 0 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">修改</button>
                    <button v-if="btnType != 0 && isEdit" class="btn-a" size="mini" @tap="submit">提交</button>
                    <button v-if="btnType != 0 && btnType == 2" class="btn-b" style="margin-left: 20rpx;" size="mini"
                        @tap="check">审核</button>
                    <button v-if="btnType != 0 && btnType == 3" class="btn-d" style="margin-left: 20rpx;" size="mini"
                        @tap="abandonCheck">反审核</button>
                    <!-- <button class="btn-b" size="mini" @tap="addNew">新增</button>
                <view class="bottom-btn">
                    <button v-if="btnType == 0 && !isEdit" class="btn-a" size="mini" @tap="submit">提交</button>
                    <button v-if="btnType != 0 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">修改</button>
                    <button v-if="btnType != 0 && isEdit" class="btn-a" size="mini" @tap="submit">提交</button>
                    <button v-if="btnType != 0 && btnType == 2" class="btn-b" style="margin-left: 20rpx;" size="mini"
                        @tap="check">审核</button>
                    <button v-if="btnType != 0 && btnType == 3" class="btn-d" style="margin-left: 20rpx;" size="mini"
                        @tap="abandonCheck">反审核</button>
                    <!-- <button class="btn-b" size="mini" @tap="addNew">新增</button>
                    <button class="btn-c" size="mini" @tap="goBack">退出</button> -->
                </view>
            </view>
        </uni-popup>
    </view>
                </view>
            </view>
        </uni-popup>
    </view>
</template>
<script>
    import getDateTime from '@/utils/getdateTime.js';
    import {
        getUserInfo
    } from "@/utils/auth.js";
import { CommonUtils } from '../../utils/common';
    import {
        CommonUtils
    } from '../../utils/common';
    export default {
        name: "BillListPopup_gongxuOut",
        name: "BillListPopup_gongxuOut",
        data() {
            return {
                userInfo: getUserInfo(),
@@ -442,8 +448,8 @@
                HEmpNameList: [],
                arrayHCenterName: [], //工作中心
                HCenterNameList: [],
                arrayHSEQName:[],//序列
                HSEQNameList:[],
                arrayHSEQName: [], //序列
                HSEQNameList: [],
                isEdit: false,
                hform: {
                    HInterID: '',
@@ -451,12 +457,12 @@
                    HBarCode: '',
                    HProcNo: '',
                    HQty: '',
                    HBadCount:0,
                    HProcNumber: '',
                    HBadCount: 0,
                    HProcNumber: '',
                    HNotReportQty: 0,
                    HIsTimeFlag: 0,
                    HRelBeginTime:'',
                    HRelEndTime:'',
                    HRelBeginTime: '',
                    HRelEndTime: '',
                    // HPieceQty:'',
                    HWasterQty: 0,
                    HSourceName: '',
@@ -467,8 +473,8 @@
                    HGroupID: 0,
                    HEmpName: '',
                    HEmpID: 0,
                    HSEQName:'',
                    HSEQNumber:0,
                    HSEQName: '',
                    HSEQNumber: 0,
                    HRemark: '',
                    HDate: getDateTime.dateTimeStr('y-m-d'),

@@ -538,15 +544,15 @@
                    // HCloseDate:'',        
                    HDeleteMan: '',
                    HDeleteDate: '',
					
                    HStyleNumber: '', // 款号

                    HStyleNumber: '', // 款号

                    eventType: 'Add',
                }
            }
        },
        
        mounted(e) {

        mounted(e) {
            // this.getEditData('1516','GXCZHB000000001290')
            console.log(e, this.userInfo)
            // this.hform.HEmpID = this.userInfo.Czybm
@@ -555,23 +561,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)
                // }
				
    //         }
            this.getNewData()
            //         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()
@@ -581,40 +587,40 @@
            this.getHCenterList()

            this.getDefValByUser()
			

        },
        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)
              console.log(e)
            },
            //打开时加载
            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)
                console.log(e)
            },
            onCGChangeHandler({
                detail
            }) {
                console.log(detail.value[0])
                console.log(detail.value[0])
                this.hform.HIsTimeFlag = detail.value[0] || 0
                if(detail.value[0]){
                    this.getNewHRelBeginDate()
                    this.hform.HRelEndTime = getDateTime.dateTimeStr('y-m-d h:i');
                }else{
                    this.hform.HWorkTimes = 0;
                }
                if (detail.value[0]) {
                    this.getNewHRelBeginDate()
                    this.hform.HRelEndTime = getDateTime.dateTimeStr('y-m-d h:i');
                } else {
                    this.hform.HWorkTimes = 0;
                }
            },
            //通过登录用户获取默认值
            getDefValByUser() {
@@ -668,18 +674,18 @@
                    var str = ret.resp_result
                    if (str.includes('@')) {
                        const parts = str.split('@');
                        //如果代码包含子序列
                        if(parts.length==3){
                            this.hform.HBarCode = parts[0]
                            this.hform.HProcNo = parts[1]
                            this.hform.HSEQNumber = parts[2]
                            this.getHBarCodeData(parts[0], 2)
                        }else{
                            this.hform.HBarCode = parts[0]
                            this.hform.HProcNo = parts[1]
                            this.getHBarCodeData(parts[0], 1)
                        }
                        
                        //如果代码包含子序列
                        if (parts.length == 3) {
                            this.hform.HBarCode = parts[0]
                            this.hform.HProcNo = parts[1]
                            this.hform.HSEQNumber = parts[2]
                            this.getHBarCodeData(parts[0], 2)
                        } else {
                            this.hform.HBarCode = parts[0]
                            this.hform.HProcNo = parts[1]
                            this.getHBarCodeData(parts[0], 1)
                        }

                        // this.getHProcNoData(parts[0],parts[1])
                    } else {
                        this.hform.HBarCode = ret.resp_result
@@ -711,15 +717,15 @@
                if (str.includes('@')) {
                    const parts = str.split('@');
                    //如果代码包含子序列
                    if(parts.length==3){
                        this.hform.HBarCode = parts[0]
                        this.hform.HProcNo = parts[1]
                        this.hform.HSEQNumber = parts[2]
                        this.getHBarCodeData(parts[0], 2)
                    }else{
                        this.hform.HBarCode = parts[0]
                        this.hform.HProcNo = parts[1]
                        this.getHBarCodeData(parts[0], 1)
                    if (parts.length == 3) {
                        this.hform.HBarCode = parts[0]
                        this.hform.HProcNo = parts[1]
                        this.hform.HSEQNumber = parts[2]
                        this.getHBarCodeData(parts[0], 2)
                    } else {
                        this.hform.HBarCode = parts[0]
                        this.hform.HProcNo = parts[1]
                        this.getHBarCodeData(parts[0], 1)
                    }
                    // this.getHProcNoData(parts[0],parts[1])
                } else {
@@ -736,7 +742,7 @@
                }, (ret) => {
                    console.log(ret.resp_result)
                    this.hform.HProcNo = ret.resp_result
                    this.getHProcNoData2(this.hform.HBarCode, ret.resp_result,this.hform.HSEQNumber)
                    this.getHProcNoData2(this.hform.HBarCode, ret.resp_result, this.hform.HSEQNumber)
                })
            },
            //日期
@@ -744,20 +750,22 @@
                console.log(e.detail.value)
                this.hform.HDate = e.detail.value
            },
            HRelBeginTimeChange(e) {
                console.log(e)
                this.hform.HRelBeginTime = e
                this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
            },
            HRelEndTimeChange(e) {
                console.log(e)
                this.hform.HRelEndTime = e
                this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
            },
            HWorkTimesChange(e){
                console.log(e);
                this.hform.HRelEndTime = getDateTime.addHoursToDate(this.hform.HRelBeginTime,e.detail.value);
            },
            HRelBeginTimeChange(e) {
                console.log(e)
                this.hform.HRelBeginTime = e
                this.hform.HWorkTimes = getDateTime.calculateHoursDiff(this.hform.HRelBeginTime, this.hform
                .HRelEndTime);
            },
            HRelEndTimeChange(e) {
                console.log(e)
                this.hform.HRelEndTime = e
                this.hform.HWorkTimes = getDateTime.calculateHoursDiff(this.hform.HRelBeginTime, this.hform
                .HRelEndTime);
            },
            HWorkTimesChange(e) {
                console.log(e);
                this.hform.HRelEndTime = getDateTime.addHoursToDate(this.hform.HRelBeginTime, e.detail.value);
            },
            //获取产品数据
            getHMaterList() {
                var Value = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + uni.getStorageSync('OrganizationID')
@@ -990,7 +998,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {
@@ -1098,70 +1107,72 @@
                    }
                }
            },
            //序列获取
            getHSEQList(e){
                uni.request({
                    url: this.serverUrl + 'Cj_StationOutBill/getAllHSEQ',
                    data: {
                        HInterID:this.hform.HProcExchHinteID
                    },
                    success: (res) => {
                        if (res.data.code == 1) {
                            this.HSEQNameList = res.data.data
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHSEQName[i] = res.data.data[i].HSEQName
                            }
                            this.$forceUpdate();
                            //没有序列号默认主序列
                            if(e==1){
                                //设置主序列
                                this.setMainHSEQ();
                                this.getHProcNoData2(this.hform.HBarCode,this.hform.HProcNo,this.hform.HSEQNumber)
                            }else if(e==2){
                                this.getHProcNoData2(this.hform.HBarCode,this.hform.HProcNo,this.hform.HSEQNumber)
                            }else{
                                //设置主序列
                                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) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            },
            //选择序列
            HSEQNameChange(e) {
                for (var i = 0; i < this.HSEQNameList.length; i++) {
                    if (this.HSEQNameList[i].HSEQName == e) {
                        this.hform.HSEQNumber = this.HSEQNameList[i].HSEQNumber
                    }
                }
            },
            //设置主序列
            setMainHSEQ(){
                for (var i = 0; i < this.HSEQNameList.length; i++) {
                    if (this.HSEQNameList[i].HSEQType == 'M') {
                        this.hform.HSEQNumber = this.HSEQNameList[i].HSEQNumber
                        this.hform.HSEQName = this.HSEQNameList[i].HSEQName
                        break;
                    }
                }
            },
            //序列获取
            getHSEQList(e) {
                uni.request({
                    url: this.serverUrl + 'Cj_StationOutBill/getAllHSEQ',
                    data: {
                        HInterID: this.hform.HProcExchHinteID
                    },
                    success: (res) => {
                        if (res.data.code == 1) {
                            this.HSEQNameList = res.data.data
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHSEQName[i] = res.data.data[i].HSEQName
                            }
                            this.$forceUpdate();
                            //没有序列号默认主序列
                            if (e == 1) {
                                //设置主序列
                                this.setMainHSEQ();
                                this.getHProcNoData2(this.hform.HBarCode, this.hform.HProcNo, this.hform
                                    .HSEQNumber)
                            } else if (e == 2) {
                                this.getHProcNoData2(this.hform.HBarCode, this.hform.HProcNo, this.hform
                                    .HSEQNumber)
                            } else {
                                //设置主序列
                                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) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            },
            //选择序列
            HSEQNameChange(e) {
                for (var i = 0; i < this.HSEQNameList.length; i++) {
                    if (this.HSEQNameList[i].HSEQName == e) {
                        this.hform.HSEQNumber = this.HSEQNameList[i].HSEQNumber
                    }
                }
            },
            //设置主序列
            setMainHSEQ() {
                for (var i = 0; i < this.HSEQNameList.length; i++) {
                    if (this.HSEQNameList[i].HSEQType == 'M') {
                        this.hform.HSEQNumber = this.HSEQNameList[i].HSEQNumber
                        this.hform.HSEQName = this.HSEQNameList[i].HSEQName
                        break;
                    }
                }
            },
            //汇报
            huibao() {
                var datas = {
@@ -1241,31 +1252,49 @@
                    },
                });
            },
            preEditOrAddCheck() {
                if(CommonUtils.isEmpty(this.hform.HQty) == true){
                    return {pass: false, message: '提交失败: 合格数量为空'}
                }
                if(CommonUtils.isEmpty(this.hform.HBadCount) == true){
                    return {pass: false, message: '提交失败: 不良数量为空'}
                }
                if(CommonUtils.isEmpty(this.hform.HQty) == true){
                    return {pass: false, message: '提交失败: 报废数量为空'}
                }
                if(this.hform.HIsTimeFlag == 1 && CommonUtils.isEmpty(this.hform.HWorkTimes, true, true)) {
                    return {pass: false, message: '提交失败: 开启计时，但工时为0或空'}
                }
                return {pass: true, message: ''}
            },
            preEditOrAddCheck() {
                if (CommonUtils.isEmpty(this.hform.HQty) == true) {
                    return {
                        pass: false,
                        message: '提交失败: 合格数量为空'
                    }
                }
                if (CommonUtils.isEmpty(this.hform.HBadCount) == true) {
                    return {
                        pass: false,
                        message: '提交失败: 不良数量为空'
                    }
                }
                if (CommonUtils.isEmpty(this.hform.HQty) == true) {
                    return {
                        pass: false,
                        message: '提交失败: 报废数量为空'
                    }
                }
                if (this.hform.HIsTimeFlag == 1 && CommonUtils.isEmpty(this.hform.HWorkTimes, true, true)) {
                    return {
                        pass: false,
                        message: '提交失败: 开启计时，但工时为0或空'
                    }
                }
                return {
                    pass: true,
                    message: ''
                }
            },
            //编辑
            ifEdit() {
                let {pass, message} = this.preEditOrAddCheck()
                if(pass == false) {
                    return uni.showToast({
                        icon: 'none',
                        title: message
                    })
                }
				
                let {
                    pass,
                    message
                } = this.preEditOrAddCheck()
                if (pass == false) {
                    return uni.showToast({
                        icon: 'none',
                        title: message
                    })
                }

                //是否编辑
                uni.request({
                    url: this.serverUrl + '/Cj_StationOutBill/set_ShowBillJudge',
@@ -1307,7 +1336,7 @@
                        console.log(1, res.data.data[0]);
                        if (res.data.code == 1) {
                            var data = res.data.data[0]
                            this.getHBarCodeData(data.HBarCode,1)
                            this.getHBarCodeData(data.HBarCode, 1)
                            //this.getHProcNoData(data.HBarCode, data.HProcNo)

                            this.hform.HInterID = data.HInterID
@@ -1318,9 +1347,9 @@
                            // this.hform.HPieceQty= data.HPieceQty
                            this.hform.HIsTimeFlag = data.HIsTimeFlag || 0
                            this.hform.HNotReportQty = data.HNotReportQty
                            this.hform.HProcNumber = data.HProcNumber || ''
                            this.hform.HProcNumber = data.HProcNumber || ''
                            this.hform.HWasterQty = data.HWasterQty
                            this.hform.HBadCount = data.HBadCount
                            this.hform.HBadCount = data.HBadCount
                            this.hform.HSourceID = data.HSourceID
                            this.hform.HSourceName = data.HSourceName
                            this.hform.HGroupID = data.HGroupID
@@ -1417,10 +1446,10 @@
                            this.hform.HCenterName = data.工作中心
                            this.hform.HCenterID = data.HCenterID
                            this.hform.NoOutboundHqty = (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)
                            this.hform.HStyleNumber = data['款号']
                            //设置序列
                            this.getHSEQList(e);
							
                            this.hform.HStyleNumber = data['款号']
                            //设置序列
                            this.getHSEQList(e);

                        } else {
                            uni.showToast({
                                title: res.data.Message,
@@ -1455,10 +1484,10 @@
                            this.hform.HCenterID = data.HCenterID
                            this.hform.NoOutboundHqty = (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)
                            this.hform.HNotReportQty = data['未报工数量']
                            this.hform.HProcNumber = data['工序代码']
                            this.hform.HProcNumber = data['工序代码']
                            this.hform.HIsTimeFlag = data['是否计时'] ? 1 : 0
                           // this.hform.HStyleNumber = data['款号']
                            // this.hform.HQty = data.合格数量
                            // this.hform.HStyleNumber = data['款号']
                            // this.hform.HQty = data.合格数量
                            if (data.首道工序 == "是") {
                                this.FirstEndHProcNo = 1
                            }
@@ -1481,13 +1510,13 @@
                    },
                });
            },
            getHProcNoData2(HBarCode, HProcNo,HSEQNumber) {
            getHProcNoData2(HBarCode, HProcNo, HSEQNumber) {
                uni.request({
                    url: this.serverUrl + '/Cj_StationOutBill/txtHProcNo_KeyDown',
                    data: {
                        sBillNo: HBarCode,
                        sProcNo: HProcNo,
                        HSEQNumber:HSEQNumber
                        HSEQNumber: HSEQNumber
                    },
                    success: (res) => {
                        console.log(3, res);
@@ -1500,15 +1529,15 @@
                            this.hform.HCenterID = data.HCenterID
                            this.hform.NoOutboundHqty = (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)
                            this.hform.HNotReportQty = data['未报工数量']
                            this.hform.HProcNumber = data['工序代码']
                            this.hform.HProcNumber = data['工序代码']
                            this.hform.HIsTimeFlag = data['是否计时'] ? 1 : 0
                            if(data['是否计时']){
                                this.hform.HRelEndTime = getDateTime.dateTimeStr('y-m-d h:i');
                                this.getNewHRelBeginDate();
                            }
                            this.hform.HSEQName = data.序列名称
                           // this.hform.HStyleNumber = data['款号']
                            // this.hform.HQty = data.合格数量
                            if (data['是否计时']) {
                                this.hform.HRelEndTime = getDateTime.dateTimeStr('y-m-d h:i');
                                this.getNewHRelBeginDate();
                            }
                            this.hform.HSEQName = data.序列名称
                            // this.hform.HStyleNumber = data['款号']
                            // this.hform.HQty = data.合格数量
                            if (data.首道工序 == "是") {
                                this.FirstEndHProcNo = 1
                            }
@@ -1531,63 +1560,68 @@
                    },
                });
            },
            //获取最新的报工日期
            getNewHRelBeginDate(){
                uni.request({
                    url: this.serverUrl + '/Cj_StationOutBill/get_Display',
                    data:{ 
                        sWhere: ` and HEmpID = N'${this.hform.HEmpID}'`,
                        user: uni.getStorageSync('HUserName'),
                        HBillSubType:'',
                    },
                    success: (res) => {
                        if(res.data.count == 1){
                            //获取列表数据
                            const listData = res.data.data
                            // 获取当前日期（去掉时间部分）
                            const today = new Date();
                            today.setHours(0, 0, 0, 0);
                            if(listData.length==0){
                                this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,'y-m-d h:i');
                                this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
                            }else{
                                // 从对象数组中提取所有日期字段并找到最大值
                                const maxDate = listData.reduce((max, obj) => {
                                    const date = new Date(obj.出站时间);
                                    return date > max ? date : max;
                                }, new Date(0)); // 初始值为最小日期
                                // 比较最大日期和今天的日期部分（不比较时间）
                                const maxDateDateOnly = new Date(maxDate);
                                maxDateDateOnly.setHours(0, 0, 0, 0);
                                  // 比较最大日期和今天
                                if (maxDateDateOnly.getTime() !== today.getTime()) {
                                    // 如果不是今天，返回当前日期
                                    this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,'y-m-d h:i');
                                    this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
                                }else{
                                    this.hform.HRelBeginTime = getDateTime.formatDate(maxDate);
                                    this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime);
                                }
                            }
                        }else{
                            uni.showToast({
                                title:res.data.Message,
                                icon:'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title:'接口请求失败',
                            icon:'none'
                        })
                    },
                });
            },
            //新增
            //获取最新的报工日期
            getNewHRelBeginDate() {
                uni.request({
                    url: this.serverUrl + '/Cj_StationOutBill/get_Display',
                    data: {
                        sWhere: ` and HEmpID = N'${this.hform.HEmpID}'`,
                        user: uni.getStorageSync('HUserName'),
                        HBillSubType: '',
                    },
                    success: (res) => {
                        if (res.data.count == 1) {
                            //获取列表数据
                            const listData = res.data.data
                            // 获取当前日期（去掉时间部分）
                            const today = new Date();
                            today.setHours(0, 0, 0, 0);
                            if (listData.length == 0) {
                                this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,
                                    'y-m-d h:i');
                                this.hform.HWorkTimes = getDateTime.calculateHoursDiff(this.hform
                                    .HRelBeginTime, this.hform.HRelEndTime);
                            } else {
                                // 从对象数组中提取所有日期字段并找到最大值
                                const maxDate = listData.reduce((max, obj) => {
                                    const date = new Date(obj.出站时间);
                                    return date > max ? date : max;
                                }, new Date(0)); // 初始值为最小日期
                                // 比较最大日期和今天的日期部分（不比较时间）
                                const maxDateDateOnly = new Date(maxDate);
                                maxDateDateOnly.setHours(0, 0, 0, 0);
                                // 比较最大日期和今天
                                if (maxDateDateOnly.getTime() !== today.getTime()) {
                                    // 如果不是今天，返回当前日期
                                    this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,
                                        'y-m-d h:i');
                                    this.hform.HWorkTimes = getDateTime.calculateHoursDiff(this.hform
                                        .HRelBeginTime, this.hform.HRelEndTime);
                                } else {
                                    this.hform.HRelBeginTime = getDateTime.formatDate(maxDate);
                                    this.hform.HWorkTimes = getDateTime.calculateHoursDiff(this.hform
                                        .HRelBeginTime, this.hform.HRelEndTime);
                                }
                            }
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            },
            //新增
            getNewData() {
				

                uni.request({
                    url: this.serverUrl + '/Web/GetMAXNum',
                    data: {
@@ -1620,9 +1654,9 @@
                })
            },
            submit() {
                //去除分号以免后端分解报错
                this.hform.HMaterName= this.hform.HMaterName.replace(/;/g, '');
                this.hform.HMaterModel = this.hform.HMaterModel.replace(/;/g, '');
                //去除分号以免后端分解报错
                this.hform.HMaterName = this.hform.HMaterName.replace(/;/g, '');
                this.hform.HMaterModel = this.hform.HMaterModel.replace(/;/g, '');
                if (!this.hform.HBarCode) {
                    uni.showToast({
                        title: '请扫描设备条形码',
@@ -1644,15 +1678,18 @@
                        icon: 'none'
                    })
                } else {
					
                    let {pass, message} = this.preEditOrAddCheck()
                    if(pass == false) {
                        return uni.showToast({
                            icon: 'none',
                            title: message
                        })
                    }
					

                    let {
                        pass,
                        message
                    } = this.preEditOrAddCheck()
                    if (pass == false) {
                        return uni.showToast({
                            icon: 'none',
                            title: message
                        })
                    }

                    uni.showLoading({
                        title: '请稍候'
                    })
@@ -1686,41 +1723,41 @@
                                // let prePage = pages[pages.length - 2]; 
                                // prePage.$vm.getList()
                                if (this.isEdit) {
                                    uni.showToast({
                                        title: '修改成功',
                                        icon: 'none'
                                    })
                                    uni.showToast({
                                        title: '修改成功',
                                        icon: 'none'
                                    })
                                    setTimeout(() => {
                                        uni.redirectTo({
                                            url: '/pages/gongxuOut/Cj_StationOutBillList'
                                        })
                                    }, 1000)
                                } else {
                                    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/Cj_StationOutBill?OperationType=1'
            //                                     // })
            //                                 } else if (res.cancel) {
            //                                     console.log('用户点击取消');
            //                                     // setTimeout(() => {
            //                                     //     uni.navigateBack();
            //                                     // }, 50)
                                                // uni.redirectTo({
                                                //     url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
                                                // })
            //                                 }
            //                             }
            //                         });
                                    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/Cj_StationOutBill?OperationType=1'
                                    //                                     // })
                                    //                                 } else if (res.cancel) {
                                    //                                     console.log('用户点击取消');
                                    //                                     // setTimeout(() => {
                                    //                                     //     uni.navigateBack();
                                    //                                     // }, 50)
                                    // uni.redirectTo({
                                    //     url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
                                    // })
                                    //                                 }
                                    //                             }
                                    //                         });
                                }
                            } else {
                                uni.showToast({
@@ -1851,60 +1888,65 @@
                    }
                });
            },
            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
							
                            // 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;
                            if(!nextProcess){
                                uni.showToast({
                                    title: '没有下一道工序即将跳转新增页面',
                                    icon: 'none'
                                })
                                uni.redirectTo({
                                    url: '/pages/gongxuOut/Cj_StationOutBill?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?OperationType=1&HBarCode='+HNextBarCode
                                })
                            }
                        }else{
                            console.log(res);
                            uni.showToast({
                                title: '获取下一道工序失败',
                                icon: 'none'
                            })
                        }
				        
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            }
            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

                            // 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;
                            if (!nextProcess) {
                                uni.showToast({
                                    title: '没有下一道工序即将跳转新增页面',
                                    icon: 'none'
                                })
                                uni.redirectTo({
                                    url: '/pages/gongxuOut/Cj_StationOutBill?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?OperationType=1&HBarCode=' +
                                        HNextBarCode
                                })
                            }
                        } else {
                            console.log(res);
                            uni.showToast({
                                title: '获取下一道工序失败',
                                icon: 'none'
                            })
                        }

                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            }
        }
    }
</script>
@@ -1918,11 +1960,13 @@
        display: flex;
        flex-direction: column;
        gap: 10rpx;
        overflow-y: auto;
        overflow-y: auto;
    }
    picker input{
        pointer-events: none;
    }

    picker input {
        pointer-events: none;
    }

    .tab_area {
        width: 100%;
        height: 50rpx;

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "2.084",
    "versionCode" : 284,
    "versionName" : "2.085",
    "versionCode" : 285,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
@@ -52,7 +52,6 @@
            },
            /* ios打包配置 */
            "ios" : {
                
                "dSYMs" : false,
                "privacyDescription" : {
                    "NSPhotoLibraryUsageDescription" : "我们需要访问您的相册来进行图片选择",
@@ -63,9 +62,7 @@
            /* SDK配置 */
            "sdkConfigs" : {
                "ad" : {},
                "push" : {
                    
                }
                "push" : {}
            },
            "icons" : {
                "android" : {

 pages.json

@@ -1850,14 +1850,14 @@
            "path" : "pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport",
            "style" : 
            {
                "navigationBarTitleText" : "设备点检任务"
                "navigationBarTitleText" : "设备待点检任务"
            }
        },
        {
            "path" : "pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport",
            "style" : 
            {
                "navigationBarTitleText" : "器具点检任务"
                "navigationBarTitleText" : "模具待点检任务"
            }
        },
        {
@@ -1871,7 +1871,28 @@
            "path" : "pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport",
            "style" : 
            {
                "navigationBarTitleText" : "器具登记故障跟踪"
                "navigationBarTitleText" : "模具故障登记跟踪"
            }
        },
        {
            "path" : "pages/MJGL/Sc_MouldUpperAwaitQuery/Sc_MouldUpperAwaitQuery",
            "style" : 
            {
                "navigationBarTitleText" : "模具待上模查询"
            }
        },
        {
            "path" : "pages/Cj_StationInBillAwaitQuery/Cj_StationInBillAwaitQuery",
            "style" : 
            {
                "navigationBarTitleText" : "待开工查询"
            }
        },
        {
            "path" : "pages/MJGL/Sc_MouldLowerBillAwaitQuery/Sc_MouldLowerBillAwaitQuery",
            "style" : 
            {
                "navigationBarTitleText" : "待下模查询"
            }
        },
        {

 pages/CustomerComplaintsBill/CustomerComplaintsBillEdit.vue

@@ -550,7 +550,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/EmployeeRecords/EmployeeRecordsBill.vue

@@ -530,7 +530,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue

Diff too large

 pages/MJGL/MouldScrapOutBill/MouldScrapOutBill.vue

@@ -512,7 +512,8 @@
            getHEmpList() {
                CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    (res) => {
                        if (res.data.count == 1) {

 pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue

@@ -292,6 +292,34 @@
        </view>
        <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
        <BillSelectorPopupVue @update="billSelectHandler" ref="billSelector" :Type="'DJ'"></BillSelectorPopupVue>

        <!-- 用于输入标准值 上限值 下限值的弹出层 -->
        <uni-popup ref="inputPopup" :mask-click="false" >
            <view class="inputPopup">
                <view class="form-item">
                    <view class="title">标准值:</view>
                    <view class="right">
                        <input type="number" v-model="selectTechParamItem.item.HStd" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">上限值:</view>
                    <view class="right">
                        <input type="number" v-model="selectTechParamItem.item.HMax" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">下限值:</view>
                    <view class="right">
                        <input type="number" v-model="selectTechParamItem.item.HMin" />
                    </view>
                </view>
                <view style="display: flex; flex-direction: row;">
                    <button size="mini" plain="true" type="primary" @click="inputPopupClose(1)">确认</button>
                    <button size="mini" plain="true" type="warn" @click="inputPopupClose(0)">取消</button>
                </view>
            </view>
        </uni-popup>
    </view>
</template>

@@ -322,6 +350,15 @@
                HBillType: '3919',
                operationType: 1,
                uploadOptions: {},

                selectTechParamItem: {
                    index: -1,
                    item: {
                        HStd: 0,
                        HMax: 0,
                        HMin: 0
                    }
                },

                HTechParams: [], // 工艺参数

@@ -407,7 +444,13 @@
        },
        methods: {
            modifyCheckValue(index, item) {
              console.log('item: ',item, 'index: ', index);  
                console.log('item: ', item, 'index: ', index);
                this.selectTechParamItem = {
                   index,
                   item: JSON.parse(JSON.stringify(item)) 
                }
                
                this.$refs.inputPopup.open()
            },
            billSelectHandler(billData) {
                console.log('billData: ', billData);
@@ -599,6 +642,24 @@
                    this.hform.HBarCode = cb
                    this.GetMessageByBarCode(cb)
                })
            },
            inputPopupClose(type) {
                if(type == 1) {
                    // 确认
                    let index = this.selectTechParamItem.index
                    let item = this.selectTechParamItem.item
                    
                    this.HTechParams[index] = item
                }
                this.selectTechParamItem = {
                    index: -1,
                    item: {
                        HStd: 0,
                        HMax: 0,
                        HMin: 0
                    }
                },
                this.$refs.inputPopup.close()
            },
            async GetMessageByBarCode(HBarCode) {
                try {
@@ -1070,5 +1131,10 @@
</script>

<style lang="scss" scoped>
    @import "@/pages/MJGL/style/MJBillStyle.scss"
    @import "@/pages/MJGL/style/MJBillStyle.scss";

    .inputPopup {
        background-color: #fff;
        padding: 20rpx;
    }
</style>

 pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport.vue

@@ -13,7 +13,12 @@
                <view class="card-detail">
                    <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
                        :key="index">
                        <text>{{field.ColmCols}}：</text>{{item[field.ColmCols]}}
                        <template v-if="field.ColmType == 'DateTime'">
                            <text>{{field.ColmCols}}：</text>{{dayjs(item[field.ColmCols]).format("YYYY-MM-DD HH:mm:ss")}}
                        </template>
                        <template v-else> 
                            <text>{{field.ColmCols}}：</text>{{item[field.ColmCols]}}
                        </template>
                    </view>
                </view>
                <view class="more" v-if="showDetail == index && operations != index">
@@ -35,9 +40,9 @@
                <view class="op" v-if="operations == index">
                    <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">编辑</button> -->
                    <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">删除</button> -->
                    <button class="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">下推派工单</button>
                    <!-- <button class="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">下推派工单</button>
                    <button class="op3" size="mini" v-if="tabs == 1" plain @tap.stop="pushBill(1, item)">下推维修单</button>
                    <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">下推验收单</button>
                    <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">下推验收单</button> -->
                    <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
                </view>
            </uni-card>

 pages/MJGL/Sb_EquipRepairCheckTaskReport/Sb_EquipRepairCheckTaskReport.vue

@@ -1,22 +1,226 @@
<template>
    <view>
        
        <view class="tabs" id="tabs">
            <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">待维修</view>
            <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">已维修</view>
            <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">已验收</view>
        </view>

        <!-- 设备点检任务列表 -->
        <view class="list" v-for="(item,index) in reportBillsDisplay" :key="index">
            <uni-card :title="item.故障登记单号" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
                <view class="card-detail">
                    <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
                        :key="index">
                        <template v-if="field.ColmType == 'DateTime'">
                            <text>{{field.ColmCols}}：</text>{{dayjs(item[field.ColmCols]).format('YYYY-MM-DD HH:mm:ss')}}
                        </template>
                        <template v-else>
                            <text>{{field.ColmCols}}：</text>{{item[field.ColmCols]}}
                        </template>
                    </view>
                </view>
                <view class="more" v-if="showDetail == index && operations != index">
                    <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">
                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>操作
                    </view>
                </view>
                <view class="more" v-if="showDetail != index && operations != index">
                    <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">
                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>操作
                    </view>
                </view>
                <view class="op" v-if="operations == index">
                    <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">编辑</button> -->
                    <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">删除</button> -->
                    <!-- <button class="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">下推派工单</button>
                    <button class="op3" size="mini" v-if="tabs == 1" plain @tap.stop="pushBill(1, item)">下推维修单</button>
                    <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">下推验收单</button> -->
                    <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
                </view>
            </uni-card>
        </view>
        <view class="over" v-if="reportBillsDisplay.length == 0">暂无数据</view>
    </view>
</template>

<script>
    import {
        getUserInfo
    } from '../../../utils/auth';
    import {
        CommonUtils
    } from '../../../utils/common';
    import dayjs from 'dayjs';
    export default {
        // 器具故障登记跟踪 模块
        name: 'Sc_MouldRepairCheckTaskReport',
        data() {
            return {
                
            }
                dayjs,
                CommonUtils,
                tabs: 0,
                showDetail: -1,
                operations: -1,

                reportBillsDisplay: [],
                reportBillsAwaitRepair: [], // 待维修
                reportBillsRepaired: [], // 已维修
                reportBillsChecked: [], // 已验收
                HFieldList: [], // 字段列表
            };
        },
        methods: {
            
            pushBill(tab, item) {
                console.log('item: ', item);
                let Query = `&HBillNo=${item['故障登记单号']}&HInterID=${item['HInterID']}&HSourceBillType=3907`
                if (tab == 0) {
                    uni.navigateTo({
                        url: '/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill?operationType=4' +
                            Query
                    })
                } else if (tab == 1) {
                    uni.navigateTo({
                        url: '/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill?operationType=5' + Query +
                            `&HSendWorkID=${item.HSendWorkID}`
                    })
                } else if (tab == 2) {
                    uni.navigateTo({
                        url: '/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill?operationType=4' +
                            Query + `&HSendWorkID=${item.HSendWorkID}`
                    })
                }
            },
            switchTab(tabIndex) {
                this.tabs = tabIndex
                switch (tabIndex) {
                    case 0:
                        this.reportBillsDisplay = this.reportBillsAwaitRepair;
                        break;
                    case 1:
                        this.reportBillsDisplay = this.reportBillsRepaired;
                        break;
                    case 2:
                        this.reportBillsDisplay = this.reportBillsChecked;
                        break;
                }
            },
            async getRepairList() {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Sb_EquipRepairCheckTaskReport/RepairCheckList',
                        data: {
                            user: getUserInfo()["HEmpName"]
                        }
                    })

                    let {
                        count,
                        data,
                        Message,
                        list
                    } = res.data
                    if (count == 1) {
                        console.log('data: ', data);

                        this.reportBillsAwaitRepair = data.h_p_Sb_EquipRepairCheckTaskReport
                        this.reportBillsRepaired = data.h_p_Sb_EquipRepairCheckTaskReport1
                        this.reportBillsChecked = data.h_p_Sb_EquipRepairCheckTaskReport2

                        let fieldList = CommonUtils.fieldListFilterRole({
                            ExcludeKeys: ['故障登记单号'],
                            FieldList: list
                        })

                        if (fieldList.status == false) {
                            CommonUtils.showTips({
                                title: '温馨提示',
                                message: `获取表单结构失败: ${fieldList.Message}`
                            })
                        }

                        this.HFieldList = fieldList.data

                        this.switchTab(0)
                    } else {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: `获取故障登记单异常: ${Message}`
                        })
                    }

                } catch (err) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: `获取故障登记单异常: ${err}`
                    })
                }
            }
        },
        onShow() {
            this.getRepairList()
        }
    }
</script>

<style>
<style lang="scss">
    @import "@/pages/MJGL/style/MJBillStyle.scss";

</style>
    .more {
        color: #888;
        font-size: 26rpx;
        display: flex;
        border-top: 1px solid #eee;
        padding-top: 20rpx;

        .part {
            width: 50%;
            display: flex;
            align-items: center;
            justify-content: center;
        }
    }

    .op {
        display: flex;
        justify-content: space-around;
        margin-top: 20rpx;

        button {
            padding: 0;
            width: 150rpx;
            font-size: 25rpx;
        }

        .op1 {
            border: 1px solid #41a863;
            color: #41a863;
        }

        .op2 {
            border: 1px solid #d98d00;
            color: #d98d00;
        }

        .op3 {
            border: 1px solid #3a78ff;
            color: #3a78ff;
        }

        .op4 {
            border: 1px solid #da0000;
            color: #da0000;
        }

        .op5 {
            border: 1px solid #888;
            color: #888;
        }
    }
</style>

 pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue

@@ -12,7 +12,12 @@
                <view class="card-detail">
                    <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
                        :key="index">
                        <text>{{field.ColmCols}}：</text>{{item[field.ColmCols]}}
                        <template v-if="field.ColmType == 'DateTime'">
                            <text>{{field.ColmCols}}：</text>{{dayjs(item[field.ColmCols]).format('YYYY-MM-DD HH:mm:ss')}}
                        </template>
                        <template v-else>
                            <text>{{field.ColmCols}}：</text>{{item[field.ColmCols]}}
                        </template>
                    </view>
                </view>
                <view class="more" v-if="showDetail == index && operations != index">

 pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue

@@ -453,6 +453,7 @@
                        data: {
                            Employee: '',
                            HGroupID: 0,
                            HDeptID: uni.getStorageSync("HDeptID")
                        }
                    })
                    let {

 pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport.vue

@@ -13,7 +13,12 @@
                <view class="card-detail">
                    <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
                        :key="index">
                        <text>{{field.ColmCols}}：</text>{{item[field.ColmCols]}}
                        <template v-if="field.ColmType == 'DateTime'">
                            <text>{{field.ColmCols}}：</text>{{dayjs(item[field.ColmCols]).format("YYYY-MM-DD HH:mm:ss")}}
                        </template>
                        <template v-else> 
                            <text>{{field.ColmCols}}：</text>{{item[field.ColmCols]}}
                        </template>
                    </view>
                </view>
                <view class="more" v-if="showDetail == index && operations != index">

 pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport.vue

@@ -1,22 +1,226 @@
<template>
    <view>
        
        <view class="tabs" id="tabs">
            <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">待维修</view>
            <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">已维修</view>
            <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">已验收</view>
        </view>

        <!-- 设备点检任务列表 -->
        <view class="list" v-for="(item,index) in reportBillsDisplay" :key="index">
            <uni-card :title="item.故障登记单号" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
                <view class="card-detail">
                    <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
                        :key="index">
                        <template v-if="field.ColmType == 'DateTime'">
                            <text>{{field.ColmCols}}：</text>{{dayjs(item[field.ColmCols]).format('YYYY-MM-DD HH:mm:ss')}}
                        </template>
                        <template v-else>
                            <text>{{field.ColmCols}}：</text>{{item[field.ColmCols]}}
                        </template>
                    </view>
                </view>
                <view class="more" v-if="showDetail == index && operations != index">
                    <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">
                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>操作
                    </view>
                </view>
                <view class="more" v-if="showDetail != index && operations != index">
                    <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">
                        <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>操作
                    </view>
                </view>
                <view class="op" v-if="operations == index">
                    <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">编辑</button> -->
                    <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">删除</button> -->
                    <!-- <button class="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">下推派工单</button>
                    <button class="op3" size="mini" v-if="tabs == 1" plain @tap.stop="pushBill(1, item)">下推维修单</button>
                    <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">下推验收单</button> -->
                    <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
                </view>
            </uni-card>
        </view>
        <view class="over" v-if="reportBillsDisplay.length == 0">暂无数据</view>
    </view>
</template>

<script>
    import {
        getUserInfo
    } from '../../../utils/auth';
    import {
        CommonUtils
    } from '../../../utils/common';
    import dayjs from 'dayjs';
    export default {
        // 器具故障登记跟踪 模块
        name: 'Sc_MouldRepairCheckTaskReport',
        data() {
            return {
                
            }
                dayjs,
                CommonUtils,
                tabs: 0,
                showDetail: -1,
                operations: -1,

                reportBillsDisplay: [],
                reportBillsAwaitRepair: [], // 待维修
                reportBillsRepaired: [], // 已维修
                reportBillsChecked: [], // 已验收
                HFieldList: [], // 字段列表
            };
        },
        methods: {
            
            pushBill(tab, item) {
                console.log('item: ', item);
                let Query = `&HBillNo=${item['故障登记单号']}&HInterID=${item['HInterID']}&HSourceBillType=3907`
                if (tab == 0) {
                    uni.navigateTo({
                        url: '/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill?operationType=4' +
                            Query
                    })
                } else if (tab == 1) {
                    uni.navigateTo({
                        url: '/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill?operationType=5' + Query +
                            `&HSendWorkID=${item.HSendWorkID}`
                    })
                } else if (tab == 2) {
                    uni.navigateTo({
                        url: '/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill?operationType=4' +
                            Query + `&HSendWorkID=${item.HSendWorkID}`
                    })
                }
            },
            switchTab(tabIndex) {
                this.tabs = tabIndex
                switch (tabIndex) {
                    case 0:
                        this.reportBillsDisplay = this.reportBillsAwaitRepair;
                        break;
                    case 1:
                        this.reportBillsDisplay = this.reportBillsRepaired;
                        break;
                    case 2:
                        this.reportBillsDisplay = this.reportBillsChecked;
                        break;
                }
            },
            async getRepairList() {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Sc_MouldRepairCheckTaskReport/RepairCheckList',
                        data: {
                            user: getUserInfo()["HEmpName"]
                        }
                    })

                    let {
                        count,
                        data,
                        Message,
                        list
                    } = res.data
                    if (count == 1) {
                        console.log('data: ', data);

                        this.reportBillsAwaitRepair = data.h_p_Sc_MouldRepairCheckTaskReport
                        this.reportBillsRepaired = data.h_p_Sc_MouldRepairCheckTaskReport1
                        this.reportBillsChecked = data.h_p_Sc_MouldRepairCheckTaskReport2

                        let fieldList = CommonUtils.fieldListFilterRole({
                            ExcludeKeys: ['故障登记单号'],
                            FieldList: list
                        })

                        if (fieldList.status == false) {
                            CommonUtils.showTips({
                                title: '温馨提示',
                                message: `获取表单结构失败: ${fieldList.Message}`
                            })
                        }

                        this.HFieldList = fieldList.data

                        this.switchTab(0)
                    } else {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: `获取故障登记单异常: ${Message}`
                        })
                    }

                } catch (err) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: `获取故障登记单异常: ${err}`
                    })
                }
            }
        },
        onShow() {
            this.getRepairList()
        }
    }
</script>

<style>
<style lang="scss">
    @import "@/pages/MJGL/style/MJBillStyle.scss";

</style>
    .more {
        color: #888;
        font-size: 26rpx;
        display: flex;
        border-top: 1px solid #eee;
        padding-top: 20rpx;

        .part {
            width: 50%;
            display: flex;
            align-items: center;
            justify-content: center;
        }
    }

    .op {
        display: flex;
        justify-content: space-around;
        margin-top: 20rpx;

        button {
            padding: 0;
            width: 150rpx;
            font-size: 25rpx;
        }

        .op1 {
            border: 1px solid #41a863;
            color: #41a863;
        }

        .op2 {
            border: 1px solid #d98d00;
            color: #d98d00;
        }

        .op3 {
            border: 1px solid #3a78ff;
            color: #3a78ff;
        }

        .op4 {
            border: 1px solid #da0000;
            color: #da0000;
        }

        .op5 {
            border: 1px solid #888;
            color: #888;
        }
    }
</style>

 pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue

@@ -13,7 +13,12 @@
                <view class="card-detail">
                    <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
                        :key="index">
                        <text>{{field.ColmCols}}：</text>{{item[field.ColmCols]}}
                        <template v-if="field.ColmType == 'DateTime'">
                            <text>{{ field.ColmCols }}：</text>{{dayjs(item[field.ColmCols]).format('YYYY-MM-DD HH:mm:ss')}}
                        </template>
                        <template v-else>
                            <text>{{ field.ColmCols }}：</text>{{item[field.ColmCols]}}
                        </template>
                    </view>
                </view>
                <view class="more" v-if="showDetail == index && operations != index">

 pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue

@@ -661,6 +661,7 @@
                        data: {
                            Employee: '',
                            HGroupID: 0,
                            HDeptID: uni.getStorageSync("HDeptID")
                        }
                    })
                    let {

 pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue

@@ -548,7 +548,8 @@
            getHEmpList() {
                CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    (res) => {
                        if (res.data.count == 1) {

 pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue

@@ -528,7 +528,8 @@
            getHEmpList() {
                CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    (res) => {
                        if (res.data.count == 1) {

 pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBill.vue

@@ -563,7 +563,8 @@
            getHEmpList() {
                CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    (res) => {
                        if (res.data.count == 1) {

 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue

@@ -647,7 +647,8 @@
                        url: this.serverUrl + '/Web/GetEmployeeList_Json',
                        data: {
                            Employee: '',
                            HGroupID: 0
                            HGroupID: 0,
                            HDeptID: uni.getStorageSync("HDeptID")
                        },
                        success: (res) => {
                            if (res.data.count == 1) {

 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue

@@ -554,7 +554,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue

@@ -576,7 +576,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue

@@ -565,7 +565,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue

@@ -548,7 +548,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/ZLGL/QuYangHuangYang/QC_BackSampleCheckBill/QC_BackSampleCheckBill.vue

@@ -332,7 +332,8 @@
                    url: '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    resFunction: (res) => {
                        let {

 pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue

@@ -368,7 +368,8 @@
                    url: '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    resFunction: (res) => {
                        let {

 pages/ZLGL/QualityReportStep/QualityReportStepBill.vue

@@ -737,7 +737,7 @@
                    let res = await CommonUtils.doRequest2Async({
                        url: "/Gy_Employee/list",
                        data: {
                            sWhere: ` and 禁用标记 = '' `,
                            sWhere: ` and 禁用标记 = ''  and HDeptID = ${uni.getStorageSync("HDeptID")}`,
                            user: getUserInfo()["Czymc"],
                            Organization: uni.getStorageSync("Organization"),
                        },

 pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill.vue

@@ -954,7 +954,7 @@
                        data: {
                            sWhere: `  and 组织名称 = '${uni.getStorageSync(
                              "Organization"
                            )}' and 禁用标记 = ''and 审核人 !='' `,
                            )}' and 禁用标记 = ''and 审核人 !=''  and HDeptID = ${uni.getStorageSync("HDeptID")}`,
                            user: getUserInfo()["Czymc"],
                            Organization: uni.getStorageSync("Organization"),
                        },

 pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue

@@ -1231,7 +1231,7 @@
                        data: {
                            sWhere: `  and 组织名称 = '${uni.getStorageSync(
              "Organization"
            )}' and 禁用标记 = ''and 审核人 !='' `,
            )}' and 禁用标记 = ''and 审核人 !='' and HDeptID = ${uni.getStorageSync("HDeptID")}`,
                            user: getUserInfo()["Czymc"],
                            Organization: uni.getStorageSync("Organization"),
                        },

 pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue

@@ -1231,7 +1231,7 @@
                        data: {
                            sWhere: `  and 组织名称 = '${uni.getStorageSync(
              "Organization"
            )}' and 禁用标记 = ''and 审核人 !='' `,
            )}' and 禁用标记 = ''and 审核人 !=''  and HDeptID = ${uni.getStorageSync("HDeptID")}`,
                            user: getUserInfo()["Czymc"],
                            Organization: uni.getStorageSync("Organization"),
                        },

 pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue

@@ -713,7 +713,8 @@
                        url: '/Web/GetEmployeeList_Json',
                        data: {
                            Employee: '',
                            HGroupID: 0
                            HGroupID: 0,
                            HDeptID: uni.getStorageSync("HDeptID")
                        },
                    })


 pages/ZLGL/mojianjianyan/ProcessCheckBill.vue

@@ -1249,7 +1249,7 @@
                    let res = await CommonUtils.doRequest2Async({
                        url: "/Gy_Employee/list",
                        data: {
                            sWhere: ` and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !='' `,
                            sWhere: ` and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !=''  and HDeptID = ${uni.getStorageSync("HDeptID")}`,
                            user: getUserInfo()["Czymc"],
                            Organization: uni.getStorageSync("Organization"),
                        },

 pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue

@@ -1283,7 +1283,7 @@
                        data: {
                            sWhere: `  and 组织名称 = '${uni.getStorageSync(
                              "Organization"
                            )}' and 禁用标记 = ''and 审核人 !=''`,
                            )}' and 禁用标记 = ''and 审核人 !='' and HDeptID = ${uni.getStorageSync("HDeptID")}`,
                            user: getUserInfo()["Czymc"],
                            Organization: uni.getStorageSync("Organization"),
                        },

 pages/ZLGL/shoujianjianyan/firstCheckBill.vue

@@ -1262,7 +1262,7 @@
                    let res = await CommonUtils.doRequest2Async({
                        url: "/Gy_Employee/list",
                        data: {
                            sWhere: `  and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !='' `,
                            sWhere: `  and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !='' and HDeptID = ${uni.getStorageSync("HDeptID")}`,
                            user: getUserInfo()["Czymc"],
                            Organization: uni.getStorageSync("Organization"),
                        },

 pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue

@@ -957,7 +957,8 @@
                    let res = await CommonUtils.doRequest2Async({
                        url: "/Gy_Employee/list",
                        data: {
                            sWhere: ` and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !='' `,
                            sWhere: ` and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !='' 
                             and HDeptID = ${uni.getStorageSync("HDeptID")}`,
                            user: getUserInfo()["Czymc"],
                            Organization: uni.getStorageSync("Organization"),
                        },

 pages/baogong/AddLineBind.vue

@@ -147,7 +147,8 @@
                        url: this.serverUrl + '/Web/GetEmployeeList_Json',
                        data: {
                            Employee: '',
                            HGroupID: 0
                            HGroupID: 0,
                            HDeptID: uni.getStorageSync("HDeptID")
                        }
                    });


 pages/baogong/OA_ErrMsgBackBill.vue

@@ -658,12 +658,14 @@

            // 获取人员列表（通用方法）
            getPersonList() {
                console.log('uni.getStorageSync("HDeptID"): ',uni.getStorageSync("HDeptID"));
                return new Promise((resolve, reject) => {
                    uni.request({
                        url: this.serverUrl + '/Web/GetEmployeeList_Json',
                        data: {
                            Employee: '',
                            HGroupID: 0
                            HGroupID: 0,
                            HDeptID: uni.getStorageSync("HDeptID")
                        },
                        success: (res) => {
                            if (res.data.count == 1) {

 pages/baogong/ProductReportStepBillList.vue

@@ -253,7 +253,7 @@
            getHEmpList(){
                uni.request({
                    url: this.serverUrl + '/Web/GetEmployeeList_Json', 
                    data: { Employee: '',HGroupID:0 },
                    data: { Employee: '',HGroupID:0 , HDeptID: uni.getStorageSync("HDeptID")},
                    success: (res) => {
                        if(res.data.count == 1){
                            this.HEmpNameList = res.data.data

 pages/caigouruku/POStockInBill.vue

@@ -969,7 +969,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/caigoutuiliao/POStockInBackBill.vue

@@ -884,7 +884,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/fenbushidiaochudan/form_out.vue

@@ -1504,7 +1504,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/fenbushidiaorudan/form.vue

@@ -1278,7 +1278,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/gongxuIn/Cj_StationInBill.vue

@@ -566,7 +566,7 @@
            getHEmpList(){
                uni.request({
                    url: this.serverUrl + '/Web/GetEmployeeList_Json', 
                    data: { Employee: '',HGroupID:0 },
                    data: { Employee: '',HGroupID:0, HDeptID: uni.getStorageSync("HDeptID")},
                    success: (res) => {
                        if(res.data.count == 1){
                            this.HEmpNameList = res.data.data

 pages/gongxuOut/Cj_StationOutBill.vue

@@ -1087,7 +1087,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/gongxuOut/moneystatistics.vue

@@ -299,7 +299,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/index/login.vue

@@ -163,7 +163,7 @@
                // 读取语言包并加载
                // let languagePack = await getLanguagePackJson(lang)
                // this.$i18n.setLocaleMessage(lang, languagePack)
                this.$i18n.locale = lang
                this.$i18n.locale = lang
            },
            onLanguageChangeHandler(e) {
                //动态获取后端的语言包文件，并将语言包应用到全局

 pages/index/tab1.vue

@@ -9,7 +9,8 @@
            <view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
                :key="index" @tap="toUrl(item)">
                <template v-if="item.corner">
                    <uni-badge :text="item.cornerCount" type="error" :max-num="99" size="normal" absolute
                    <uni-badge :text="item.cornerCount" type="error" :max-num="99" size="normal"
                        absolute="rightTop"
                        :offset="[7, 7]">
                        <image :src="item.img" mode=""></image>
                    </uni-badge>
@@ -206,7 +207,7 @@
                }
                
                this.itemData.forEach((e, index) => {
                    if(MessageIdentifier.data[e.text]) {
                    if(MessageIdentifier.data[e.text] != undefined) {
                        this.itemData[index]["corner"] = true
                        this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
                    }
@@ -258,7 +259,6 @@
                            moduleName: menuListName
                        }
                    })
                    console.log('common module: ',res);
                    let {
                        data,
                        count,
@@ -312,9 +312,8 @@
                Array.from(data).forEach((e, index) => {
                    if (index < this.itemData.length) {
                        if (MessageIdentifier.data[this.itemData[e["HIndex"]].text]) {
                            this.itemData[e["HIndex"]]["corner"] = true,
                                this.itemData[e["HIndex"]]["cornerCount"] = MessageIdentifier.data[this
                                    .itemData[e["HIndex"]].text]
                            this.$set(this.itemData[e["HIndex"]], "corner", true)
                            this.$set(this.itemData[e["HIndex"]], "cornerCount", MessageIdentifier.data[this.itemData[e["HIndex"]].text])
                        }
                    }
                })

 pages/index/tab3.vue

@@ -9,7 +9,8 @@
            <view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
                :key="index" @tap="toUrl(item)">
                <template v-if="item.corner">
                    <uni-badge :text="item.cornerCount" style="z-index: 99 !important;" type="error" :max-num="99" size="normal" absolute
                    <uni-badge :text="item.cornerCount" style="z-index: 99 !important;" type="error" :max-num="99" size="normal"
                        absolute="rightTop"
                        :offset="[7, 7]">
                        <image :src="item.img" mode=""></image>
                    </uni-badge>
@@ -91,7 +92,6 @@
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                    
                        "text": "模具保养任务",
                        "url": "/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport",
                        "id": 25,
@@ -109,6 +109,20 @@
                        "text": "模具维修任务",
                        "url": "/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport",
                        "id": 27,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "设备待点检任务",
                        "url": "/pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport",
                        "id": 29,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "模具待点检任务",
                        "url": "/pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport",
                        "id": 30,
                        "hidden": false
                    },
                    {
@@ -249,16 +263,37 @@
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "设备点检任务",
                        "url": "/pages/MJGL/Sb_EquipDotCheckTaskReport/Sb_EquipDotCheckTaskReport",
                        "id": 29,
                        "text": "设备故障登记跟踪",
                        "url": "/pages/MJGL/Sb_EquipRepairCheckTaskReport/Sb_EquipRepairCheckTaskReport",
                        "id": 31,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "器具点检任务",
                        "url": "/pages/MJGL/Sc_MouldDotCheckTaskReport/Sc_MouldDotCheckTaskReport",
                        "id": 30,
                        "text": "模具故障登记跟踪",
                        "url": "/pages/MJGL/Sc_MouldRepairCheckTaskReport/Sc_MouldRepairCheckTaskReport",
                        "id": 32,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "待上模查询",
                        "url": "/pages/MJGL/Sc_MouldUpperAwaitQuery/Sc_MouldUpperAwaitQuery",
                        "id": 33,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "待开工查询",
                        "url": "/pages/Cj_StationInBillAwaitQuery/Cj_StationInBillAwaitQuery",
                        "id": 34,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "待下模查询",
                        "url": "/pages/MJGL/Sc_MouldLowerBillAwaitQuery/Sc_MouldLowerBillAwaitQuery",
                        "id": 35,
                        "hidden": false
                    }
                ]
@@ -278,9 +313,8 @@

                    return
                }

                this.itemData.forEach((e, index) => {
                    if (MessageIdentifier.data[e.text]) {
                    if (MessageIdentifier.data[e.text] != undefined) {
                        this.itemData[index]["corner"] = true
                        this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
                    }
@@ -319,9 +353,10 @@
                Array.from(data).forEach((e, index) => {
                    if (index < this.itemData.length) {
                        if (MessageIdentifier.data[this.itemData[e["HIndex"]].text]) {
                            this.itemData[e["HIndex"]]["corner"] = true,
                                this.itemData[e["HIndex"]]["cornerCount"] = MessageIdentifier.data[this
                                    .itemData[e["HIndex"]].text]
                            // 使用$set 添加响应式数据
                            this.$set(this.itemData[e["HIndex"]], "corner", true)
                            this.$set(this.itemData[e["HIndex"]], "cornerCount", MessageIdentifier.data[this.itemData[e["HIndex"]].text])
                            
                        }
                    }
                })
@@ -338,7 +373,6 @@
                            moduleName: menuListName
                        }
                    })
                    console.log('common module: ', res);
                    let {
                        data,
                        count,

 pages/qitachuku/qitachukudan.vue

@@ -993,7 +993,8 @@
            getHEmpList() {
                CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    (res) => {
                        if (res.data.count == 1) {

 pages/qitachuku_v2/OtherOutBill.vue

@@ -980,7 +980,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/qitaruku/qitarukudan.vue

@@ -668,7 +668,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/qitaruku_v2/OtherInBill.vue

@@ -991,7 +991,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/shengchanbuliao/MateReplenishOutBill.vue

@@ -881,7 +881,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/shengchanlingliaoshengdan/Kf_MateOutBill.vue

@@ -964,7 +964,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/shengchanrukushengdan/Kf_ProductInBill.vue

@@ -995,7 +995,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/shengchantuiliao/MateOutBackBill.vue

@@ -939,7 +939,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/shoujishouming/form.vue

@@ -310,7 +310,7 @@
            getHEmpList(){
                uni.request({
                    url: this.serverUrl + '/Web/GetEmployeeList_Json', 
                    data: { Employee: '',HGroupID:0 },
                    data: { Employee: '',HGroupID:0, HDeptID: uni.getStorageSync("HDeptID") },
                    success: (res) => {
                        if(res.data.count == 1){
                            this.HEmpNameList = res.data.data

 pages/weiwaigxIn/Cj_StationEntrustInBill.vue

@@ -650,7 +650,7 @@
            getHEmpList(){
                uni.request({
                    url: this.serverUrl + '/Web/GetEmployeeList_Json', 
                    data: { Employee: '',HGroupID:0 },
                    data: { Employee: '',HGroupID:0, HDeptID: uni.getStorageSync("HDeptID") },
                    success: (res) => {
                        if(res.data.count == 1){
                            this.HEmpNameList = res.data.data

 pages/weiwaigxOut/Cj_StationEntrustOutBill.vue

@@ -795,7 +795,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/weiwailingliao/Kf_EntrustOutBill.vue

@@ -913,7 +913,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/weiwairuku/EntrustInBill.vue

@@ -907,7 +907,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/xiaoshouchuku/SellOutBill.vue

@@ -982,7 +982,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/xiaoshoutuihuo/ICStockBillMain.vue

@@ -747,7 +747,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 pages/zhijiediaobo/MoveStockBill.vue

@@ -1524,7 +1524,8 @@
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {

 utils/WebSocketServices.js

@@ -36,6 +36,7 @@
    createConnect(userId, userName, count = 0, limit = 3) {
        // 登录建立连接时，需要重新获取http地址，可能会变更
        this.wsUrl = CommonUtils.httpFormatWs();
        //this.wsUrl = uni.getStorageSync("serverUrl") + "WebSocketHandler.ashx"
        // 缓存用户信息（用于重连）
        this.currentUserId = userId;
        this.currentUserName = userName;

 utils/common.js

@@ -501,13 +501,13 @@
            httpUrl = httpUrl.substring(0, httpUrl.length - 1)
            let BackSlashLast = httpUrl.lastIndexOf('/')
            httpUrl = httpUrl.substring(0, BackSlashLast)
            httpUrl = "ws://" + httpUrl.split(":")[0]+":8888/ws"
            httpUrl = "ws://" + httpUrl.split(":")[0]+":12345/ws"
        }else if(httpUrl.indexOf("https://") === 0) {
            httpUrl = httpUrl.replace("https://", "")
            httpUrl = httpUrl.substring(0, httpUrl.length - 1)
            let BackSlashLast = httpUrl.lastIndexOf('/')
            httpUrl = httpUrl.substring(0, BackSlashLast)
            httpUrl = "wss://" + httpUrl.split(":")[0]+":8888/ws"
            httpUrl = "wss://" + httpUrl.split(":")[0]+":12345/ws"
        }else{
            // 提示传入连接错误
        }