优化测试模具维修流程

zrg

5 天以前 63ec424ca1ed594f4adbccc17696aa94524968df

优化测试模具维修流程

 components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue

@@ -225,7 +225,7 @@
                    sWhere += ` and (单据号 like '%${this.HBillNo}%'  `;
                }
                sWhere += ` and isnull(维修人,'')!='${uni.getStorageSync('HUserName')}$'  `
                sWhere += ` and isnull(关闭人,'')!=''  `
                sWhere += ` and isnull(关闭人,'') =''  `
                return sWhere;
            },


 components/BillListPopup/BillListPopupMouldConkBookBill.vue

@@ -1,380 +1,394 @@
<template>
    <view>
        <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
            <view class="content">
                <view class="search-condition">
                    <view class="title"><text>日期: </text></view>
                    <view class="daterange" style="flex: 1;">
                        <view class="right general">
                            <uni-datetime-picker type="date" :clear-icon="false" v-model="HBeginDate">
                                <view>{{HBeginDate}}</view>
                            </uni-datetime-picker>
                        </view>
                        <view>—</view>
                        <view class="right general">
                            <uni-datetime-picker type="date" :clear-icon="false" v-model="HEndDate">
                                <view>{{HEndDate}}</view>
                            </uni-datetime-picker>
                        </view>
                    </view>
                </view>
                <view class="search-condition">
                    <view class="title"><text>模具编码: </text></view>
                    <view class="right"><input type="text" :focus="enablefocus" v-model="HNumber"
                            @confirm="getBillList" /></view>
                </view>
                <view class="search-condition">
                    <view class="title"><text>模具名称: </text></view>
                    <view class="right"><input type="text" v-model="HName" @confirm="getBillList" /></view>
                </view>
                <view class="search-condition">
                    <view class="title"><text>单据号: </text></view>
                    <view class="right"><input type="text" v-model="HBillNo" @confirm="getBillList" /></view>
                </view>
                <view class="buttons">
                    <view style="flex: 1;"></view>
                    <button size="mini" type="primary" @click="search">搜索</button>
                    <button v-if="MultiSourceBill" size="mini" type="primary" @click="ret">返回</button>
                    <button size="mini" type="primary" @click="exit">退出</button>
                </view>
                <scroll-view id="#BillListPanel" scroll-y="true" style="height: 55vh;">
                    <view class="options-wrapper" v-show="HBillList.length != 0">
                        <uni-card :is-active="bill.isActive" :class="bill.isActive?'uni-card--is-active':''"
                            v-for="(bill, index) in HBillList[curPage-1]" :key="index" :title="bill['单据号']"
                            @tap="clickCard(bill, index)">
                            <view class="item">
                                <view class="left">日期: </view>
                                <view class="right">{{dayjs(bill['日期']).format('YYYY-MM-DD')}}</view>
                            </view>
                            <view class="item">
                                <view class="left">故障类别代码: </view>
                                <view class="right">{{bill['故障类别代码']}}</view>
                            </view>
                            <view class="item">
                                <view class="left">故障类别: </view>
                                <view class="right">{{bill['故障类别']}}</view>
                            </view>
                            <view class="item" v-if="bill['产品模具代码']">
                                <view class="left">产品模具代码: </view>
                                <view class="right">{{bill['产品模具代码']}}</view>
                            </view>
                            <view class="item" v-if="bill['产品模具']">
                                <view class="left">产品模具: </view>
                                <view class="right">{{bill['款号']}}</view>
                            </view>
                            <view class="item" v-if="bill['模具规格']">
                                <view class="left">模具规格: </view>
                                <view class="right">{{bill['模具规格']}}</view>
                            </view>
                            <view class="item" v-if="bill['模具型号']">
                                <view class="left">模具型号: </view>
                                <view class="right">{{bill['模具型号']}}</view>
                            </view>
                            <view class="item" v-if="bill['故障发生日期']">
                                <view class="left">故障发生日期: </view>
                                <view class="right">{{dayjs(bill['故障发生日期']).format('YYYY-MM-DD')}}</view>
                            </view>
                            <view class="item" v-if="bill['要求完善日期']">
                                <view class="left">要求完善日期: </view>
                                <view class="right">{{dayjs(bill['要求完善日期']).format('YYYY-MM-DD')}}</view>
                            </view>
                        </uni-card>
                    </view>
                    <view class="over" v-show="HBillList.length == 0">暂无数据</view>
                </scroll-view>
                <uni-pagination id="#pagination" title="标题文字" v-model="curPage" :pageSize="size"
                    :total="length"></uni-pagination>
            </view>
    <view>
        <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
            <view class="content">
                <view class="search-condition">
                    <view class="title"><text>日期: </text></view>
                    <view class="daterange" style="flex: 1;">
                        <view class="right general">
                            <uni-datetime-picker type="date" :clear-icon="false" v-model="HBeginDate">
                                <view>{{HBeginDate}}</view>
                            </uni-datetime-picker>
                        </view>
                        <view>—</view>
                        <view class="right general">
                            <uni-datetime-picker type="date" :clear-icon="false" v-model="HEndDate">
                                <view>{{HEndDate}}</view>
                            </uni-datetime-picker>
                        </view>
                    </view>
                </view>
                <view class="search-condition">
                    <view class="title"><text>模具编码: </text></view>
                    <view class="right"><input type="text" :focus="enablefocus" v-model="HNumber"
                            @confirm="getBillList" /></view>
                </view>
                <view class="search-condition">
                    <view class="title"><text>模具名称: </text></view>
                    <view class="right"><input type="text" v-model="HName" @confirm="getBillList" /></view>
                </view>
                <view class="search-condition">
                    <view class="title"><text>单据号: </text></view>
                    <view class="right"><input type="text" v-model="HBillNo" @confirm="getBillList" /></view>
                </view>
                <view class="buttons">
                    <view style="flex: 1;"></view>
                    <button size="mini" type="primary" @click="search">搜索</button>
                    <button v-if="MultiSourceBill" size="mini" type="primary" @click="ret">返回</button>
                    <button size="mini" type="primary" @click="exit">退出</button>
                </view>
                <scroll-view id="#BillListPanel" scroll-y="true" style="height: 55vh;">
                    <view class="options-wrapper" v-show="HBillList.length != 0">
                        <uni-card :is-active="bill.isActive" :class="bill.isActive?'uni-card--is-active':''"
                            v-for="(bill, index) in HBillList[curPage-1]" :key="index" :title="bill['单据号']"
                            @tap="clickCard(bill, index)">
                            <view class="item">
                                <view class="left">日期: </view>
                                <view class="right">{{dayjs(bill['日期']).format('YYYY-MM-DD')}}</view>
                            </view>
                            <view class="item">
                                <view class="left">故障类别代码: </view>
                                <view class="right">{{bill['故障类别代码']}}</view>
                            </view>
                            <view class="item">
                                <view class="left">故障类别: </view>
                                <view class="right">{{bill['故障类别']}}</view>
                            </view>
                            <view class="item" v-if="bill['产品模具代码']">
                                <view class="left">产品模具代码: </view>
                                <view class="right">{{bill['产品模具代码']}}</view>
                            </view>
                            <view class="item" v-if="bill['产品模具']">
                                <view class="left">产品模具: </view>
                                <view class="right">{{bill['款号']}}</view>
                            </view>
                            <view class="item" v-if="bill['模具规格']">
                                <view class="left">模具规格: </view>
                                <view class="right">{{bill['模具规格']}}</view>
                            </view>
                            <view class="item" v-if="bill['模具型号']">
                                <view class="left">模具型号: </view>
                                <view class="right">{{bill['模具型号']}}</view>
                            </view>
                            <view class="item" v-if="bill['故障发生日期']">
                                <view class="left">故障发生日期: </view>
                                <view class="right">{{dayjs(bill['故障发生日期']).format('YYYY-MM-DD')}}</view>
                            </view>
                            <view class="item" v-if="bill['要求完善日期']">
                                <view class="left">要求完善日期: </view>
                                <view class="right">{{dayjs(bill['要求完善日期']).format('YYYY-MM-DD')}}</view>
                            </view>
                        </uni-card>
                    </view>
                    <view class="over" v-show="HBillList.length == 0">暂无数据</view>
                </scroll-view>
                <uni-pagination id="#pagination" title="标题文字" v-model="curPage" :pageSize="size"
                    :total="length"></uni-pagination>
            </view>

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

