~jhz/STUWMS.git

parent: adf23cc2 | 补丁 | 提交 | show whitespace

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

zrg

6 天以前 300cfd23e8deb4c43dd37ca2a733e2369ec2f234

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

7个文件已修改

	App.vue	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	locale/zh-Hans.json	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	main.js	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/ZLGL/shoujianjianyan/firstCheckBill.vue	48 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/gongxuOut/Cj_StationOutBill_Standard.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/tiaomamingxi/tiaomamingxi.vue	173 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/weiwairuku/EntrustInBill.vue	62 ●●●●● 补丁 \| 查看 \| 原始文档 \| 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')

 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/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">
@@ -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);

                // 查找当前检验项目中，下一个分析方法为定量分析的检验项目，将检验项目的检验值设置为聚焦
                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,7 +1447,11 @@
                }
                return "";
            },
            checkResultChange({detail: {value}}) {
            checkResultChange({
                detail: {
                    value
                }
            }) {
               if(value == 1) {
                   this.hform.HLastResult = false
               }else {
@@ -1479,6 +1500,8 @@
                    HAQL: "",
                    HSamplingType: "",
                    HInspectResultToSee: "",
                    HInspectValQ: "",
                    isFocus: false,
                };
                if (resource) {
                    // 通过主表检验方案带出的检验项目
@@ -2420,7 +2443,10 @@
                    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

@@ -24,13 +24,23 @@
        </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)">
                <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.table_SourceBillNo") == "Kf_ProductInBill_PDA.table_SourceBillNo" ? "数量" : $t("Kf_ProductInBill_PDA.table_SourceBillNo") }}：</text>{{ item.HQty }}
                            <text>{{ $t("Kf_ProductInBill_PDA.SourceBillQty") == "Kf_ProductInBill_PDA.SourceBillQty" ? "数量" : $t("Kf_ProductInBill_PDA.SourceBillQty") }}：</text>{{ item.HQty }}
                        </view>
                    </view>
                </uni-card>
@@ -243,7 +253,8 @@
                CommonUtils.doRequest2({
                    url: '/Kf_BarCodeEditDlg/Kf_BarCodeEditDlg_Json',
                    data: {
                        swhere:  ' and HInterID= ' + this.HInterID + ' and HMaterID= '+ this.HMaterID + " and HBarCode= '" + this.hform.HBarCode + "'"
                        swhere: ' and HInterID= ' + this.HInterID + ' and HMaterID= ' + this.HMaterID +
                            " and HBarCode= '" + this.hform.HBarCode + "'"
                    },
                    resFunction: (res) => {
                        let {
@@ -274,9 +285,12 @@
                                                    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,
                                                    HSourceInterID: data[0]
                                                        .HSourceInterID,
                                                    HSourceEntryID: data[0]
                                                        .HSourceEntryID,
                                                    EndQty: this.hform.iQty - data[0]
                                                        .HQty,
                                                    sQty: data[0].HQty
                                                },
                                                resFunction: () => {
@@ -291,27 +305,67 @@
                                                        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
                                                                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(); 
                                                                console
                                                                    .log(
                                                                        "修改成功，开始刷新"
                                                                    )
                                                                uni.$emit(
                                                                    'refreshList'
                                                                )
                                                                this
                                                                    .GetMater();
                                                                uni.showToast({
                                                                    title: '修改成功',
                                                                    icon: 'success'
@@ -340,8 +394,11 @@
                    }
                });
            },
            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) {
@@ -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,22 +18,23 @@
                </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">
@@ -393,7 +394,7 @@
            BarCodePopupVue
        },
        computed: {
            HStockPlaceNameListComputed: {
            arrayHStockPlaceNameComputed: {
                get() {
                    // 动态计算对应仓库的仓位
                    return this.HStockPlaceNameList
@@ -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')
                        },
                    })
            
                    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 {
                    this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
            
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
            },
            async qrCodeDisplay() {
@@ -1450,7 +1471,8 @@
            //删除物料码
            delMater(item) {
                uni.navigateTo({
                        url:'../tiaomamingxi/tiaomamingxi?HInterID=' + this.hform.HInterID + '&HMaterID=' + item.HMaterID + '&HBillType=' + this.hform.HBillType
                    url: '../tiaomamingxi/tiaomamingxi?HInterID=' + this.hform.HInterID + '&HMaterID=' + item
                        .HMaterID + '&HBillType=' + this.hform.HBillType
                    })
                // uni.showModal({
                //     title: '提示',

			@@ -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')

			@@ -137,6 +137,7 @@
			"StockPlace": "仓位",
			"SourceBillType": "源单类型",
			"SourceBillNo": "源单单号",
			"SourceBillQty": "源单数量",
			"Date": "日期",
			"Maker": "制单人",
			"bt_HMaterNumber": "物料代码",

			@@ -89,6 +89,7 @@




			// #ifndef VUE3
			import Vue from 'vue'
			import VueI18n from 'vue-i18n'

			@@ -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">
			@@ -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);

			// 查找当前检验项目中，下一个分析方法为定量分析的检验项目，将检验项目的检验值设置为聚焦
			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,7 +1447,11 @@
			}
			return "";
			},
			checkResultChange({detail: {value}}) {
			checkResultChange({
			detail: {
			value
			}
			}) {
			if(value == 1) {
			this.hform.HLastResult = false
			}else {
			@@ -1479,6 +1500,8 @@
			HAQL: "",
			HSamplingType: "",
			HInspectResultToSee: "",
			HInspectValQ: "",
			isFocus: false,
			};
			if (resource) {
			// 通过主表检验方案带出的检验项目
			@@ -2420,7 +2443,10 @@
			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;

			@@ -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);

			@@ -24,13 +24,23 @@
			</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)">
			<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.table_SourceBillNo") == "Kf_ProductInBill_PDA.table_SourceBillNo" ? "数量" : $t("Kf_ProductInBill_PDA.table_SourceBillNo") }}：</text>{{ item.HQty }}
			<text>{{ $t("Kf_ProductInBill_PDA.SourceBillQty") == "Kf_ProductInBill_PDA.SourceBillQty" ? "数量" : $t("Kf_ProductInBill_PDA.SourceBillQty") }}：</text>{{ item.HQty }}
			</view>
			</view>
			</uni-card>
			@@ -243,7 +253,8 @@
			CommonUtils.doRequest2({
			url: '/Kf_BarCodeEditDlg/Kf_BarCodeEditDlg_Json',
			data: {
			swhere: ' and HInterID= ' + this.HInterID + ' and HMaterID= '+ this.HMaterID + " and HBarCode= '" + this.hform.HBarCode + "'"
			swhere: ' and HInterID= ' + this.HInterID + ' and HMaterID= ' + this.HMaterID +
			" and HBarCode= '" + this.hform.HBarCode + "'"
			},
			resFunction: (res) => {
			let {
			@@ -274,9 +285,12 @@
			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,
			HSourceInterID: data[0]
			.HSourceInterID,
			HSourceEntryID: data[0]
			.HSourceEntryID,
			EndQty: this.hform.iQty - data[0]
			.HQty,
			sQty: data[0].HQty
			},
			resFunction: () => {
			@@ -291,27 +305,67 @@
			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
			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();
			console
			.log(
			"修改成功，开始刷新"
			)
			uni.$emit(
			'refreshList'
			)
			this
			.GetMater();
			uni.showToast({
			title: '修改成功',
			icon: 'success'
			@@ -340,8 +394,11 @@
			}
			});
			},
			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) {
			@@ -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>

			@@ -18,22 +18,23 @@
			</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">
			@@ -393,7 +394,7 @@
			BarCodePopupVue
			},
			computed: {
			HStockPlaceNameListComputed: {
			arrayHStockPlaceNameComputed: {
			get() {
			// 动态计算对应仓库的仓位
			return this.HStockPlaceNameList
			@@ -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')
			},
			})

			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 {
			this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
			uni.showToast({
			title: '仓位数据请求失败',
			icon: 'none'
			})
			}

			} catch (err) {
			uni.showToast({
			title: '仓位数据请求失败',
			icon: 'none'
			})
			}
			},
			async qrCodeDisplay() {
			@@ -1450,7 +1471,8 @@
			//删除物料码
			delMater(item) {
			uni.navigateTo({
			url:'../tiaomamingxi/tiaomamingxi?HInterID=' + this.hform.HInterID + '&HMaterID=' + item.HMaterID + '&HBillType=' + this.hform.HBillType
			url: '../tiaomamingxi/tiaomamingxi?HInterID=' + this.hform.HInterID + '&HMaterID=' + item
			.HMaterID + '&HBillType=' + this.hform.HBillType
			})
			// uni.showModal({
			// title: '提示',