llj
3 天以前 e3b1aed09146a93c4ad5a253d4162af453062c74
Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
9个文件已修改
674 ■■■■■ 已修改文件
App.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/BillListPopup/BillListPopupEquipConkBookBill.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
locale/zh-Hans.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
main.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/shoujianjianyan/firstCheckBill.vue 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/gongxuOut/Cj_StationOutBill_Standard.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tiaomamingxi/tiaomamingxi.vue 487 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/weiwairuku/EntrustInBill.vue 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
App.vue
@@ -8,7 +8,10 @@
        getUserInfo
    } from "./utils/auth";
    import getuiUtils from "./utils/getuiUtils";
    import { overrideUniRequest, cancelAllRequest } from './utils/RequestQueue'
    import {
        overrideUniRequest,
        cancelAllRequest
    } from './utils/RequestQueue'
    export default {
        onLaunch: function() {
            console.log('App Launch')
components/BillListPopup/BillListPopupEquipConkBookBill.vue
@@ -195,6 +195,7 @@
                        HEquipName: bill['设备名称'],
                        HEquipSpec: bill['模具规格'],
                        HEquipModel: bill['模具型号'],
                        HBillType: bill['HBillType'],
                        enableMultiSourceBill: this.MultiSourceBill
                    })
                } else {
locale/zh-Hans.json
@@ -137,6 +137,7 @@
        "StockPlace": "仓位",
        "SourceBillType": "源单类型",
        "SourceBillNo": "源单单号",
        "SourceBillQty": "源单数量",
        "Date": "日期",
        "Maker": "制单人",
        "bt_HMaterNumber": "物料代码",
main.js
@@ -89,6 +89,7 @@
// #ifndef VUE3
import Vue from 'vue'
import VueI18n from 'vue-i18n'
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
@@ -268,6 +268,7 @@
                    "lngBillKey": "",
                    "lngBillSubKey": "",
                    // 新增:维修记录(源单)相关字段
                    "HMainSourceBillType":"",
                    "HMainSourceBillNo": "",
                    "HMainSourceInterID": 0,
                    "HMainSourceEntryID": 0,
@@ -334,6 +335,7 @@
                        this.hform.HMainSourceBillNo = data[0]["单据号"];
                        this.hform.HMainSourceInterID = data[0]["hmainid"];
                        this.hform.HMainSourceEntryID = data[0]["hsubid"];
                        this.hform.HMainSourceBillType="3910"
                        // 如果源单有设备信息,可以自动填充
                        if (data[0].HEquipID) {
@@ -770,6 +772,7 @@
                        this.hform.HMainSourceInterID = data[0]["HEquipRepairCheckBillInterID"];
                        this.hform.HMainSourceEntryID = data[0]["HEquipRepairCheckBillEntryID"];
                        this.hform.HManagerID = data[0]["HManagerID"];
                        this.hform.HMainSourceBillType="3907"
                        this.hform.HEmpID = data[0]["HEmpID"];
                        this.getSendWorkBill(HSendWorkID)
                    } else {
@@ -881,6 +884,7 @@
            // 监听单据选择完成事件
            uni.$on('BillSelectComplete', (e) => {
                console.log("接收到的消息: ", e)
                this.hform.HMainSourceBillType=e.HBillType
                this.hform.HMainSourceInterID = e.HInterID
                this.hform.HMainSourceBillNo = e.HBillNo
                this.hform.HMainSourceEntryID = e.HEntryID
pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -329,8 +329,9 @@
                                <!-- 只有定量分析才启用检验值 -->
                                <view class="detail editable" v-show="checkItem.HAnalysisMethod == 2">
                                    <text>检验值:</text>
                                    <input type="text" class="editable-input" @blur="calcHResult(checkItem)"
                                        v-model="checkItem.HInspectValQ" />
                                    <input type="number" class="editable-input" :data-index="checkItem.num"
                                        :focus="checkItem.isFocus" @confirm.stop="calcHResult(checkItem, $event)"
                                        @blur.stop="calcHResult(checkItem, $event)" v-model="checkItem.HInspectValQ" />
                                </view>
                                <view class="detail" v-if="checkItem.HQCNote">
@@ -445,7 +446,7 @@
        </view>
        <view style="height: 120rpx"></view>
        <view class="bottom-btn" @tap.stop="() => {}">
            <button class="btn-a" size="mini"  @tap.stop="submit">提交</button>
            <button class="btn-a" size="mini" @tap.stop="submit">提交</button>
            <view style="flex: 1"></view>
            <button class="btn-a" size="mini" @tap.stop="addNew">新增</button>
            <button class="btn-c" size="mini" @tap.stop="goBack">退出</button>
@@ -671,19 +672,35 @@
        },
        methods: {
            // 检验值 计算是否合格
            calcHResult(item) {
            calcHResult(item, event) {
                // 非抽检条件下判断结论
                console.log('item: ', item);
                if (!item.HSampleSchemeID) {
                if (!item.HQCCheckItemID) {
                    CommonUtils.showTips({
                        message: '录入检验值时,未选中检验项目,请选择检验项目后再录入检验值'
                    })
                    return
                }
                if (item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit) {
                    this.checkItems[item.num].HResult = 1
                    return
                } else {
                    this.checkItems[item.num].HResult = 2
                }
                console.log('item: ', item);
                console.log('event.type: ', event.type);
                this.checkItems[item.num].HResult = 2
                // 查找当前检验项目中,下一个分析方法为定量分析的检验项目,将检验项目的检验值设置为聚焦
                for (let key in this.checkItems) {
                    if (this.checkItems.hasOwnProperty(key)) {
                        let element = this.checkItems[key];
                        if (key > item.num && element["HAnalysisMethod"] == 2) {
                            this.checkItems[item.num]["isFocus"] = false
                            element["isFocus"] = false
                            this.$nextTick(() => {
                                element["isFocus"] = true
                            })
                        }
                    }
                }
            },
            // 读取缓存
            loadCache() {
@@ -1430,12 +1447,16 @@
                }
                return "";
            },
            checkResultChange({detail: {value}}) {
               if(value == 1) {
                   this.hform.HLastResult = false
               }else {
                   this.hform.HLastResult = true
               }
            checkResultChange({
                detail: {
                    value
                }
            }) {
                if (value == 1) {
                    this.hform.HLastResult = false
                } else {
                    this.hform.HLastResult = true
                }
            },
            // 检验项目新增行
            addCheckItem(resource) {
@@ -1479,6 +1500,8 @@
                    HAQL: "",
                    HSamplingType: "",
                    HInspectResultToSee: "",
                    HInspectValQ: "",
                    isFocus: false,
                };
                if (resource) {
                    // 通过主表检验方案带出的检验项目
@@ -1982,29 +2005,29 @@
                    });
                    return false;
                }
                // 判断 最后结果为不合格的情况下,检验项目中是否有不合格项
                if(this.hform.HLastResult == 0 || this.hform.HLastResult == false){
                if (this.hform.HLastResult == 0 || this.hform.HLastResult == false) {
                    let count = 0
                    console.log('this.checkItems: ',this.checkItems);
                    console.log('this.checkItems: ', this.checkItems);
                    for (let key in this.checkItems) {
                        if (this.checkItems.hasOwnProperty(key)) {
                            let element = this.checkItems[key];
                            if(element.HResult == 2){
                                count ++
                            if (element.HResult == 2) {
                                count++
                            }
                        }
                    }
                    if(count == 0) {
                    if (count == 0) {
                        CommonUtils.showTips({
                            message: "判断结论为不合格,检验项目中不存在不合格单据,提交失败!",
                        });
                        return false;
                    }
                }
                if(!this.hform.HSourceBillNo) {
                if (!this.hform.HSourceBillNo) {
                    CommonUtils.showTips({
                        message: "未扫描(选择)源单,请扫描(选择)源单后提交!",
                    });
@@ -2133,9 +2156,9 @@
                            this.$refs.popup.open('center')
                            return
                        }
                        // 根据 提交返回 的是否允许显示提示信息 判断是直接新增单据还是提示信息
                        if(res.data.NotShowTips) {
                        if (res.data.NotShowTips) {
                            this.addNew()
                            return
                        }
@@ -2178,7 +2201,7 @@
                        '&HSourceName=' + this.hform.HSourceName +
                        '&HSourceBillNo=' + this.hform.HSourceBillNo +
                        '&HType=' + item +
                        '&OperationType=5&linterid='+ this.hform.HInterID +'&HSouceBillType=7505'
                        '&OperationType=5&linterid=' + this.hform.HInterID + '&HSouceBillType=7505'
                })
            },
            async auditBill() {
@@ -2396,7 +2419,7 @@
                await this.getMaxBillNo();
            } else if (this.operationType == 2) {
                //有源单下推
                await this.getMaxBillNo();
                await this.getMaxBillNo();
                if (e.HSouceBillType == "7521") {
                    if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") {
@@ -2409,18 +2432,21 @@
                    this.hform.HTakeSampleCheckBillID = e.linterid;
                    //取样单查询数据
                    await this.LoadingInformation_TakeSampleCheckBill(e.linterid);
                } else if (e.HSouceBillType == "3772"){
                } 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})
                    await this.HandleBillSelectComplete({
                        HInterID: e.linterid,
                        HEntryID: e.hsubid
                    })
                }
            } else if (this.operationType == 3) {
                this.hform.HInterID = e.linterid || 0;
pages/gongxuOut/Cj_StationOutBill_Standard.vue
@@ -1505,6 +1505,7 @@
                            this.hform.NoOutboundHqty = (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)
                            this.hform.HStyleNumber = data['款号']
                            this.hform.HNotReportQty = data['未报工数量']
                            this.hform.HQty = data['合格数量']
                            //设置序列
                            this.getHSEQList(e);
                            
pages/tiaomamingxi/tiaomamingxi.vue
@@ -1,6 +1,6 @@
<template>
    <view class="page" id="pageContent">
<!--        <view class="search-condition-zone">
        <!--        <view class="search-condition-zone">
            <view class="form-item">
                <view class="left">
                    条码:
@@ -18,23 +18,33 @@
                </view>
            </view>
        </view> -->
<!--        <view class="button-zone">
        <!--        <view class="button-zone">
            <button type="default" class="btn-a" size="mini" @tap="cmdChange">调整</button>
            <button type="default" class="btn-c" size="mini" @tap="exit">退出</button>
        </view> -->
        <view class="info-list-zone" id="scroll-content" :style="{height: scrollContentHeight + 'px'}">
            <view class="list" v-for="(item, index) in Materlist" :key="index">
                <uni-card :title="item.HBarCode" style="margin: 10px;" @tap="delMater(item)">
                    <view class="card-detail">
                        <view class="detail">
                            <text>{{ $t("Kf_ProductInBill_PDA.table_SourceBillNo") == "Kf_ProductInBill_PDA.table_SourceBillNo" ? "批次" : $t("Kf_ProductInBill_PDA.table_SourceBillNo") }}:</text>{{ item.HBatchNo }}
                        </view>
                        <view class="detail">
                            <text>{{ $t("Kf_ProductInBill_PDA.table_SourceBillNo") == "Kf_ProductInBill_PDA.table_SourceBillNo" ? "数量" : $t("Kf_ProductInBill_PDA.table_SourceBillNo") }}:</text>{{ item.HQty }}
                        </view>
                    </view>
                </uni-card>
            </view>
            <view class="list" v-for="(item, index) in Materlist" :key="index">
                <uni-card style="margin: 10px;" @tap="delMater(item)">
                    <template slot="title">
                        <view  class="uni-card__header">
                            <view class="uni-card__header-box">
                                <view class="uni-card__header-content">
                                    <view class="uni-card__header-content-title wrap-title">{{ item.HBarCode }}</view>
                                </view>
                            </view>
                        </view>
                    </template>
                    <view class="card-detail">
                        <view class="detail">
                            <text>{{ $t("Kf_ProductInBill_PDA.table_SourceBillNo") == "Kf_ProductInBill_PDA.table_SourceBillNo" ? "批次" : $t("Kf_ProductInBill_PDA.table_SourceBillNo") }}:</text>{{ item.HBatchNo }}
                        </view>
                        <view class="detail">
                            <text>{{ $t("Kf_ProductInBill_PDA.SourceBillQty") == "Kf_ProductInBill_PDA.SourceBillQty" ? "数量" : $t("Kf_ProductInBill_PDA.SourceBillQty") }}:</text>{{ item.HQty }}
                        </view>
                    </view>
                </uni-card>
            </view>
        </view>
        <view class="pagination-zone" id="pagination-zone">
            <uni-pagination show-icon :page-size="paginationMeta.pageSize" :total="paginationMeta.total"
@@ -58,35 +68,35 @@
                arrayHWHName: [],
                HStockPlaceNameList: [],
                arrayHStockPlaceName: [],
                Materlist: [],
                HMaterID: 0,
                HBillType: 0,
                HInterID: 0,
                Materlist: [],
                HMaterID: 0,
                HBillType: 0,
                HInterID: 0,
                HIsStockMgr: false,
                scrollTop: 0,
                HInterID_check: 0,
                HBillType_check: '',
                sBatchNo_check: '',
                sBarCode_check: '',
                sSCWhID_check: 0,
                sSCSPID_check: 0,
                sAuxPropID_check: 0,
                sMTONo_check: '',
                HMaterID_check: 0,
                sWhID_check: 0,
                sSPID_check: 0,
                HSourceInterID_check: 0,
                HSourceEntryID_check: 0,
                EndQty_check: 0,
                HInterID_check_check: 0,
                HInterID_check: 0,
                HBillType_check: '',
                sBatchNo_check: '',
                sBarCode_check: '',
                sSCWhID_check: 0,
                sSCSPID_check: 0,
                sAuxPropID_check: 0,
                sMTONo_check: '',
                HMaterID_check: 0,
                sWhID_check: 0,
                sSPID_check: 0,
                HSourceInterID_check: 0,
                HSourceEntryID_check: 0,
                EndQty_check: 0,
                HInterID_check_check: 0,
                hform: {
                    HBarCode: '',
                    HWHName: '',
                    HWHID: 0,
                    HStockPlaceName: '',
                    HStockPlaceID: 0,
                    iQty: 0,
                    iQty: 0,
                },
                paginationMeta: {
@@ -148,46 +158,46 @@
                    },
                )
            },
            delMater(item){
                console.log(this.HBillType, this.HInterID, item.HBarCode);
                uni.showModal({
                    title: '提示',
                    content: '确认要删除 "' + item.HBarCode + '" 吗?删除后将不可恢复!',
                    success: (res) => {
                        if (res.confirm) {
                            try {
                                CommonUtils.doRequest2({
                                    url: '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
                                    data: {
                                        HInterID: this.HInterID,
                                        HBillType: this.HBillType,
                                        HBarCode: item.HBarCode
                                    },
                                    resFunction: () => {
                                        console.log("删除成功,开始刷新")
                                        uni.$emit('refreshList')
                                        this.GetMater();
                                        uni.showToast({
                                            title: '删除成功',
                                            icon: 'success'
                                        })
                                    }
                                });
                            } catch (e) {
                                console.log("删除异常", e);
                            }
                        } else if (res.cancel) {
                            console.log('用户取消删除');
                        }
                    }
                });
            },
            GetMater(){
            delMater(item) {
                console.log(this.HBillType, this.HInterID, item.HBarCode);
                uni.showModal({
                    title: '提示',
                    content: '确认要删除 "' + item.HBarCode + '" 吗?删除后将不可恢复!',
                    success: (res) => {
                        if (res.confirm) {
                            try {
                                CommonUtils.doRequest2({
                                    url: '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
                                    data: {
                                        HInterID: this.HInterID,
                                        HBillType: this.HBillType,
                                        HBarCode: item.HBarCode
                                    },
                                    resFunction: () => {
                                        console.log("删除成功,开始刷新")
                                        uni.$emit('refreshList')
                                        this.GetMater();
                                        uni.showToast({
                                            title: '删除成功',
                                            icon: 'success'
                                        })
                                    }
                                });
                            } catch (e) {
                                console.log("删除异常", e);
                            }
                        } else if (res.cancel) {
                            console.log('用户取消删除');
                        }
                    }
                });
            },
            GetMater() {
                CommonUtils.doRequest2({
                    url: '/Kf_BarCodeEditDlg/Kf_BarCodeEditDlg_Json',
                    data: {
                        swhere:  ' and HInterID= ' + this.HInterID + ' and HMaterID= '+ this.HMaterID + ''
                    },
                        swhere: ' and HInterID= ' + this.HInterID + ' and HMaterID= ' + this.HMaterID + ''
                    },
                    resFunction: (res) => {
                        let {
                            data,
@@ -203,8 +213,8 @@
                            })
                        }
                    }
                });
            },
                });
            },
            onArrayHStockPlaceNameChangeHandler() {
                let index = this.HStockPlaceNameList.findIndex(p => p.HName == e)
                if (index != -1) {
@@ -232,7 +242,7 @@
                            }
                        } else {
                            uni.showToast({
                                title: '仓位数据请求失败'+res.Message,
                                title: '仓位数据请求失败' + res.Message,
                                icon: 'none'
                            })
                        }
