chenhaozhe
2026-03-10 6fc5583176c175855daf04a9ed925e0eb769d6e1
App 报工台页面 添加 首检 巡检 末检按钮 跳转到检验单制单页面
8个文件已修改
155 ■■■■ 已修改文件
main.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/shoujianjianyan/firstCheckBill.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/baogong/DayPlanBillList.vue 76 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/caigouruku/POStockInBill.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/login.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
utils/i18n.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
main.js
@@ -54,7 +54,7 @@
    // 调用原始 $t 执行翻译
    const translated = originalT.call(this, key, args);
    
    // console.log(i18n.getLocaleMessage(i18n.locale))
    if (translated == key) {
        // 翻译后的文本与传入的key相同,则表示翻译文本缺失 记录缺失的翻译文本
        let [moduleName, fieldCode] = key.split(".")
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -556,7 +556,7 @@
                // 不良类型
                popList: [],
                badReasonBackTypeList: [],
                // 检验方案
                arrayAnalysisMethod: [{
                        value: 1,
@@ -2166,7 +2166,7 @@
                            return
                        }
                        // 根据 提交返回 的是否允许显示提示信息 判断是直接新增单据还是提示信息
                        if(res.data.NotShowTips) {
                        if (res.data.NotShowTips) {
                            this.addNew()
                            return
                        }
@@ -2460,6 +2460,21 @@
                    this.hform.HTakeSampleCheckBillID = e.linterid;
                    //取样单查询数据
                    await this.LoadingInformation_TakeSampleCheckBill(e.linterid);
                } else if (e.HSouceBillType == "3772") {
                    if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") {
                        this.HSourceBillType = "工序流转卡"; // 显示名称
                        this.hform.HSourceBillType = "3772"; // 对应的值
                        this.hform.HSourceBillNo = e.HBillNo
                    }
                    this.hform.HProcExchBillNo = e.HBillNo
                    this.hform.HProcExchInterID = e.linterid
                    this.hform.HProcExchEntryID = e.hsubid
                    await this.HandleBillSelectComplete({
                        HInterID: e.linterid,
                        HEntryID: e.hsubid
                    })
                }
            } else if (this.operationType == 3) {
                await this.RoadBillMain();
@@ -2796,13 +2811,13 @@
        margin-left: 4px;
        font-weight: bold;
    }
    .popup-content {
        width: 500rpx;
        border-radius: 20rpx;
        text-align: center;
        padding-bottom: 20rpx;
        .tit {
            height: 120rpx;
            line-height: 120rpx;
@@ -2810,7 +2825,7 @@
            color: #222;
            font-weight: bold;
        }
        .item {
            height: 88rpx;
            line-height: 88rpx;
pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -2364,7 +2364,7 @@
                await this.getMaxBillNo();
            } else if (this.operationType == 2) {
                //有源单下推
                await this.getMaxBillNo();
                await this.getMaxBillNo();
                if (e.HSouceBillType == "7521") {
                    if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") {
@@ -2377,6 +2377,18 @@
                    this.hform.HTakeSampleCheckBillID = e.linterid;
                    //取样单查询数据
                    await this.LoadingInformation_TakeSampleCheckBill(e.linterid);
                } else if (e.HSouceBillType == "3772"){
                    if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") {
                        this.HSourceBillType = "工序流转卡"; // 显示名称
                        this.hform.HSourceBillType = "3772"; // 对应的值
                        this.hform.HSourceBillNo = e.HBillNo
                    }
                    this.hform.HProcExchBillNo = e.HBillNo
                    this.hform.HProcExchInterID = e.linterid
                    this.hform.HProcExchEntryID = e.hsubid
                    await this.HandleBillSelectComplete({HInterID: e.linterid, HEntryID: e.hsubid})
                }
            } else if (this.operationType == 3) {
                this.hform.HInterID = e.linterid || 0;
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -1819,11 +1819,11 @@
                            return
                        }
                        // 根据 提交返回 的是否允许显示提示信息 判断是直接新增单据还是提示信息
                        if(res.data.NotShowTips) {
                        if (res.data.NotShowTips) {
                            this.addNew()
                            return
                        }
                        uni.showModal({
                            title: "提示",
                            content: res.data.Message + "。是否返回?",
@@ -2136,6 +2136,18 @@
                    this.hform.HTakeSampleCheckBillNo = e.HBillNo;
                    this.hform.HTakeSampleCheckBillID = e.linterid;
                    //取样单查询数据
                } else if (e.HSouceBillType == "3772") {
                    if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") {
                        this.HSourceBillType = "工序流转卡"; // 显示名称
                        this.hform.HSourceBillType = "3772"; // 对应的值
                        this.hform.HSourceBillNo = e.HBillNo
                    }
                    this.hform.HProcExchBillNo = e.HBillNo
                    this.hform.HProcExchInterID = e.linterid
                    this.hform.HProcExchEntryID = e.hsubid
                    await this.LoadingInformation_ProcExchange(e.HBillNo)
                }
            } else if (this.operationType == 3) {
                await this.RoadBillMain();
pages/baogong/DayPlanBillList.vue
@@ -40,8 +40,10 @@
</template>
<script>
    import { CommonUtils } from "../../utils/common";
import {
    import {
        CommonUtils
    } from "../../utils/common";
    import {
        getUserInfo
    } from "@/utils/auth.js";
    export default {
@@ -92,9 +94,30 @@
                        handler: 'handleICMOTechParam',
                        checkStatus: true,
                        denyMsg: '单据状态不满足工艺参数点检条件!' // 固定错误提示
                    },
                    '首检': {
                        apiUrl: '',
                        type: '首检',
                        handler: 'handleFirstCheck',
                        checkStatus: false,
                        denyMsg: '单据状态不满足工艺参数点检条件!'
                    },
                    '巡检': {
                        apiUrl: '', // 巡检需要检查首件是否完成
                        type: '巡检',
                        handler: 'handlePatrolCheck',
                        checkStatus: false,
                        denyMsg: '单据状态不满足巡检条件!'
                    },
                    '末检': {
                        apiUrl: '',
                        type: '末检',
                        handler: 'handleProcessCheck',
                        checkStatus: false,
                        denyMsg: '单据状态不满足末检条件!'
                    }
                }
            }
            }
        },
        onLoad(e) {
            console.log(e)
@@ -114,7 +137,7 @@
        },
        methods: {
            async getErrMsgBackType() {
                try{
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_BadReason/Gy_ErrMsgBackTypeList',
                        data: {
@@ -122,18 +145,22 @@
                            user: getUserInfo()['Czymc']
                        }
                    })
                    let {data, count, Message} = res.data
                    if(count == 1) {
                    let {
                        data,
                        count,
                        Message
                    } = res.data
                    if (count == 1) {
                        this.popList = Array.from(data).map(item => item['异常反馈类型名称'])
                        this.badReasonBackTypeList = data
                    }else {
                    } else {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: `获取异常反馈类型失败: ${Message}`
                        })
                    }
                }catch(err){
                } catch (err) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: `获取异常反馈类型失败: ${err}`
