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

llj

6 天以前 00573ced1f083d45dbeea58aad6bf4dced03903c

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

 locale/zh-Hans.json

@@ -17,7 +17,8 @@
    "Kf_OtherOutBill_PDA": {
        "title": "其他出库单",
        "disabledPlaceholder": "",
        "placeholder_FIFOWarehouse": ""
        "placeholder_FIFOWarehouse": "",
        "stockOutStyleList": "出库类型"
    },
    "SellOutBill_PDA": {
        "title": "销售出库单"

 pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue

@@ -1,30 +1,34 @@
<template>
    <view style="padding: 20rpx 40rpx;">
        <view>
            <view v-for="item in HTechParams">
                    {{ item["分组名称"] }}
                    <uni-row :gutter="3">
                        <uni-col :span="8" v-for="unit in item['参数列表']">
                            <view>
                                 <uni-tag :text="`${unit.HTechParamName}:${unit.HResult}`" type="primary" />
                            </view>
                        </uni-col>
                    </uni-row>
            <view v-for="item in HTechParams" style="padding-bottom: 20rpx;">
                <view class="row-head">{{ item["分组名称"] }}</view>
                <uni-row :gutter="3" class="row-content">
                    <uni-col class="equal-height-col" :span="8" v-for="unit in item['参数列表']">
                        <view style="font-size: 28rpx;">
                            {{ unit.HTechParamName }}:{{unit.HResult}}
                        </view>
                    </uni-col>
                </uni-row>

            </view>
            </view>
        </view>
    </view>
</template>

<script>
    import { CommonUtils } from '@/utils/common';
    import { getUserInfo } from '@/utils/auth';
    import {
        CommonUtils
    } from '@/utils/common';
    import {
        getUserInfo
    } from '@/utils/auth';
    export default {
        data() {
            return {
                HTechParams: []
            };
        },  
        },
        methods: {
            async loadBillMain(HEquipID) {
                try {
@@ -34,51 +38,51 @@
                            HEquipID: HEquipID,
                        }
                    })
            

                    let {
                        data,
                        count,
                        Message,
                        code
                    } = res.data
            

                    if (code == 1) {
            //             Object.assign(this.hform, {
            //                 "HMaterID": data[0].HMaterID,
            //                 "HMaterNumber": data[0].产品代码,
            //                 "HMaterName": data[0].产品名称,
            //                 "HMaterModel": data[0].规格型号,
            //                 "HProcID": data[0].HProcID,
            //                 "HProcName": data[0].工序名称,
            //                 "HProcNo": data[0].工序号,
            //                 //"HGroupID": data[0].HGroupID == undefined ? 0 : data[0].HGroupID,
            //                 //"HGroupName": data[0].班组,
            //                 "HDeptID": data[0].HDeptID == undefined ? 0 : data[0].HDeptID,
            //                 "HDeptName": data[0].加工车间,
            
            //                 "HSourceID": data[0].HSourceID,
            //                 "HSourceName": data[0].生产资源,
            
            //                 "HEquipID": data[0].HEquipID,
            //                 "HEquipName": data[0].设备名称,
            
            //                 "HICMOInterID": data[0].hicmointerid,
            //                 "HICMOEntryID": data[0].HICMOEntryID,
            //                 "HICMOBillNo": data[0].任务单号,
            
            //                 "HProcExchInterID": data[0].hmainid,
            //                 "HProcExchEntryID": data[0].HEntryID,
            //                 "HProcExchBillNo": data[0].单据号,
            
            //                 "HMainSourceInterID": data[0].hmainid,
            //                 "HMainSourceEntryID": data[0].HEntryID,
            //                 "HMainSourceBillNo": data[0].单据号,
            //                 "HMainSourceBillType": data[0].单据类型,
                        
            //                 "HMouldName": data[0].模具名称,
            //                 "HMouldID": data[0].HMouldID
            //             })
            
                        //             Object.assign(this.hform, {
                        //                 "HMaterID": data[0].HMaterID,
                        //                 "HMaterNumber": data[0].产品代码,
                        //                 "HMaterName": data[0].产品名称,
                        //                 "HMaterModel": data[0].规格型号,
                        //                 "HProcID": data[0].HProcID,
                        //                 "HProcName": data[0].工序名称,
                        //                 "HProcNo": data[0].工序号,
                        //                 //"HGroupID": data[0].HGroupID == undefined ? 0 : data[0].HGroupID,
                        //                 //"HGroupName": data[0].班组,
                        //                 "HDeptID": data[0].HDeptID == undefined ? 0 : data[0].HDeptID,
                        //                 "HDeptName": data[0].加工车间,

                        //                 "HSourceID": data[0].HSourceID,
                        //                 "HSourceName": data[0].生产资源,

                        //                 "HEquipID": data[0].HEquipID,
                        //                 "HEquipName": data[0].设备名称,

                        //                 "HICMOInterID": data[0].hicmointerid,
                        //                 "HICMOEntryID": data[0].HICMOEntryID,
                        //                 "HICMOBillNo": data[0].任务单号,

                        //                 "HProcExchInterID": data[0].hmainid,
                        //                 "HProcExchEntryID": data[0].HEntryID,
                        //                 "HProcExchBillNo": data[0].单据号,

                        //                 "HMainSourceInterID": data[0].hmainid,
                        //                 "HMainSourceEntryID": data[0].HEntryID,
                        //                 "HMainSourceBillNo": data[0].单据号,
                        //                 "HMainSourceBillType": data[0].单据类型,

                        //                 "HMouldName": data[0].模具名称,
                        //                 "HMouldID": data[0].HMouldID
                        //             })

                        this.HTechParams = data
                    } else {
                        CommonUtils.showTips({
@@ -86,7 +90,7 @@
                            message: `获取源单信息失败: ${Message}`
                        })
                    }
            

                } catch (err) {
                    CommonUtils.showTips({
                        title: '温馨提示',
@@ -96,12 +100,44 @@
            },
        },
        onLoad(e) {
            let {HEquipID} = e
            let {
                HEquipID
            } = e
            this.loadBillMain(HEquipID)
        }
    }