@@ -240,120 +250,167 @@
                )
            },
            cmdChange() {
                CommonUtils.doRequest2({
                    url: '/Kf_BarCodeEditDlg/Kf_BarCodeEditDlg_Json',
                    data: {
                        swhere:  ' and HInterID= ' + this.HInterID + ' and HMaterID= '+ this.HMaterID + " and HBarCode= '" + this.hform.HBarCode + "'"
                    },
                    resFunction: (res) => {
                        let {
                            data,
                            count,
                            Message
                        } = res.data
                        if (count > 0) {
                            console.log(data)
                            uni.showModal({
                                title: '提示',
                                content: '确认要修改 "' + data[0].HBarCode + '" 吗?',
                                success: (res) => {
                                    if (res.confirm) {
                                        try {
                                            CommonUtils.doRequest2({
                                                url: '/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill',
                                                data: {
                                                    HInterID: data[0].HInterID,
                                                    HBillType: data[0].HBillType,
                                                    sBatchNo: data[0].HBatchNo,
                                                    sBarCode: data[0].HBarCode,
                                                    sSCSPID: data[0].HOutStockPlaceID,
                                                    sSCWhID: data[0].HSCWHID,
                                                    sAuxPropID: data[0].HAuxPropID,
                                                    sMTONo: data[0].HMTONo,
                                                    iQty: this.hform.iQty,
                                                    HMaterID: data[0].HMaterID,
                                                    sWhID: data[0].HWhID,
                                                    sSPID: data[0].HStockPlaceID,
                                                    HSourceInterID: data[0].HSourceInterID,
                                                    HSourceEntryID: data[0].HSourceEntryID,
                                                    EndQty: this.hform.iQty - data[0].HQty,
                                                    sQty: data[0].HQty
                                                },
                                                resFunction: () => {
                                                    console.log("修改成功,开始刷新")
                                                    uni.$emit('refreshList')
                                                    this.GetMater();
                                                    uni.showToast({
                                                        title: '修改成功',
                                                        icon: 'success'
                                                    })
                                                    try {
                                                        CommonUtils.doRequest2({
                                                            url: '/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill',
                                                            data: {
                                                                HInterID: data[0].HInterID,
                                                                HBillType: data[0].HBillType,
                                                                sBatchNo: data[0].HBatchNo,
                                                                sBarCode: data[0].HBarCode,
                                                                sSCSPID: data[0].HOutStockPlaceID,
                                                                sSCWhID: data[0].HSCWHID,
                                                                sAuxPropID: data[0].HAuxPropID,
                                                                sMTONo: data[0].HMTONo,
                                                                iQty: this.hform.iQty,
                                                                HMaterID: data[0].HMaterID,
                                                                sWhID: data[0].HWhID,
                                                                sSPID: data[0].HStockPlaceID,
                                                                HSourceInterID: data[0].HSourceInterID,
                                                                HSourceEntryID: data[0].HSourceEntryID,
                                                                EndQty: this.hform.iQty - data[0].HQty,
                                                                sQty: data[0].HQty
                                                            },
                                                            resFunction: () => {
                                                                console.log("修改成功,开始刷新")
                                                                uni.$emit('refreshList')
                                                                this.GetMater();
                                                                uni.showToast({
                                                                    title: '修改成功',
                                                                    icon: 'success'
                                                                })
                                                            }
                                                        });
                                                    } catch (e) {
                                                        console.log("修改异常", e);
                                                    }
                                                }
                                            });
                                        } catch (e) {
                                            console.log("修改异常", e);
                                        }
                                    } else if (res.cancel) {
                                        console.log('用户取消修改');
                                    }
                                }
                            });
                        } else {
                            uni.showToast({
                                icon: 'none',
                                title: Message
                            })
                        }
                    }
                });
                CommonUtils.doRequest2({
                    url: '/Kf_BarCodeEditDlg/Kf_BarCodeEditDlg_Json',
                    data: {
                        swhere: ' and HInterID= ' + this.HInterID + ' and HMaterID= ' + this.HMaterID +
                            " and HBarCode= '" + this.hform.HBarCode + "'"
                    },
                    resFunction: (res) => {
                        let {
                            data,
                            count,
                            Message
                        } = res.data
                        if (count > 0) {
                            console.log(data)
                            uni.showModal({
                                title: '提示',
                                content: '确认要修改 "' + data[0].HBarCode + '" 吗?',
                                success: (res) => {
                                    if (res.confirm) {
                                        try {
                                            CommonUtils.doRequest2({
                                                url: '/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill',
                                                data: {
                                                    HInterID: data[0].HInterID,
                                                    HBillType: data[0].HBillType,
                                                    sBatchNo: data[0].HBatchNo,
                                                    sBarCode: data[0].HBarCode,
                                                    sSCSPID: data[0].HOutStockPlaceID,
                                                    sSCWhID: data[0].HSCWHID,
                                                    sAuxPropID: data[0].HAuxPropID,
                                                    sMTONo: data[0].HMTONo,
                                                    iQty: this.hform.iQty,
                                                    HMaterID: data[0].HMaterID,
                                                    sWhID: data[0].HWhID,
                                                    sSPID: data[0].HStockPlaceID,
                                                    HSourceInterID: data[0]
                                                        .HSourceInterID,
                                                    HSourceEntryID: data[0]
                                                        .HSourceEntryID,
                                                    EndQty: this.hform.iQty - data[0]
                                                        .HQty,
                                                    sQty: data[0].HQty
                                                },
                                                resFunction: () => {
                                                    console.log("修改成功,开始刷新")
                                                    uni.$emit('refreshList')
                                                    this.GetMater();
                                                    uni.showToast({
                                                        title: '修改成功',
                                                        icon: 'success'
                                                    })
                                                    try {
                                                        CommonUtils.doRequest2({
                                                            url: '/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill',
                                                            data: {
                                                                HInterID: data[
                                                                        0]
                                                                    .HInterID,
                                                                HBillType: data[
                                                                        0]
                                                                    .HBillType,
                                                                sBatchNo: data[
                                                                        0]
                                                                    .HBatchNo,
                                                                sBarCode: data[
                                                                        0]
                                                                    .HBarCode,
                                                                sSCSPID: data[
                                                                        0]
                                                                    .HOutStockPlaceID,
                                                                sSCWhID: data[
                                                                        0]
                                                                    .HSCWHID,
                                                                sAuxPropID: data[
                                                                        0]
                                                                    .HAuxPropID,
                                                                sMTONo: data[
                                                                        0]
                                                                    .HMTONo,
                                                                iQty: this
                                                                    .hform
                                                                    .iQty,
                                                                HMaterID: data[
                                                                        0]
                                                                    .HMaterID,
                                                                sWhID: data[
                                                                        0]
                                                                    .HWhID,
                                                                sSPID: data[
                                                                        0]
                                                                    .HStockPlaceID,
                                                                HSourceInterID: data[
                                                                        0]
                                                                    .HSourceInterID,
                                                                HSourceEntryID: data[
                                                                        0]
                                                                    .HSourceEntryID,
                                                                EndQty: this
                                                                    .hform
                                                                    .iQty -
                                                                    data[0]
                                                                    .HQty,
                                                                sQty: data[
                                                                        0]
                                                                    .HQty
                                                            },
                                                            resFunction: () => {
                                                                console
                                                                    .log(
                                                                        "修改成功,开始刷新"
                                                                    )
                                                                uni.$emit(
                                                                    'refreshList'
                                                                )
                                                                this
                                                                    .GetMater();
                                                                uni.showToast({
                                                                    title: '修改成功',
                                                                    icon: 'success'
                                                                })
                                                            }
                                                        });
                                                    } catch (e) {
                                                        console.log("修改异常", e);
                                                    }
                                                }
                                            });
                                        } catch (e) {
                                            console.log("修改异常", e);
                                        }
                                    } else if (res.cancel) {
                                        console.log('用户取消修改');
                                    }
                                }
                            });
                        } else {
                            uni.showToast({
                                icon: 'none',
                                title: Message
                            })
                        }
                    }
                });
            },
            async onPaginationChangeHandler({current}) {
                this.listDataShow =this.listData.slice((current - 1) * this.paginationMeta.pageSize,current * this.paginationMeta.pageSize)
            async onPaginationChangeHandler({
                current
            }) {
                this.listDataShow = this.listData.slice((current - 1) * this.paginationMeta.pageSize, current * this
                    .paginationMeta.pageSize)
            }
        },
        async onLoad(options) {
            this.hform.HBarCode = options.HMaterNumber || '';
            this.hform.HBarCode = options.HMaterNumber || '';
            this.getWHInfo()
            this.getStockPlaceInfo()
            this.HMaterID = options.HMaterID
            this.HBillType = options.HBillType
            this.HInterID = options.HInterID
            console.log("赋值后:", this.HInterID, this.HMaterID, this.HBillType);
            await this.$nextTick();
            this.GetMater()
            this.HMaterID = options.HMaterID
            this.HBillType = options.HBillType
            this.HInterID = options.HInterID
            console.log("赋值后:", this.HInterID, this.HMaterID, this.HBillType);
            await this.$nextTick();
            this.GetMater()
            // this.$nextTick(() => {
            //     this.cmdSearch()
            // })
@@ -366,7 +423,7 @@
            }).exec()
            query.select("#pagination-zone").boundingClientRect((data) => {
                this.pageMeta.bottomBtnTop = data.top
                console.log('this.pageMeta.bottomBtnTop: ',this.pageMeta.bottomBtnTop);
                console.log('this.pageMeta.bottomBtnTop: ', this.pageMeta.bottomBtnTop);
            }).exec()
        },
    }
