wtt
2026-01-14 eab1260c8fd6da58125d6d6233a99aacf4ce9208
末件检验单错误名字修改,检验模块添加数量控制
2 文件已重命名
6个文件已修改
152 ■■■■■ 已修改文件
pages.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/QualityReportStep/QualityReportStepBill.vue 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/tab2.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/tab4.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json
@@ -1326,7 +1326,7 @@
            }
        },
        {
            "path": "pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
            "path": "pages/ZLGL/mojianjianyan/ProcessCheckBillList",
            "style": {
                "navigationBarTitleText": "末件检验单维护"
            }
@@ -1344,7 +1344,7 @@
            }
        },
        {
            "path": "pages/ZLGL/mojianjianyan/lastPieceCheckBill",
            "path": "pages/ZLGL/mojianjianyan/ProcessCheckBill",
            "style": {
                "navigationBarTitleText": "末件检验单"
            }
pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
@@ -7,6 +7,7 @@
                <view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">基本信息</view>
                <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">扫描信息</view>
                <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">制单信息</view>
                <view :class="mainTabSelected == 4 ? 'selected' : ''" @tap="mainTabSelected = 4">其他信息</view>
            </view>
            <!-- 主表内容 -->
            <view class="bill-main-contents">
@@ -92,19 +93,7 @@
                            <input type="number" v-model="hform.HCheckQty" :disabled="hasCheckQty" />
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="left">生产班组</view>
                        <view class="right-select">
                            <zxz-uni-data-select
                                v-model="hform.HGroupID"
                                dataKey="班组名称"
                                dataValue="HItemID"
                                :filterable="true"
                                :localdata="HGroupList"
                                :clear="false"
                            ></zxz-uni-data-select>
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="left">检验员</view>
                        <view class="right-select">
@@ -127,19 +116,7 @@
                        
                    </view>
                    
                    <view class="form-item">
                        <view class="left">生产资源</view>
                        <view class="right-select">
                            <zxz-uni-data-select
                                v-model="hform.HSourceID"
                                dataKey="生产资源名称"
                                dataValue="HItemID"
                                :filterable="true"
                                :localdata="HSourceList"
                                :clear="false"
                            ></zxz-uni-data-select>
                        </view>
                    </view>
                    
                    <view class="form-item">
                        <view class="left">备注</view>
@@ -225,6 +202,35 @@
                        <view class="left">作废日期</view>
                        <view class="right disabled">
                            <input type="text" :value="hform.HDeleteDate" disabled />
                        </view>
                    </view>
                </view>
                <!-- 其他信息 -->
                <view class="bill-main-content" v-if="mainTabSelected == 4">
                    <view class="form-item">
                        <view class="left">生产班组</view>
                        <view class="right-select">
                            <zxz-uni-data-select
                                v-model="hform.HGroupID"
                                dataKey="班组名称"
                                dataValue="HItemID"
                                :filterable="true"
                                :localdata="HGroupList"
                                :clear="false"
                            ></zxz-uni-data-select>
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="left">生产资源</view>
                        <view class="right-select">
                            <zxz-uni-data-select
                                v-model="hform.HSourceID"
                                dataKey="生产资源名称"
                                dataValue="HItemID"
                                :filterable="true"
                                :localdata="HSourceList"
                                :clear="false"
                            ></zxz-uni-data-select>
                        </view>
                    </view>
                </view>
@@ -529,12 +535,19 @@
                    count
                } = res.data
                if (count == 1) {
                    if(data[0]['HBack']==1){
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: data[0]['HBackRemark']
                        })
                        return;
                    }
                    this.hform.HMaterID = data[0]['HMaterID']
                    this.hform.HMaterName = data[0]['产品名称']
                    this.hform.HMaterNumber = data[0]['产品代码']
                    //源单信息
                    this.hform.HMainSourceBillNo = data[0]['HBillNo']
                    this.hform.HSourceBillNo = data[0]['HBillNo']
                    this.hform.HMainSourceBillNo = data[0]['单据号']
                    this.hform.HSourceBillNo = data[0]['单据号']
                    this.hform.HMainSourceInterID = data[0].HInterID
                    this.hform.HMainSourceEntryID = data[0].HEntryID
                    this.hform.HSourceBillQty = data[0].流转卡数量
@@ -589,6 +602,14 @@
                        count
                    } = res.data
                    if (count == 1) {
                        //如果源单数量超出提示
                        if(data[0]['HBack']==1){
                            CommonUtils.showTips({
                                title: '温馨提示',
                                message: data[0]['HBackRemark']
                            })
                            return;
                        }
                        console.log('获取源单:', data)
                        this.hform.HMaterID = data[0]['HMaterID']
                        this.hform.HMaterName = data[0]['产品名称']
@@ -868,6 +889,9 @@
                        ,HMakeDate:this.hform.HMakeDate
                        ,HReportType:1
                        ,HSourceBillType:this.hform.HSourceBillType
                        ,HSourceBillNo:this.hform.HSourceBillNo
                        ,HSourceInterID:this.hform.HMainSourceInterID
                        ,HSourceEntryID:this.hform.HMainSourceEntryID
                        ,HBadReasonHQty:1
                        ,HQty:this.hform.HCheckQty
                    }
pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
@@ -780,6 +780,13 @@
                        count
                    } = res.data
                    if (count == 1) {
                        if(data[0]['HBack']==1){
                            CommonUtils.showTips({
                                title: '温馨提示',
                                message: data[0]['HBackRemark']
                            })
                            return;
                        }
                        console.log('获取源单:', data)
                        this.hform.HMaterID = data[0]['HMaterID']
                        this.hform.HMaterName = data[0]['HMaterName']
@@ -881,6 +888,13 @@
                    count
                } = res.data
                if (count == 1) {
                    if(data[0]['HBack']==1){
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: data[0]['HBackRemark']
                        })
                        return;
                    }
                    this.hform.HMaterID = data[0]['HMaterID']
                    this.hform.HMaterName = data[0]['HMaterName']
                    this.hform.HMaterNumber = data[0]['HMaterNumber']
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
File was renamed from pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue
@@ -708,6 +708,13 @@
                    count
                } = res.data
                if (count == 1) {
                    if(data[0]['HBack']==1){
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: data[0]['HBackRemark']
                        })
                        return;
                    }
                    this.hform.HMaterID = data[0]['HMaterID']
                    this.hform.HMaterName = data[0]['产品名称']
                    this.hform.HMaterNumber = data[0]['产品代码']
@@ -762,6 +769,13 @@
                    } = res.data
                    if (count == 1) {
                        console.log('获取源单:', data)
                        if(data[0]['HBack']==1){
                            CommonUtils.showTips({
                                title: '温馨提示',
                                message: data[0]['HBackRemark']
                            })
                            return;
                        }
                        this.hform.HMaterID = data[0]['HMaterID']
                        this.hform.HMaterName = data[0]['产品名称']
                        this.hform.HMaterNumber = data[0]['产品代码']
@@ -1933,7 +1947,7 @@
                                if (res.confirm) {
                                    console.log("用户点击确定");
                                    uni.redirectTo({
                                        url: "/pages/ZLGL/mojianjianyan/form?operationType=1",
                                        url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
                                    });
                                } else if (res.cancel) {
                                    console.log("用户点击取消");
@@ -1958,7 +1972,7 @@
            },
            addNew() {
                uni.redirectTo({
                    url: "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList?operationType=1",
                    url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
                });
            },
            goBack() {
pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue
File was renamed from pages/ZLGL/mojianjianyan/lastPieceCheckBillList.vue
@@ -193,7 +193,7 @@
            },
            cmdAdd() {
                uni.redirectTo({
                    url: "/pages/ZLGL/mojianjianyan/lastPieceCheckBill?operationType=1"
                    url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1"
                })
            },
            async cmdSearch() {
pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
@@ -175,13 +175,13 @@
                            <input type="text" v-model="hform.HErrTreatment" value="" />
                        </view>
                    </view>
                    <view class="form-item" v-if="false">
                    <view class="form-item" >
                        <view class="left">任务单数量</view>
                        <view class="right">
                            <input type="number" v-model="hform.HICMOQty" />
                        </view>
                    </view>
                    <view class="form-item" v-if="false">
                    <view class="form-item">
                        <view class="left">流转卡数量</view>
                        <view class="right">
                            <input type="number" v-model="hform.HProcExchQty" />
@@ -794,6 +794,13 @@
                        count
                    } = res.data
                    if (count == 1) {
                        if(data[0]['HBack']==1){
                            CommonUtils.showTips({
                                title: '温馨提示',
                                message: data[0]['HBackRemark']
                            })
                            return;
                        }
                        this.hform.HMaterID = data[0]['HMaterID']
                        this.hform.HMaterName = data[0]['产品名称']
                        this.hform.HMaterNumber = data[0]['产品代码']
@@ -807,6 +814,7 @@
                        this.hform.HProcName = data[0]['当前工序']
                        this.hform.HSourceBillQty = data[0].HSourceBillQty
                        this.hasSourceBill = true
                        this.hform.HProcExchQty = data[0]['流转卡数量']
                        this.get_CheckItem();
                        this.$refs['billList'].exit()
                    } else {
@@ -816,14 +824,7 @@
                        })
                    }
                    if (
                        (uni.getStorageSync("OrganizationID") == "7667152" &&
                            uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
                        (uni.getStorageSync("OrganizationID") == "100199" &&
                            uni.getStorageSync("Organization") == "杭州斯莫尔磁性材料有限公司")
                    ) {
                        await this.GetCheckItemID(); // 客户为斯莫尔,进入按照质检方案表头上的物料绑定带出默认方案
                    }
                } catch (err) {
                    CommonUtils.showTips({
                        title: '温馨提示',
@@ -894,7 +895,13 @@
                } = res.data
                if (count == 1) {
                    console.log('data: ', data);
                    if(data[0]['HBack']==1){
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: data[0]['HBackRemark']
                        })
                        return;
                    }
                    this.hform.HMaterID = data[0]['HMaterID']
                    this.hform.HMaterName = data[0]['产品名称']
                    this.hform.HMaterNumber = data[0]['产品代码']
@@ -907,6 +914,7 @@
                    this.hform.HProcID = data[0]['HProcID']
                    this.hform.HProcName = data[0]['当前工序']
                    this.hform.HSourceBillQty = data[0].HSourceBillQty
                    this.hform.HProcExchQty = data[0]['流转卡数量']
                    this.hasSourceBill = true
                    this.get_CheckItem();
                } else {
pages/index/tab2.vue
@@ -358,7 +358,7 @@
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "末件检验单列表",
                        "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
                        "url": "/pages/ZLGL/mojianjianyan/ProcessCheckBillList",
                        "id": 43,
                        "hidden": false
                    },
pages/index/tab4.vue
@@ -64,7 +64,7 @@
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "末件检验单",
                        "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBill?operationType=1",
                        "url": "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
                        "id": 3,
                        "hidden": false
                    },