</script>

<style lang="scss">
    .row-head {
        border-radius: 10rpx 10rpx 0 0;
        background-color: rgb(229, 236, 243);
        padding: 0 12rpx;
        font-family: "PingFang SC", "Microsoft YaHei", sans-serifs;
    }

</style>
    .row-content {
        width: 100%;
        padding: 15rpx;
        background: #f5f5f5;
        word-break: break-all;
        display: flex;
        align-items: stretch;
        flex-wrap: wrap;
        border-collapse: collapse;
        border: #f0f0f0 2px solid;
    }

    .row-content:last-child {
        border-radius: 0 0 10rpx 10rpx;
    }

    .equal-height-col {
        display: flex;
        height: inherit;
        padding: 1rpx;
        justify-content: center;
        color: rgba(124, 124, 124, 1.0);
        font-family: "PingFang SC", "Microsoft YaHei", sans-serifs;
    }
</style>

 pages/qitachuku_v2/OtherOutBill.vue

@@ -127,13 +127,13 @@
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">出库类型:</view>
                    <zxz-uni-data-select v-if="showHSupName" required class="right" :localdata="stockOutStyleList"
                    <view class="title">{{$t('Kf_OtherOutBill_PDA.stockOutStyleList')}}:</view>
                    <zxz-uni-data-select required class="right" :localdata="stockOutStyleList"
                        dataKey="HName" dataValue="HName" v-model="hform.HStockStyle">
                    </zxz-uni-data-select>
                    <view class="righton" v-if="!showHSupName">
                        <input name="HSupName" disabled v-model="hform.HSupName" placeholder="请选择供应商" />
                    </view>
                    <!-- <view class="righton" v-if="!showHSupName">
                        <input name="stockOutSty" disabled v-model="hform.HStockStyle" placeholder="请选择出库类型" />
                    </view> -->
                </view>
                <view class="form-item">
                    <view class="title">
@@ -1771,7 +1771,8 @@
                            this.hform.HBillNo = data.HBillNo
                            this.hform.HMainSourceBillType = data.HSourceBillType
                            this.hform.HSourceBillNo = data.HSourceBillNo

                            this.hform.HStockStyle = data.HStockStyle
    
                            let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
                                .HSourceBillType)
                            if (index != -1) {

 pages/shengchanlingliao/PPickingCheckBill.vue

@@ -157,9 +157,14 @@
                </view>
                <view class="form-item">
                    <view class="title">数量:</view>
                    <view class="righton">
                        <input disabled v-model="hform.HQty_B" />
                    <view class="right">
                        <input v-model="hform.HQty_B" placeholder="请输入数量" />
                    </view>
                    <view style="width: 12rpx;"></view>
                    <button class="btn-a" size="mini" @tap="changeQty">确定</button>
                    <!-- <view class="righton">
                        <input disabled v-model="hform.HQty_B" />
                    </view> -->
                </view>
                <view class="form-item">
                    <view class="title">容量:</view>
@@ -325,6 +330,19 @@
            uni.$off('BillSelectComplete')
        },
        methods: {
            async changeQty() {
                let HBarCodeOld = this.hform.HBarCode_B
                let HQtyOld = this.hform.HQty_B
                this.hform.HBarCode = `*${this.hform.HBarCode_B}`
                // 先删除
                await this.getCode(`*${this.hform.HBarCode_B}`)
                // 再录入
                this.hform.HBarCode = HBarCodeOld
                this.hform.HQty = HQtyOld
                await this.getCode(this.hform.HBarCode_B)
                this.hform.HQty = ''
                this.hform.HBarCode = ''
            },
            // 获取仓位
            async getStockPlaceRemote(HSPGroupID) {
                try {
@@ -696,6 +714,8 @@
                if (!this.hform.HStockPlaceName) {
                    this.hform.HStockPlaceID = 0
                }
                
                console.log('HBarCode: ',HBarCode);
                var sOldBarCode = HBarCode
                var HDeleteFlag = sOldBarCode.substring(0, 1);
                var sBarCode = sOldBarCode.slice(1);
@@ -1534,4 +1554,9 @@
        margin-top: 30rpx;
        float: right;
    }
    .btn-a {
        background-color: #3A78FF;
        color: #fff;
        font-size: 28rpx;
    }
</style>

 pages/tiaomachaima/tiaomachaima2.vue

@@ -260,7 +260,7 @@
                        }
                    },
                    (err) => {
                        console.err(err)
                        console.error(err)
                        this.barCodeCall = false
                    }
                )
@@ -368,7 +368,7 @@
                        }
                    },
                    (err) => {
                        console.err(err)
                        console.error(err)
                    },
                    "POST"
                )