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

chenhaozhe

2026-04-10 4372eb278c7c4338a0fe8222e6ac61dfce0b679f

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

 components/ZLGL/ProcExchBillPopup.vue

@@ -206,7 +206,7 @@
                    sWhere += ` and  CONVERT(varchar(100),日期, 23) between '${this.HBeginDate}' and '${this.HEndDate}'`
                }
                if (this.HPrdOrderBillNo) {
                    sWhere += ` and 生产订单号 like'%${this.HPrdOrderBillNo}%`
                    sWhere += ` and 生产订单号 like'%${this.HPrdOrderBillNo}%'`
                }
                if (this.HWorkShop != '全部车间') {
                    let workshopValue = this.HWorkShopValues.find(e => e.HName = this.HStatus )

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "3.012",
    "versionCode" : 312,
    "versionName" : "3.014",
    "versionCode" : 314,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue

@@ -91,6 +91,12 @@
                        <view class="detail" v-if="item.计划结束时间点">
                            <text>计划结束时间点：</text>{{item.计划结束时间点.substr(0,10)}}
                        </view>
                        <view class="detail" v-if="false">
                          <text>保养计划单主ID：</text>{{item.HPlanHInterID}}
                        </view>
                        <view class="detail" v-if="false">
                          <text>保养计划单子ID：</text>{{item.HPlanHEntryID}}
                        </view>
                    </view>
                    <view class="card-detail" v-if="showDetail == item.hmainid">
                        <view class="detail" v-if="item.制单人">
@@ -281,7 +287,7 @@
        },
        methods: {
            pushBill(currTab, item) {
                let Query = `?operationType=4&HBarCode=${item['设备代码']}`
                let Query = `?operationType=4&HBarCode=${item['设备代码']}&HPlanHInterID=${item['HPlanHInterID']}&HPlanHEntryID=${item['HPlanHEntryID']}`
                if(currTab == 0) {
                    uni.navigateTo({
                        url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill' + Query

 pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue

@@ -88,6 +88,12 @@
                        <view class="detail" v-if="item.计划结束时间点">
                            <text>计划结束时间点：</text>{{item.计划结束时间点.substr(0,10)}}
                        </view>
                        <view class="detail" v-if="false">
                          <text>保养计划单主ID：</text>{{item.HPlanHInterID}}
                        </view>
                        <view class="detail" v-if="false">
                          <text>保养计划单子ID：</text>{{item.HPlanHEntryID}}
                        </view>
                    </view>
                    <view class="card-detail" v-if="showDetail == item.hmainid">
                        <view class="detail" v-if="item.制单人">
@@ -283,7 +289,7 @@
        },
        methods: {
            pushBill(currTab, item) {
                let Query = `?operationType=4&HBarCode=${item['器具编号']}`
                let Query = `?operationType=4&HBarCode=${item['器具编号']}&HPlanHInterID=${item['HPlanHInterID']}&HPlanHEntryID=${item['HPlanHEntryID']}`
                if (currTab == 0) {
                    uni.navigateTo({
                        url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill' + Query

 pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue

@@ -622,7 +622,7 @@
                        this.hform.HQty = 1

                        // 获取检验规程
                        this.GetItemByEquipFile()
                        await this.GetItemByEquipFile()
                    } else {
                        CommonUtils.showTips({
                            title: "温馨提示",
@@ -794,7 +794,7 @@
                }
            }
        },
        onLoad(e) {
        async onLoad(e) {
            console.log('e: ', e);
            if (!e.operationType) {
                this.operationType = 1
@@ -813,8 +813,20 @@
            } else if (this.operationType == 4) {
                // 下推
                let HBarCode = e.HBarCode
                let HPlanHInterID = e.HPlanHInterID
                let HPlanHEntryID = e.HPlanHEntryID
                this.getMaxNum()
                this.GetMessageByBarCode(HBarCode)
                //this.GetMessageByBarCode(HBarCode)
                if (HBarCode) {
                    await this.GetMessageByBarCode(HBarCode)
                    if(uni.getStorageSync('Organization')=='宁波市华舟包装有限公司'){
                        //保养计划的ID根据保养任务下推的实际id进行赋值
                        this.hform.HEquipMaintainPlanInterID = (HPlanHInterID == null ? this.hform.HEquipMaintainPlanInterID : HPlanHInterID) =="" ? this.hform.HEquipMaintainPlanInterID : HPlanHInterID
                        this.hform.HEquipMaintainPlanEntryID = (HPlanHEntryID == null ? this.hform.HEquipMaintainPlanEntryID : HPlanHEntryID) =="" ? this.hform.HEquipMaintainPlanEntryID : HPlanHEntryID						
                        this.hform.HMainSourceInterID = (HPlanHInterID == null ? this.hform.HMainSourceInterID : HPlanHInterID) =="" ? this.hform.HMainSourceInterID : HPlanHInterID
                        this.hform.HMainSourceEntryID = (HPlanHEntryID == null ? this.hform.HMainSourceEntryID : HPlanHEntryID) =="" ? this.hform.HMainSourceEntryID : HPlanHEntryID						
                    }
                }
            }

            this.getHDeptList()

 pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue

@@ -477,8 +477,8 @@
                    this.hform.HBarSpec = data[0].HModel
                    this.hform.HBarModel = data[0].HModel2
                    this.hform.HQty = 1
                    // 获取检验规程
                    this.GetItemByMouldFile()
                    // 获取保养规程
                    await  this.GetItemByMouldFile()
                } catch (err) {

                }
@@ -858,7 +858,7 @@
                }
            }
        },
        onLoad(e) {
        async onLoad(e) {
            console.log('e: ', e);
            this.getHMaintainLevList()
            if (!e.operationType) {
@@ -879,9 +879,15 @@
                // 浏览
                // 下推
                let HBarCode = e.HBarCode
                let HPlanHInterID = e.HPlanHInterID
                let HPlanHEntryID = e.HPlanHEntryID
                this.getMaxNum()
                if (HBarCode) {
                    this.GetMessageByBarCode(HBarCode)
                    await this.GetMessageByBarCode(HBarCode)
                    if (uni.getStorageSync('Organization') == '宁波市华舟包装有限公司') {
                        this.hform.HMouldMaintainPlanInterID = (HPlanHInterID == null ? this.hform.HMouldMaintainPlanInterID : HPlanHInterID) == "" ? this.hform.HMouldMaintainPlanInterID : HPlanHInterID
                        this.hform.HMouldMaintainPlanEntryID = (HPlanHEntryID == null ? this.hform.HMouldMaintainPlanEntryID : HPlanHEntryID) == "" ? this.hform.HMouldMaintainPlanEntryID : HPlanHEntryID
                    }
                }

            }

 pages/ZLGL/QualityReport/SB_EquipRunningStatusReport.vue

@@ -277,7 +277,8 @@
            }
        },
        onLoad() {
            this.GetReportTreeList()
            this.GetReportTreeList();
            this.getReport();
        },
        onReachBottom() {
            this.page++

 pages/ZLGL/QualityReportStep/QualityReportStepBill.vue

@@ -1062,7 +1062,7 @@
            
        },
        async onLoad(e) {
            this.setAuto(); 
            //this.setAuto(); 
            this.operationType = e.operationType || 1;
            this.hform.HInterID = e.linterid || 0;
            if (this.operationType == 1) {

 pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue

@@ -2281,7 +2281,7 @@
            },
        },
        async onLoad(e) {
            this.setAuto(); 
            //this.setAuto(); 
            this.operationType = e.operationType || 1;
            this.hform.HInterID = e.linterid || 0;
            console.log(this.hform.HFirstCheckEmp)

 pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue

@@ -2333,7 +2333,7 @@
            },
        },
        async onLoad(e) {
            this.setAuto(); 
            //this.setAuto(); 
            this.operationType = e.operationType || 1;
            this.hform.HInterID = e.linterid || 0;
            if (this.operationType == 1) {

 pages/baogong/DayPlanBillList.vue

@@ -7,8 +7,8 @@
                    <view class="detail" v-if="currentOrder[0].HSourceName" style="width: 100%;">
                        <text>当前设备：</text>{{currentOrder[0].HSourceName}}
                    </view>
                    <view class="detail" v-if="currentOrder[0].首检次数?currentOrder[0].首检次数:0" style="width: 100%;">
                        <text>首检次数：</text>{{currentOrder[0].首检次数}}
                    <view class="detail" >
                        <text>首检次数：</text>{{currentOrder[0].首检次数?currentOrder[0].首检次数:0}}
                    </view>
                    <view class="detail">
                        <text>巡检次数：</text>{{currentOrder[0].巡检次数?currentOrder[0].巡检次数:0}}