页面优化

zrg

2026-01-25 b0bffe34022a062856ca9fedefeaa5ced90e7327

页面优化

 pages.json

@@ -230,13 +230,13 @@
                "enablePullDownRefresh": true
            }
        },
        // {
        //     "path": "pages/baogong/OA_ErrMsgBackBill",
        //     "style": {
        //         "navigationBarTitleText": "异常反馈单",
        //         "enablePullDownRefresh": false
        //     }
        // },
        {
            "path": "pages/baogong/OA_ErrMsgBackBill",
            "style": {
                "navigationBarTitleText": "异常反馈单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList",
            "style": {

 pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue

@@ -21,14 +21,14 @@
                    size="20"></uni-icons>
            </view>
            <view class="form-item">
                <view class="title">仓库:</view>
                <view class="title"><text>*</text>仓库:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHWHName" placeholder="请输入(或扫描)仓库" v-model="hform.HWHName"
                        @input="HWHNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">仓位:</view>
                <view class="title"><text>*</text>仓位:</view>
                <view class="right" v-show="showHStockPlaceName">
                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
@@ -38,21 +38,21 @@
                </view>
            </view>
            <view class="form-item">
                <view class="title">发出人:</view>
                <view class="title"><text>*</text>发出人:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHEmpName" placeholder="请输入(或扫描)发出人" v-model="hform.HKeeperName"
                        @input="HScatterUserChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">领用人:</view>
                <view class="title"><text>*</text>领用人:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHEmpName" placeholder="请输入(或扫描)领用人" v-model="hform.HSecManagerName"
                        @input="HCollectUserChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">部门:</view>
                <view class="title"><text>*</text>部门:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHDeptName" placeholder="请选择部门" v-model="hform.HDeptName"
                        @input="HDeptNameChange"></uni-combox>
@@ -502,7 +502,7 @@
            /* #region 仓库仓位获取下拉框 */
            getHBaseList() {
                CommonUtils.doRequest(
                    "/Web/GetWarehouseList_Json_New", {
                    "/Web/GetWarehouseList_Json_MJ", {
                        Warehouse: "",
                        HOrgID: uni.getStorageSync('OrganizationID')
                    },

 pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue

@@ -1,1055 +1,1066 @@
<template>
    <view>
        <view class="form">
            <view class="form-item">
                <view class="title">条码</view>
                <view class="right" style="width: 350rpx;">
                    <input v-model="hform.HBarCode" placeholder="请扫描(或输入)条码" @confirm="getCode(hform.HBarCode)"
                        @blur="getCode(hform.HBarCode)" />
                </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" @click="searchModule">
                <view class="title">器具</view>
                <view class="righton" style="width: 350rpx;">
                    <input placeholder="请选择器具" />
                </view>
                <uni-icons type="search"
                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
                    size="20"></uni-icons>
            </view>
            <view class="form-item">
                <view class="title">仓库:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHWHName" placeholder="请输入(或扫描)仓库" v-model="hform.HWHName"
                        @input="HWHNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">仓位:</view>
                <view class="right" v-show="showHStockPlaceName">
                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
                </view>
                <view class="righton" v-show="!showHStockPlaceName">
                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="不可操作" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">发出人:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHEmpName" placeholder="请输入(或扫描)发出人" v-model="hform.HKeeperName"
                        @input="HScatterUserChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">领用人:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHEmpName" placeholder="请输入(或扫描)领用人" v-model="hform.HSecManagerName"
                        @input="HCollectUserChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">部门:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHDeptName" placeholder="请选择部门" v-model="hform.HDeptName"
                        @input="HDeptNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">往来类型:</view>
                <view class="right">
                    <uni-combox :candidates="['供应商','客户','部门']" placeholder="请选择类型" v-model="hform.TypeName"
                        @input="HSelectTypeChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">往来单位:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHSelectType" placeholder="请选择" v-model="hform.HSupName"
                        @input="HSupNameChange"></uni-combox>
                </view>
            </view>
            <view class="tabs">
                <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">表头信息</view>
                <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">模具信息</view>
            </view>
            <view v-if="tabs == 0">
                <view class="form-item">
                    <view class="title">日期:</view>
                    <view class="right">
                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
                            <view class="picker-overlay"></view>
                            <input disabled v-model="hform.HDate" placeholder="请选择日期" />
                        </picker>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">源单类型:</view>
                    <view class="right" v-show="showHMainSourceBillType">
                        <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
                            >
                            <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
                                placeholder="请选择源单类型" />
                            <view class="picker-overlay"></view>
                        </picker>
                    </view>
                    <view class="righton" v-show="!showHMainSourceBillType">
                        <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
                            placeholder="请选择源单类型" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">源单单号:</view>
                    <view class="right" v-show="showHSourceBillNo">
                        <!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="请输入源单单号"
    <view>
        <view class="form">
            <view class="form-item">
                <view class="title">条码</view>
                <view class="right" style="width: 350rpx;">
                    <input v-model="hform.HBarCode" placeholder="请扫描(或输入)条码" @confirm="getCode(hform.HBarCode)"
                        @blur="getCode(hform.HBarCode)" />
                </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" @click="searchModule">
                <view class="title">器具</view>
                <view class="righton" style="width: 350rpx;">
                    <input placeholder="请选择器具" />
                </view>
                <uni-icons type="search"
                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
                    size="20"></uni-icons>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>仓库:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHWHName" placeholder="请输入(或扫描)仓库" v-model="hform.HWHName"
                        @input="HWHNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>仓位:</view>
                <view class="right" v-show="showHStockPlaceName">
                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
                </view>
                <view class="righton" v-show="!showHStockPlaceName">
                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="不可操作" />
                </view>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>发出人:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHEmpName" placeholder="请输入(或扫描)发出人" v-model="hform.HKeeperName"
                        @input="HScatterUserChange"></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.HSecManagerName"
                        @input="HCollectUserChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>部门:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHDeptName" placeholder="请选择部门" v-model="hform.HDeptName"
                        @input="HDeptNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>往来类型:</view>
                <view class="right">
                    <uni-combox :candidates="['供应商','客户','部门']" placeholder="请选择类型" v-model="hform.TypeName"
                        @input="HSelectTypeChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>往来单位:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHSelectType" placeholder="请选择" v-model="hform.HSupName"
                        @input="HSupNameChange"></uni-combox>
                </view>
            </view>
            <view class="tabs">
                <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">表头信息</view>
                <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">模具信息</view>
            </view>
            <view v-if="tabs == 0">
                <view class="form-item">
                    <view class="title">日期:</view>
                    <view class="right">
                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
                            <view class="picker-overlay"></view>
                            <input disabled v-model="hform.HDate" placeholder="请选择日期" />
                        </picker>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">源单类型:</view>
                    <view class="right" v-show="showHMainSourceBillType">
                        <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType">
                            <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
                                placeholder="请选择源单类型" />
                            <view class="picker-overlay"></view>
                        </picker>
                    </view>
                    <view class="righton" v-show="!showHMainSourceBillType">
                        <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
                            placeholder="请选择源单类型" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">源单单号:</view>
                    <view class="right" v-show="showHSourceBillNo">
                        <!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="请输入源单单号"
                            v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
                        <input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
                            v-model="hform.HSourceBillNo"  placeholder="请输入源单单号" />
                        <input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
                            v-model="hform.HSourceBillNo" placeholder="请输入源单单号" />

                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="search" size="20" ></uni-icons>
                    </view>
                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="search" size="20"></uni-icons>
                    </view>

                    <view class="righton" v-show="!showHSourceBillNo">
                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="请输入源单单号" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">制单人:</view>
                    <view class="righton">
                        <input name="HMaker" disabled v-model="hform.HMaker" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">单据号:</view>
                    <view class="righton">
                        <input name="HBillNo" disabled v-model="hform.HBillNo" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">单据ID:</view>
                    <view class="righton">
                        <input name="HInterID" disabled v-model="hform.HInterID" />
                    </view>
                </view>
            </view>
            <view v-if="tabs==1">
                <view class="list" v-for="(item,index) in HMouldList" :key="index">
                    <uni-card :title="item.器具名称" style="margin: 10px;" @tap="delMater(item, $event)">
                        <!-- 器具代码作为可点击链接 -->
                        <view class="card-header">
                            <text class="link-text">器具号：{{item.器具号}}</text>
                        </view>
                    <view class="righton" v-show="!showHSourceBillNo">
                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="请输入源单单号" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">制单人:</view>
                    <view class="righton">
                        <input name="HMaker" disabled v-model="hform.HMaker" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">单据号:</view>
                    <view class="righton">
                        <input name="HBillNo" disabled v-model="hform.HBillNo" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">单据ID:</view>
                    <view class="righton">
                        <input name="HInterID" disabled v-model="hform.HInterID" />
                    </view>
                </view>
            </view>
            <view v-if="tabs==1">
                <view class="list" v-for="(item,index) in HMouldList" :key="index">
                    <uni-card :title="item.器具名称" style="margin: 10px;" @tap="delMater(item, $event)">
                        <!-- 器具代码作为可点击链接 -->
                        <view class="card-header">
                            <text class="link-text">器具号：{{item.器具号}}</text>
                        </view>

                        <view class="card-detail">
                            <view class="detail">
                                <text>数量：</text>{{item.数量}}
                            </view>
                            <view class="detail">
                                <text>器具条码：</text>{{item.器具条码}}
                            </view>
                        </view>
                    </uni-card>
                </view>
                <view class="over" v-if="HMouldList.length == 0">暂无数据</view>
            </view>
            <view class="bottom-btn">
                <button class="btn-a" size="mini" @tap="submit">提交</button>
                <button class="btn-c" size="mini" @tap="goBack">退出</button>
            </view>
        </view>
        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
            :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
        <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
    </view>
                        <view class="card-detail">
                            <view class="detail">
                                <text>数量：</text>{{item.数量}}
                            </view>
                            <view class="detail">
                                <text>器具条码：</text>{{item.器具条码}}
                            </view>
                        </view>
                    </uni-card>
                </view>
                <view class="over" v-if="HMouldList.length == 0">暂无数据</view>
            </view>
            <view class="bottom-btn">
                <button class="btn-a" size="mini" @tap="submit">提交</button>
                <button class="btn-c" size="mini" @tap="goBack">退出</button>
            </view>
        </view>
        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
            :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
        <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
    </view>
</template>

<script>
    import getDateTime from '@/utils/getdateTime.js';
    import {
        getUserInfo
    } from "@/utils/auth.js";
    import {
        CommonUtils
    } from '@/utils/common';
    import BillListPopupVue from '../../../components/BillListPopup/BillListPopup.vue';
    import BillListPopupMouldVue from '../../../components/BillListPopup/BillListPopup_Mould.vue';
    import getDateTime from '@/utils/getdateTime.js';
    import {
        getUserInfo
    } from "@/utils/auth.js";
    import {
        CommonUtils
    } from '@/utils/common';
    import BillListPopupVue from '../../../components/BillListPopup/BillListPopup.vue';
    import BillListPopupMouldVue from '../../../components/BillListPopup/BillListPopup_Mould.vue';

    export default {
        components: {
            BillListPopupVue,
            BillListPopupMouldVue
        },
        data() {
            return {
                HSourceBillNoFocus: false,
                barCodeFocus: true, //条码光标
                userInfo: getUserInfo(),
                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                tabs: 0,
                arrayHEmpName: [],
                HEmpNameList: [],
                arrayHWHName: [], //仓库
                HWHNameList: [],
                arrayHStockPlaceName: [], //仓位
                HStockPlaceNameList: [],
                arrayHDeptName: [], //部门
                HDeptNameList: [],
                arrayHCusName: [],//客户
                HCusNameList: [],
                arrayHSupplierName: [], //供应商
                HSuplierList: [],
                linterid: '',
                HBillNo: '',
                arrayHSelectType: [], // 往来单位下拉列表
                HSelectTypeList: [], // 往来单位完整数据列表
                showHStockPlaceName: true,
                HMouldList: [],
                isEdit: false,
    export default {
        components: {
            BillListPopupVue,
            BillListPopupMouldVue
        },
        data() {
            return {
                HSourceBillNoFocus: false,
                barCodeFocus: true, //条码光标
                userInfo: getUserInfo(),
                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                tabs: 0,
                arrayHEmpName: [],
                HEmpNameList: [],
                arrayHWHName: [], //仓库
                HWHNameList: [],
                arrayHStockPlaceName: [], //仓位
                HStockPlaceNameList: [],
                arrayHDeptName: [], //部门
                HDeptNameList: [],
                arrayHCusName: [], //客户
                HCusNameList: [],
                arrayHSupplierName: [], //供应商
                HSuplierList: [],
                linterid: '',
                HBillNo: '',
                arrayHSelectType: [], // 往来单位下拉列表
                HSelectTypeList: [], // 往来单位完整数据列表
                showHStockPlaceName: true,
                HMouldList: [],
                isEdit: false,

                showHMainSourceBillType: true,
                showHSourceBillNo: true,
                HMainSourceBillType: uni.getStorageSync('billTypeName_3803') ? uni.getStorageSync('billTypeName_3803') :
                    '手工录入',
                arrayHMainSourceBillType: ['手工录入'],
                arrayHMainSourceBillValue: ['-1'],
                showHMainSourceBillType: true,
                showHSourceBillNo: true,
                HMainSourceBillType: uni.getStorageSync('billTypeName_3803') ? uni.getStorageSync('billTypeName_3803') :
                    '手工录入',
                arrayHMainSourceBillType: ['手工录入'],
                arrayHMainSourceBillValue: ['-1'],

                hform: {
                    HBarCode: '',
                    HInterID: '',
                    HBillType: 3803,
                    HWHName: getUserInfo().HWhName,
                    HWHID: getUserInfo().HWhID,
                    HStockPlaceName: getUserInfo().HSPName,
                    HStockPlaceID: getUserInfo().HSPID,
                    
                    HDeptName: getUserInfo().HDeptName,
                    HDeptID: getUserInfo().HDeptID,
                    HSecManagerID: getUserInfo().HEmpID,
                    HSecManagerName:  getUserInfo().HEmpName,
                    HKeeperName: getUserInfo().HKeeperName,
                    HKeeperID: getUserInfo().HKeeperID,//发料人
                    //源单信息
                    HMainSourceBillType: uni.getStorageSync('billType_3803') ? uni.getStorageSync('billType_3803') :
                        3849,
                    HSourceBillNo: '', //CGDD000200
                hform: {
                    HBarCode: '',
                    HInterID: '',
                    HBillType: 3803,
                    HWHName: getUserInfo().HWhName,
                    HWHID: getUserInfo().HWhID,
                    HStockPlaceName: getUserInfo().HSPName,
                    HStockPlaceID: getUserInfo().HSPID,

                    //往来类型
                    TypeName: uni.getStorageSync('typeName_3803'),
                    HSupName: '', // 往来单位选中的值
                    HSupID: '', // 往来单位对应的ID
                    HSupTypeID: uni.getStorageSync('typeID_3803') ? uni.getStorageSync('typeID_3803') : 0,
                    HDate: getDateTime.dateTimeStr('y-m-d'),
                    HMaker: uni.getStorageSync('HUserName'),
                    HDeptName: getUserInfo().HDeptName,
                    HDeptID: getUserInfo().HDeptID,
                    HSecManagerID: getUserInfo().HEmpID,
                    HSecManagerName: getUserInfo().HEmpName,
                    HKeeperName: getUserInfo().HEmpName,
                    HKeeperID: getUserInfo().HEmpID, //发料人
                    // HKeeperName: getUserInfo().HKeeperName,
                    // HKeeperID: getUserInfo().HKeeperID,//发料人
                    //源单信息
                    HMainSourceBillType: uni.getStorageSync('billType_3803') ? uni.getStorageSync('billType_3803') : 3849,
                    HSourceBillNo: '', //CGDD000200

                    HRedBlueFlag: 'false',
                    HStockOrgName: uni.getStorageSync('Organization'),
                    HStockOrgID: uni.getStorageSync('OrganizationID'),
                    HStockOutOrgID: uni.getStorageSync('OrganizationID'),
                    HBarCode_B: '',
                    HMouldName_B: '',
                    HMouldID_B: '',
                    HMouldCount_B: ''
                }
            }
        },
        methods: {
            searchModule() {
                this.$refs['billListMould'].showPopup()
            },
            MouldBillHandler(mould) {
                if (!mould.enableMultiSourceBill) {
                    let val = mould.val[0]
                    this.hform.HBarCode = val['条码编号']
                    this.getCode(this.hform.HBarCode)
                }
                this.$refs['billListMould'].exit()
            },
            HSupNameChange(e) {
                let index = this.arrayHSelectType.findIndex(el => el == e)
                let HSupInfo = this.HSelectTypeList[index]
                console.log('HSupInfo: ', HSupInfo);
                    //往来类型
                    TypeName: uni.getStorageSync('typeName_3803'),
                    HSupName: '', // 往来单位选中的值
                    HSupID: '', // 往来单位对应的ID
                    HSupTypeID: uni.getStorageSync('typeID_3803') ? uni.getStorageSync('typeID_3803') : 0,
                    HDate: getDateTime.dateTimeStr('y-m-d'),
                    HMaker: uni.getStorageSync('HUserName'),

                this.hform.HSupID = HSupInfo.HItemID
                this.hform.HSupName = HSupInfo['部门名称'] || HSupInfo['客户名称'] || HSupInfo['供应商名称']
                    HRedBlueFlag: 'false',
                    HStockOrgName: uni.getStorageSync('Organization'),
                    HStockOrgID: uni.getStorageSync('OrganizationID'),
                    HStockOutOrgID: uni.getStorageSync('OrganizationID'),
                    HBarCode_B: '',
                    HMouldName_B: '',
                    HMouldID_B: '',
                    HMouldCount_B: ''
                }
            }
        },
        methods: {
            searchModule() {
                this.$refs['billListMould'].showPopup()
            },
            MouldBillHandler(mould) {
                if (!mould.enableMultiSourceBill) {
                    let val = mould.val[0]
                    this.hform.HBarCode = val['条码编号']
                    this.getCode(this.hform.HBarCode)
                }
                this.$refs['billListMould'].exit()
            },
            HSupNameChange(e) {
                let index = this.arrayHSelectType.findIndex(el => el == e)
                let HSupInfo = this.HSelectTypeList[index]
                console.log('HSupInfo: ', HSupInfo);

                const pages = getCurrentPages()
                // 获取页面栈中的最后一个元素，也就是当前显示的页面
                const currentPage = pages[pages.length - 1]
                // 选择源单类型后 缓存当前页面选择
                uni.setStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`, {
                    HSupName: HSupInfo['部门名称'] || HSupInfo['客户名称'] || HSupInfo['供应商名称'],
                    HSupID: HSupInfo.HItemID
                })
            },
            loadCache() {
                const pages = getCurrentPages()
                // 获取页面栈中的最后一个元素，也就是当前显示的页面
                const currentPage = pages[pages.length - 1]
                // 选择源单类型后 缓存当前页面选择
                let cache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`)
                this.hform.HSupID = HSupInfo.HItemID
                this.hform.HSupName = HSupInfo['部门名称'] || HSupInfo['客户名称'] || HSupInfo['供应商名称']

                this.hform.HSupID = cache.HSupID
                this.hform.HSupName = cache.HSupName
            },
            //扫码
            toScanCode() {
                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
                mpaasScanModule.mpaasScan({
                    'hideAlbum': true,
                    'timeoutInterval': '10', //超时时间
                    'timeoutText': '未识别到二维码' //超时提醒            
                }, (ret) => {
                    console.log(ret.resp_result)
                    if (this.hform.HBarCode == '*') {
                        this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
                    } else {
                        this.hform.HBarCode = ret.resp_result
                    }
                const pages = getCurrentPages()
                // 获取页面栈中的最后一个元素，也就是当前显示的页面
                const currentPage = pages[pages.length - 1]
                // 选择源单类型后 缓存当前页面选择
                uni.setStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`, {
                    HSupName: HSupInfo['部门名称'] || HSupInfo['客户名称'] || HSupInfo['供应商名称'],
                    HSupID: HSupInfo.HItemID
                })
            },
            loadCache() {
                const pages = getCurrentPages()
                // 获取页面栈中的最后一个元素，也就是当前显示的页面
                const currentPage = pages[pages.length - 1]
                // 选择源单类型后 缓存当前页面选择
                let cache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`)

                    this.getCode(this.hform.HBarCode)
                })
            },
            getNewData() {
                CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
                        HBillType: this.hform.HBillType
                    },
                    (res) => {
                        let res1 = res.data;
                        let {
                            data,
                            count
                        } = res1
                        if (count == 1) {
                            this.hform.HInterID = data[0].HInterID
                            this.hform.HBillNo = data[0].HBillNo
                        } else {
                            uni.showToast({
                                title: data.Message,
                                icon: 'none'
                            })
                        }
                    })
            },
            getCode(HBarCode) {
                //仓库、仓位文本框为空时，清空对应ID
                if (!this.hform.HWHName) {
                    this.hform.HWHID = 0
                }
                if (!this.hform.HStockPlaceName) {
                    this.hform.HStockPlaceID = 0
                }
                var sHWHID = this.hform.HWHID
                var sHSPID = this.hform.HStockPlaceID
                var sOldBarCode = HBarCode;
                var HDeleteFlag = sOldBarCode.substring(0, 1); //取条码第一个字符
                var sBarCode = sOldBarCode.slice(1); //获取第一个字符以外的全部字符
                var sSourceBillNo = ""
                var sSourceBillType = "-1"
                if (HDeleteFlag == '*') {
                    if (sBarCode == "") {
                        uni.showToast({
                            title: '请输入要删除的条码',
                            icon: 'none'
                        });
                    } else {
                        uni.request({
                            url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_Json',
                            data: {
                                HInterID: this.hform.HInterID,
                                HBillType: this.hform.HBillType,
                                HBarCode: sBarCode
                            },
                            success: (res) => {
                                console.log('删除条码', res.data);
                                this.hform.HBarCode = '';
                                if (res.data.count == 1) {
                                    this.hform.HQty = ''
                                } else {
                                    uni.showToast({
                                        title: res.data.Message,
                                        icon: 'none'
                                    })
                                }
                            },
                            fail: (res) => {
                                console.log(res);
                                uni.showToast({
                                    title: '接口请求失败',
                                    icon: 'none'
                                })
                            },
                        });
                    }
                } else {
                    var sBarCode = this.hform.HBarCode
                    uni.request({
                        url: this.serverUrl + '/MouldController/Get_CheckTypeByMouldBarCode_Json',
                        data: {
                            sBarCode: sBarCode,
                            HInterID: this.hform.HInterID,
                            HBillType: this.hform.HBillType,
                            HBillNo: this.hform.HBillNo,
                            HMaker: this.hform.HMaker,
                            HWhID: sHWHID,
                            HSPID: sHSPID,
                            HSCWhID: 0,
                            HSCSPID: 0,
                            HRedBlueFlag: this.hform.HRedBlueFlag,
                            HSourceBillNo: sSourceBillNo,
                            HSourceBillType: sSourceBillType,
                            HStockOrgID: this.hform.HStockOrgID,
                            HStockOutOrgID: this.hform.HStockOutOrgID,
                        },
                        success: (res) => {
                            console.log('检查扫码返回的数据', res.data);
                            this.hform.HBarCode = ''
                            if (res.data.count == 1) {
                                this.tabs = 1
                                this.DisBillEntryList()
                            } else {
                                uni.showToast({
                                    title: res.data.Message,
                                    icon: 'none'
                                })
                            }
                        },
                        fail: (res) => {
                            console.log(res);
                            uni.showToast({
                                title: '接口请求失败',
                                icon: 'none'
                            })
                        },
                    })
                }
            },
            //仓库监听事件
            HWHNameChange(e) {
                for (var i = 0; i < this.HWHNameList.length; i++) {
                    if (this.HWHNameList[i]["HName"] == e) {
                        this.hform.HWHName = this.HWHNameList[i]["HName"]
                        this.hform.HWHID = this.HWHNameList[i].HItemID
                this.hform.HSupID = cache.HSupID
                this.hform.HSupName = cache.HSupName
            },
            //扫码
            toScanCode() {
                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
                mpaasScanModule.mpaasScan({
                    'hideAlbum': true,
                    'timeoutInterval': '10', //超时时间
                    'timeoutText': '未识别到二维码' //超时提醒            
                }, (ret) => {
                    console.log(ret.resp_result)
                    if (this.hform.HBarCode == '*') {
                        this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
                    } else {
                        this.hform.HBarCode = ret.resp_result
                    }

                        this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
                    }
                }
            },
            HStockPlaceNameChange(e) {
                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
                    if (this.HStockPlaceNameList[i]["HWhName"] == e) {
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
                    }
                }
            },
            HScatterUserChange(e) {
                for (var i = 0; i < this.HEmpNameList.length; i++) {
                    if (this.HEmpNameList[i].HName == e) {
                        this.hform.HKeeperID = this.HEmpNameList[i].HItemID
                        this.hform.HKeeperName = this.HEmpNameList[i].HName
                    }
                }
            },
            HCollectUserChange(e) {
                for (var i = 0; i < this.HEmpNameList.length; i++) {
                    if (this.HEmpNameList[i].HName == e) {
                        this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
                        this.hform.HSecManagerName = this.HEmpNameList[i].HName
                    }
                }
            },
            /* #region 仓库仓位获取下拉框 */
            getHBaseList() {
                CommonUtils.doRequest(
                    "/Web/GetWarehouseList_Json_New", {
                        Warehouse: "",
                        HOrgID: uni.getStorageSync('OrganizationID')
                    },
                    (res) => {
                        let res1 = res.data
                        let {
                            data,
                            count
                        } = res1
                        if (count == 1) {
                            this.HWHNameList = data
                            for (var i = 0; i < data.length; i++) {
                                this.arrayHWHName[i] = data[i]["HName"]
                            }
                        } else {
                            uni.showToast({
                                title: '仓库数据请求失败',
                                icon: 'none'
                            })
                        }
                    },
                )
                CommonUtils.doRequest(
                    "/WEBSController/GetStockPlaceList_Json", {
                        StockPlace: '',
                        HWhID: this.hform.HWHID,
                        HStockOrgID: uni.getStorageSync('OrganizationID')
                    },
                    (res) => {
                        let res1 = res.data
                        console.log(res1)
                        let {
                            data,
                            count
                        } = res1
                        if (count == 1) {
                            this.HStockPlaceNameList = data
                            for (var i = 0; i < data.length; i++) {
                                this.arrayHStockPlaceName[i] = data[i]["HWhName"]
                            }
                        } 
                    },
                )
            },
            /* #endregion */
            getHEmpList() {
                CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
                        Employee: '',
                        HGroupID: 0
                    },
                    (res) => {
                        if (res.data.count == 1) {
                            this.HEmpNameList = res.data.data
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHEmpName[i] = res.data.data[i].HName
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: '人员数据请求失败',
                                icon: 'none'
                            })
                        }
                    },
                )
            },
            //获取使用部门数据
            getHDeptList() {
                uni.request({
                    url: this.serverUrl + '/Gy_Department/list',
                    data: {
                        sWhere: "",
                        user: uni.getStorageSync('HUserName'),
                        Organization: uni.getStorageSync('Organization')
                    },
                    success: (res) => {
                        if (res.data.count == 1) {
                            this.HDeptNameList = res.data.data
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHDeptName[i] = res.data.data[i].部门名称
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: '部门数据请求失败',
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            },
            getHSupList() {
                CommonUtils.doRequest(
                    "/Gy_Supplier/list", {
                        sWhere: "",
                        user: uni.getStorageSync('HUserName'),
                        Organization: uni.getStorageSync('Organization')
                    },
                    (res) => {
                        let res1 = res.data
                        let {
                            data,
                            count
                        } = res1
                        if (count == 1) {
                            this.HSuplierList = data
                            for (var i = 0; i < data.length; i++) {
                                this.arrayHSupplierName[i] = data[i].供应商名称
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: data.Message,
                                icon: 'none'
                            })
                        }
                    }
                )
            },
            
            //选择使用部门
            HDeptNameChange(e) {
                for (var i = 0; i < this.HDeptNameList.length; i++) {
                    if (this.HDeptNameList[i].部门名称 == e) {
                        this.hform.HDeptID = this.HDeptNameList[i].HItemID
                        this.hform.HDeptName = this.HDeptNameList[i].部门名称
                    }
                }
            },
            //选择客户
            // HSupNameChange(e) {
            //     for (var i = 0; i < this.HSupNameList.length; i++) {
            //         if (this.HSupNameList[i].客户名称 == e) {
            //             this.hform.HSupID = this.HSupNameList[i].HItemID
            //             this.hform.HSupName = this.HSupNameList[i].客户名称
            //         }
            //     }
            // },
            HDateChange(e) {
                console.log(e.detail.value)
                this.hform.HDate = e.detail.value
            },
            HSelectTypeChange(e) {
                this.hform.TypeName=e;
                this.hform.HSupName = ''; // 清空往来单位选择
                this.hform.HSupID = '';
                uni.setStorageSync("typeName_3803",e);
                if(e=='部门')
                {
                    this.hform.HSupTypeID=3;
                    uni.setStorageSync("typeID_3803",3);
                    this.arrayHSelectType = this.arrayHDeptName;
                    this.HSelectTypeList = this.HDeptNameList;
                }
                else if(e === '供应商') {
                    this.hform.HSupTypeID=1;
                    uni.setStorageSync("typeID_3803",1);
                    this.arrayHSelectType = this.arrayHSupplierName;
                    this.HSelectTypeList = this.HSuplierList;
                } else if(e === '客户') {
                // 客户数据 - 这里留空，后续添加获取客户数据的逻辑
                    this.hform.HSupTypeID=2;
                    uni.setStorageSync("typeID_3803",2);
                    this.arrayHSelectType =this.arrayHCusName;
                    this.HSelectTypeList = this.HCusNameList;
                } else {
                    uni.setStorageSync("typeID_3803",0);
                    this.arrayHSelectType = [];
                    this.HSelectTypeList = [];
                }    
            },
            //器具信息
            DisBillEntryList() {
                CommonUtils.doRequest(
                    "/MouldController/GetMouldBillEntryTmpList_Json", {
                        HInterID: this.hform.HInterID,
                        HBillNo: this.hform.HBillNo,
                        HBillType: this.hform.HBillType
                    },
                    (res) => {
                        console.log('器具', res.data)
                        var data = res.data.data
                        this.HMouldList = data;
                        if (res.data.count == 0) {
                            this.HMouldList = [];
                            this.hform.HMouldCount_B = ''
                            this.hform.HMouldID_B = ''
                            this.hform.HMouldName_B = ''
                    this.getCode(this.hform.HBarCode)
                })
            },
            getNewData() {
                CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
                        HBillType: this.hform.HBillType
                    },
                    (res) => {
                        let res1 = res.data;
                        let {
                            data,
                            count
                        } = res1
                        if (count == 1) {
                            this.hform.HInterID = data[0].HInterID
                            this.hform.HBillNo = data[0].HBillNo
                        } else {
                            uni.showToast({
                                title: data.Message,
                                icon: 'none'
                            })
                        }
                    })
            },
            getCode(HBarCode) {
                //仓库、仓位文本框为空时，清空对应ID
                if (!this.hform.HWHName) {
                    this.hform.HWHID = 0
                }
                if (!this.hform.HStockPlaceName) {
                    this.hform.HStockPlaceID = 0
                }
                var sHWHID = this.hform.HWHID
                var sHSPID = this.hform.HStockPlaceID
                var sOldBarCode = HBarCode;
                var HDeleteFlag = sOldBarCode.substring(0, 1); //取条码第一个字符
                var sBarCode = sOldBarCode.slice(1); //获取第一个字符以外的全部字符
                var sSourceBillNo = ""
                var sSourceBillType = "-1"
                if (HDeleteFlag == '*') {
                    if (sBarCode == "") {
                        uni.showToast({
                            title: '请输入要删除的条码',
                            icon: 'none'
                        });
                    } else {
                        uni.request({
                            url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_Json',
                            data: {
                                HInterID: this.hform.HInterID,
                                HBillType: this.hform.HBillType,
                                HBarCode: sBarCode
                            },
                            success: (res) => {
                                console.log('删除条码', res.data);
                                this.hform.HBarCode = '';
                                if (res.data.count == 1) {
                                    this.hform.HQty = ''
                                } else {
                                    uni.showToast({
                                        title: res.data.Message,
                                        icon: 'none'
                                    })
                                }
                            },
                            fail: (res) => {
                                console.log(res);
                                uni.showToast({
                                    title: '接口请求失败',
                                    icon: 'none'
                                })
                            },
                        });
                    }
                } else {
                    var sBarCode = this.hform.HBarCode
                    uni.request({
                        url: this.serverUrl + '/MouldController/Get_CheckTypeByMouldBarCode_Json',
                        data: {
                            sBarCode: sBarCode,
                            HInterID: this.hform.HInterID,
                            HBillType: this.hform.HBillType,
                            HBillNo: this.hform.HBillNo,
                            HMaker: this.hform.HMaker,
                            HWhID: sHWHID,
                            HSPID: sHSPID,
                            HSCWhID: 0,
                            HSCSPID: 0,
                            HRedBlueFlag: this.hform.HRedBlueFlag,
                            HSourceBillNo: sSourceBillNo,
                            HSourceBillType: sSourceBillType,
                            HStockOrgID: this.hform.HStockOrgID,
                            HStockOutOrgID: this.hform.HStockOutOrgID,
                        },
                        success: (res) => {
                            console.log('检查扫码返回的数据', res.data);
                            this.hform.HBarCode = ''
                            if (res.data.count == 1) {
                                this.tabs = 1
                                this.DisBillEntryList()
                            } else {
                                uni.showToast({
                                    title: res.data.Message,
                                    icon: 'none'
                                })
                            }
                        },
                        fail: (res) => {
                            console.log(res);
                            uni.showToast({
                                title: '接口请求失败',
                                icon: 'none'
                            })
                        },
                    })
                }
            },
            //仓库监听事件
            HWHNameChange(e) {
                for (var i = 0; i < this.HWHNameList.length; i++) {
                    if (this.HWHNameList[i]["HName"] == e) {
                        this.hform.HWHName = this.HWHNameList[i]["HName"]
                        this.hform.HWHID = this.HWHNameList[i].HItemID

                        } else {
                            this.hform.HMouldCount_B = data[0].HQty
                            this.hform.HMouldID_B = data[0].HMouldID
                            this.hform.HMouldName_B = data[0].HMouldName
                            this.hform.HBarCode_B = data[0].HBarCode
                        }
                    },
                        this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
                    }
                }
            },
            HStockPlaceNameChange(e) {
                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
                    if (this.HStockPlaceNameList[i]["HWhName"] == e) {
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
                    }
                }
            },
            HScatterUserChange(e) {
                for (var i = 0; i < this.HEmpNameList.length; i++) {
                    if (this.HEmpNameList[i].HName == e) {
                        this.hform.HKeeperID = this.HEmpNameList[i].HItemID
                        this.hform.HKeeperName = this.HEmpNameList[i].HName
                    }
                }
            },
            HCollectUserChange(e) {
                for (var i = 0; i < this.HEmpNameList.length; i++) {
                    if (this.HEmpNameList[i].HName == e) {
                        this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
                        this.hform.HSecManagerName = this.HEmpNameList[i].HName
                    }
                }
            },
            /* #region 仓库仓位获取下拉框 */
            getHBaseList() {
                CommonUtils.doRequest(
                    "/Web/GetWarehouseList_Json_MJ", {
                        Warehouse: "",
                        HOrgID: uni.getStorageSync('OrganizationID')
                    },
                    (res) => {
                        let res1 = res.data
                        let {
                            data,
                            count
                        } = res1
                        if (count == 1) {
                            this.HWHNameList = data
                            for (var i = 0; i < data.length; i++) {
                                this.arrayHWHName[i] = data[i]["HName"]
                            }
                            if (!this.hform.HWHName && this.arrayHWHName.length > 0) {
                                this.hform.HWHName = this.arrayHWHName[0];
                                // 同时设置对应的仓库ID
                                for (var j = 0; j < this.HWHNameList.length; j++) {
                                    if (this.HWHNameList[j]["HName"] == this.hform.HWHName) {
                                        this.hform.HWHID = this.HWHNameList[j].HItemID;
                                        this.showHStockPlaceName = this.HWHNameList[j].HIsStockMgr;
                                        break;
                                    }
                                }
                                // 触发仓库变更事件，以更新相关依赖（如仓位）
                                this.HWHNameChange(this.hform.HWHName);
                            }
                        } else {
                            uni.showToast({
                                title: '仓库数据请求失败',
                                icon: 'none'
                            })
                        }
                    },
                )
                CommonUtils.doRequest(
                    "/WEBSController/GetStockPlaceList_Json", {
                        StockPlace: '',
                        HWhID: this.hform.HWHID,
                        HStockOrgID: uni.getStorageSync('OrganizationID')
                    },
                    (res) => {
                        let res1 = res.data
                        console.log(res1)
                        let {
                            data,
                            count
                        } = res1
                        if (count == 1) {
                            this.HStockPlaceNameList = data
                            for (var i = 0; i < data.length; i++) {
                                this.arrayHStockPlaceName[i] = data[i]["HWhName"]
                            }
                        }
                    },
                )
            },
            /* #endregion */
            getHEmpList() {
                CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
                        Employee: '',
                        HGroupID: 0
                    },
                    (res) => {
                        if (res.data.count == 1) {
                            this.HEmpNameList = res.data.data
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHEmpName[i] = res.data.data[i].HName
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: '人员数据请求失败',
                                icon: 'none'
                            })
                        }
                    },
                )
            },
            //获取使用部门数据
            getHDeptList() {
                uni.request({
                    url: this.serverUrl + '/Gy_Department/list',
                    data: {
                        sWhere: "",
                        user: uni.getStorageSync('HUserName'),
                        Organization: uni.getStorageSync('Organization')
                    },
                    success: (res) => {
                        if (res.data.count == 1) {
                            this.HDeptNameList = res.data.data
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHDeptName[i] = res.data.data[i].部门名称
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: '部门数据请求失败',
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            },
            getHSupList() {
                CommonUtils.doRequest(
                    "/Gy_Supplier/list", {
                        sWhere: "",
                        user: uni.getStorageSync('HUserName'),
                        Organization: uni.getStorageSync('Organization')
                    },
                    (res) => {
                        let res1 = res.data
                        let {
                            data,
                            count
                        } = res1
                        if (count == 1) {
                            this.HSuplierList = data
                            for (var i = 0; i < data.length; i++) {
                                this.arrayHSupplierName[i] = data[i].供应商名称
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: data.Message,
                                icon: 'none'
                            })
                        }
                    }
                )
            },

                )
            },
            goBack() {
                uni.showModal({
                    title: '提示',
                    content: '确认要退出当前页面吗？',
                    success: (res) => {
                        if (res.confirm) {
                            console.log('用户点击确定');
                            uni.redirectTo({
                                url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList'
                            })
                        } else if (res.cancel) {
                            console.log('用户点击取消');
                        }
                    }
                });
            },
            submit() {
                //仓库、仓位、保管、验收、部门、供应商文本框为空时，清空对应ID
                if (!this.hform.HWHName) {
                    this.hform.HWHID = 0
                }
                if (!this.hform.HStockPlaceName) {
                    this.hform.HStockPlaceID = 0
                }
                
                if (!this.hform.HDeptName) {
                    this.hform.HDeptID = 0
                }
                if (!this.hform.HSupName) {
                    this.hform.HSupID = 0
                }
                if (this.hform.HInterID == 0 || !this.hform.HInterID) {
                    uni.showToast({
                        title: '单据内码获取失败，错误的单据内码！',
                        icon: 'none'
                    })
                } else if (!this.hform.HBillNo) {
                    uni.showToast({
                        title: '单据号获取失败，错误的单据号！',
                        icon: 'none'
                    })
                } else {
                    if (this.hform.HMouldID_B == 0 || this.hform.HMouldID_B == null) {
                        uni.showToast({
                            title: '没有扫描器具条码，请先扫描器具条码，确认无误后再提交！',
                            icon: 'none'
                        })
                    } else {
                        uni.showLoading({
                            title: '请稍候'
                        })
            //选择使用部门
            HDeptNameChange(e) {
                for (var i = 0; i < this.HDeptNameList.length; i++) {
                    if (this.HDeptNameList[i].部门名称 == e) {
                        this.hform.HDeptID = this.HDeptNameList[i].HItemID
                        this.hform.HDeptName = this.HDeptNameList[i].部门名称
                    }
                }
            },
            //选择客户
            // HSupNameChange(e) {
            //     for (var i = 0; i < this.HSupNameList.length; i++) {
            //         if (this.HSupNameList[i].客户名称 == e) {
            //             this.hform.HSupID = this.HSupNameList[i].HItemID
            //             this.hform.HSupName = this.HSupNameList[i].客户名称
            //         }
            //     }
            // },
            HDateChange(e) {
                console.log(e.detail.value)
                this.hform.HDate = e.detail.value
            },
            HSelectTypeChange(e) {
                this.hform.TypeName = e;
                this.hform.HSupName = ''; // 清空往来单位选择
                this.hform.HSupID = '';
                uni.setStorageSync("typeName_3803", e);
                if (e == '部门') {
                    this.hform.HSupTypeID = 3;
                    uni.setStorageSync("typeID_3803", 3);
                    this.arrayHSelectType = this.arrayHDeptName;
                    this.HSelectTypeList = this.HDeptNameList;
                } else if (e === '供应商') {
                    this.hform.HSupTypeID = 1;
                    uni.setStorageSync("typeID_3803", 1);
                    this.arrayHSelectType = this.arrayHSupplierName;
                    this.HSelectTypeList = this.HSuplierList;
                } else if (e === '客户') {
                    // 客户数据 - 这里留空，后续添加获取客户数据的逻辑
                    this.hform.HSupTypeID = 2;
                    uni.setStorageSync("typeID_3803", 2);
                    this.arrayHSelectType = this.arrayHCusName;
                    this.HSelectTypeList = this.HCusNameList;
                } else {
                    uni.setStorageSync("typeID_3803", 0);
                    this.arrayHSelectType = [];
                    this.HSelectTypeList = [];
                }
            },
            //器具信息
            DisBillEntryList() {
                CommonUtils.doRequest(
                    "/MouldController/GetMouldBillEntryTmpList_Json", {
                        HInterID: this.hform.HInterID,
                        HBillNo: this.hform.HBillNo,
                        HBillType: this.hform.HBillType
                    },
                    (res) => {
                        console.log('器具', res.data)
                        var data = res.data.data
                        this.HMouldList = data;
                        if (res.data.count == 0) {
                            this.HMouldList = [];
                            this.hform.HMouldCount_B = ''
                            this.hform.HMouldID_B = ''
                            this.hform.HMouldName_B = ''

                        } else {
                            this.hform.HMouldCount_B = data[0].HQty
                            this.hform.HMouldID_B = data[0].HMouldID
                            this.hform.HMouldName_B = data[0].HMouldName
                            this.hform.HBarCode_B = data[0].HBarCode
                        }
                    },

                )
            },
            goBack() {
                uni.showModal({
                    title: '提示',
                    content: '确认要退出当前页面吗？',
                    success: (res) => {
                        if (res.confirm) {
                            console.log('用户点击确定');
                            uni.redirectTo({
                                url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList'
                            })
                        } else if (res.cancel) {
                            console.log('用户点击取消');
                        }
                    }
                });
            },
            submit() {
                //仓库、仓位、保管、验收、部门、供应商文本框为空时，清空对应ID
                if (!this.hform.HWHName) {
                    this.hform.HWHID = 0
                }
                if (!this.hform.HStockPlaceName) {
                    this.hform.HStockPlaceID = 0
                }

                if (!this.hform.HDeptName) {
                    this.hform.HDeptID = 0
                }
                if (!this.hform.HSupName) {
                    this.hform.HSupID = 0
                }
                if (this.hform.HInterID == 0 || !this.hform.HInterID) {
                    uni.showToast({
                        title: '单据内码获取失败，错误的单据内码！',
                        icon: 'none'
                    })
                } else if (!this.hform.HBillNo) {
                    uni.showToast({
                        title: '单据号获取失败，错误的单据号！',
                        icon: 'none'
                    })
                } else {
                    if (this.hform.HMouldID_B == 0 || this.hform.HMouldID_B == null) {
                        uni.showToast({
                            title: '没有扫描器具条码，请先扫描器具条码，确认无误后再提交！',
                            icon: 'none'
                        })
                    } else {
                        uni.showLoading({
                            title: '请稍候'
                        })


                        let sMainStr = JSON.stringify(this.hform);
                        console.log("主表：" + sMainStr)
                        let sMainStr = JSON.stringify(this.hform);
                        console.log("主表：" + sMainStr)

                        CommonUtils.doRequest(
                            '/MouldController/set_SaveMouldProdBackBill_Json', {
                                oMain: sMainStr
                            },
                            (res) => {
                                console.log(1, res);
                                uni.hideLoading()
                                if (res.data.count == 1) {
                                    uni.showModal({
                                        title: '提示',
                                        content: res.data.Message + '。是否继续新增？(点击取消返回上级页面)',
                                        success: (res) => {
                                            if (res.confirm) {
                                                console.log('用户点击确定');
                                                uni.redirectTo({
                                                    url: '/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill'
                                                })
                                            } else if (res.cancel) {
                                                console.log('用户点击取消');
                                                setTimeout(() => {
                                                    uni.navigateBack();
                                                }, 50)
                                            }
                                        }
                                    });
                                } else {
                                    // uni.showToast({
                                    //     title: res.data.Message,
                                    //     icon: 'none'
                                    // })
                                    uni.showModal({
                                        content: res.data.Message,
                                        showCancel: false,
                                        complete() {
                                            uni.hideLoading()
                                        }
                                    })
                                }
                            },
                            null,
                            "POST"
                        )
                    }
                }
            },
            getHCusList() {
                CommonUtils.doRequest(
                    "/Gy_Customer/list", {
                        sWhere: "",
                        user: uni.getStorageSync('HUserName'),
                        Organization: uni.getStorageSync('Organization')
                    },
                    (res) => {
                        let res1 = res.data
                        let {
                            data,
                            count
                        } = res1
                        if (count == 1) {
                            this.HCusNameList = data
                            for (var i = 0; i < data.length; i++) {
                                this.arrayHCusName[i] = data[i].客户名称
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: data.Message,
                                icon: 'none'
                            })
                        }
                    }
                )
            },
        },
        onLoad(e) {
            console.log(e, this.userInfo)
                        CommonUtils.doRequest(
                            '/MouldController/set_SaveMouldProdBackBill_Json', {
                                oMain: sMainStr
                            },
                            (res) => {
                                console.log(1, res);
                                uni.hideLoading()
                                if (res.data.count == 1) {
                                    uni.showModal({
                                        title: '提示',
                                        content: res.data.Message + '。是否继续新增？(点击取消返回上级页面)',
                                        success: (res) => {
                                            if (res.confirm) {
                                                console.log('用户点击确定');
                                                uni.redirectTo({
                                                    url: '/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill'
                                                })
                                            } else if (res.cancel) {
                                                console.log('用户点击取消');
                                                setTimeout(() => {
                                                    uni.navigateBack();
                                                }, 50)
                                            }
                                        }
                                    });
                                } else {
                                    // uni.showToast({
                                    //     title: res.data.Message,
                                    //     icon: 'none'
                                    // })
                                    uni.showModal({
                                        content: res.data.Message,
                                        showCancel: false,
                                        complete() {
                                            uni.hideLoading()
                                        }
                                    })
                                }
                            },
                            null,
                            "POST"
                        )
                    }
                }
            },
            getHCusList() {
                CommonUtils.doRequest(
                    "/Gy_Customer/list", {
                        sWhere: "",
                        user: uni.getStorageSync('HUserName'),
                        Organization: uni.getStorageSync('Organization')
                    },
                    (res) => {
                        let res1 = res.data
                        let {
                            data,
                            count
                        } = res1
                        if (count == 1) {
                            this.HCusNameList = data
                            for (var i = 0; i < data.length; i++) {
                                this.arrayHCusName[i] = data[i].客户名称
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: data.Message,
                                icon: 'none'
                            })
                        }
                    }
                )
            },
        },
        onLoad(e) {
            console.log(e, this.userInfo)

            if (e.HInterID) {
                // this.HInterID_Temp = e.HInterID
                // this.btnType = 1
                this.RoadBillMain(e.HInterID)
            } else {
                this.getNewData()
            }
            this.getHBaseList()
            this.getHCusList()
            this.getHEmpList()
            this.getHDeptList()
            this.getHSupList()
            if (e.HInterID) {
                // this.HInterID_Temp = e.HInterID
                // this.btnType = 1
                this.RoadBillMain(e.HInterID)
            } else {
                this.getNewData()
            }
            this.getHBaseList()
            this.getHCusList()
            this.getHEmpList()
            this.getHDeptList()
            this.getHSupList()

            setTimeout(() => {
                this.HSelectTypeChange(this.hform.TypeName)
                //初始化往来单位
                if (this.hform.TypeName == '部门') {
                    this.hform.HSupName = getUserInfo().HDept; // 清空往来单位选择
                    this.hform.HSupID = getUserInfo().HDeptID;
                } else if (this.hform.TypeName === '供应商') {
                    this.hform.HSupName = getUserInfo().HSupName; // 清空往来单位选择
                    this.hform.HSupID = getUserInfo().HSupID;
                } else if (this.hform.TypeName === '客户') {
            setTimeout(() => {
                this.HSelectTypeChange(this.hform.TypeName)
                //初始化往来单位
                if (this.hform.TypeName == '部门') {
                    this.hform.HSupName = getUserInfo().HDept; // 清空往来单位选择
                    this.hform.HSupID = getUserInfo().HDeptID;
                } else if (this.hform.TypeName === '供应商') {
                    this.hform.HSupName = getUserInfo().HSupName; // 清空往来单位选择
                    this.hform.HSupID = getUserInfo().HSupID;
                } else if (this.hform.TypeName === '客户') {

                }
                this.$nextTick(() => {
                    this.loadCache()
                })
                }
                this.$nextTick(() => {
                    this.loadCache()
                })

            }, 300);
            uni.$on('BillSelectComplete', (e) => {
                console.log("接收到的消息: ", e.HBillNo)
                this.getHBarCodeData(e.HBillNo)
                this.$refs.billList.exit()
            })
            }, 300);
            uni.$on('BillSelectComplete', (e) => {
                console.log("接收到的消息: ", e.HBillNo)
                this.getHBarCodeData(e.HBillNo)
                this.$refs.billList.exit()
            })

            this.loadCache()
            //this.getHEmpList()
        },
        //重要选择源单必须添加这个否则出现严重bug
        onUnload() {
            uni.$off('BillSelectComplete')
        },
    }
            this.loadCache()
            //this.getHEmpList()
        },
        //重要选择源单必须添加这个否则出现严重bug
        onUnload() {
            uni.$off('BillSelectComplete')
        },
    }
