Merge branch 'bfwms' of http://47.97.1.152:5880/r/wms_app into bfwms

whycq

2023-10-07 cab317e376ca9073eab95ed98a7cb61c58b8071b

Merge branch 'bfwms' of http://47.97.1.152:5880/r/wms_app into bfwms

 App.vue

@@ -604,7 +604,6 @@
    }

    .title-text {
        /* background-color: #000000; */
        display: inline-block;
        height: 100rpx;
        width: 250rpx;

 pages/basics/orderPakin.vue

@@ -39,11 +39,19 @@
                            <radio :checked="ck2" style="margin-left: 50rpx;"/><text>否</text>
                        </label>
                    </radio-group>
                    <!-- <radio :value="yes" style="margin-left: 100rpx;">是</radio>
                    <radio :value="no" style="margin-left: 50rpx;">否</radio> -->
                </view>
            </view>
            
            <view class="square-1">
                <view class="square-title" style="display: flex;align-items: center;">
                    <view class="title-sign"><view class="sign"></view></view>
                    <view class="title-text" style="flex: 1;"><text>商品类型</text></view>
                    <view style="">
                        <uni-combox style="width: 150px;margin-right: 10px;" :candidates="matTypes" placeholder="请选择商品类型"
                        v-model="matType"></uni-combox>
                    </view>
                </view>
            </view>
            
            <view class="square-2">
                <view class="square-title">
@@ -187,6 +195,9 @@
                check:false,
                checkText:'全选',
                checkedData:[],
                matType: '',
                matTypes: ['单品物料','高频混合物料','低频混合物料'],
                matTypeId: 0,
                batch:'',
                memo: '',
                cstmr: '',
@@ -313,6 +324,8 @@
                this.barcode = ''
                this.matnr = ''
                this.orderNo = ''
                this.matType = ''
                this.matTypeId = 0
                this.barcodeFocuss()
                uni.vibrateShort();
            },
@@ -373,6 +386,7 @@
                for (let k in that.matList) {
                    that.matList[k].anfme = that.matList[k].enterCount
                }
                this.getMatTypeIn(this.matType)
                uni.showLoading();
                uni.request({
                    url: that.commonUrl + '/mobile/comb/auth',
@@ -380,6 +394,7 @@
                        frozen: that.frozen,
                        barcode: that.barcode,
                        orderNo: that.orderNo,
                        matTypeIn: that.matTypeId,
                        combMats: that.matList
                    }),
                    method: 'POST',
@@ -419,6 +434,21 @@
                    }
                });
            },
            getMatTypeIn(type) {
                switch (type) {
                    case '单品物料':
                        this.matTypeId = 1
                        break;
                    case '高频混合物料':
                        this.matTypeId = 2
                        break;
                    case '低频混合物料':
                        this.matTypeId = 3
                        break;
                    default:
                        this.matType = 0
                }
            },
            selectMat() {
                let that = this
                uni.vibrateShort();

 pages/basics/pakin.vue

@@ -31,6 +31,16 @@
                </view>
            </view>
            
            <view class="square-1">
                <view class="square-title" style="display: flex;align-items: center;">
                    <view class="title-sign"><view class="sign"></view></view>
                    <view class="title-text" style="flex: 1;"><text>商品类型</text></view>
                    <view style="">
                        <uni-combox style="width: 150px;margin-right: 10px;" :candidates="matTypes" placeholder="请选择商品类型"
                        v-model="matType"></uni-combox>
                    </view>
                </view>
            </view>
            
            <view class="square-2">
                <view class="square-title">
@@ -175,7 +185,10 @@
                ck1: false,
                ck2: true,
                frozen: 0,
                owner: ''
                owner: '',
                matType: '',
                matTypes: ['单品物料','高频混合物料','低频混合物料'],
                matTypeId: 0,
            }
        },
        onShow() {
@@ -269,6 +282,8 @@
                this.matList = []
                this.barcode = ''
                this.matnr = ''
                this.matType = ''
                this.matTypeId = 0
                this.barcodeFocuss()
                uni.vibrateShort();
            },
@@ -318,12 +333,14 @@
                        }
                    }
                }
                this.getMatTypeIn(this.matType)
                uni.showLoading();
                uni.request({
                    url: that.commonUrl + '/mobile/comb/auth',
                    data: JSON.stringify({
                        frozen: that.frozen,
                        barcode: that.barcode,
                        matTypeIn: that.matTypeId,
                        combMats: that.matList
                    }),
                    method: 'POST',
@@ -363,6 +380,21 @@
                    }
                });
            },
            getMatTypeIn(type) {
                switch (type) {
                    case '单品物料':
                        this.matTypeId = 1
                        break;
                    case '高频混合物料':
                        this.matTypeId = 2
                        break;
                    case '低频混合物料':
                        this.matTypeId = 3
                        break;
                    default:
                        this.matType = 0
                }
            },
            selectMat() {
                let that = this
                uni.vibrateShort();