<script>
    import dayjs from 'dayjs';
    import {
        CommonUtils
    } from '../../utils/common';
    import {
        getUserInfo
    } from '../../utils/auth';
    export default {
        name: "BillListPopup",
        data() {
            return {
                dayjs: dayjs,
                enablefocus: false,
                size: 20,
                curPage: 1,
                length: 0,
                page: 0,
                HSourceBillNo: '',
                HMater: '',
                HCustom: '',
                HBillList: [],
                panelHeight: 0,
                HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
                HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
                HNumber: '',
                HName: '',
                HBillNo: '',
    import dayjs from 'dayjs';
    import {
        CommonUtils
    } from '../../utils/common';
    import {
        getUserInfo
    } from '../../utils/auth';
    export default {
        name: "BillListPopup",
        data() {
            return {
                dayjs: dayjs,
                enablefocus: false,
                size: 20,
                curPage: 1,
                length: 0,
                page: 0,
                HSourceBillNo: '',
                HMater: '',
                HCustom: '',
                HBillList: [],
                panelHeight: 0,
                HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
                HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
                HNumber: '',
                HName: '',
                HBillNo: '',

                multiSouceBillList: []
            };
        },
        props: {
            HBillType: {
                type: [String, Number],
                required: true
            },
            HSourceBillType: {
                type: [String, Number],
                required: true
            },
            HStockOrgID: {
                type: [String, Number],
                required: true
            },
            MultiSourceBill: {
                type: Boolean,
                default: false,
                required: false
            }
        },
        model: {
            prop: "HSourceBill",
            event: 'change'
        },
        methods: {
            popupChangeHandler(e) {
                if (e.show === true) {
                    this.getBillList()
                }
            },
            async exit() {
                this.size = 20
                this.curPage = 1
                this.length = 0
                this.page = 0
                this.HSourceBillNo = ''
                this.HMater = ''
                this.HCustom = ''
                this.HBillList = []
                this.enablefocus = false
                this.multiSouceBillList = []
                // 需要等待页面内的数据赋值完毕
                await this.$nextTick()
                this.$refs.popup.close();
            },
            search() {
                this.getBillList()
            },
            ret() {
                console.log('this.MultiSourceBill: ', this.MultiSourceBill);
                uni.$emit('BillSelectComplete', {
                    HInterID: 0,
                    HBillNo: 0,
                    enableMultiSourceBill: this.MultiSourceBill,
                    MultiSourceBillList: this.multiSouceBillList
                })
            },
            showPopup() {
                this.$refs.popup.open();
            },
            clickCard(bill, index) {
                if (this.MultiSourceBill == false) { // 非多源单模式
                    uni.$emit('BillSelectComplete', {
                        HInterID: bill["hmainid"],
                        HEntryID: bill["hsubid"],
                        HBillNo: bill["单据号"],
                        HMouldID: bill["HMouldID"],
                        HMouldName: bill['产品模具'],
                        HMouldSpec: bill['模具规格'],
                        HMouldModel: bill['模具型号'],
                        enableMultiSourceBill: this.MultiSourceBill
                    })
                } else {
                    this.$set(this.HBillList[this.curPage - 1][index], 'isActive', !this.HBillList[this.curPage - 1][
                        index
                    ]['isActive'])
                    console.log(this.HBillList[this.curPage - 1][index])
                    // 设置了多源单模式
                    this.setMultiSourceBillList({
                        HInterID: interid,
                        HBillNo: billno,
                        HIsActive: this.HBillList[this.curPage - 1][index]['isActive']
                    })
                }
                multiSouceBillList: []
            };
        },
        props: {
            HBillType: {
                type: [String, Number],
                required: true
            },
            HSourceBillType: {
                type: [String, Number],
                required: true
            },
            HStockOrgID: {
                type: [String, Number],
                required: true
            },
            MultiSourceBill: {
                type: Boolean,
                default: false,
                required: false
            },
            // 新增：是否忽略关闭人过滤条件
            ignoreClosePersonFilter: {
                type: Boolean,
                default: false
            },
            HMouldID: {
                type: Number,
                default: 0
            }
        },
        model: {
            prop: "HSourceBill",
            event: 'change'
        },
        methods: {
            popupChangeHandler(e) {
                if (e.show === true) {
                    this.getBillList()
                }
            },
            async exit() {
                this.size = 20
                this.curPage = 1
                this.length = 0
                this.page = 0
                this.HSourceBillNo = ''
                this.HMater = ''
                this.HCustom = ''
                this.HBillList = []
                this.enablefocus = false
                this.multiSouceBillList = []
                // 需要等待页面内的数据赋值完毕
                await this.$nextTick()
                this.$refs.popup.close();
            },
            search() {
                this.getBillList()
            },
            ret() {
                console.log('this.MultiSourceBill: ', this.MultiSourceBill);
                uni.$emit('BillSelectComplete', {
                    HInterID: 0,
                    HBillNo: 0,
                    enableMultiSourceBill: this.MultiSourceBill,
                    MultiSourceBillList: this.multiSouceBillList
                })
            },
            showPopup() {
                this.$refs.popup.open();
            },
            clickCard(bill, index) {
                if (this.MultiSourceBill == false) { // 非多源单模式
                    uni.$emit('BillSelectComplete', {
                        HInterID: bill["hmainid"],
                        HEntryID: bill["hsubid"],
                        HBillNo: bill["单据号"],
                        HMouldID: bill["HMouldID"],
                        HMouldName: bill['产品模具'],
                        HMouldSpec: bill['模具规格'],
                        HMouldModel: bill['模具型号'],
                        enableMultiSourceBill: this.MultiSourceBill
                    })
                } else {
                    this.$set(this.HBillList[this.curPage - 1][index], 'isActive', !this.HBillList[this.curPage - 1][
                        index
                    ]['isActive'])
                    console.log(this.HBillList[this.curPage - 1][index])
                    // 设置了多源单模式
                    this.setMultiSourceBillList({
                        HInterID: interid,
                        HBillNo: billno,
                        HIsActive: this.HBillList[this.curPage - 1][index]['isActive']
                    })
                }

                // this.exit()
            },
            setMultiSourceBillList(billInfo) {
                let index = this.multiSouceBillList.findIndex(item => item.HInterID == billInfo.HInterID)
                if (index == -1) {
                    billInfo['count'] = 1
                    this.multiSouceBillList.push(billInfo)
                } else {
                    if (billInfo.HIsActive) {
                        // 如果对应单据传入的是否激活数是true，则计数器+1
                        this.multiSouceBillList[index]['count']++;
                    } else {
                        // 如果对应单据传入的是否激活数是false，则计数器-1
                        this.multiSouceBillList[index]['count']--;
                    }
                    if (this.multiSouceBillList[index]['count'] == 0) {
                        // 没有选中的单据，则移除缓存中的数据
                        this.multiSouceBillList.splice(index, 1)
                    }
                }
                console.log('this.multiSouceBillList: ', this.multiSouceBillList);
            },
            getsWhere() {
                let sWhere = ''
                if (this.HBeginDate && this.HEndDate) {
                    sWhere += ` and  CONVERT(varchar(100),日期, 23) between '${this.HBeginDate}' and '${this.HEndDate}'`
                }
                // this.exit()
            },
            setMultiSourceBillList(billInfo) {
                let index = this.multiSouceBillList.findIndex(item => item.HInterID == billInfo.HInterID)
                if (index == -1) {
                    billInfo['count'] = 1
                    this.multiSouceBillList.push(billInfo)
                } else {
                    if (billInfo.HIsActive) {
                        // 如果对应单据传入的是否激活数是true，则计数器+1
                        this.multiSouceBillList[index]['count']++;
                    } else {
                        // 如果对应单据传入的是否激活数是false，则计数器-1
                        this.multiSouceBillList[index]['count']--;
                    }
                    if (this.multiSouceBillList[index]['count'] == 0) {
                        // 没有选中的单据，则移除缓存中的数据
                        this.multiSouceBillList.splice(index, 1)
                    }
                }
                console.log('this.multiSouceBillList: ', this.multiSouceBillList);
            },
            getsWhere() {
                let sWhere = ''
                if (this.HBeginDate && this.HEndDate) {
                    sWhere += ` and  CONVERT(varchar(100),日期, 23) between '${this.HBeginDate}' and '${this.HEndDate}'`
                }


                if (this.HNumber) {
                    sWhere += ` and 产品模具代码 like '%${this.HNumber}%'`
                }
                if (this.HNumber) {
                    sWhere += ` and 产品模具代码 like '%${this.HNumber}%'`
                }

                if (this.HName) {
                    sWhere += ` and 产品模具 like '%${this.HName}%'`
                }

                if (this.HBillNo) {
                    sWhere += ` and 单据号 like '%${this.HBillNo}%'`
                }
                sWhere += ` and isnull(关闭人,'')!=''  `
                return sWhere
            },
            getBillList() {
                this.HBillList = []
                this.length = 0
                this.page = 0
                this.curPage = 1
                CommonUtils.doRequest(
                    "/Sc_MouldConkBookBill/GetMouldConkBookBillList_PDA", {
                        sWhere: this.getsWhere(),
                        user: getUserInfo()["Czymc"]
                    },
                    (res) => {
                        let {
                            data,
                            count,
                            Message
                        } = res.data
                        if (count == 1) {
                            this.length = Array.from(data).length
                            const result = [];
                            for (let i = 0; i < data.length; i += this.size) {
                                result.push(data.slice(i, i + this.size));
                            }
                            this.HBillList = result
                            this.page = result.length
                            setTimeout(() => {
                                this.enablefocus = true
                            }, 500)
                        } else {
                            setTimeout(() => {
                                this.enablefocus = true
                            }, 500)
                            uni.showToast({
                                icon: 'none',
                                title: Message
                            })
                        }
                    }
                )
            },
        },
    }
                if (this.HName) {
                    sWhere += ` and 产品模具 like '%${this.HName}%'`
                }
                if (this.HMouldID && this.HMouldID > 0) {
                    sWhere += ` and HMouldID = ${this.HMouldID}`
                }
                if (this.HBillNo) {
                    sWhere += ` and 单据号 like '%${this.HBillNo}%'`
                }
                // 关键修改：只有当不忽略过滤时，才添加关闭人条件
                if (!this.ignoreClosePersonFilter) {
                    sWhere += ` and isnull(关闭人,'') =''  `
                }
                return sWhere
            },
            getBillList() {
                this.HBillList = []
                this.length = 0
                this.page = 0
                this.curPage = 1
                CommonUtils.doRequest(
                    "/Sc_MouldConkBookBill/GetMouldConkBookBillList_PDA", {
                        sWhere: this.getsWhere(),
                        user: getUserInfo()["Czymc"]
                    },
                    (res) => {
                        let {
                            data,
                            count,
                            Message
                        } = res.data
                        if (count == 1) {
                            this.length = Array.from(data).length
                            const result = [];
                            for (let i = 0; i < data.length; i += this.size) {
                                result.push(data.slice(i, i + this.size));
                            }
                            this.HBillList = result
                            this.page = result.length
                            setTimeout(() => {
                                this.enablefocus = true
                            }, 500)
                        } else {
                            setTimeout(() => {
                                this.enablefocus = true
                            }, 500)
                            uni.showToast({
                                icon: 'none',
                                title: Message
                            })
                        }
                    }
                )
            },
        },
    }
