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

wtt

2025-08-19 d8b46eb0f1bbe8b51528c0b10d0786fe46c43015

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

# Conflicts:
#	pages/gongxuOut/form.vue
#	pages/weiwaigxOut/form.vue

 App.vue

@@ -29,6 +29,7 @@

    /* 用于解决picker内部设置 disabled input 时不响应的问题 */
    .picker-overlay {
        box-sizing: border-box;
        position: absolute;
        top: 0;
        left: 0;

 pages/caigouruku/form.vue

@@ -404,14 +404,15 @@
                this.HSourceBillNoFocus = false
                await this.$nextTick(() => {
                    this.HSourceBillNoFocus = true
                    this.hform.HBarCode = ""
                    this.hform.HSourceBillNo = ""
					
                })
            },
            async refreshBarCodeState() {
                this.barCodeFocus = false
                await this.$nextTick(() => {
                    this.barCodeFocus = true
                    this.hform.HSourceBillNo = ""
                    this.hform.HBarCode = ""
                })
            },
            playSound(e) {
@@ -905,6 +906,7 @@
                            this.playSound(1)
                            this.DisBillEntryList()
                        } else {
                            console.log('res.data.Message: ',res.data.Message);
                            this.refreshHSourceBillState()
                            this.playSound(0)
                            uni.showToast({
@@ -1515,6 +1517,10 @@
            position: relative;
            display: flex;

            picker {
                width: 100%;
            }
			
            .uni-combox {
                width: 100%;
            }

 pages/caigoutuiliao/form.vue

@@ -1422,6 +1422,10 @@
            position: relative;
            display: flex;

            picker {
                width: 100%;
            }

            .uni-combox {
                width: 100%;
            }

 pages/qitachuku_v2/form.vue

@@ -69,8 +69,8 @@
                            name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="请输入源单单号" />

                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
                    <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">
@@ -1562,6 +1562,10 @@
            border: 1px solid #acacac;
            position: relative;
            display: flex;
			
            picker {
                width: 100%;
            }

            .uni-combox {
                width: 100%

 pages/qitaruku_v2/form.vue

@@ -69,7 +69,7 @@
                            name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="请输入源单单号" />

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

@@ -1558,6 +1558,10 @@
            border: 1px solid #acacac;
            position: relative;
            display: flex;
			
            picker {
                width: 100%;
            }

            .uni-combox {
                width: 100%

 pages/shengchanbuliao/form.vue

@@ -1438,6 +1438,10 @@
            border: 1px solid #acacac;
            position: relative;
            display: flex;
			
            picker {
                width: 100%;
            }

            .uni-combox {
                width: 100%;

 pages/shengchanlingliaoshengdan/form.vue

@@ -1512,6 +1512,10 @@
            border: 1px solid #acacac;
            position: relative;
            display: flex;
			
            picker {
                width: 100%;
            }

            .uni-combox {
                width: 100%;

 pages/shengchanrukushengdan/form.vue

@@ -1515,6 +1515,10 @@
            border: 1px solid #acacac;
            position: relative;
            display: flex;
			
            picker {
                width: 100%;
            }

            .uni-combox {
                width: 100%

 pages/weiwaigxIn/form.vue

@@ -75,6 +75,7 @@
                <view class="right">
                    <picker mode="date" v-model="hform.HDate" @change="HDateChange">
                        <input disabled v-model="hform.HDate" placeholder="请选择日期" />
                        <view class="picker-overlay"></view>
                    </picker>
                </view>
            </view>
@@ -1229,6 +1230,8 @@
        align-items: center;
        font-size: 30rpx;
        padding: 6rpx 0;
        position: relative;
		
        .title{
            width: 208rpx;
            text{

 pages/weiwaigxOut/form.vue

@@ -28,10 +28,10 @@
                    size="20" @click="toScanProcNo"></uni-icons>
            </view>
            <view class="form-item">
                <view class="title">工序编码:</view>
                <view class="righton">
                    <input disabled v-model="hform.HProcNumber" placeholder="请输入工序编码" />
                </view>
                <view class="title">工序编码:</view>
                <view class="righton">
                    <input disabled v-model="hform.HProcNumber" placeholder="请输入工序编码" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">未报工数量:</view>
@@ -115,6 +115,7 @@
                <view class="right">
                    <picker mode="date" v-model="hform.HDate" @change="HDateChange">
                        <input disabled v-model="hform.HDate" placeholder="请选择日期" />
                        <view class="picker-overlay"></view>
                    </picker>
                </view>
            </view>
@@ -383,7 +384,9 @@
        getUserInfo
    } from "@/utils/auth.js";
    import ProcExchListPopupVue from '../../components/ProcExchListPopup/ProcExchListPopup.vue';
import { CommonUtils } from '../../utils/common';
    import {
        CommonUtils
    } from '../../utils/common';
    export default {
        components: {
            ProcExchListPopupVue
@@ -711,30 +714,33 @@
            },
            getHDeptList() { // 获得部门
                CommonUtils.doRequest(
                "/Gy_Department/list",
                {
                    sWhere: ` and HUSEORGID=${uni.getStorageSync('OrganizationID')}`,
                    user: this.userInfo['Czymc'],
                    Organization: uni.getStorageSync('Organization')
                },
                (res) => {
                    let {data, count, Message} = res.data
                    console.log('data: ',data);
                    if(count == 1) {
                        this.HDeptList = data
                        this.arrayHDept = Array.from(data).map(e => e['部门名称'])
                    }else {
                        uni.showToast({
                            icon: 'none',
                            Message: Message
                        })
                    "/Gy_Department/list", {
                        sWhere: ` and HUSEORGID=${uni.getStorageSync('OrganizationID')}`,
                        user: this.userInfo['Czymc'],
                        Organization: uni.getStorageSync('Organization')
                    },
                    (res) => {
                        let {
                            data,
                            count,
                            Message
                        } = res.data
                        console.log('data: ', data);
                        if (count == 1) {
                            this.HDeptList = data
                            this.arrayHDept = Array.from(data).map(e => e['部门名称'])
                        } else {
                            uni.showToast({
                                icon: 'none',
                                Message: Message
                            })
                        }
                    }
                }
                )
            },
            HHDeptChange(e) {
                for (var i = 0; i < this.HDeptList.length; i++) {
                    if (this.HDeptList[i]['部门名称']== e) {
                    if (this.HDeptList[i]['部门名称'] == e) {
                        this.hform.HDeptID = this.HDeptList[i].HItemID
                    }
                }
@@ -964,7 +970,7 @@
                        console.log(1, res.data.data[0]);
                        if (res.data.code == 1) {
                            var data = res.data.data[0]
                            this.getHBarCodeData(data.HBarCode,1)
                            this.getHBarCodeData(data.HBarCode, 1)
                            // this.getHProcNoData(data.HBarCode, data.HProcNo)

                            this.hform.HInterID = data.HInterID
@@ -1199,7 +1205,7 @@
            },
            submit() {
                //去除分号以免后端分解报错
                this.hform.HMaterName= this.hform.HMaterName.replace(/;/g, '');
                this.hform.HMaterName = this.hform.HMaterName.replace(/;/g, '');
                this.hform.HMaterModel = this.hform.HMaterModel.replace(/;/g, '');
                if (!this.hform.HBarCode) {
                    uni.showToast({
@@ -1251,8 +1257,8 @@
                                // prePage.$vm.getList()
                                if (this.isEdit) {
                                    uni.showToast({
                                        title: '修改成功',
                                        icon: 'none'
                                        title: '修改成功',
                                        icon: 'none'
                                    })
                                    setTimeout(() => {
                                        uni.redirectTo({
@@ -1438,6 +1444,7 @@
        font-size: 30rpx;
        padding: 6rpx 0;
        gap: 10rpx;
        position: relative;

        .title {
            width: 188rpx;

 pages/weiwailingliao/form.vue

@@ -878,7 +878,6 @@
            },
            //选中源单
            getHBarCodeData(HBarCode) {
				
                if(this.hform.HMainSourceBillType == -1) {
                    this.playSound(1)
                    this.barCodeFocus = true
@@ -1495,6 +1494,10 @@
            border: 1px solid #acacac;
            position: relative;
            display: flex;
			
            picker {
                width: 100%;
            }

            .uni-combox {
                width: 100%;

 pages/xiaoshouchuku/form.vue

@@ -470,7 +470,13 @@
                    this.BarCodeFocus = true
                    return
                }
                let inputVal = this.$refs.uniComboxSourceBill.inputVal
                let inputVal = ''
                if(this.$refs.uniComboxSourceBill){
                    inputVal = this.$refs.uniComboxSourceBill.inputVal || this.hform.HBillNo
                }else {
                    inputVal = this.hform.HBillNo
                }
				 
                if (inputVal == '') {
                    CommonUtils.playSound(0)
                    return uni.showToast({
@@ -1477,6 +1483,10 @@
            border: 1px solid #acacac;
            position: relative;
            display: flex;
			
            picker {
                width: 100%;
            }

            .uni-combox {
                width: 100%;

 pages/xiaoshoutuihuo/form.vue

@@ -1306,6 +1306,8 @@
            width: 450rpx;
            border-radius: 22rpx;
            border: 1px solid #acacac;
            display: flex;
            position: relative;
        }

        .righton {

 pages/zhijiediaobo/form.vue

@@ -453,8 +453,8 @@
                    HQty: '',
                    HSCWHName: getUserInfo().HWHName,
                    HSCWHID: getUserInfo().HWhID,
                    HWHName: "",
                    HWHID: "",
                    HWHName: getUserInfo().HWHName,
                    HWHID: getUserInfo().HWhID,
                    HStockStyle: '',
                    HOutStockPlaceName: getUserInfo().HSPName,
                    HOutStockPlaceID: getUserInfo().HSPID,
@@ -1341,11 +1341,11 @@
            //扫条码处理
            getCode(HBarCode) {
                //仓库、仓位文本框为空时，清空对应ID
                if (!this.hform.HWHName) {
                    this.hform.HWHID = 0
                if (!this.hform.HSCWHName) {
                    this.hform.HSCWHID = 0
                }
                if (!this.hform.HStockPlaceName) {
                    this.hform.HStockPlaceID = 0
                if (!this.hform.HOutStockPlaceName) {
                    this.hform.HOutStockPlaceID = 0
                }
                var sOldBarCode = HBarCode
                var HDeleteFlag = sOldBarCode.substring(0, 1);
@@ -1353,6 +1353,8 @@

                var sHWHID = this.hform.HWHID
                var sHSPID = this.hform.HStockPlaceID
                var sHSCWHID = this.hform.HSCWHID
                var sHOUTSPID = this.hform.HOutStockPlaceID
                var sHQty = this.hform.HQty
                var sSourceBillNo = this.hform.HSourceBillNo
                var sSourceBillType = this.hform.HMainSourceBillType
@@ -1417,7 +1419,7 @@
                        sHQty = 0;
                    }
                    uni.request({
                        url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
                        url: this.serverUrl + '/WEBSController/get_BarCode_MoveStock_New_Json',
                        data: {
                            sBarCode: sBarCode,
                            HInterID: this.hform.HInterID,
@@ -1426,12 +1428,15 @@
                            HMaker: this.hform.HMaker,
                            HWhID: sHWHID,
                            HSPID: sHSPID,
                            HSCWHID: sHSCWHID,
                            HSCSPID: sHOUTSPID,
                            HQty: sHQty,
                            HRedBlueFlag: this.hform.HRedBlueFlag,
                            // HRedBlueFlag: this.hform.HRedBlueFlag,
                            SourceFlag: HSourceFlag,
                            HSourceBillNo: sSourceBillNo,
                            HSourceBillType: sSourceBillType,
                            HStockOrgID: this.hform.HStockOrgID,
                            HStockInOrgID: this.hform.HStockOrgID,
                            HStockOutOrgID: this.hform.HStockOutOrgID,
                            HScanStyle: "",
                            HCustom1: "",
                            HCustom2: ""
@@ -1982,6 +1987,10 @@
            position: relative;
            display: flex;

            picker {
                width: 100%;
            }
			
            .uni-combox {
                width: 100%;
            }