@@ -294,6 +321,27 @@
                    upData
                )
            },
            handleFirstCheck(item, config) {
                let uri = `?HSouceBillType=${item.HBillType}&HBillNo=${item.HICMOBillNo}` +
                    `&linterid=${item.HProcExchInterID}&hsubid=${item.HProcExchEntryID || 1}`
                uni.navigateTo({
                    url: '/pages/ZLGL/shoujianjianyan/firstCheckBill' + uri + `&operationType=2`
                })
            },
            handlePatrolCheck(item, config) {
                let uri = `?HSouceBillType=${item.HBillType}&HBillNo=${item.HICMOBillNo}` +
                    `&linterid=${item.HProcExchInterID}&hsubid=${item.HProcExchEntryID || 1}`
                uni.navigateTo({
                    url: '/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill' + uri + `&operationType=2`
                })
            },
            handleProcessCheck(item, config) {
                let uri = `?HSouceBillType=${item.HBillType}&HBillNo=${item.HICMOBillNo}` +
                    `&linterid=${item.HProcExchInterID}&hsubid=${item.HProcExchEntryID || 1}`
                uni.navigateTo({
                    url: '/pages/ZLGL/mojianjianyan/ProcessCheckBill' + uri + `&operationType=2`
                })
            },
            // 创建通用的请求数据
            createUpData(item) {
                return {
@@ -406,10 +454,10 @@
                    mask: true
                })
                console.log('执行操作参数:', upData)
                if (actionType == '工艺参数点检') {
                    uni.hideLoading()
                    console.log('item: ',item);
                    console.log('item: ', item);
                    uni.navigateTo({
                        url: `/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit?hinterid=${item.HSourceInterID}&hsubid=${item.HSourceEntryID}&operationType=5`
                    })
@@ -426,8 +474,8 @@
                                    title: `${actionType}成功!`,
                                    icon: 'success'
                                })
                                if(actionType == '完工') {
                                if (actionType == '完工') {
                                    // 完工单提交成功后。提示是否需要跳转达到下模单
                                    uni.showModal({
                                        title: "跳转页面",
@@ -443,7 +491,7 @@
                                            }
                                        }
                                    })
                                }
                            } else {
                                uni.hideLoading()
pages/caigouruku/POStockInBill.vue
@@ -60,7 +60,7 @@
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">源单单号:</view>
                    <view class="title">{{$t(`Gy.HMainSourceBillNo`) == "Gy.HMainSourceBillNo"?"源单单号": $t(`Gy.HMainSourceBillNo`) }}:</view>
                    <view class="right" v-show="showHSourceBillNo">
                        <!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="请输入源单单号"
                            v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
pages/index/login.vue
@@ -126,8 +126,8 @@
                    "宁波华舟包装1": "http://192.168.110.222:8082/API_NW/",
                    "宁波华舟包装2": "http://192.168.88.167:8082/API_NW/",
                    "宁波华舟包装": "http://61.164.64.222:8082/API_WW/",
                    //余姚华远
                    "余姚华远": "http://192.168.3.248:82/HuaYuaAPI/",
                    //余姚华远
                    "余姚华远": "http://192.168.3.248:82/HuaYuaAPI/",
                },
                serverUrlName: uni.getStorageSync('serverUrlName') || '宁波华舟包装',
@@ -163,10 +163,13 @@
        methods: {
            async ApplyLanguagePack(lang, forceUpdate = false) {
                // 读取语言包并加载
                let {data, getRemoteFile} = await getLanguagePackJson(lang)
                if(getRemoteFile){
                    this.$i18n.setLocaleMessage(lang, data)
                }
                // let {
                //     data,
                //     getRemoteFile
                // } = await getLanguagePackJson(lang)
                // if (getRemoteFile) {
                //     this.$i18n.setLocaleMessage(lang, data)
                // }
                this.$i18n.locale = lang
            },
            onLanguageChangeHandler(e) {
utils/i18n.js
@@ -42,7 +42,10 @@
                title: "温馨提示",
                message: "[i18n]获取语言包失败: " + Message
            })
            return
            return {
                data: [],
                getRemoteFile: false
            }
        }
    } catch (err) {
        enableCollectMissingKey = false