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

dytyqx

2026-03-13 b007e23a8a249af8488ffe32822b046c345bddc0

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

# Conflicts:
#	pages/xiaoshouchuku/SellOutBill.vue

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "2.091",
    "versionCode" : 291,
    "versionName" : "2.092",
    "versionCode" : 292,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue

@@ -108,6 +108,12 @@
                        <input v-model="hform.HEquipName" disabled />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">模具:</view>
                    <view class="righton">
                        <input v-model="hform.HMouldName" disabled />
                    </view>
                </view>
            </view>
        </template>
        <!-- 其他信息 -->
@@ -412,7 +418,9 @@
                    "HUpDater": "",
                    "HDeleteMan": "",
                    "HUpDateDate": "",
                    "HDeleteDate": ""
                    "HDeleteDate": "",
                    "HMouldName": "",
                    "HMouldID": 0,
                }
            };
        },
@@ -1003,6 +1011,9 @@
                            "HMainSourceEntryID": data[0].HEntryID,
                            "HMainSourceBillNo": data[0].单据号,
                            "HMainSourceBillType": data[0].单据类型,
                        
                            "HMouldName": data[0].模具名称,
                            "HMouldID": data[0].HMouldID
                        })

                        this.HTechParams = data.map(item => {

 pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue

@@ -560,7 +560,7 @@
                            this.hform.HMouldMaintainRuleInterNo = data.单据号;
                            this.hform.HMouldMaintainRuleInterID = data.hmainid;
                            this.hform.HPlanNo = data.保养计划号 == null ? "" : data.保养计划号;
                            this.hform.HPlanInterID = data.保养计划id == null ? 0 : ata.保养计划id,
                            this.hform.HPlanInterID = data.保养计划id == null ? 0 : data.保养计划id,
                                this.hform.HMouldMaintainPlanInterID = data.保养计划id == null ? 0 :
                                data.保养计划id;
                            this.hform.HMouldMaintainPlanEntryID = data.保养计划子id == null ? 0 : data

 pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList.vue

@@ -50,12 +50,27 @@
            <view class="list" v-for="(item,index) in listData" :key="index">
                <uni-card :title="item.单据号" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
                    <view class="card-detail">
                        <view class="detail" v-if="item.点检周期">
                            <text>点检周期：</text>{{item.点检周期}}
                        <view class="detail" v-if="item.保养计划号">
                            <text>保养计划号：</text>{{item.保养计划号}}
                        </view>
                        <view class="detail" v-if="item.保养计划id" v-show="false">
                            <text>保养计划id：</text>{{item.保养计划id}}
                        </view>
                        <view class="detail" v-if="item.保养计划子id" v-show="false">
                            <text>保养计划子id：</text>{{item.保养计划子id}}
                        </view>
                        <view class="detail" v-if="item.保养周期">
                            <text>保养周期：</text>{{item.保养周期}}
                        </view>
                        <view class="detail" v-if="item.周期单位">
                            <text>周期单位：</text>{{item.周期单位}}
                        </view>
                        <view class="detail" v-if="item.保养开始日期">
                            <text>保养开始日期：</text>{{item.保养开始日期.substr(0,10)}}
                        </view>
                        <view class="detail" v-if="item.保养结束日期">
                            <text>保养结束日期：</text>{{item.保养结束日期.substr(0,10)}}
                        </view>
                        <view class="detail" v-if="item.摘要">
                            <text>摘要：</text>{{item.摘要}}
                        </view>

 pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue

@@ -175,7 +175,7 @@
                }
            },
            onSearchClickHandler() {
                this.getWorkLinkList()
               this.switchTab(this.tabs)
            },
            onResetClickHandler() {
                this.dateRangePicker = ["任意间隔", "今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天"],
@@ -187,6 +187,7 @@
            },
            switchTab(tabIndex) {
                this.tabs = tabIndex
                this.sWhere = ''
                switch (tabIndex) {
                    case 0:
                        this.sWhere =
@@ -207,8 +208,8 @@
                this.getWorkLinkList()
            },
            async getWorkLinkList() {
                this.sWhere += ` and 日期 >= CONVERT(VARCHAR(10), '${this.startDate}', 23) and 日期 <= CONVERT(VARCHAR(10), '${this.endDate}', 23)`
                try {
                    this.sWhere += ` and 日期 >= CONVERT(VARCHAR(10), '${this.startDate}', 23) and 日期 <= CONVERT(VARCHAR(10), '${this.endDate}', 23)`
                    
                    let res = await CommonUtils.doRequest2Async({
                        url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList',

 pages/baogong/DayPlanBillList.vue

@@ -1,5 +1,39 @@
<template>
    <view class="content">
        <view class="list">
            <uni-card :title="'当期订单：'+currentOrder[0].HSourceBillNo" 
            style="margin: 10px;">
                <view class="card-detail">
                    <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>
                    <view class="detail">
                        <text>巡检次数：</text>{{currentOrder[0].巡检次数?currentOrder[0].巡检次数:0}}
                    </view>
                    <view class="detail">
                        <text>过程检次数：</text>{{currentOrder[0].过程检次数?currentOrder[0].过程检次数:0}}
                    </view>
                    <view class="detail" v-if="currentOrder[0].当日点检完成情况">
                        <text>点检完成情况：</text>{{currentOrder[0].当日点检完成情况}}
                    </view>
                    <view class="detail" v-if="currentOrder[0].安灯未验收数量">
                        <text>异常反馈未验收：</text>{{currentOrder[0].安灯未验收数量}}
                        <view style="width: 6rpx; display: inline-block;"></view>
                        <template v-if="currentOrder[0].安灯未验收数量 == 0">
                            <uni-icons type="smallcircle-filled" size="12"
                                color="#13ad4c"></uni-icons>
                        </template>
                        <template v-else-if="currentOrder[0].安灯未验收数量 != 0">
                            <uni-icons type="smallcircle-filled" size="12"
                                color="#e74c3c"></uni-icons>
                        </template>
                    </view>
                </view>
            </uni-card>
        </view>
        <view class="list" v-for="(item,index) in listData" :key="index">
            <uni-card :title="'工单号：'+item.HICMOBillNo" :extra="'日期：'+item.计划日期" style="margin: 10px;" @tap="edit(item)">
                <view class="card-detail">
@@ -58,6 +92,7 @@
                chooseIt: '',
                popList: ['人员原因', '设备原因', '材料原因', '工艺原因', '模具原因', '测试原因', '环境原因'],
                badReasonBackTypeList: [],
                currentOrder: [],
                // 定义操作映射配置
                actionConfig: {
                    '开工': {
@@ -177,6 +212,7 @@
                        if (res.data.count == 1) {
                            console.log(res.data.data.h_p_JIT_GetWorkBillListInfoBySource)
                            this.listData = res.data.data.h_p_JIT_GetWorkBillListInfoBySource
                            this.currentOrder = res.data.data.h_p_JIT_GetWorkBillListInfoBySource1
                            for (var i = 0; i < this.listData.length; i++) {
                                this.listData[i].percent = (this.listData[i].HDateFinishQty / this.listData[
                                    i].HDatePlanQty).toFixed(4)

 pages/caigouruku/POStockInBill.vue

@@ -83,8 +83,12 @@

                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
                    </view>


                    <view class="righton" v-show="!showHSourceBillNo">
                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="请输入源单单号" />
@@ -298,6 +302,7 @@
    } from "@/utils/userRelationManager.js"
    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
import { MpaasScan } from '../../utils/mpaasScan';
    export default {
        data() {
            return {
@@ -438,6 +443,11 @@
            uni.$off('BillSelectComplete')
        },
        methods: {
            toScanBillCode() {
                MpaasScan.scanCode((res) => {
                    this.getHBarCodeData(res)
                })
            },
            async HWHNameScan(e) {
                return
                // 扫描仓库码

 pages/caigoutuiliao/POStockInBackBill.vue

@@ -74,6 +74,9 @@

                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
                    </view>
                    <view class="righton" v-show="!showHSourceBillNo">
@@ -271,6 +274,7 @@
    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
    import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
import { MpaasScan } from '../../utils/mpaasScan';
    export default {
        components: {
            BillListPopupVue,
@@ -443,6 +447,11 @@
            uni.$off('BillSelectComplete')
        },
        methods: {
            toScanBillCode() {
              MpaasScan.scanCode((res) => {
                  this.getHBarCodeData(res)
              })  
            },
            async HWHNameScan(e) {
                // 扫描仓库码
                console.log('仓库码: ', e);

 pages/index/login.vue

@@ -165,13 +165,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) {

 pages/index/tab1.vue

@@ -9,8 +9,7 @@
            <view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
                :key="index" @tap="toUrl(item)">
                <template v-if="item.corner">
                    <uni-badge :text="item.cornerCount" type="error" :max-num="99" size="normal"
                        absolute="rightTop"
                    <uni-badge :text="item.cornerCount" type="error" :max-num="99" size="normal" absolute="rightTop"
                        :offset="[7, 7]">
                        <image :src="item.img" mode=""></image>
                    </uni-badge>
@@ -195,26 +194,46 @@
            this.getHiddenItem()
        },
        async onShow() {
            if(this.initFinished) {
            if (this.initFinished) {
                let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
                if(MessageIdentifier.code == 0) {
                if (MessageIdentifier.code == 0) {
                    CommonUtils.showTips({
                        title: "温馨提示",
                        message: MessageIdentifier.msg
                    })
                    

                    return
                }
                

                this.itemData.forEach((e, index) => {
                    if(MessageIdentifier.data[e.text] != undefined) {
                    if (MessageIdentifier.data[e.text] != undefined) {
                        this.itemData[index]["corner"] = true
                        this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
                    }
                })
                

                this.$forceUpdate()
            }
        },
        async onReady() {
            let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
            if (MessageIdentifier.code == 0) {
                CommonUtils.showTips({
                    title: "温馨提示",
                    message: MessageIdentifier.msg
                })

                return
            }

            this.itemData.forEach((e, index) => {
                if (MessageIdentifier.data[e.text] != undefined) {
                    this.itemData[index]["corner"] = true
                    this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
                }
            })

            this.$forceUpdate()
        },
        methods: {
            async getWorkLinkList() {
@@ -269,7 +288,7 @@
                            acc[item['moduleName']] = item.count
                            return acc
                        }, {})
                        

                        return {
                            code: 1,
                            msg: Message,
@@ -283,14 +302,14 @@
                        }
                    }
                } catch (err) {
            

                }
            },
            async getHiddenItem() {
                let data = await getMenuList({
                    menuName: this.menuListName
                })
            

                Array.from(data).forEach((e, index) => {
                    if (index < this.itemData.length) {
                        this.itemData[e["HIndex"]]["hidden"] = !CommonUtils.stringToBoolean(e[
@@ -298,22 +317,23 @@
                        this.itemData[e["HIndex"]].id = e["HEntryID"]; //id为0强制隐藏
                    }
                })
            

                let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
                if (MessageIdentifier.code == 0) {
                    CommonUtils.showTips({
                        title: "温馨提示",
                        message: MessageIdentifier.msg
                    })
            

                    return
                }
            

                Array.from(data).forEach((e, index) => {
                    if (index < this.itemData.length) {
                        if (MessageIdentifier.data[this.itemData[e["HIndex"]].text]) {
                            this.$set(this.itemData[e["HIndex"]], "corner", true)
                            this.$set(this.itemData[e["HIndex"]], "cornerCount", MessageIdentifier.data[this.itemData[e["HIndex"]].text])
                            this.$set(this.itemData[e["HIndex"]], "cornerCount", MessageIdentifier.data[this
                                .itemData[e["HIndex"]].text])
                        }
                    }
                })

 pages/index/tab3.vue

@@ -323,6 +323,26 @@
                this.$forceUpdate()
            }
        },
        async onReady() {
            let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
            if (MessageIdentifier.code == 0) {
                CommonUtils.showTips({
                    title: "温馨提示",
                    message: MessageIdentifier.msg
                })
        
                return
            }
        
            this.itemData.forEach((e, index) => {
                if (MessageIdentifier.data[e.text] != undefined) {
                    this.itemData[index]["corner"] = true
                    this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
                }
            })
        
            this.$forceUpdate()
        },
        methods: {
            judgeHidden() {
                return process.env.NODE_ENV === 'development'

 pages/qitachuku_v2/OtherOutBill.vue

@@ -2,7 +2,9 @@
    <view>
        <view class="form">
            <view class="form-item">
                <view class="title">{{ $t("Kf_OtherOutBill_PDA.BarCode") == "Kf_OtherOutBill_PDA.BarCode" ? "条码" : $t("Kf_OtherOutBill_PDA.BarCode") }}：</view>
                <view class="title">
                    {{ $t("Kf_OtherOutBill_PDA.BarCode") == "Kf_OtherOutBill_PDA.BarCode" ? "条码" : $t("Kf_OtherOutBill_PDA.BarCode") }}：
                </view>
                <view class="right" style="width: 380rpx;">
                    <input :focus="BarCodeFocus" v-model="hform.HBarCode" :placeholder="placeholder_BarCode"
                        @confirm="getCode(hform.HBarCode)" />
@@ -12,40 +14,59 @@
                </view>
            </view>
            <view class="form-item">
                <view class="title">{{ $t("Kf_OtherOutBill_PDA.Qty") == "Kf_OtherOutBill_PDA.Qty" ? "数量" : $t("Kf_OtherOutBill_PDA.Qty") }}：</view>
                <view class="title">
                    {{ $t("Kf_OtherOutBill_PDA.Qty") == "Kf_OtherOutBill_PDA.Qty" ? "数量" : $t("Kf_OtherOutBill_PDA.Qty") }}：
                </view>
                <view class="right">
                    <input v-model="hform.HQty" :placeholder="placeholder_Qty" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">{{ $t("Kf_OtherOutBill_PDA.Warehouse") == "Kf_OtherOutBill_PDA.Warehouse" ? "仓库" : $t("Kf_OtherOutBill_PDA.Warehouse") }}：</view>
                <view class="title">
                    {{ $t("Kf_OtherOutBill_PDA.Warehouse") == "Kf_OtherOutBill_PDA.Warehouse" ? "仓库" : $t("Kf_OtherOutBill_PDA.Warehouse") }}：
                </view>
                <view class="right">
                    <uni-combox :candidates="arrayHWHName" :placeholder="placeholder_Warehouse" v-model="hform.HWHName"
                        @input="HWHNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">{{ $t("Kf_OtherOutBill_PDA.StockPlace") == "Kf_OtherOutBill_PDA.StockPlace" ? "仓位" : $t("Kf_OtherOutBill_PDA.StockPlace") }}：</view>
                <view class="title">
                    {{ $t("Kf_OtherOutBill_PDA.StockPlace") == "Kf_OtherOutBill_PDA.StockPlace" ? "仓位" : $t("Kf_OtherOutBill_PDA.StockPlace") }}：
                </view>
                <view class="right" v-show="showHStockPlaceName">
                    <uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_StockPlace"
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
                </view>
                <view class="righton" v-show="!showHStockPlaceName">
                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" :placeholder="$t('Kf_OtherOutBill_PDA.disabledPlaceholder')" />
                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName"
                        :placeholder="$t('Kf_OtherOutBill_PDA.disabledPlaceholder')" />
                </view>
            </view>

            <view class="tabs">
                <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">{{ $t("Kf_OtherOutBill_PDA.selectSource") == "Kf_OtherOutBill_PDA.selectSource" ? "选择源单" : $t("Kf_OtherOutBill_PDA.selectSource") }}</view>
                <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">{{ $t("Kf_OtherOutBill_PDA.tableInfo") == "Kf_OtherOutBill_PDA.tableInfo" ? "表头信息" : $t("Kf_OtherOutBill_PDA.tableInfo") }}</view>
                <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">{{ $t("Kf_OtherOutBill_PDA.materInfo") == "Kf_OtherOutBill_PDA.materInfo" ? "物料信息" : $t("Kf_OtherOutBill_PDA.materInfo") }}</view>
                <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">{{ $t("Kf_OtherOutBill_PDA.barInfo") == "Kf_OtherOutBill_PDA.barInfo" ? "条码信息" : $t("Kf_OtherOutBill_PDA.barInfo") }}</view>
                <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">{{ $t("Kf_OtherOutBill_PDA.removeShelvesInfo") == "Kf_OtherOutBill_PDA.removeShelvesInfo" ? "下架信息" : $t("Kf_OtherOutBill_PDA.removeShelvesInfo") }}</view>
                <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">
                    {{ $t("Kf_OtherOutBill_PDA.selectSource") == "Kf_OtherOutBill_PDA.selectSource" ? "选择源单" : $t("Kf_OtherOutBill_PDA.selectSource") }}
                </view>
                <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">
                    {{ $t("Kf_OtherOutBill_PDA.tableInfo") == "Kf_OtherOutBill_PDA.tableInfo" ? "表头信息" : $t("Kf_OtherOutBill_PDA.tableInfo") }}
                </view>
                <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">
                    {{ $t("Kf_OtherOutBill_PDA.materInfo") == "Kf_OtherOutBill_PDA.materInfo" ? "物料信息" : $t("Kf_OtherOutBill_PDA.materInfo") }}
                </view>
                <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">
                    {{ $t("Kf_OtherOutBill_PDA.barInfo") == "Kf_OtherOutBill_PDA.barInfo" ? "条码信息" : $t("Kf_OtherOutBill_PDA.barInfo") }}
                </view>
                <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">
                    {{ $t("Kf_OtherOutBill_PDA.removeShelvesInfo") == "Kf_OtherOutBill_PDA.removeShelvesInfo" ? "下架信息" : $t("Kf_OtherOutBill_PDA.removeShelvesInfo") }}
                </view>
            </view>

            <view v-if="tabs == 0">
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.SourceBillType") == "Kf_OtherOutBill_PDA.SourceBillType" ? "源单类型" : $t("Kf_OtherOutBill_PDA.SourceBillType") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.SourceBillType") == "Kf_OtherOutBill_PDA.SourceBillType" ? "源单类型" : $t("Kf_OtherOutBill_PDA.SourceBillType") }}：
                    </view>
                    <view class="right" v-show="showHMainSourceBillType">
                        <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
                            @change="HMainSourceBillTypeChange">
@@ -60,54 +81,75 @@
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.SourceBillNo") == "Kf_OtherOutBill_PDA.SourceBillNo" ? "源单单号" : $t("Kf_OtherOutBill_PDA.SourceBillNo") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.SourceBillNo") == "Kf_OtherOutBill_PDA.SourceBillNo" ? "源单单号" : $t("Kf_OtherOutBill_PDA.SourceBillNo") }}：
                    </view>
                    <view class="right" v-show="showHSourceBillNo">
                        <input :focus="HSourceBillNoFocus" @confirm="onHSourceBillNoConfirmHandler" type="text"
                            name="HSourceBillNo" v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
                            name="HSourceBillNo" v-model="hform.HSourceBillNo"
                            :placeholder="placeholder_SourceBillNo" />
                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
                    </view>

                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType == -1">
                        <uni-icons :hidden="hform.HMainSourceBillType == -1" type="search" size="20"
                            @click="showBillList"></uni-icons>
                    </view>
                    <view class="righton" v-show="!showHSourceBillNo">
                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />
                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo"
                            :placeholder="placeholder_SourceBillNo" />
                    </view>
                </view>

                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.BillSubType") == "Kf_OtherOutBill_PDA.BillSubType" ? "单据子类型" : $t("Kf_OtherOutBill_PDA.BillSubType") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.BillSubType") == "Kf_OtherOutBill_PDA.BillSubType" ? "单据子类型" : $t("Kf_OtherOutBill_PDA.BillSubType") }}：
                    </view>
                    <view class="right">
                        <picker :range="arrayHBillSubType" v-model="hform.HBillSubType" @change="HBillSubTypeChange">
                            <input disabled name="HMainSourceBillType" v-model="HBillSubType" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_BillSubType')" />
                            <input disabled name="HMainSourceBillType" v-model="HBillSubType"
                                :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_BillSubType')" />
                            <view class="picker-overlay"></view>
                        </picker>
                    </view>
                </view>

                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.FIFOWarehouse") == "Kf_OtherOutBill_PDA.FIFOWarehouse" ? "先进先出仓" : $t("Kf_OtherOutBill_PDA.FIFOWarehouse") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.FIFOWarehouse") == "Kf_OtherOutBill_PDA.FIFOWarehouse" ? "先进先出仓" : $t("Kf_OtherOutBill_PDA.FIFOWarehouse") }}：
                    </view>
                    <view class="right">
                        <uni-combox :candidates="arrayHWHName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_FIFOWarehouse')" v-model="hform.HFIFOWHName"
                            @input="HFIFOWHNameChange"></uni-combox>
                        <uni-combox :candidates="arrayHWHName"
                            :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_FIFOWarehouse')"
                            v-model="hform.HFIFOWHName" @input="HFIFOWHNameChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.Date") == "Kf_OtherOutBill_PDA.Date" ? "日期" : $t("Kf_OtherOutBill_PDA.Date") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.Date") == "Kf_OtherOutBill_PDA.Date" ? "日期" : $t("Kf_OtherOutBill_PDA.Date") }}：
                    </view>
                    <view class="right">
                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
                            <view class="picker-overlay"></view>
                            <input disabled v-model="hform.HDate" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Date')" />
                            <input disabled v-model="hform.HDate"
                                :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Date')" />
                        </picker>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.Maker") == "Kf_OtherOutBill_PDA.Maker" ? "制单人" : $t("Kf_OtherOutBill_PDA.Maker") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.Maker") == "Kf_OtherOutBill_PDA.Maker" ? "制单人" : $t("Kf_OtherOutBill_PDA.Maker") }}：
                    </view>
                    <view class="righton">
                        <input name="HMaker" disabled v-model="hform.HMaker" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.BillNo") == "Kf_OtherOutBill_PDA.BillNo" ? "单据号" : $t("Kf_OtherOutBill_PDA.BillNo") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.BillNo") == "Kf_OtherOutBill_PDA.BillNo" ? "单据号" : $t("Kf_OtherOutBill_PDA.BillNo") }}：
                    </view>
                    <view class="righton">
                        <input name="HBillNo" disabled v-model="hform.HBillNo" />
                    </view>