@@ -506,4 +563,66 @@
            width: 100%;
        }
    }
    .wrap-title {
        white-space: normal;
        display: inline-block;
        /* 行内块,可设宽高、触发文本完整换行 */
        max-width: 100%;
        /* 限制不超过父容器 */
        word-break: break-all;
        /* 兼容旧浏览器备用 */
        overflow-wrap: break-word;
    }
    .uni-card__header {
        display: flex;
        border-bottom: 1px #EBEEF5 solid;
        flex-direction: row;
        align-items: center;
        padding: 10px;
        overflow: hidden;
        .uni-card__header-box {
            /* #ifndef APP-NVUE */
            display: flex;
            /* #endif */
            flex: 1;
            flex-direction: row;
            align-items: center;
            overflow: hidden;
        }
        .uni-card__header-avatar {
            width: 40px;
            height: 40px;
            overflow: hidden;
            border-radius: 5px;
            margin-right: 10px;
            .uni-card__header-avatar-image {
                flex: 1;
                width: 40px;
                height: 40px;
            }
        }
        .uni-card__header-content {
            /* #ifndef APP-NVUE */
            display: flex;
            /* #endif */
            flex-direction: column;
            justify-content: center;
            flex: 1;
            // height: 40px;
            overflow: hidden;
            .uni-card__header-content-title {
                font-size: 14px;
                color: #3a3a3a;
                // line-height: 22px;
            }
        }
    }