</script>

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

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

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

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

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

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

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

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

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

            }
            }

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

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

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

        .daterange {
            display: flex;
            flex-direction: row;
            gap: 10rpx;
            justify-content: center;
            align-items: center;
        .daterange {
            display: flex;
            flex-direction: row;
            gap: 10rpx;
            justify-content: center;
            align-items: center;

        }
    }
        }
    }
</style>

 pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue

@@ -99,7 +99,7 @@
                    </zxz-uni-data-select>
                </view>
                <view class="form-item">
                    <view class="title">验收项目:</view>
                    <view class="title required">验收项目:</view>
                    <zxz-uni-data-select class="right" :localdata="HRepairCheckList" dataKey="维修验收项目"
                        dataValue="hitemid" v-model="hform.HRepairCheckMainID">
                    </zxz-uni-data-select>
@@ -210,8 +210,9 @@
            <button class="btn-c" size="mini" @tap="goBack">退出</button>
        </view>
        <!-- 弹出模具故障登记单的选择列表 -->
        <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
            :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
        <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HMouldID="hform.HMouldID"
            :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID"
            :ignore-close-person-filter="true">
        </BillListPopupMouldConkBookBillVue>
        <!-- 弹出模具维修记录单的选择列表 -->
        <RepairRecordPopup ref="repairRecordList" :HBillType="hform.HBillType" :HStockOrgID="hform.HStockOrgID">