@@ -116,7 +158,9 @@
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.BillID") == "Kf_OtherOutBill_PDA.BillID" ? "单据ID" : $t("Kf_OtherOutBill_PDA.BillID") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.BillID") == "Kf_OtherOutBill_PDA.BillID" ? "单据ID" : $t("Kf_OtherOutBill_PDA.BillID") }}：
                    </view>
                    <view class="righton">
                        <input name="HInterID" disabled v-model="hform.HInterID" />
                    </view>
@@ -125,34 +169,48 @@

            <view v-if="tabs == 1">
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.Keeper") == "Kf_OtherOutBill_PDA.Keeper" ? "保管" : $t("Kf_OtherOutBill_PDA.Keeper") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.Keeper") == "Kf_OtherOutBill_PDA.Keeper" ? "保管" : $t("Kf_OtherOutBill_PDA.Keeper") }}：
                    </view>
                    <view class="right">
                        <uni-combox :candidates="arrayHEmpName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Keeper')" v-model="hform.HKeeperName"
                        <uni-combox :candidates="arrayHEmpName"
                            :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Keeper')" v-model="hform.HKeeperName"
                            @input="HKeeperNameChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.SecManager") == "Kf_OtherOutBill_PDA.SecManager" ? "验收" : $t("Kf_OtherOutBill_PDA.SecManager") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.SecManager") == "Kf_OtherOutBill_PDA.SecManager" ? "验收" : $t("Kf_OtherOutBill_PDA.SecManager") }}：
                    </view>
                    <view class="right">
                        <uni-combox :candidates="arrayHEmpName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_SecManager')" v-model="hform.HSecManagerName"
                            @input="HSecManagerNameChange"></uni-combox>
                        <uni-combox :candidates="arrayHEmpName"
                            :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_SecManager')"
                            v-model="hform.HSecManagerName" @input="HSecManagerNameChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.Dept") == "Kf_OtherOutBill_PDA.Dept" ? "部门" : $t("Kf_OtherOutBill_PDA.Dept") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.Dept") == "Kf_OtherOutBill_PDA.Dept" ? "部门" : $t("Kf_OtherOutBill_PDA.Dept") }}：
                    </view>
                    <view class="right">
                        <uni-combox :candidates="arrayHDeptName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Dept')" v-model="hform.HDeptName"
                        <uni-combox :candidates="arrayHDeptName"
                            :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Dept')" v-model="hform.HDeptName"
                            @input="HDeptNameChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.Customer") == "Kf_OtherOutBill_PDA.Customer" ? "客户" : $t("Kf_OtherOutBill_PDA.Customer") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.Customer") == "Kf_OtherOutBill_PDA.Customer" ? "客户" : $t("Kf_OtherOutBill_PDA.Customer") }}：
                    </view>
                    <view class="righton">
                        <input name="HSupName" disabled v-model="hform.HSupName" :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Customer')" />
                        <input name="HSupName" disabled v-model="hform.HSupName"
                            :placeholder="$t('Kf_OtherOutBill_PDA.placeholder_Customer')" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.StockOrg") == "Kf_OtherOutBill_PDA.StockOrg" ? "组织" : $t("Kf_OtherOutBill_PDA.StockOrg") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.StockOrg") == "Kf_OtherOutBill_PDA.StockOrg" ? "组织" : $t("Kf_OtherOutBill_PDA.StockOrg") }}：
                    </view>
                    <view class="righton">
                        <input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
                    </view>
