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

whycq

2023-06-08 aab4ddd36c63d4bd239d2d7fe9c4780b2fcc76da

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

# Conflicts:
#	pages/basics/pakin.vue

 manifest.json

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

 pages/basics/pakin.vue

@@ -639,6 +639,7 @@
        min-height: 320rpx;
        margin: 15rpx;
        border-radius: 20rpx;
        display: flex;
    }
    .data-list:first-child {
        margin-top: 20rpx;
@@ -655,12 +656,12 @@
        line-height: 180rpx;
    } */
    .data-list-left {
        display: inline-block;
        float: left;
        margin-left: 6%;
        min-height: 320rpx;
        color: #676767;
        width: 500rpx;
        color: #676767;
        max-width: 450rpx;
    }
    .matnr {
        padding-top: 10rpx;

 pages/basics/piking.vue

@@ -457,10 +457,10 @@
        background-color: #ebebeb;
    }
    .data-list {
        border-bottom: 1px solid #d8d8d8;
        height: 240rpx;
        min-height: 250rpx;
        margin: 15rpx;
        border-radius: 20rpx;
        display: flex;
    }
    .data-list:first-child {
        margin-top: 20rpx;
@@ -469,26 +469,19 @@
        margin-bottom: 180rpx;
    }
    .data-list-left {
        display: inline-block;
        float: left;
        margin-left: 6%;
        height: 240rpx;
        color: #676767;
        max-width: 450rpx;
    }
    .matnr {
        padding-top: 10rpx;
    }
    .data-list-right {
        display: inline-block;
        float: right;
        width: 200rpx;
        height: 240rpx;
        line-height: 240rpx;
        display: flex;
        justify-content: space-around;
        align-items: center;
    }
    .data-list-right label {
        display: inline-block;
        float: left;
        width: 100rpx;
        height: 180rpx;
    }
</style>

 pages/basics/stockCheck.vue

@@ -427,10 +427,10 @@
        background-color: #ebebeb;
    }
    .data-list {
        border-bottom: 1px solid #d8d8d8;
        height: 240rpx;
        min-height: 250rpx;
        margin: 15rpx;
        border-radius: 20rpx;
        display: flex;
    }
    .data-list:first-child {
        margin-top: 20rpx;
@@ -438,27 +438,26 @@
    .data-list:last-child {
        margin-bottom: 180rpx;
    }
    .data-list-left {
    /* .data-list-left {
        display: inline-block;
        float: left;
        margin-left: 6%;
        text-align: center;
        width: 100rpx;
        height: 180rpx;
        line-height: 180rpx;
    } */
    .data-list-left {
        margin-left: 6%;
        color: #676767;
        max-width: 450rpx;
    }
    .matnr {
        padding-top: 10rpx;
    }
    .data-list-right {
        display: inline-block;
        float: right;
        width: 200rpx;
        height: 230rpx;
        line-height: 230rpx;
    }
    .data-list-right label {
        display: inline-block;
        float: left;
        width: 100rpx;
        height: 180rpx;
        display: flex;
        justify-content: space-around;
        align-items: center;
    }
</style>

 pages/basics/stockCheckv2.vue

@@ -55,11 +55,11 @@
            <checkbox-group>
                <view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
                    <view class="data-list-left">
                        <view class="matnr"><text style="width: 400rpx;">编码：{{item.matnr}}</text></view>
                        <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 class="matnr">编码：<text style="min-height: 10rpx;">{{item.matnr}}</text></view>
                        <view><text>规格：{{item.specs}}</text></view>
                        <view><text>品名：{{item.maktx}}</text></view>
                        <view><text>批号：{{item.batch}}</text></view>
                        <view><text>客户信息：{{item.cstmr}}</text></view>
                        <view>
                            <text style="width: 400rpx;">备注：{{item.memo}}</text>
                            <text style="width: 400rpx;margin-left: 100rpx">数量：{{item.anfme}}</text>
@@ -427,10 +427,10 @@
        background-color: #ebebeb;
    }
    .data-list {
        border-bottom: 1px solid #d8d8d8;
        height: 250rpx;
        min-height: 250rpx;
        margin: 15rpx;
        border-radius: 20rpx;
        display: flex;
    }
    .data-list:first-child {
        margin-top: 20rpx;
@@ -439,26 +439,19 @@
        margin-bottom: 180rpx;
    }
    .data-list-left {
        display: inline-block;
        float: left;
        margin-left: 6%;
        height: 180rpx;
        color: #676767;
        max-width: 450rpx;
    }
    .matnr {
        padding-top: 10rpx;
    }
    .data-list-right {
        display: inline-block;
        float: right;
        width: 200rpx;
        height: 230rpx;
        line-height: 230rpx;
        display: flex;
        justify-content: space-around;
        align-items: center;
    }
    .data-list-right label {
        display: inline-block;
        float: left;
        width: 100rpx;
        height: 180rpx;
    }
</style>