</script>
<style lang="scss" scoped>
    .form {
        width: 668rpx;
        margin: 20rpx auto;
        padding-bottom: 240rpx;
    }
    .form {
        width: 668rpx;
        margin: 20rpx auto;
        padding-bottom: 240rpx;
    }

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

    .other {
        margin-top: 8rpx;
        text-align: center;
        font-size: 28rpx;
        padding: 4rpx 18rpx;
        color: #1890FF;
    }
    .other {
        margin-top: 8rpx;
        text-align: center;
        font-size: 28rpx;
        padding: 4rpx 18rpx;
        color: #1890FF;
    }

    .tabs {
        width: 100%;
        display: flex;
        border-bottom: 1px solid #ddd;
        margin: 20rpx 0;
    .tabs {
        width: 100%;
        display: flex;
        border-bottom: 1px solid #ddd;
        margin: 20rpx 0;

        view {
            width: 25%;
            font-size: 30rpx;
            color: #555;
            text-align: center;
            padding: 16rpx 0;
        }
        view {
            width: 25%;
            font-size: 30rpx;
            color: #555;
            text-align: center;
            padding: 16rpx 0;
        }

        .on {
            color: #3a78ff;
            font-weight: bold;
            border-bottom: 3px solid #3a78ff;
        }
    }
        .on {
            color: #3a78ff;
            font-weight: bold;
            border-bottom: 3px solid #3a78ff;
        }
    }

    .form-item {
        display: flex;
        align-items: center;
        font-size: 30rpx;
        padding: 6rpx 0;
        gap: 12rpx;
    .form-item {
        display: flex;
        align-items: center;
        font-size: 30rpx;
        padding: 6rpx 0;
        gap: 12rpx;

        .title {
            width: 208rpx;
            flex-shrink: 0;
        .title {
            width: 208rpx;
            flex-shrink: 0;

            text {
                color: red;
                font-weight: bold;
            }
        }
            text {
                color: red;
                font-weight: bold;
            }
        }

        .right {
            // width: 450rpx;
            flex: 1;
            border-radius: 22rpx;
            border: 1px solid #acacac;
            position: relative;
            display: flex;
        .right {
            // width: 450rpx;
            flex: 1;
            border-radius: 22rpx;
            border: 1px solid #acacac;
            position: relative;
            display: flex;

            picker {
                width: 100%;
            }
            picker {
                width: 100%;
            }

            .uni-combox {
                width: 100%;
            }
        }
            .uni-combox {
                width: 100%;
            }
        }

        .righton {
            border-radius: 22rpx;
            border: 1px solid #e4e4e4;
            background-color: #e4e4e4;
            flex: 1;
            position: relative;
            display: flex;
        .righton {
            border-radius: 22rpx;
            border: 1px solid #e4e4e4;
            background-color: #e4e4e4;
            flex: 1;
            position: relative;
            display: flex;

        }
        }

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

        textarea {
            width: 98%;
            padding: 8rpx 20rpx;
            font-size: 30rpx;
        }
        textarea {
            width: 98%;
            padding: 8rpx 20rpx;
            font-size: 30rpx;
        }

        .icon-wrapper {
            background-color: #3A78FF;
            border-radius: 100%;
            width: 52rpx;
            height: 52rpx;
            display: flex;
            justify-content: center;
            align-items: center;
            flex-shrink: 0;
        .icon-wrapper {
            background-color: #3A78FF;
            border-radius: 100%;
            width: 52rpx;
            height: 52rpx;
            display: flex;
            justify-content: center;
            align-items: center;
            flex-shrink: 0;

            .uni-icons {
                color: #fff !important;
            }
        }
            .uni-icons {
                color: #fff !important;
            }
        }

        .icon-wrapper[disabled] {
            background-color: rgba(228, 228, 228, 1);
            pointer-events: none;
            touch-action: none;
        }
    }
        .icon-wrapper[disabled] {
            background-color: rgba(228, 228, 228, 1);
            pointer-events: none;
            touch-action: none;
        }
    }

    .bottom-btn {
        width: 100%;
        box-sizing: border-box;
        // height: 120rpx;
        position: fixed;
        bottom: 0;
        left: 0;
        background-color: #fff;
        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
        padding: 30rpx 40rpx 40rpx 40rpx;
        display: flex;
        flex-direction: row;
        gap: 10rpx;
    .bottom-btn {
        width: 100%;
        box-sizing: border-box;
        // height: 120rpx;
        position: fixed;
        bottom: 0;
        left: 0;
        background-color: #fff;
        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
        padding: 30rpx 40rpx 40rpx 40rpx;
        display: flex;
        flex-direction: row;
        gap: 10rpx;

        button {
            border-radius: 50rpx;
            width: 180rpx;
            height: 66rpx;
            line-height: 66rpx;
            font-size: 28rpx;
        }
        button {
            border-radius: 50rpx;
            width: 180rpx;
            height: 66rpx;
            line-height: 66rpx;
            font-size: 28rpx;
        }

        .btn-a {
            background-color: #3A78FF;
            color: #fff;
        }
        .btn-a {
            background-color: #3A78FF;
            color: #fff;
        }

        .btn-b {
            background-color: #41a863;
            color: #fff;
        }
        .btn-b {
            background-color: #41a863;
            color: #fff;
        }

        .btn-c {
            background-color: #acacac;
            color: #fff;
            // position: absolute;
            // right: 120rpx;
        }
        .btn-c {
            background-color: #acacac;
            color: #fff;
            // position: absolute;
            // right: 120rpx;
        }

        .btn-d {
            background-color: #ff8901;
            color: #fff;
        }
    }
        .btn-d {
            background-color: #ff8901;
            color: #fff;
        }
    }

    .list {
        width: 100%;
    .list {
        width: 100%;

        .card-detail {
            width: 100%;
            display: flex;
            flex-wrap: wrap;
            justify-content: space-between;
            line-height: 120%;
        .card-detail {
            width: 100%;
            display: flex;
            flex-wrap: wrap;
            justify-content: space-between;
            line-height: 120%;

            .detail {
                // width: 50%;
                font-size: 26rpx;
                margin-bottom: 12rpx;
                color: #555;
                margin-right: 20rpx;
            .detail {
                // width: 50%;
                font-size: 26rpx;
                margin-bottom: 12rpx;
                color: #555;
                margin-right: 20rpx;

                text {
                    color: #999;
                    font-size: 26rpx;
                }
            }
        }
                text {
                    color: #999;
                    font-size: 26rpx;
                }
            }
        }

        .more {
            color: #888;
            font-size: 24rpx;
            display: flex;
            border-top: 1px solid #eee;
            padding-top: 20rpx;
        .more {
            color: #888;
            font-size: 24rpx;
            display: flex;
            border-top: 1px solid #eee;
            padding-top: 20rpx;

            .part {
                width: 50%;
                text-align: center;
            }
        }
    }
            .part {
                width: 50%;
                text-align: center;
            }
        }
    }