@@ -184,7 +242,9 @@
                        </view>
                    </uni-card>
                </view>
                <view class="over" v-if="Materlist.length == 0">{{ $t("Kf_OtherOutBill_PDA.noData") == "Kf_OtherOutBill_PDA.noData" ? "暂无数据" : $t("Kf_OtherOutBill_PDA.noData") }}</view>
                <view class="over" v-if="Materlist.length == 0">
                    {{ $t("Kf_OtherOutBill_PDA.noData") == "Kf_OtherOutBill_PDA.noData" ? "暂无数据" : $t("Kf_OtherOutBill_PDA.noData") }}
                </view>
            </view>

            <view v-if="tabs == 4">
@@ -216,60 +276,80 @@
                        </view>
                    </uni-card>
                </view>
                <view class="over" v-if="FIFOlist.length == 0">{{ $t("Kf_OtherOutBill_PDA.noData") == "Kf_OtherOutBill_PDA.noData" ? "暂无数据" : $t("Kf_OtherOutBill_PDA.noData") }}</view>
                <view class="over" v-if="FIFOlist.length == 0">
                    {{ $t("Kf_OtherOutBill_PDA.noData") == "Kf_OtherOutBill_PDA.noData" ? "暂无数据" : $t("Kf_OtherOutBill_PDA.noData") }}
                </view>
            </view>

            <view v-if="tabs == 3">
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.BarCode") == "Kf_OtherOutBill_PDA.BarCode" ? "条码" : $t("Kf_OtherOutBill_PDA.BarCode") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.BarCode") == "Kf_OtherOutBill_PDA.BarCode" ? "条码" : $t("Kf_OtherOutBill_PDA.BarCode") }}：
                    </view>
                    <view class="righton">
                        <input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.Material") == "Kf_OtherOutBill_PDA.Material" ? "物料" : $t("Kf_OtherOutBill_PDA.Material") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.Material") == "Kf_OtherOutBill_PDA.Material" ? "物料" : $t("Kf_OtherOutBill_PDA.Material") }}：
                    </view>
                    <view class="righton">
                        <input disabled v-model="hform.HMaterName_B" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.MaterModel") == "Kf_OtherOutBill_PDA.MaterModel" ? "规格" : $t("Kf_OtherOutBill_PDA.MaterModel") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.MaterModel") == "Kf_OtherOutBill_PDA.MaterModel" ? "规格" : $t("Kf_OtherOutBill_PDA.MaterModel") }}：
                    </view>
                    <view class="righton">
                        <input disabled v-model="hform.HMaterModel_B" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.BatchNo") == "Kf_OtherOutBill_PDA.BatchNo" ? "批次" : $t("Kf_OtherOutBill_PDA.BatchNo") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.BatchNo") == "Kf_OtherOutBill_PDA.BatchNo" ? "批次" : $t("Kf_OtherOutBill_PDA.BatchNo") }}：
                    </view>
                    <view class="righton">
                        <input disabled v-model="hform.HBatchNo_B" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.Unit") == "Kf_OtherOutBill_PDA.Unit" ? "单位" : $t("Kf_OtherOutBill_PDA.Unit") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.Unit") == "Kf_OtherOutBill_PDA.Unit" ? "单位" : $t("Kf_OtherOutBill_PDA.Unit") }}：
                    </view>
                    <view class="righton">
                        <input disabled v-model="hform.HUnitName_B" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.Qty") == "Kf_OtherOutBill_PDA.Qty" ? "数量" : $t("Kf_OtherOutBill_PDA.Qty") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.Qty") == "Kf_OtherOutBill_PDA.Qty" ? "数量" : $t("Kf_OtherOutBill_PDA.Qty") }}：
                    </view>
                    <view class="righton">
                        <input disabled v-model="hform.HQty_B" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.Capacity") == "Kf_OtherOutBill_PDA.Capacity" ? "容量" : $t("Kf_OtherOutBill_PDA.Capacity") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.Capacity") == "Kf_OtherOutBill_PDA.Capacity" ? "容量" : $t("Kf_OtherOutBill_PDA.Capacity") }}：
                    </view>
                    <view class="righton">
                        <input disabled v-model="hform.HTMQty_B" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.Warehouse") == "Kf_OtherOutBill_PDA.Warehouse" ? "仓库" : $t("Kf_OtherOutBill_PDA.Warehouse") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.Warehouse") == "Kf_OtherOutBill_PDA.Warehouse" ? "仓库" : $t("Kf_OtherOutBill_PDA.Warehouse") }}：
                    </view>
                    <view class="righton">
                        <input disabled v-model="hform.HWHName_B" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">{{ $t("Kf_OtherOutBill_PDA.StockPlace") == "Kf_OtherOutBill_PDA.StockPlace" ? "仓位" : $t("Kf_OtherOutBill_PDA.StockPlace") }}：</view>
                    <view class="title">
                        {{ $t("Kf_OtherOutBill_PDA.StockPlace") == "Kf_OtherOutBill_PDA.StockPlace" ? "仓位" : $t("Kf_OtherOutBill_PDA.StockPlace") }}：
                    </view>
                    <view class="righton">
                        <input disabled v-model="hform.HSPName_B" />
                    </view>
