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

whycq

2023-02-04 b75ab103d8763245432c773d32c1f38239ec162f

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

 manifest.json

@@ -2,7 +2,7 @@
    "name" : "中扬WMS",
    "appid" : "__UNI__DA5854D",
    "description" : "",
    "versionName" : "20230129A",
    "versionName" : "20230202A",
    "versionCode" : 104,
    "transformPx" : false,
    /* 5+App特有相关 */

 pages/basics/matQuery.vue

@@ -23,6 +23,10 @@
                    <view class="text-title"><input type="text" v-model="matData.memo"></view>
                </view>
                <view class="text-box">
                    <view class="text-title"><text>客户信息</text></view>
                    <view class="text-title"><input type="text" v-model="matData.cstmr"></view>
                </view>
                <view class="text-box">
                    <view class="text-title"><text>数量</text></view>
                    <view class="text-title">
                        <view>

 pages/basics/pakin.vue

@@ -156,7 +156,7 @@
                searchBox: 'hide',
                pick:'hide',
                matnr:'',
                matList:[{}],
                matList:[],
                result: '',
                enableQty:'',
                count:'',
@@ -444,6 +444,7 @@
                this.count = this.matList[index].anfme
                this.batch = this.matList[index].batch
                this.memo = this.matList[index].memo
                this.cstmr = this.matList[index].cstmr
                this.rowNum = index
                this.eject()
            },
@@ -459,6 +460,7 @@
                this.matList[this.rowNum].anfme = this.count
                this.matList[this.rowNum].batch = this.batch
                this.matList[this.rowNum].memo = this.memo
                this.matList[this.rowNum].cstmr = this.cstmr
                this.$refs.revise.close()
                this.$forceUpdate() // 强制刷新
            },
@@ -639,7 +641,7 @@
        margin-top: 20rpx;
    }
    .data-list:last-child {
        margin-bottom: 120rpx;
        margin-bottom: 180rpx;
    }
    /* .data-list-left {
        display: inline-block;

 pages/basics/piking.vue

@@ -43,8 +43,10 @@
                        <view><text style="width: 400rpx;">规格：{{item.specs}}</text></view>
                        <view><text style="width: 400rpx;">品名：{{item.maktx}}</text></view>
                        <view><text style="width: 400rpx;">批号：{{item.batch}}</text></view>
                        <view><text style="width: 400rpx;">客户信息：{{item.cstmr}}</text></view>
                        <view>
                            <text style="width: 400rpx;">数量：{{item.anfme}}</text>
                            <text style="width: 400rpx;">备注：{{item.memo}}</text>
                            <text style="width: 400rpx;margin-left: 100rpx">数量：{{item.anfme}}</text>
                        </view>
                    </view>
                    <view class="data-list-right">
@@ -456,7 +458,7 @@
    }
    .data-list {
        border-bottom: 1px solid #d8d8d8;
        height: 230rpx;
        height: 240rpx;
        margin: 15rpx;
        border-radius: 20rpx;
    }
@@ -464,13 +466,13 @@
        margin-top: 20rpx;
    }
    .data-list:last-child {
        margin-bottom: 160rpx;
        margin-bottom: 180rpx;
    }
    .data-list-left {
        display: inline-block;
        float: left;
        margin-left: 6%;
        height: 180rpx;
        height: 240rpx;
        color: #676767;
    }
    .matnr {
@@ -480,8 +482,8 @@
        display: inline-block;
        float: right;
        width: 200rpx;
        height: 230rpx;
        line-height: 230rpx;
        height: 240rpx;
        line-height: 240rpx;
    }
    .data-list-right label {
        display: inline-block;

 pages/basics/stockCheck.vue

@@ -59,8 +59,10 @@
                        <view><text style="width: 400rpx;">规格：{{item.specs}}</text></view>
                        <view><text style="width: 400rpx;">品名：{{item.maktx}}</text></view>
                        <view><text style="width: 400rpx;">批号：{{item.batch}}</text></view>
                        <view><text style="width: 400rpx;">客户信息：{{item.cstmr}}</text></view>
                        <view>
                            <text style="width: 400rpx;">数量：{{item.anfme}}</text>
                            <text style="width: 400rpx;">备注：{{item.memo}}</text>
                            <text style="width: 400rpx;margin-left: 100rpx">数量：{{item.anfme}}</text>
                        </view>
                    </view>
                    <view class="data-list-right">
@@ -426,7 +428,7 @@
    }
    .data-list {
        border-bottom: 1px solid #d8d8d8;
        height: 230rpx;
        height: 240rpx;
        margin: 15rpx;
        border-radius: 20rpx;
    }
@@ -434,7 +436,7 @@
        margin-top: 20rpx;
    }
    .data-list:last-child {
        margin-bottom: 160rpx;
        margin-bottom: 180rpx;
    }
    .data-list-left {
        display: inline-block;

 pages/basics/stockCheckv2.vue

@@ -59,8 +59,10 @@
                        <view><text style="width: 400rpx;">规格：{{item.specs}}</text></view>
                        <view><text style="width: 400rpx;">品名：{{item.maktx}}</text></view>
                        <view><text style="width: 400rpx;">批号：{{item.batch}}</text></view>
                        <view><text style="width: 400rpx;">客户信息：{{item.cstmr}}</text></view>
                        <view>
                            <text style="width: 400rpx;">数量：{{item.anfme}}</text>
                            <text style="width: 400rpx;">备注：{{item.memo}}</text>
                            <text style="width: 400rpx;margin-left: 100rpx">数量：{{item.anfme}}</text>
                        </view>
                    </view>
                    <view class="data-list-right">
@@ -426,7 +428,7 @@
    }
    .data-list {
        border-bottom: 1px solid #d8d8d8;
        height: 230rpx;
        height: 250rpx;
        margin: 15rpx;
        border-radius: 20rpx;
    }
@@ -434,7 +436,7 @@
        margin-top: 20rpx;
    }
    .data-list:last-child {
        margin-bottom: 160rpx;
        margin-bottom: 180rpx;
    }
    .data-list-left {
        display: inline-block;

 pages/index/index2.vue

@@ -80,6 +80,12 @@
                        cuIcon: 'safe'
                    },
                    {
                        title: '补货',
                        name: 'stockCheckv2',
                        color: 'blue',
                        cuIcon: 'safe'
                    },
                    {
                        title: '拣料出库',
                        name: 'piking',
                        color: 'blue',