</style>

 pages/MJGL/shangmudan/MouldUpperBill.vue

@@ -14,6 +14,7 @@
            <view class="tabs">
                <view :class="tabs == 0 ? 'on':''" @tap="() => { tabs = 0; reFocusBarCode(); }">单据信息</view>
                <view :class="tabs == 1 ? 'on':''" @tap="() => { tabs = 1; reFocusBarCode(); }">模具信息</view>
                <view :class="tabs == 2 ? 'on':''" @tap="() => { tabs = 2; reFocusBarCode(); }">制单信息</view>
            </view>

            <!-- 单据信息 -->
@@ -89,15 +90,44 @@
            </view>
            <!-- 模具信息 -->
            <view v-if="tabs == 1">
                <zb-table id="list-table" :checked-highlight="true" :fit="true"
                    :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData" :show-header="true"
                    :border="true" :row-key="row => row.index" @toggleRowSelection="handleSelect"
                    @toggleAllSelection="handleSelectAll" @rowClick="onTableRowClickHandler" />
                <view class="card-list" :style="{height: `${listTableHeight}px`, overflow: 'auto'}">
                    <!-- 卡片列表 -->
                    <view v-for="(item, index) in listData" :key="index" class="card-item">
                        <uni-card style="margin: 10rpx 0;">
                            <view class="card-content">
                                <view class="card-row">
                                    <text class="label">序号：</text>
                                    <text class="value">{{ index + 1 }}</text>
                                </view>
                                <view class="card-row">
                                    <text class="label">器具编码：</text>
                                    <text class="value">{{ item.器具编码 }}</text>
                                </view>
                                <view class="card-row">
                                    <text class="label">器具名称：</text>
                                    <text class="value">{{ item.器具名称 }}</text>
                                </view>
                                <view class="card-row">
                                    <text class="label">器具型号：</text>
                                    <text class="value">{{ item.器具型号 }}</text>
                                </view>
                                <view class="card-row">
                                    <text class="label">器具条码：</text>
                                    <text class="value">{{ item.器具条码 }}</text>
                                </view>
                                <view class="card-row">
                                    <text class="label">器具数量：</text>
                                    <text class="value">{{ item.器具数量 }}</text>
                                </view>
                            </view>
                        </uni-card>
                    </view>

                    <view class="over" v-if="listData.length == 0">暂无模具数据</view>
                </view>
            </view>

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

            <view v-if="showmore">
            <view v-if="tabs == 2">
                <view class="form-item">
                    <view class="title">制单人:</view>
                    <view class="righton">