@@ -277,10 +357,13 @@
            </view>

            <view class="bottom-btn">
                <button class="btn-a" size="mini" @tap="submit">{{ $t("Kf_OtherOutBill_PDA.btnSubmit") == "Kf_OtherOutBill_PDA.btnSubmit" ? "提交" : $t("Kf_OtherOutBill_PDA.btnSubmit") }}</button>
                <button class="btn-a" size="mini"
                    @tap="submit">{{ $t("Kf_OtherOutBill_PDA.btnSubmit") == "Kf_OtherOutBill_PDA.btnSubmit" ? "提交" : $t("Kf_OtherOutBill_PDA.btnSubmit") }}</button>
                <view style="flex: 1;"></view>
                <button class="btn-a" size="mini" @tap="addNew">{{ $t("Kf_OtherOutBill_PDA.btnAdd") == "Kf_OtherOutBill_PDA.btnAdd" ? "新增" : $t("Kf_OtherOutBill_PDA.btnAdd") }}</button>
                <button class="btn-c" size="mini" @tap="goBack">{{ $t("Kf_OtherOutBill_PDA.btnExit") == "Kf_OtherOutBill_PDA.btnExit" ? "退出" : $t("Kf_OtherOutBill_PDA.btnExit") }}</button>
                <button class="btn-a" size="mini"
                    @tap="addNew">{{ $t("Kf_OtherOutBill_PDA.btnAdd") == "Kf_OtherOutBill_PDA.btnAdd" ? "新增" : $t("Kf_OtherOutBill_PDA.btnAdd") }}</button>
                <button class="btn-c" size="mini"
                    @tap="goBack">{{ $t("Kf_OtherOutBill_PDA.btnExit") == "Kf_OtherOutBill_PDA.btnExit" ? "退出" : $t("Kf_OtherOutBill_PDA.btnExit") }}</button>
            </view>
        </view>
        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