@@ -324,36 +325,42 @@
        methods: {
            // 提交数据有效性校验
            ValidCheck() {
                if (this.hform.HEquipID == 0) {
                if (this.hform.HEquipID == 0 || this.hform.HEquipID === undefined) {
                    return {
                        Message: "未录入模具信息，请先录入模具信息!",
                        state: false
                    }
                }
                if (this.hform.HDeptID == 0) {
                if (this.hform.HDeptID == 0 || this.hform.HDeptID === undefined) {
                    return {
                        Message: "部门不得为空!",
                        state: false
                    }
                }
                if (this.hform.HEmpID == 0) {
                if (this.hform.HEmpID == 0 || this.hform.HEmpID === undefined) {
                    return {
                        Message: "验收人不得为空!",
                        state: false
                    }
                }
                // if (this.hform.HRepairCheckMainID == 0) {
                //     return {
                //         Message: "验证项目不得为空!",
                //         state: false
                //     }
                // }
                if (this.hform.HManagerID == 0) {
                if (this.hform.HRepairCheckMainID == 0 || this.hform.HRepairCheckMainID === undefined) {
                    return {
                        Message: "验收项目不得为空!",
                        state: false
                    }
                }
                if (this.hform.HManagerID == 0 || this.hform.HManagerID === undefined) {
                    return {
                        Message: "负责人不得为空!",
                        state: false
                    }
                }
                if (this.hform.HMouldRepairWorkID == 0 || this.hform.HMouldRepairWorkID === undefined) {
                    return {
                        Message: "维修记录不得为空!",
                        state: false
                    }
                }

                return {
                    Message: "",

 pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue

@@ -281,8 +281,9 @@
        </view>

        <!-- 新增弹窗组件 -->
        <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
            :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
        <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HMouldID="hform.HMouldID"
            :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID"
            :ignore-close-person-filter="false">
        </BillListPopupMouldConkBookBillVue>
    </view>
</template>
@@ -828,7 +829,7 @@
                                if (res.confirm) {
                                    console.log('用户点击确定');
                                    uni.redirectTo({
                                        // url: './Sc_MouldRepairSendWorkBill?operationType=1'
                                         url: './Sc_MouldRepairSendWorkBill?operationType=1'
                                    })
                                } else if (res.cancel) {
                                    console.log('用户点击取消');

 pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue

@@ -79,26 +79,6 @@
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">维修内容</view>
                    <view class="right">
                        <textarea v-model="hform.HRepairContent" style="height: 6em;" maxlength="2000"
                            placeholder="请输入维修内容..." />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title required">计划维修工时</view>
                    <view class="right">
                        <input type="number" name="HPlanTimes" v-model="hform.HPlanTimes"
                            @focus="hform.HPlanTimes = ''" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title required">实际维修工时</view>
                    <view class="right">
                        <input type="number" name="HTimes" v-model="hform.HTimes" @focus="hform.HTimes = ''" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">单据号</view>
                    <view class="righton">
                        <input name="HInterID" disabled v-model="hform.HBillNo" />
@@ -119,6 +99,13 @@
                            @input="DeptChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title required">负责人</view>
                    <view class="right">
                        <uni-combox :candidates="EmpNameList" placeholder="请选择负责人" v-model="hform.HManagerName"
                            @input="ManagerChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title required">维修人</view>
                    <view class="right">
@@ -126,20 +113,34 @@
                            @input="EmpChange"></uni-combox>
                    </view>
                </view>
                
                <view class="form-item">
                    <view class="title required">负责人</view>
                    <view class="right">
                        <uni-combox :candidates="EmpNameList" placeholder="请选择负责人" v-model="hform.HManagerName"
                            @input="ManagerChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">维修项目</view>
                    <view class="title required">维修项目</view>
                    <view class="right">
                        <uni-combox :candidates="RepairNameNameList" placeholder="请选择维修项目" v-model="hform.HRepairName"
                            @input="RepairNameChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">计划维修工时</view>
                    <view class="right">
                        <input type="number" name="HPlanTimes" v-model="hform.HPlanTimes"
                            @focus="hform.HPlanTimes = ''" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">实际维修工时</view>
                    <view class="right">
                        <input type="number" name="HTimes" v-model="hform.HTimes" @focus="hform.HTimes = ''" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">维修内容</view>
                    <view class="right">
                        <textarea v-model="hform.HRepairContent" style="height: 6em;" maxlength="2000"
                            placeholder="请输入维修内容..." />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">维修要求</view>
                    <view class="right">
@@ -255,8 +256,9 @@
                <button class="btn-c" size="mini" @tap="goBack">退出</button>
            </view>
        </view>
        <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
            :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
        <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"  :HMouldID="hform.HMouldID"
            :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID"
            :ignore-close-person-filter="false">
        </BillListPopupMouldConkBookBillVue>
        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
        <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
@@ -1086,17 +1088,17 @@
                let message = ''

                if (!this.hform.HMainSourceBillNo && this.hform.HMainSourceBillType != '1') {
                    message = '未填写故障登记单'
                    message = '请选择故障登记单'
                } else if (!this.hform.HDeptName) {
                    message = '未填写部门'
                    message = '请选择部门'
                } else if (!this.hform.HEmpName) {
                    message = '未填写维修人'
                    message = '请选择维修人'
                } else if (!this.hform.HManagerName) {
                    message = '未填写负责人'
                    message = '请选择负责人'
                } 
                // else if (!this.hform.HRepairName) {
                //     message = '未填写维修项目'
                // }
                else if (!this.hform.HRepairName) {
                    message = '请选择维修项目'
                }

                if (!message) {
                    return true