@@ -139,16 +169,6 @@
                </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="tab_area"></view>

            <view class="bottom-btn">
                <button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">提交</button>
@@ -193,51 +213,6 @@
                listOption: [], // 列表选项
                listData: [], // 表格数据
                selectedRows: [], // 表格选中的数据
                // 在columns配置中添加操作列
                columns: [ // 表格列配置
                    {
                        type: 'selection',
                        fixed: true,
                        width: 50
                    },
                    {
                        name: 'index',
                        label: '序号',
                        width: 60,
                        hidden: true
                    },
                    {
                        name: 'HMouldID',
                        label: 'HMouldID',
                        width: 100,
                        hidden: true
                    },
                    {
                        name: '器具数量',
                        label: '器具数量',
                        width: 120
                    },
                    {
                        name: '器具编码',
                        label: '器具编码',
                        width: 150
                    },
                    {
                        name: '器具名称',
                        label: '器具名称',
                        width: 120
                    },
                    {
                        name: '器具型号',
                        label: '器具型号',
                        width: 120
                    },
                    {
                        name: '器具条码',
                        label: '器具条码',
                        width: 120
                    }
                ],

                hform: {
                    HInterID: '',
@@ -336,75 +311,16 @@
                    this.HBarCodeFocus = true;
                });
            },
            // 表格行点击处理
            onTableRowClickHandler(row, index) {
                if (!this.listData[index].checked) {
                    this.$set(this.listData[index], 'checked', true)
                } else {
                    this.listData[index].checked = !this.listData[index].checked
                }
            },

            // 表格选择处理
            handleSelect(selected, array) {
                this.selectedRows = array
            },

            // 表格全选处理
            handleSelectAll(selected, array) {
                this.selectedRows = array
            },
            // 表格行删除
            deleteSelected() {
                if (this.selectedRows.length === 0) {
                    uni.showToast({
                        title: '请先选择要删除的模具',
                        icon: 'none'
                    })
                    return
                }

                // 显示确认对话框
                uni.showModal({
                    title: '确认删除',
                    content: `确定要删除选中的${this.selectedRows.length}条数据吗？`,
                    success: (res) => {
                        if (res.confirm) {
                            // 获取选中行的HMouldID集合
                            const selectedIds = this.selectedRows.map(row => row.HMouldID)

                            // 过滤掉选中的数据
                            this.listData = this.listData.filter(item =>
                                !selectedIds.includes(item.HMouldID)
                            )

                            // 重新计算序号
                            this.listData.forEach((item, index) => {
                                item.index = index + 1
                            })

                            // 清空选中状态
                            this.selectedRows = []

                            uni.showToast({
                                title: '删除成功',
                                icon: 'success'
                            })
                        }
                    }
                })
            },

            //日期
            HDateChange(e) {
                console.log(e.detail.value)
                this.hform.HDate = e.detail.value
            },
            getHBarCodeData(HBarCode) {
                if (uni.getStorageSync('Organization') == "杭州斯莫尔磁性材料有限公司") {
                if (uni.getStorageSync('Organization') != "事业一处") {
                    if (!this.hform.HSourceName) {
                        uni.showToast({
                            title: '请先选择生产资源',
                            title: '请先选择或扫描生产资源',
                            icon: 'none'
                        });
                        return;
@@ -954,25 +870,25 @@
                    })
                }
                // 如果是事业一处组织，校验器具数量
                // if (uni.getStorageSync('OrganizationID') === "100007" && uni.getStorageSync('Organization') === "事业一处") {
                //     const zeroQtyItem = this.listData.find(item => {
                //         // 考虑0、null、undefined等异常情况
                //         const qty = Number(item.器具数量) || 0;
                //         return qty <= 0;
                //     });
                if (uni.getStorageSync('OrganizationID') === "100007" && uni.getStorageSync('Organization') === "事业一处") {
                    const zeroQtyItem = this.listData.find(item => {
                        // 考虑0、null、undefined等异常情况
                        const qty = Number(item.器具数量) || 0;
                        return qty <= 0;
                    });

                //     if (zeroQtyItem) {
                //         // 找到第一个数量异常项的位置（索引+1）
                //         const index = this.listData.indexOf(zeroQtyItem) + 1;
                //         const code = zeroQtyItem.器具编码 || '未知编码';
                //         uni.showToast({
                //             title: `第${index}行【${code}】器具数量为0，请检查`,
                //             icon: 'none',
                //             duration: 3000
                //         });
                //         return;
                //     }
                // }
                    if (zeroQtyItem) {
                        // 找到第一个数量异常项的位置（索引+1）
                        const index = this.listData.indexOf(zeroQtyItem) + 1;
                        const code = zeroQtyItem.器具编码 || '未知编码';
                        uni.showToast({
                            title: `第${index}行【${code}】器具数量为0，请检查`,
                            icon: 'none',
                            duration: 3000
                        });
                        return;
                    }
                }
                if (!this.hform.HEmpName) {
                    uni.showToast({
                        title: '请选择操作员',
@@ -1202,7 +1118,7 @@
        }

        .btn-c {
            background-color: #acacac;
            background-color: #FFA500;
            color: #fff;
            position: absolute;
            right: 120rpx;
@@ -1234,4 +1150,5 @@
            border-bottom: 3px solid #3a78ff;
        }
    }

</style>

 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue

@@ -44,36 +44,36 @@
                </view>
                <view class="form-item">
                    <view class="title">主题:</view>
                    <view class="right">
                        <input name="HContext" v-model="hform.HContext" placeholder="请输入主题" />
                    <view class="righton">
                        <input name="HContext" disabled  v-model="hform.HContext" placeholder="请输入主题" />
                    </view>
                </view>
                <view class="form-item" style="align-items: flex-start;">
                    <view class="title"><text>*</text>详细内容:</view>
                    <view class="right" style="min-height: 150rpx;">
                    <view class="righton" style="min-height: 150rpx;">
                        <textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
                            placeholder="请输入详细内容"></textarea>
                            placeholder="请输入详细内容" disabled ></textarea>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">异常类型:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="请选择"
                            v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
                            v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">发送部门:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHDeptName" placeholder="请选择部门" v-model="hform.HDeptName"
                            @input="HDeptNameChange"></uni-combox>
                            @input="HDeptNameChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">发送人:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHEmpName" placeholder="请选择发送人" v-model="hform.HSendMan"
                            @input="HSendManChange"></uni-combox>
                            @input="HSendManChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
@@ -92,28 +92,28 @@
                </view>
                <view class="form-item">
                    <view class="title">相关设备:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHEquipName" placeholder="请选择设备" v-model="hform.HEquipName"
                            @input="HEquipNameChange"></uni-combox>
                            @input="HEquipNameChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">相关模具:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHMouldName" placeholder="请选择模具" v-model="hform.HMouldName"
                            @input="HMouldIDNameChange"></uni-combox>
                            @input="HMouldIDNameChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">产品名称:</view>
                    <view class="right">
                        <input name="HMaterName" v-model="hform.HMaterName" placeholder="请输入产品名称" />
                    <view class="righton">
                        <input name="HMaterName" disabled  v-model="hform.HMaterName" placeholder="请输入产品名称" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">规格型号:</view>
                    <view class="right">
                        <input name="HMaterModel" v-model="hform.HMaterModel" placeholder="请输入规格型号" />
                    <view class="righton">
                        <input name="HMaterModel" disabled  v-model="hform.HMaterModel" placeholder="请输入规格型号" />
                    </view>
                </view>
                <view class="form-item">

 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue

@@ -44,36 +44,36 @@
                </view>
                <view class="form-item">
                    <view class="title">主题:</view>
                    <view class="right">
                        <input name="HContext" v-model="hform.HContext" placeholder="请输入主题" />
                    <view class="righton">
                        <input name="HContext" disabled  v-model="hform.HContext" placeholder="请输入主题" />
                    </view>
                </view>
                <view class="form-item" style="align-items: flex-start;">
                    <view class="title"><text>*</text>详细内容:</view>
                    <view class="right" style="min-height: 150rpx;">
                    <view class="righton" style="min-height: 150rpx;">
                        <textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
                            placeholder="请输入详细内容"></textarea>
                            placeholder="请输入详细内容" disabled ></textarea>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">异常类型:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="请选择"
                            v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
                            v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">发送部门:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHDeptName" placeholder="请选择部门" v-model="hform.HDeptName"
                            @input="HDeptNameChange"></uni-combox>
                            @input="HDeptNameChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">发送人:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHEmpName" placeholder="请选择发送人" v-model="hform.HSendMan"
                            @input="HSendManChange"></uni-combox>
                            @input="HSendManChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
@@ -99,28 +99,28 @@
                </view>
                <view class="form-item">
                    <view class="title">相关设备:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHEquipName" placeholder="请选择设备" v-model="hform.HEquipName"
                            @input="HEquipNameChange"></uni-combox>
                            @input="HEquipNameChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">相关模具:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHMouldName" placeholder="请选择模具" v-model="hform.HMouldName"
                            @input="HMouldIDNameChange"></uni-combox>
                            @input="HMouldIDNameChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">产品名称:</view>
                    <view class="right">
                        <input name="HMaterName" v-model="hform.HMaterName" placeholder="请输入产品名称" />
                    <view class="righton">
                        <input name="HMaterName" disabled  v-model="hform.HMaterName" placeholder="请输入产品名称" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">规格型号:</view>
                    <view class="right">
                        <input name="HMaterModel" v-model="hform.HMaterModel" placeholder="请输入规格型号" />
                    <view class="righton">
                        <input name="HMaterModel" disabled  v-model="hform.HMaterModel" placeholder="请输入规格型号" />
                    </view>
                </view>
                <view class="form-item">

 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue

@@ -43,36 +43,36 @@
                </view>
                <view class="form-item">
                    <view class="title">主题:</view>
                    <view class="right">
                        <input name="HContext" v-model="hform.HContext" placeholder="请输入主题" />
                    <view class="righton">
                        <input name="HContext" disabled  v-model="hform.HContext" placeholder="请输入主题" />
                    </view>
                </view>
                <view class="form-item" style="align-items: flex-start;">
                    <view class="title"><text>*</text>详细内容:</view>
                    <view class="right" style="min-height: 150rpx;">
                    <view class="righton" style="min-height: 150rpx;">
                        <textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
                            placeholder="请输入详细内容"></textarea>
                            placeholder="请输入详细内容" disabled ></textarea>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">异常类型:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="请选择"
                            v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
                            v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">发送部门:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHDeptName" placeholder="请选择部门" v-model="hform.HDeptName"
                            @input="HDeptNameChange"></uni-combox>
                            @input="HDeptNameChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">发送人:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHEmpName" placeholder="请选择发送人" v-model="hform.HSendMan"
                            @input="HSendManChange"></uni-combox>
                            @input="HSendManChange" disabled ></uni-combox>
                    </view>
                </view>

@@ -99,28 +99,28 @@
                </view>
                <view class="form-item">
                    <view class="title">相关设备:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHEquipName" placeholder="请选择" v-model="hform.HEquipName"
                            @input="HEquipNameChange"></uni-combox>
                            @input="HEquipNameChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">相关模具:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHMouldName" placeholder="请选择" v-model="hform.HMouldName"
                            @input="HMouldIDNameChange"></uni-combox>
                            @input="HMouldIDNameChange" disabled ></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">产品名称:</view>
                    <view class="right">
                        <input name="HMaterName" v-model="hform.HMaterName" placeholder="请输入产品名称" />
                    <view class="righton">
                        <input name="HMaterName" disabled  v-model="hform.HMaterName" placeholder="请输入产品名称" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">规格型号:</view>
                    <view class="right">
                        <input name="HMaterModel" v-model="hform.HMaterModel" placeholder="请输入规格型号" />
                    <view class="righton">
                        <input name="HMaterModel" disabled  v-model="hform.HMaterModel" placeholder="请输入规格型号" />
                    </view>
                </view>
                <view class="form-item">

 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue

@@ -37,36 +37,36 @@
                </view>
                <view class="form-item">
                    <view class="title">主题:</view>
                    <view class="right">
                        <input name="HContext" v-model="hform.HContext" placeholder="请输入主题" />
                    <view class="righton">
                        <input name="HContext" disabled v-model="hform.HContext" placeholder="请输入主题" />
                    </view>
                </view>
                <view class="form-item" style="align-items: flex-start;">
                    <view class="title"><text>*</text>详细内容:</view>
                    <view class="right" style="min-height: 150rpx;">
                        <textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
                    <view class="righton" style="min-height: 150rpx;">
                        <textarea name="HDescription" disabled v-model="hform.HDescription" auto-height maxlength="-1"
                            placeholder="请输入详细内容"></textarea>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">异常类型:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="请选择"
                            v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
                            v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange" disabled></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">发送部门:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHDeptName" placeholder="请选择部门" v-model="hform.HDeptName"
                            @input="HDeptNameChange"></uni-combox>
                            @input="HDeptNameChange" disabled></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">发送人:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHEmpName" placeholder="请选择发送人" v-model="hform.HSendMan"
                            @input="HSendManChange"></uni-combox>
                            @input="HSendManChange" disabled></uni-combox>
                    </view>
                </view>

@@ -86,28 +86,28 @@
                </view>
                <view class="form-item">
                    <view class="title">相关设备:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHEquipName" placeholder="请选择" v-model="hform.HEquipName"
                            @input="HEquipNameChange"></uni-combox>
                            @input="HEquipNameChange" disabled></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">相关模具:</view>
                    <view class="right">
                    <view class="righton">
                        <uni-combox :candidates="arrayHMouldName" placeholder="请选择" v-model="hform.HMouldName"
                            @input="HMouldIDNameChange"></uni-combox>
                            @input="HMouldIDNameChange" disabled></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">产品名称:</view>
                    <view class="right">
                        <input name="HMaterName" v-model="hform.HMaterName" placeholder="请输入产品名称" />
                    <view class="righton">
                        <input name="HMaterName" v-model="hform.HMaterName" disabled placeholder="请输入产品名称" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">规格型号:</view>
                    <view class="right">
                        <input name="HMaterModel" v-model="hform.HMaterModel" placeholder="请输入规格型号" />
                    <view class="righton">
                        <input name="HMaterModel" v-model="hform.HMaterModel" disabled placeholder="请输入规格型号" />
                    </view>
                </view>
                <view class="form-item">
@@ -985,5 +985,5 @@
</script>

<style lang="scss">
    @import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss"
    @import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss";
</style>

 pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss

@@ -27,7 +27,7 @@
        color: #fff;
    }
    .btn-c {
        background-color: #acacac;
        background-color: #FFA500;
        color: #fff;
        // position: absolute;
        // right: 120rpx;
@@ -268,4 +268,37 @@
        justify-content: flex-start;
        gap: 6rpx;

    }
    }
    .uni-combox.disabled,
    .uni-combox[disabled] {
        opacity: 0.6;
        pointer-events: none;
	    
        .uni-combox__selector {
            background-color: #f5f5f5 !important;
            color: #999 !important;
        }
	    
        .uni-combox__input {
            background-color: #f5f5f5 !important;
            color: #999 !important;
            -webkit-text-fill-color: #999 !important;
        }
    }
	
    /* 针对 righton 类中的 uni-combox */
    .righton {
        .uni-combox.disabled,
        .uni-combox[disabled] {
            .uni-combox__selector {
                background-color: #f5f5f5 !important;
                border-color: #e0e0e0 !important;
            }
	        
            .uni-combox__input {
                background-color: #f5f5f5 !important;
                color: #999 !important;
                -webkit-text-fill-color: #999 !important;
            }
        }
    }

 pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue

@@ -60,7 +60,7 @@
            <view class="form-item">
                <view class="title">生产班组:</view>
                <view class="right">
                    <uni-combox :candidates="HGroupNameArray" name="HShiftsName" id="HShiftsName" placeholder="请选择生产班组"
                    <uni-combox :candidates="HGroupNameArray" name="HGroupName" id="HGroupName" placeholder="请选择生产班组"
                        v-model="hform.HGroupName" @input="HGroupNameChangeHandler"></uni-combox>
                </view>
            </view>
@@ -368,7 +368,7 @@
                    url: '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID:0
                        HGroupID: 0
                    },
                    resFunction: (res) => {
                        let {
@@ -495,9 +495,10 @@
                            Message,
                            count
                        } = res.data

                        this.hform.HShiftsID = data[0]['HInterID']
                        this.hform.HShiftsName = data[0]['班次']
                        if (count && data && data.length > 0) {
                            this.hform.HShiftsID = data[0]['HInterID']
                            this.hform.HShiftsName = data[0]['班次']
                        }
                    }
                })
            },
@@ -626,8 +627,22 @@
                                "HICMOBillNo": data1[0].任务单号, //生产订单
                                "HDeptID": data1[0].HWorkShopID, //车间ID
                                "HDeptName": data1[0].生产车间, //车间
								

                            })
                            if (data1 && data1.length === 1) {
                                // 获取工序ID
                                let procId = data1[0].HProcID
                                // 在工序数组中查找对应的工序名称
                                let procIndex = this.HProcNameArraySource.findIndex(item => item.HItemID ==
                                    procId)

                                if (procIndex !== -1) {
                                    // 自动设置工序
                                    this.hform.HProcName = this.HProcNameArraySource[procIndex].HName
                                    this.hform.HProcID = procId
                                    this.onHProcNameChangeHandler(this.hform.HProcName)
                                }
                            }

                            uni.showToast({
                                icon: 'none',
@@ -652,7 +667,13 @@
                if (this.hform.HQty == '') {
                    return uni.showToast({
                        icon: 'none',
                        title: '取样数量为空'
                        title: '取样数量不能为空'
                    })
                }
                if (this.hform.HSampleDamageQty == '') {
                    return uni.showToast({
                        icon: 'none',
                        title: '破坏性实验数量不能为空'
                    })
                }
                if (this.hform.HProcID == 0) {
@@ -709,21 +730,21 @@
                        } = res.data
                        if (count == 1) {
                            uni.showModal({
                                title: '提示',
                                content: res.data.Message + '。是否继续新增？',
                                success: (res) => {
                                    if (res.confirm) {
                                        console.log('用户点击确定');
                                        uni.redirectTo({
                                            url: '/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=1'
                                        })
                                    } else if (res.cancel) {
                                        console.log('用户点击取消');
                                        setTimeout(() => {
                                            uni.navigateBack();
                                        }, 50)
                                    }
                                }
                                title: '提示',
                                content: res.data.Message + '。是否继续新增？',
                                success: (res) => {
                                    if (res.confirm) {
                                        console.log('用户点击确定');
                                        uni.redirectTo({
                                            url: '/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=1'
                                        })
                                    } else if (res.cancel) {
                                        console.log('用户点击取消');
                                        setTimeout(() => {
                                            uni.navigateBack();
                                        }, 50)
                                    }
                                }
                            });
                        } else {
                            return uni.showToast({

 pages/ZLGL/mojianjianyan/ProcessCheckBill.vue

@@ -2002,9 +2002,9 @@
                                    });
                                } else if (res.cancel) {
                                    console.log("用户点击取消");
                                    // setTimeout(() => {
                                    //     uni.navigateBack();
                                    // }, 50)
                                    setTimeout(() => {
                                        uni.navigateBack();
                                    }, 50)
                                }
                            },
                        });