@@ -301,14 +384,24 @@
        getUserStockRelation
    } from '../../utils/userRelationManager';
    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
    import { MpaasScan } from '../../utils/mpaasScan';
    export default {
        data() {
            return {
                 placeholder_BarCode: this.$t("Kf_OtherOutBill_PDA.placeholder_BarCode") == "Kf_OtherOutBill_PDA.placeholder_BarCode" ? "请扫描(或输入)条码" : this.$t("Kf_OtherOutBill_PDA.placeholder_BarCode"),
        placeholder_Qty: this.$t("Kf_OtherOutBill_PDA.placeholder_Qty") == "Kf_OtherOutBill_PDA.placeholder_Qty" ? "请输入数量" : this.$t("Kf_OtherOutBill_PDA.placeholder_Qty"),
        placeholder_Warehouse: this.$t("Kf_OtherOutBill_PDA.placeholder_Warehouse") == "Kf_OtherOutBill_PDA.placeholder_Warehouse" ? "请输入(或扫描)仓库" : this.$t("Kf_OtherOutBill_PDA.placeholder_Warehouse"),
        placeholder_StockPlace: this.$t("Kf_OtherOutBill_PDA.placeholder_StockPlace") == "Kf_OtherOutBill_PDA.placeholder_StockPlace" ? "请输入(或扫描)仓位" : this.$t("Kf_OtherOutBill_PDA.placeholder_StockPlace"),
        placeholder_SourceBillNo: this.$t("Kf_OtherOutBill_PDA.placeholder_SourceBillNo") == "Kf_OtherOutBill_PDA.placeholder_SourceBillNo" ? "请输入源单单号" : this.$t("Kf_OtherOutBill_PDA.placeholder_SourceBillNo"),
                placeholder_BarCode: this.$t("Kf_OtherOutBill_PDA.placeholder_BarCode") ==
                    "Kf_OtherOutBill_PDA.placeholder_BarCode" ? "请扫描(或输入)条码" : this.$t(
                        "Kf_OtherOutBill_PDA.placeholder_BarCode"),
                placeholder_Qty: this.$t("Kf_OtherOutBill_PDA.placeholder_Qty") ==
                    "Kf_OtherOutBill_PDA.placeholder_Qty" ? "请输入数量" : this.$t("Kf_OtherOutBill_PDA.placeholder_Qty"),
                placeholder_Warehouse: this.$t("Kf_OtherOutBill_PDA.placeholder_Warehouse") ==
                    "Kf_OtherOutBill_PDA.placeholder_Warehouse" ? "请输入(或扫描)仓库" : this.$t(
                        "Kf_OtherOutBill_PDA.placeholder_Warehouse"),
                placeholder_StockPlace: this.$t("Kf_OtherOutBill_PDA.placeholder_StockPlace") ==
                    "Kf_OtherOutBill_PDA.placeholder_StockPlace" ? "请输入(或扫描)仓位" : this.$t(
                        "Kf_OtherOutBill_PDA.placeholder_StockPlace"),
                placeholder_SourceBillNo: this.$t("Kf_OtherOutBill_PDA.placeholder_SourceBillNo") ==
                    "Kf_OtherOutBill_PDA.placeholder_SourceBillNo" ? "请输入源单单号" : this.$t(
                        "Kf_OtherOutBill_PDA.placeholder_SourceBillNo"),
                userInfo: getUserInfo(),
                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                HModName: 'Kf_OtherOutBill_PDA',
@@ -419,8 +512,9 @@
        },
        onLoad(e) {
            uni.setNavigationBarTitle({
                    title: this.$t("Kf_OtherOutBill_PDA.title")
                });
                title: this.$t("Kf_OtherOutBill_PDA.title") == 'Kf_OtherOutBill_PDA.title' ?
                    '其他出库单' : this.$t("Kf_OtherOutBill_PDA.title")
            });
            console.log(e, this.userInfo)
            this.OperationType = e.OperationType
            if (e.HInterID) {
@@ -453,6 +547,11 @@
            uni.$off('BillSelectComplete')
        },
        methods: {
            toScanBillCode() {
                MpaasScan.scanCode((res) => {
                    this.getHBarCodeData(res)
                })
            },
            async HWHNameScan(e) {
                // 扫描仓库码
                console.log('仓库码: ', e);
@@ -470,7 +569,7 @@
                // 扫描仓位码
                console.log('仓位码: ', e);
                let index = this.HStockPlaceNameList.findIndex(elem => elem['条码编号'] == e.trim())
               // 不先置空的话，数据再次扫描相同的仓位码 不会触发组件内的刷新
                // 不先置空的话，数据再次扫描相同的仓位码 不会触发组件内的刷新
                this.hform.HStockPlaceID = 0
                this.hform.HStockPlaceName = ''
                await this.$nextTick()
@@ -1907,7 +2006,7 @@
                font-weight: bold;
            }
        }
        


        .right {
            // width: 450rpx;

 pages/qitaruku_v2/OtherInBill.vue

@@ -74,6 +74,13 @@
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType == -1">
                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
                    </view>
                    
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType == -1">
                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
                    </view>

                    <view class="righton" v-show="!showHSourceBillNo">
                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="Kf_OtherInBill_PDA" />
@@ -312,6 +319,7 @@
    import {
        getUserStockRelation
    } from '../../utils/userRelationManager';
    import { MpaasScan } from '@/utils/mpaasScan';
    export default {
        data() {
            return {
@@ -442,8 +450,9 @@
        },
        onLoad(e) {
            uni.setNavigationBarTitle({
                title: this.$t("Kf_OtherInBill_PDA.title")
            })
                title: this.$t("Kf_OtherInBill_PDA.title") == 'Kf_OtherInBill_PDA.title'
                ? '其他入库单' : this.$t("Kf_OtherInBill_PDA.title")
            })
            console.log(e, this.userInfo)
            this.OperationType = e.OperationType
            if (e.HInterID) {
@@ -476,6 +485,11 @@
            uni.$off('BillSelectComplete')
        },
        methods: {
            toScanBillCode() {
                MpaasScan.scanCode((res) => {
                    this.getHBarCodeData(res)
                })
            },
            async HWHNameScan(e) {
                // 扫描仓库码
                console.log('仓库码: ', e);

 pages/shengchanrukushengdan/Kf_ProductInBill.vue

@@ -73,6 +73,9 @@
                            :placeholder="placeholder_SourceBillNo" />

                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
                    </view>
@@ -305,7 +308,8 @@
        getUserStockRelation
    } from "@/utils/userRelationManager.js"
    import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
    export default {
    import { MpaasScan } from '../../utils/mpaasScan';
    export default {
        data() {
            return {
                userInfo: getUserInfo(),
@@ -428,7 +432,7 @@
        },
        async onLoad(e) {
            uni.setNavigationBarTitle({
                title: this.$t("Kf_ProductInBill_PDA.title")
                title: this.$t("Kf_ProductInBill_PDA.title") == 'Kf_ProductInBill_PDA.title' ? '生产入库单' : this.$t("Kf_ProductInBill_PDA.title") 
            })
            console.log(e, this.userInfo)
            this.OperationType = e.OperationType
@@ -459,6 +463,11 @@
            uni.$off('BillSelectComplete')
        },
        methods: {
            toScanBillCode() {
                MpaasScan.scanCode((res) => {
                    this.getHBarCodeData(res)
                })
            },
            async HWHNameScan(e) {
                return
                // 扫描仓库码

 pages/xiaoshouchuku/SellOutBill.vue

@@ -27,12 +27,17 @@
            <view class="form-item">
                <view class="title">{{ $t("SellOutBill_PDA.StockPlace") == "SellOutBill_PDA.StockPlace" ? "仓位" : $t("SellOutBill_PDA.StockPlace") }}:</view>
                <!-- 四维尔启用仓位扫码 其他客户按需启用控制 -->
<<<<<<< HEAD
                <view class="right" >
                    <uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_SCStockPlace"
=======
                <view class="right">
                    <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="请输入(或扫描)仓位"
>>>>>>> ab4be81fa6146ef1238f96ba3bc92bc64f74a553
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
                        @confirm="HStockPlaceNameScan"></uni-combox>
                </view>
<!--                <view class="righton" v-show="!showHStockPlaceName">
                <!--                <view class="righton" v-show="!showHStockPlaceName">
                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="不可操作" />
                </view> -->
            </view>
@@ -79,6 +84,10 @@
                            name="HSourceBillNo" v-model="hform.HSourceBillNo" :placeholder="placeholder_SourceBillNo" />

                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
                    </view>

                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
                    </view>
@@ -316,6 +325,7 @@
        CommonUtils
    } from '../../utils/common';
    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
    import { MpaasScan } from '../../utils/mpaasScan';
    export default {
        data() {
            return {
@@ -484,6 +494,11 @@
            uni.$off('BillSelectComplete')
        },
        methods: {
            toScanBillCode() {
                MpaasScan.scanCode((res) => {
                    this.getHBarCodeData(res)
                })
            },
            async HWHNameScan(e) {
                return
                // 扫描仓库码
@@ -512,9 +527,9 @@
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                

                    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
@@ -525,7 +540,7 @@
                            icon: 'none'
                        })
                    }
                

                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
@@ -829,7 +844,7 @@
                        if (this.HWHNameList[i]['启用仓位'] == 'Y') {
                            this.showHStockPlaceName = true
                            this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
                        } 
                        }
                    }
                }
            },
@@ -843,7 +858,7 @@
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
            

                    if (res.data.count == 1) {
                        this.HStockPlaceNameList = res.data.data
                        for (var i = 0; i < res.data.data.length; i++) {
@@ -855,7 +870,7 @@
                            icon: 'none'
                        })
                    }
            

                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',

 pages/zhijiediaobo/MoveStockBill.vue

@@ -72,6 +72,9 @@

                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="scan" size="20" @click="toScanBillCode"></uni-icons>
                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
                    </view>

@@ -392,6 +395,7 @@
        getUserStockRelation
    } from '../../utils/userRelationManager';
    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
    import { MpaasScan } from '../../utils/mpaasScan';
    export default {
        data() {
            return {
@@ -616,6 +620,11 @@
            }
        },
        methods: {
            toScanBillCode() {
                MpaasScan.scanCode((res) => {
                    this.getHBarCodeData(res)
                })
            },
            //获取供应商数据
            getHCusList() {
                if (!this.hform.HStockOrgID) {
@@ -1063,7 +1072,7 @@
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHWHInName[i] = res.data.data[i].仓库名称
                            }
                            

                            this.HWHInNameChange(getUserInfo()["HSCWHName"])
                        } else {
                            uni.showToast({
@@ -1451,13 +1460,13 @@
            },
            //选择源单类型
            HMainSourceBillTypeChange(e) {
                console.log('e: ',e);
                console.log('e: ', e);
                let index = e.detail.value
                if (index != -1) {
                    this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
                    this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
                }
                

            },

            //获取供应商数据
@@ -2069,7 +2078,7 @@
                        console.log(33, res.data.data[0]);
                        if (res.data.count == 1) {
                            var data = res.data.data[0]
                            

                            this.hform.HInterID = data.HInterID
                            this.hform.HBillNo = data.HBillNo
                            this.hform.HMainSourceBillType = data.HSourceBillType