</style>
pages/weiwairuku/EntrustInBill.vue
@@ -18,24 +18,25 @@
                </view>
            </view>
            <view class="form-item">
                <view class="title">仓库:</view>
                <view class="title">{{ $t(`Gy.HWHName`) == "Gy.HWHName"?"仓库": $t(`Gy.HWHName`) }}:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHWHName" placeholder="请输入(或扫描)仓库" v-model="hform.HWHName"
                        @input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
                    <uni-combox :candidates="arrayHWHName" :placeholder="$t(`Gy.HWHName_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="HStockPlaceNameListComputed" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
                        @confirm='HStockPlaceNameScan'></uni-combox>
                <view class="title">
                    {{ $t(`Gy.HStockPlaceName`) == "Gy.HStockPlaceName"?"仓位": $t(`Gy.HStockPlaceName`) }}:
                </view>
                <view class="righton" v-show="!showHStockPlaceName">
                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="不可操作" />
                <view class="right" v-show="true">
                    <uni-combox :candidates="arrayHStockPlaceNameComputed"
                        :placeholder="$t(`Gy.HStockPlaceName_Placeholder`)" v-model="hform.HStockPlaceName"
                        @input="HStockPlaceNameChange" @confirm="HStockPlaceNameScan"></uni-combox>
                </view>
                <view class="righton" v-show="false"><input v-model="hform.HStockPlaceName"
                        :placeholder="$t(`Gy.OperationDisabled`)" :disabled="!showHStockPlaceName" /></view>
            </view>
            <view class="tabs">
                <view :class="tabs == 0 ? 'on' : ''" @tap="tabs = 0">选择源单</view>
                <view :class="tabs == 1 ? 'on' : ''" @tap="tabs = 1">表头信息</view>