@@ -2340,7 +2340,7 @@
        }

        .btn-c {
            background-color: #acacac;
            background-color: #FFA500;
            color: #fff;
            // position: absolute;
            // right: 120rpx;

 pages/ZLGL/shoujianjianyan/firstCheckBill.vue

@@ -2049,9 +2049,9 @@
                                    });
                                } else if (res.cancel) {
                                    console.log("用户点击取消");
                                    // setTimeout(() => {
                                    //     uni.navigateBack();
                                    // }, 50)
                                    setTimeout(() => {
                                        uni.navigateBack();
                                    }, 50)
                                }
                            },
                        });
@@ -2391,7 +2391,7 @@
        }

        .btn-c {
            background-color: #acacac;
            background-color: #FFA500;
            color: #fff;
            // position: absolute;
            // right: 120rpx;

 pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue

@@ -1756,9 +1756,9 @@
                                    });
                                } else if (res.cancel) {
                                    console.log("用户点击取消");
                                    // setTimeout(() => {
                                    //     uni.navigateBack();
                                    // }, 50)
                                    setTimeout(() => {
                                        uni.navigateBack();
                                    }, 50)
                                }
                            },
                        });
@@ -2093,7 +2093,7 @@
        }

        .btn-c {
            background-color: #acacac;
            background-color: #FFA500;
            color: #fff;
            // position: absolute;
            // right: 120rpx;