@@ -393,7 +394,7 @@
            BarCodePopupVue
        },
        computed: {
            HStockPlaceNameListComputed: {
            arrayHStockPlaceNameComputed: {
                get() {
                    // 动态计算对应仓库的仓位
                    return this.HStockPlaceNameList
@@ -418,10 +419,10 @@
            this.getHSupList()
            this.getHEmpList()
            this.getHDeptList()
            uni.$on('refreshList', () => {
                console.log('收到刷新指令!')
                this.DisBillEntryList() // 你的刷新方法
              })
            uni.$on('refreshList', () => {
                console.log('收到刷新指令!')
                this.DisBillEntryList() // 你的刷新方法
            })
            this.getRelationStore()
@@ -433,7 +434,7 @@
        },
        onUnload() {
            uni.$off('BillSelectComplete')
            this.$refs.billList.exit()
            this.$refs.billList.exit()
        },
        methods: {
            async HWHNameScan(e) {
@@ -451,19 +452,39 @@
            },
            async HStockPlaceNameScan(e) {
                // 扫描仓位码
                console.log('仓位码: ', e);
                let index = this.HStockPlaceNameList.findIndex(elem => elem['条码编号'] == e.trim())
               // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                console.log('Code: ', e);
                // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                this.hform.HStockPlaceID = 0
                this.hform.HStockPlaceName = ''
                await this.$nextTick()
                if (index == -1) {
                    uni.showToast({
                        icon: 'none',
                        title: '扫描仓位条码对应的仓位不存在...'
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and 条码编号 = '${e}'`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                } else {
                    this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
                    if (res.data.count == 1) {
                        this.hform.HStockPlaceID = res.data.data[0].HMainID
                        this.hform.HStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HWHID = res.data.data[0].HWHID
                        this.hform.HWHName = res.data.data[0].所属仓库
                        this.refreshBarCodeState()
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
            },
            async qrCodeDisplay() {
@@ -1449,9 +1470,10 @@
            },
            //删除物料码
            delMater(item) {
                uni.navigateTo({
                        url:'../tiaomamingxi/tiaomamingxi?HInterID=' + this.hform.HInterID + '&HMaterID=' + item.HMaterID + '&HBillType=' + this.hform.HBillType
                    })
                uni.navigateTo({
                    url: '../tiaomamingxi/tiaomamingxi?HInterID=' + this.hform.HInterID + '&HMaterID=' + item
                        .HMaterID + '&HBillType=' + this.hform.HBillType
                })
                // uni.showModal({
                //     title: '提示',
                //     content: '确认要删除 " ' + item.物料名称 + ' " 所有扫码记录?删除后将不可恢复!',
@@ -1686,7 +1708,7 @@
                                icon: 'none'
                            })
                        }
                        // uni.request({
                        //     url: this.serverUrl + '/WEBSController/set_SaveEntrustInBill_Json',
                        //     method: 'POST',