wms_app.git - Gitblit

parent: 5acba5e6 | 补丁 | 提交 | ignore whitespace

pang.jiabao

2025-04-11 162b3abda98bf6c33d60e0846b54febade343274

界面翻译为俄语

23个文件已修改

	pages.json	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/checkout.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/checkout2.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/demo.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/logOut.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/manStoCheck.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/matQuery.vue	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/matSelect.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/offLines.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/offline.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/order.vue	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/orderOut.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/outPakin.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/pakStore.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/pakin.vue	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/putOnSale.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/stoOut.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/stockCheck.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/basics/stockQuery.vue	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/index/index.vue	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/login/login.vue	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	static/logo.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	unpackage/dist/dev/app-plus/app-view.js	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pages.json

@@ -5,12 +5,12 @@
            "style": {
                "navigationBarBackgroundColor":"#FFF",
                "navigationBarTextStyle":"black",
                "navigationBarTitleText": "登录"
                "navigationBarTitleText": "Вход"
            }  
        },{
            "path": "pages/index/index",
            "style": {
                "navigationBarTitleText": "PDA首页"
                "navigationBarTitleText": "Главная страница PDA"
            }
        },{
            "path": "pages/basics/demo02",
@@ -70,14 +70,14 @@
            "path" : "pages/basics/pakin",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "组托入库",
                "navigationBarTitleText": "Группировка поддонов на складе",
                "enablePullDownRefresh": false
            } 
        },{
            "path" : "pages/basics/order",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "订单组托",
                "navigationBarTitleText": "Группировка поддонов для заказа",
                "enablePullDownRefresh": false
            } 
        },{
@@ -91,7 +91,7 @@
            "path" : "pages/basics/matQuery",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "检索商品",
                "navigationBarTitleText": "Поиск товара",
                "enablePullDownRefresh": false
                
            }
@@ -107,7 +107,7 @@
            "path" : "pages/basics/stockQuery",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "库存查询",
                "navigationBarTitleText": "Поиск по местоположению склада",
                "enablePullDownRefresh": false
                
            }

 pages/basics/checkout.vue

@@ -53,7 +53,7 @@
        </scroll-view>
        <view class="footer flex justify-around">
            <view>
                <button class="cu-btn lg" @click="resst()">重置</button>
                <button class="cu-btn lg" @click="resst()">Сброс</button>
            </view>
            <view>
                <button class="cu-btn lg pakin-btn bg-blue" @click="comb()">确认</button>

 pages/basics/checkout2.vue

@@ -36,7 +36,7 @@
                </view>
            </view>
            <view class="square-none" v-show="matList.length === 0">
                <view class="v-show">暂无更多数据...</view>
                <view class="v-show">Нет дополнительных данных...</view>
            </view>
            <checkbox-group @change="checkbox">
                <view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
@@ -52,7 +52,7 @@
        </scroll-view>
        <view class="footer flex justify-around">
            <view>
                <button class="cu-btn lg" @click="resst()">重置</button>
                <button class="cu-btn lg" @click="resst()">Сброс</button>
            </view>
            <view>
                <button class="cu-btn lg pakin-btn bg-blue" @click="comb()">确认</button>

 pages/basics/demo.vue

@@ -64,7 +64,7 @@
        </view>
        
        <view class="square-none">
            <view class="v-show">暂无更多数据...</view>
            <view class="v-show">Нет дополнительных данных...</view>
        </view>
        <!-- 商品列表 -->
        <view>

 pages/basics/logOut.vue

@@ -5,7 +5,7 @@
    export default {
        mounted() {
            uni.showToast({
                title: '注销成功',
                title: 'Выход успешен',
                duration: 1000
            })
            setTimeout(() => {

 pages/basics/manStoCheck.vue

@@ -40,7 +40,7 @@
        </view>
        
        <view class="square-none" v-show="matList.length == 0">
            <view class="v-show">暂无更多数据...</view>
            <view class="v-show">Нет дополнительных данных...</view>
        </view>
        
        <checkbox-group @change="checkbox">
@@ -73,7 +73,7 @@
            </label> -->
            
            <label class="label-btn" style="width: 150rpx;">
                <button class="cu-btn" @click="resst()">重置</button>
                <button class="cu-btn" @click="resst()">Сброс</button>
            </label>
            <label class="label-btn">
                <button class="cu-btn bg-blue " @click="comb()">盘点</button>

 pages/basics/matQuery.vue

@@ -3,23 +3,23 @@
        <view>
            <view class="container">
                <view class="text-box">
                    <view class="text-title"><text>商品编码</text></view>
                    <view class="text-title"><text>Номер складского места</text></view>
                    <view class="text-title"><text>{{matData.matnr}}</text></view>
                </view>
                <view class="text-box">
                    <view class="text-title"><text>商品名称</text></view>
                    <view class="text-title"><text>Наименование товара</text></view>
                    <view class="text-title">{{matData.maktx}}</view>
                </view>
                <view class="text-box">
                    <view class="text-title"><text>规格</text></view>
                    <view class="text-title"><text>Спецификация</text></view>
                    <view class="text-title">{{matData.specs}}</view>
                </view>
                <view class="text-box">
                    <view class="text-title"><text>合同号</text></view>
                    <view class="text-title"><text>Номер партии</text></view>
                    <view class="text-title"><input type="text" v-model="matData.batch"></view>
                </view>
                <view class="text-box">
                    <view class="text-title"><text>数量</text></view>
                    <view class="text-title"><text>Количество</text></view>
                    <view class="text-title">
                        <view>
                            <uni-number-box :value="matData.anfme" :max="99999999" color="#747474" @change="changeValue"/>

 pages/basics/matSelect.vue

@@ -4,17 +4,17 @@
            <view class="search-box">
                <view class="search-area">
                    <view class="search-icon"><uni-icons type="search" size="25" color="#a5a5a5"></uni-icons></view>
                    <input type="text" v-model="condition" placeholder="请输入商品编码 / 名称"/>
                    <input type="text" v-model="condition" placeholder="Пожалуйста, введите код товара / название."/>
                    <view class="close-icon" @click="reset()"><uni-icons type="closeempty" size="25" color="#a5a5a5"></uni-icons></view>
                </view>
                <view class="search-btn"><button @click="search(condition)" class="cu-btn bg-blue">搜索</button></view>
                <view class="search-btn"><button @click="search(condition)" class="cu-btn bg-blue">Поиск</button></view>
            </view>
            <checkbox-group @change="checkbox">
                <label v-for="(item,index) in tag" :key="index" class="demo-list bg-false"
                    @click="showTag(item.id)">
                    <view class="demo-list-right">
                        <view class="tag">
                            <view class="cu-tag bg-blue ">归类</view>
                            <view class="cu-tag bg-blue ">Классификация</view>
                        </view>
                        
                        <view class="order-ditel"><text class="orderNo">{{item.name}}</text></view>
@@ -238,7 +238,7 @@
    .search-area {
        display: inline-block;
        background-color: #F1F1F1;
        width: 75%;
        width: 70%;
        height: 70%;
        margin: 15rpx;
        border-radius: 15rpx;

 pages/basics/offLines.vue

@@ -38,7 +38,7 @@
        </view>
        
        <view class="square-none" v-show="matList.length == 0">
            <view class="v-show">暂无更多数据...</view>
            <view class="v-show">Нет дополнительных данных...</view>
        </view>
        
        <checkbox-group>
@@ -71,7 +71,7 @@
            </label> -->
            
            <label class="label-btn" style="width: 150rpx;">
                <button class="cu-btn" @click="resst()">重置</button>
                <button class="cu-btn" @click="resst()">Сброс</button>
            </label>
            <label class="label-btn">
                <button class="cu-btn bg-blue " @click="comb()">下架</button>

 pages/basics/offline.vue

@@ -34,7 +34,7 @@
                </view>
            </view>
            <view class="square-none" v-show="matList.length === 0">
                <view class="v-show">暂无更多数据...</view>
                <view class="v-show">Нет дополнительных данных...</view>
            </view>
            <checkbox-group>
                <view v-for="(item,index) in matList" :key="index" class="data-list bg-false"  >
@@ -50,10 +50,10 @@
        </scroll-view>
        <view class="footer flex justify-around">
            <view>
                <button class="cu-btn lg" @click="resst()">重置</button>
                <button class="cu-btn lg" @click="resst()">Сброс</button>
            </view>
            <view>
                <button class="cu-btn lg pakin-btn bg-blue" @click="comb()">组托</button>
                <button class="cu-btn lg pakin-btn bg-blue" @click="comb()">Группировка поддонов</button>
            </view>
        </view>
        <view>

 pages/basics/order.vue

@@ -4,7 +4,7 @@
            <view class="square-2">
                <view class="square-title">
                    <view class="title-sign"><view class="sign"></view></view>
                    <view class="title-text"><text>托盘条码</text></view>
                    <view class="title-text"><text>Штрих-код поддона</text></view>
                </view>
                <view class="square-content">
                    <view class="content-input">
@@ -18,7 +18,7 @@
            <view class="square-2">
                <view class="square-title">
                    <view class="title-sign"><view class="sign"></view></view>
                    <view class="title-text"><text>单据编号</text></view>
                    <view class="title-text"><text>Номер документа</text></view>
                </view>
                <view class="square-content">
                    <view class="content-input">
@@ -48,7 +48,7 @@
                
            </view>
            <view class="square-none" v-show="matList.length === 0">
                <view class="v-show">暂无更多数据...</view>
                <view class="v-show">Нет дополнительных данных...</view>
            </view>
            
            <checkbox-group @change="checkbox">
@@ -57,11 +57,11 @@
                        <checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
                    </label>
                    <view class="data-list-left">
                        <view class="matnr"><text style="width: 700rpx;">编码：{{item.matnr}}</text></view>
                        <view><text style="width: 700rpx;">品名：{{item.maktx}}</text></view>
                        <view><text style="width: 700rpx;">批号：{{item.batch}}</text></view>
                        <view class="matnr"><text style="width: 700rpx;">Код товара：{{item.matnr}}</text></view>
                        <view><text style="width: 700rpx;">Наименование товара：{{item.maktx}}</text></view>
                        <view><text style="width: 700rpx;">Номер партии：{{item.batch}}</text></view>
                        <view>
                            <text style="width: 700rpx;">数量：{{item.anfme}}</text>
                            <text style="width: 700rpx;">Количество：{{item.anfme}}</text>
                        </view>
                    </view>
                    <view class="data-list-right">
@@ -84,10 +84,10 @@
            </label> -->
            
            <label class="label-btn" style="width: 150rpx;">
                <button class="cu-btn" @click="resst()">重置</button>
                <button class="cu-btn" @click="resst()">Сброс</button>
            </label>
            <label class="label-btn">
                <button class="cu-btn bg-blue " @click="comb()">组托</button>
                <button class="cu-btn bg-blue " @click="comb()">Группировка поддонов</button>
            </label>
        </view>
        
@@ -97,10 +97,10 @@
                <view class="revise-box">
                    <view class="revise-box-top">
                        <view class="color-block-blue"></view>
                        <text class="title">组托数量</text>
                        <text class="title">Количество сгруппированных поддонов</text>
                    </view>
                    <view class="text-box">
                        <text>可组数量：{{enableQty}}</text>
                        <text>Количество, доступное для группировки：{{enableQty}}</text>
                    </view>
                    <view class="changeBox flex justify-around">
                        <view class="num-box">
@@ -110,7 +110,7 @@
                    </view>
                    <view class="revise-box-buttom">
                        <view>
                            <button class="cu-btn bg-blue" @click="confirm()">确认</button>
                            <button class="cu-btn bg-blue" @click="confirm()">Подтверждение</button>
                        </view>
                    </view>
                    
@@ -340,10 +340,9 @@
                        if (res.code === 200) {
                            if(res.data) {
                                    uni.showLoading();
                                that.matList = res.data;
                                that.matList = res.data[0].combMats;
                                that.orderNo = that.order
                                that.initAnfme()
                                console.log(that.matList)
                            }
                        } else if (res.code == 403) {
                            uni.showToast({title: res.msg, icon: "none", position: 'top'})
@@ -445,6 +444,9 @@
<style>
    /* @import "../../colorui/main.css";
    @import "../../colorui/icon.css"; */
    .title-text {
        width: 270px; /* 或你需要的宽度值 */
    }
    .square-1 .lable {
        display: inline-block;
        float: right;

 pages/basics/orderOut.vue

@@ -34,7 +34,7 @@
        </view>
        
        <view class="square-none" v-show="matList.length === 0">
            <view class="v-show">暂无更多数据...</view>
            <view class="v-show">Нет дополнительных данных...</view>
        </view>
        
        <checkbox-group @change="checkbox">
@@ -58,7 +58,7 @@
            </view>
        </checkbox-group>
      <!--  <view style="margin-top: 10px;">
            <uni-table ref="table" border stripe emptyText="暂无更多数据">
            <uni-table ref="table" border stripe emptyText="反选</text>">
                <uni-tr>
                    <uni-th align="center" width="50">出库数量</uni-th>
                    <uni-th align="center" width="70">产品ID</uni-th>
@@ -85,7 +85,7 @@
            </label> -->
            
            <label class="label-btn" style="width: 150rpx;">
                <button class="cu-btn" @click="resst()">重置</button>
                <button class="cu-btn" @click="resst()">Сброс</button>
            </label>
            <label class="label-btn">
                <button class="cu-btn bg-blue " @click="outbound()">启动出库</button>

 pages/basics/outPakin.vue

@@ -36,7 +36,7 @@
                </view>
            </view>
            <view class="square-none"  v-show="matList.length === 0">
                <view class="v-show">暂无更多数据...</view>
                <view class="v-show">Нет дополнительных данных...</view>
            </view>
            <checkbox-group >
                <view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
@@ -52,10 +52,10 @@
        </scroll-view>
        <view class="footer flex justify-around">
            <view>
                <button class="cu-btn lg" @click="resst()">重置</button>
                <button class="cu-btn lg" @click="resst()">Сброс</button>
            </view>
            <view>
                <button class="cu-btn lg pakin-btn bg-blue" @click="comb()">组托</button>
                <button class="cu-btn lg pakin-btn bg-blue" @click="comb()">Группировка поддонов</button>
            </view>
        </view>
        <view>

 pages/basics/pakStore.vue

@@ -50,7 +50,7 @@
        </view>
        
        <view class="square-none" v-show="matList.length === 0">
            <view class="v-show">暂无更多数据...</view>
            <view class="v-show">Нет дополнительных данных...</view>
        </view>
        
        <view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
@@ -73,7 +73,7 @@
        <!-- 底部按钮 -->
        <view class="footer flex justify-around">
            <label class="label-btn" style="width: 150rpx;">
                <button class="cu-btn" @click="resst()">重置</button>
                <button class="cu-btn" @click="resst()">Сброс</button>
            </label>
            <label class="label-btn">
                <button class="cu-btn bg-blue " @click="comb()">启动入库</button>

 pages/basics/pakin.vue

@@ -4,7 +4,7 @@
            <view class="square-2">
                <view class="square-title">
                    <view class="title-sign"><view class="sign"></view></view>
                    <view class="title-text"><text>托盘条码</text></view>
                    <view class="title-text"><text>Штрих-код поддона</text></view>
                </view>
                <view class="square-content">
                    <view class="content-input">
@@ -19,7 +19,7 @@
            <view class="square-2">
                <view class="square-title">
                    <view class="title-sign"><view class="sign"></view></view>
                    <view class="title-text"><text>检索商品</text></view>
                    <view class="title-text"><text>Поиск товара</text></view>
                </view>
                <view class="square-content">
                    <view class="content-input-btn">
@@ -28,7 +28,7 @@
                        <uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr()"></uni-icons>
                    </view>
                    <view class="content-btn">
                        <button class="cu-btn bg-blue pda-btn" @click="selectMat()">+提取</button>
                        <button class="cu-btn bg-blue pda-btn" @click="selectMat()">Извлечь товар</button>
                    </view>
                </view>
            </view>
@@ -43,7 +43,7 @@
            </view>
            
            <view class="square-none"  v-show="matList.length === 0">
                <view class="v-show">暂无更多数据...</view>
                <view class="v-show">Нет дополнительных данных...</view>
            </view>
            
            <checkbox-group @change="checkbox">
@@ -52,11 +52,11 @@
                        <!-- <view>
                            <checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
                        </view> -->
                        <view class="matnr"><text style="width: 400rpx;">编码：{{item.matnr}}</text></view>
                        <view><text style="width: 400rpx;">品名：{{item.maktx}}</text></view>
                        <view><text style="width: 400rpx;">合同号：{{item.batch}}</text></view>
                        <view class="matnr"><text style="width: 400rpx;">Код товара：{{item.matnr}}</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.anfme}}</text>
                            <text style="width: 400rpx;">Количество：{{item.anfme}}</text>
                        </view>
                    </view>
                    <view class="data-list-right">
@@ -78,10 +78,10 @@
            </label> -->
            
            <label class="label-btn" style="width: 150rpx;">
                <button class="cu-btn" @click="resst()">重置</button>
                <button class="cu-btn" @click="resst()">Сброс</button>
            </label>
            <label class="label-btn">
                <button class="cu-btn bg-blue " @click="comb()">组托</button>
                <button class="cu-btn bg-blue " @click="comb()">Группировка поддонов</button>
            </label>
        </view>
        
@@ -91,21 +91,21 @@
            <view class="revise-box ">
                <view class="revise-box-top">
                    <view class="color-block-blue"></view>
                    <text class="title">修改批号/数量</text>
                    <text class="title">Изменить партию/количество</text>
                </view>
                <view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
                    <text style="display: inline-block;float: left;width: 60px;">合同号：</text>
                    <text style="display: inline-block;float: left;width: 60px;">Номер партии：</text>
                    <input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="batch">
                </view>
                <view class="changeBox">
                    <view class="num-box">
                        <text style="display: inline-block;float: left;width: 60px;">数量：</text>
                        <text style="display: inline-block;float: left;width: 60px;">Количество：</text>
                        <uni-number-box :value="count" :max="99999999" color="#747474"  @change="changeValue"/>
                    </view> 
                </view>
                <view class="revise-box-buttom">
                    <view>
                        <button class="cu-btn bg-blue" @click="confirm()">确认</button>
                        <button class="cu-btn bg-blue" @click="confirm()">Сохранить</button>
                    </view>
                </view>
            </view>
@@ -459,6 +459,9 @@
<style>
    /* @import "../../colorui/main.css";
    @import "../../colorui/icon.css"; */
    .title-text {
        width: 270px; /* 或你需要的宽度值 */
    }
    .revise-box {
        position: relative;
        width: 500rpx;

 pages/basics/putOnSale.vue

@@ -40,7 +40,7 @@
        </view>
        
        <view class="square-none" v-show="matList.length == 0">
            <view class="v-show">暂无更多数据...</view>
            <view class="v-show">Нет дополнительных данных...</view>
        </view>
        
        <checkbox-group>
@@ -70,7 +70,7 @@
            </label> -->
            
            <label class="label-btn" style="width: 150rpx;">
                <button class="cu-btn" @click="resst()">重置</button>
                <button class="cu-btn" @click="resst()">Сброс</button>
            </label>
            <label class="label-btn">
                <button class="cu-btn bg-blue " @click="comb()">上架</button>

 pages/basics/stoOut.vue

@@ -34,7 +34,7 @@
        </view>
        
        <view class="square-none" v-show="matList.length === 0">
            <view class="v-show">暂无更多数据...</view>
            <view class="v-show">Нет дополнительных данных...</view>
        </view>
        
        <checkbox-group @change="checkbox">
@@ -58,7 +58,7 @@
            </view>
        </checkbox-group>
      <!--  <view style="margin-top: 10px;">
            <uni-table ref="table" border stripe emptyText="暂无更多数据">
            <uni-table ref="table" border stripe emptyText="反选</text>">
                <uni-tr>
                    <uni-th align="center" width="50">出库数量</uni-th>
                    <uni-th align="center" width="70">产品ID</uni-th>
@@ -85,7 +85,7 @@
            </label> -->
            
            <label class="label-btn" style="width: 150rpx;">
                <button class="cu-btn" @click="resst()">重置</button>
                <button class="cu-btn" @click="resst()">Сброс</button>
            </label>
            <label class="label-btn">
                <button class="cu-btn bg-blue " @click="outbound()">启动出库</button>

 pages/basics/stockCheck.vue

@@ -34,7 +34,7 @@
                </view>
            </view>
            <view class="pak-data-box"  v-show="matList.length === 0">
                <view style="text-align: center;">暂无更多数据</view>
                <view style="text-align: center;">反选</text></view>
            </view>
            <checkbox-group>
                <view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
@@ -54,7 +54,7 @@
            </checkbox-group>
            <view class="footer flex justify-around">
                <view>
                    <button class="cu-btn lg" @click="resst()">重置</button>
                    <button class="cu-btn lg" @click="resst()">Сброс</button>
                </view>
                <view>
                    <button class="cu-btn lg pakin-btn bg-blue" @click="adjust()">确认</button>

 pages/basics/stockQuery.vue

@@ -5,7 +5,7 @@
            <view class="searchBox">
                <view class="searchIcon"><uni-icons type="search" size="20" color="#dadada"></uni-icons></view>
                <view class="searchArea">
                    <input v-model="locNo" type="text" placeholder=" 库位号" @input="searchByLoc" placeholder-style="line-height:  85rpx;"></view>
                    <input v-model="locNo" type="text" placeholder=" Номер места" @input="searchByLoc" placeholder-style="line-height:  85rpx;"></view>
                <view class="closeIcon"><uni-icons type="closeempty" size="20" color="#dadada" @click="removeLocNo"></uni-icons></view>
            </view>
        </view>
@@ -14,7 +14,7 @@
            <view class="searchBox">
                <view class="searchIcon"><uni-icons type="search" size="20" color="#dadada"></uni-icons></view>
                <view class="searchArea">
                    <input v-model="matnr" type="text" placeholder=" 商品编码" @input="searchByMatnr" placeholder-style="line-height:  85rpx;"></view>
                    <input v-model="matnr" type="text" placeholder=" По умолчанию" @input="searchByMatnr" placeholder-style="line-height:  85rpx;"></view>
                <view class="closeIcon"><uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr"></uni-icons></view>
            </view>
        </view>
@@ -48,11 +48,11 @@
                    <checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
                </label>
                <view class="data-list-left">
                    <view class="matnr"><text style="width: 700rpx;">编码：{{item.matnr}}</text></view>
                    <view><text style="width: 700rpx;">品名：{{item.maktx}}</text></view>
                    <view><text style="width: 700rpx;">合同号：{{item.batch}}</text></view>
                    <view class="matnr"><text style="width: 700rpx;">Код товара：{{item.matnr}}</text></view>
                    <view><text style="width: 700rpx;">Наименование товара：{{item.maktx}}</text></view>
                    <view><text style="width: 700rpx;">Номер партии：{{item.batch}}</text></view>
                    <view>
                        <text style="width: 700rpx;">数量：{{item.anfme}}</text>
                        <text style="width: 700rpx;">Количество：{{item.anfme}}</text>
                    </view>
                </view>
                <view class="data-list-right">
@@ -64,7 +64,7 @@
        </checkbox-group>
        <!-- 无数据显示 -->
        <view class="square-none"  v-show="matList.length === 0">
            <view class="v-show">暂无更多数据...</view>
            <view class="v-show">Нет дополнительных данных...</view>
        </view>
    </view>
</template>
@@ -127,7 +127,7 @@
                                console.log(that.matList)
                            } else {
                                uni.showToast({
                                    title: "暂无更多数据",
                                    title: "反选</text>",
                                    position: 'top',
                                    duration: 1000
                                });

 pages/index/index.vue

@@ -2,9 +2,9 @@
    <view>
        <scroll-view scroll-y>
            <view class="flex justify-end custom-position">
                <view>
<!--                 <view>
                    <image class="img-logo flex solid-bottom " src="../../static/zoneyung.png" mode="widthFix"></image>
                </view>
                </view> -->
            </view>
            <view class="nav-list" >
                <navigator hover-class="none" :url="'/pages/basics/' + item.name" class="nav-li" navigateTo :class="'bg-'+item.color"
@@ -36,19 +36,19 @@
                    //     cuIcon: 'copy'
                    // },
                    {
                        title: '组托入库',
                        title: 'Группировка поддонов на складе',
                        name: 'pakin',
                        color: 'blue',
                        cuIcon: 'copy'
                    },
                    {
                        title: '订单组托',
                        title: 'Группировка поддонов для заказа',
                        name: 'order',
                        color: 'blue',
                        cuIcon: 'goods'
                    },
                    {
                        title: '库存查询',
                        title: 'Поиск по местоположению склада',
                        name: 'stockQuery',
                        color: 'blue',
                        cuIcon: 'searchlist'
@@ -72,12 +72,12 @@
                    //     color: 'blue',
                    //     cuIcon: 'video'
                    // },
                    {
                        title: '库存盘点',
                        name: 'stoCheck',
                        color: 'blue',
                        cuIcon: 'safe'
                    },
                    // {
                    //     title: '库存盘点',
                    //     name: 'stoCheck',
                    //     color: 'blue',
                    //     cuIcon: 'safe'
                    // },
                    // {
                    //     title: '平仓库存盘点',
                    //     name: 'manStoCheck',

 pages/login/login.vue

@@ -9,12 +9,12 @@
            <view class="box padding-lr-xl login-paddingtop" :style="[{animation: 'show ' + 0.6+ 's 1'}]">
                <block v-if="loginWay==1">
                    <view class="cu-form-group margin-top  shadow-warp" :class="[shape=='round'?'round':'']">
                        <view class="title-login"><text class="cuIcon-people margin-right-xs"></text>账号:</view>
                        <input placeholder="请输入账号" name="input" v-model="userName"></input>
                        <view class="title-login"><text class="cuIcon-people margin-right-xs"></text></view>
                        <input placeholder="Пожалуйста, введите имя пользователя" name="input" v-model="userName"></input>
                    </view>
                    <view class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']">
                        <view class="title-login"><text class="cuIcon-lock margin-right-xs"></text>密码:</view>
                        <input class="uni-input" placeholder="请输入密码" :password="!showPassword" v-model="password" />
                        <view class="title-login"><text class="cuIcon-lock margin-right-xs"></text></view>
                        <input class="uni-input" placeholder="Пожалуйста, введите пароль" :password="!showPassword" v-model="password" />
                        <view class="action text-lg">
                            <text :class="[showPassword ? 'cuIcon-attention' : 'cuIcon-attentionforbid']" @click="changePassword"></text>
                        </view>
@@ -22,15 +22,15 @@
                    <view class="flex margin-xs justify-between">
                        <checkbox-group class="rember">
                            <label>
                                <checkbox value="cb" :checked="rember"  @tap="rember = !rember" style="transform:scale(0.7)" /><text>记住密码</text>
                                <checkbox value="cb" :checked="rember"  @tap="rember = !rember" style="transform:scale(0.7)" /><text>Запомнить пароль</text>
                            </label>
                        </checkbox-group>
                        <!-- <text class="changeIP" @click="changeIP()">设置IP</text> -->
                        <text class="changeIP" @click="config()">配置</text>
                        <text class="changeIP" @click="config()">Запомнить пароль</text>
                    </view>
                    <view class="flex padding justify-center margin-top">
                        <button class="cu-btn bg-blue lg  shadow" :loading="loading" :class="[shape=='round'?'round':'']"
                            @tap="onLogin"><text space="emsp">{{loading ? "登录中...":" 登录 "}}</text>
                            @tap="onLogin"><text space="emsp">{{loading ? "登录中...":" Вход "}}</text>
                        </button>
                    </view>
                </block>
@@ -47,21 +47,21 @@
        <view>
            <uni-popup ref="popup" type="right">
                <view class="config">
                    <view class="config-title"><text >配置</text></view>
                    <view class="config-title"><text >Конфигурация</text></view>
                    <view class="config-item">
                        <text>ip地址：</text>
                        <text>IP-адрес：</text>
                        <input v-model="IP" type="text" placeholder="192.168.1.1" placeholder-style="font-size:16rpx;text-indent: 10rpx;">
                    </view>
                    <view class="config-item">
                        <text>端口号：</text>
                        <text>Номер порта：</text>
                        <input v-model="PORT" type="text" placeholder="8080" placeholder-style="font-size:16rpx;text-indent: 10rpx;">
                    </view>
                    <view class="config-item">
                        <text>项目：</text>
                        <input v-model="PROJECT" type="text" placeholder="lywms" placeholder-style="font-size:16rpx;text-indent: 10rpx;">
                        <input v-model="PROJECT" type="text" placeholder="elswms" placeholder-style="font-size:16rpx;text-indent: 10rpx;">
                    </view>
                    <view class="flex justify-around">
                        <button class="cu-btn bg-blue lg" @click="configConfirm">确认</button>
                        <button class="cu-btn bg-blue lg" @click="configConfirm">Сохранить</button>
                    </view>
                </view>
            </uni-popup>
@@ -237,11 +237,11 @@
            },
            onLogin: function (){
                if(!this.userName || this.userName.length==0){
                    uni.showToast({title: '请填写账号',icon: "none"})
                    uni.showToast({title: 'Пожалуйста, введите имя пользователя',icon: "none"})
                    return;
                }
                if(!this.password || this.password.length==0){
                    uni.showToast({title: '请填写密码',icon: "none"})
                    uni.showToast({title: 'Пожалуйста, введите пароль',icon: "none"})
                    return;
                }
                if(this.baseIP == undefined || this.baseIP == '' ) {
@@ -261,11 +261,11 @@
                uni.showLoading();
                setTimeout(function(){
                    uni.hideLoading();
                    uni.showToast({
                        title: '登录超时',
                        position: 'bottom',
                        duration: 1000
                    });
                    // uni.showToast({
                    //     title: '登录超时',
                    //     position: 'bottom',
                    //     duration: 1000
                    // });
                },6000)
                uni.request({
                    url: this.baseHttp + this.baseIP + ':' +this.basePORT +"/" +this.baseUrl + '/login.action',

 static/logo.png



 unpackage/dist/dev/app-plus/app-view.js

@@ -2889,7 +2889,7 @@
          _c(
            "uni-view",
            { staticClass: _vm._$g(47, "sc"), attrs: { _i: 47 } },
            [_vm._v("暂无更多数据...")]
            [_vm._v("Нет дополнительных данных...")]
          )
        ],
        1
@@ -5201,7 +5201,7 @@
              _c(
                "uni-view",
                { staticClass: _vm._$g(29, "sc"), attrs: { _i: 29 } },
                [_vm._v("暂无更多数据...")]
                [_vm._v("Нет дополнительных данных...")]
              )
            ],
            1
@@ -5967,7 +5967,7 @@
              _c(
                "uni-view",
                { staticClass: _vm._$g(29, "sc"), attrs: { _i: 29 } },
                [_vm._v("暂无更多数据...")]
                [_vm._v("Нет дополнительных данных...")]
              )
            ],
            1
@@ -7237,7 +7237,7 @@
              _c(
                "uni-view",
                { staticClass: _vm._$g(31, "sc"), attrs: { _i: 31 } },
                [_vm._v("暂无更多数据...")]
                [_vm._v("Нет дополнительных данных...")]
              )
            ],
            1
@@ -8020,7 +8020,7 @@
              _c(
                "uni-view",
                { staticClass: _vm._$g(36, "sc"), attrs: { _i: 36 } },
                [_vm._v("暂无更多数据...")]
                [_vm._v("Нет дополнительных данных...")]
              )
            ],
            1
@@ -9795,7 +9795,7 @@
          _c(
            "uni-view",
            { staticClass: _vm._$g(40, "sc"), attrs: { _i: 40 } },
            [_vm._v("暂无更多数据...")]
            [_vm._v("Нет дополнительных данных...")]
          )
        ],
        1
@@ -10735,7 +10735,7 @@
          _c(
            "uni-view",
            { staticClass: _vm._$g(30, "sc"), attrs: { _i: 30 } },
            [_vm._v("暂无更多数据...")]
            [_vm._v("Нет дополнительных данных...")]
          )
        ],
        1
@@ -11410,7 +11410,7 @@
          _c(
            "uni-view",
            { staticClass: _vm._$g(28, "sc"), attrs: { _i: 28 } },
            [_vm._v("暂无更多数据...")]
            [_vm._v("Нет дополнительных данных...")]
          )
        ],
        1
@@ -12062,7 +12062,7 @@
          _c(
            "uni-view",
            { staticClass: _vm._$g(26, "sc"), attrs: { _i: 26 } },
            [_vm._v("暂无更多数据...")]
            [_vm._v("Нет дополнительных данных...")]
          )
        ],
        1
@@ -12597,7 +12597,7 @@
          _c(
            "uni-view",
            { staticClass: _vm._$g(26, "sc"), attrs: { _i: 26 } },
            [_vm._v("暂无更多数据...")]
            [_vm._v("Нет дополнительных данных...")]
          )
        ],
        1
@@ -13157,7 +13157,7 @@
          _c(
            "uni-view",
            { staticClass: _vm._$g(28, "sc"), attrs: { _i: 28 } },
            [_vm._v("暂无更多数据...")]
            [_vm._v("Нет дополнительных данных...")]
          )
        ],
        1
@@ -13845,7 +13845,7 @@
          _c(
            "uni-view",
            { staticClass: _vm._$g(30, "sc"), attrs: { _i: 30 } },
            [_vm._v("暂无更多数据...")]
            [_vm._v("Нет дополнительных данных...")]
          )
        ],
        1

			@@ -5,12 +5,12 @@
			"style": {
			"navigationBarBackgroundColor":"#FFF",
			"navigationBarTextStyle":"black",
			"navigationBarTitleText": "登录"
			"navigationBarTitleText": "Вход"
			}
			},{
			"path": "pages/index/index",
			"style": {
			"navigationBarTitleText": "PDA首页"
			"navigationBarTitleText": "Главная страница PDA"
			}
			},{
			"path": "pages/basics/demo02",
			@@ -70,14 +70,14 @@
			"path" : "pages/basics/pakin",
			"style" :
			{
			"navigationBarTitleText": "组托入库",
			"navigationBarTitleText": "Группировка поддонов на складе",
			"enablePullDownRefresh": false
			}
			},{
			"path" : "pages/basics/order",
			"style" :
			{
			"navigationBarTitleText": "订单组托",
			"navigationBarTitleText": "Группировка поддонов для заказа",
			"enablePullDownRefresh": false
			}
			},{
			@@ -91,7 +91,7 @@
			"path" : "pages/basics/matQuery",
			"style" :
			{
			"navigationBarTitleText": "检索商品",
			"navigationBarTitleText": "Поиск товара",
			"enablePullDownRefresh": false

			}
			@@ -107,7 +107,7 @@
			"path" : "pages/basics/stockQuery",
			"style" :
			{
			"navigationBarTitleText": "库存查询",
			"navigationBarTitleText": "Поиск по местоположению склада",
			"enablePullDownRefresh": false

			}

			@@ -53,7 +53,7 @@
			</scroll-view>
			<view class="footer flex justify-around">
			<view>
			<button class="cu-btn lg" @click="resst()">重置</button>
			<button class="cu-btn lg" @click="resst()">Сброс</button>
			</view>
			<view>
			<button class="cu-btn lg pakin-btn bg-blue" @click="comb()">确认</button>

			@@ -36,7 +36,7 @@
			</view>
			</view>
			<view class="square-none" v-show="matList.length === 0">
			<view class="v-show">暂无更多数据...</view>
			<view class="v-show">Нет дополнительных данных...</view>
			</view>
			<checkbox-group @change="checkbox">
			<view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
			@@ -52,7 +52,7 @@
			</scroll-view>
			<view class="footer flex justify-around">
			<view>
			<button class="cu-btn lg" @click="resst()">重置</button>
			<button class="cu-btn lg" @click="resst()">Сброс</button>
			</view>
			<view>
			<button class="cu-btn lg pakin-btn bg-blue" @click="comb()">确认</button>

			@@ -64,7 +64,7 @@
			</view>

			<view class="square-none">
			<view class="v-show">暂无更多数据...</view>
			<view class="v-show">Нет дополнительных данных...</view>
			</view>
			<!-- 商品列表 -->
			<view>

			@@ -5,7 +5,7 @@
			export default {
			mounted() {
			uni.showToast({
			title: '注销成功',
			title: 'Выход успешен',
			duration: 1000
			})
			setTimeout(() => {

			@@ -40,7 +40,7 @@
			</view>

			<view class="square-none" v-show="matList.length == 0">
			<view class="v-show">暂无更多数据...</view>
			<view class="v-show">Нет дополнительных данных...</view>
			</view>

			<checkbox-group @change="checkbox">
			@@ -73,7 +73,7 @@
			</label> -->

			<label class="label-btn" style="width: 150rpx;">
			<button class="cu-btn" @click="resst()">重置</button>
			<button class="cu-btn" @click="resst()">Сброс</button>
			</label>
			<label class="label-btn">
			<button class="cu-btn bg-blue " @click="comb()">盘点</button>

			@@ -3,23 +3,23 @@
			<view>
			<view class="container">
			<view class="text-box">
			<view class="text-title"><text>商品编码</text></view>
			<view class="text-title"><text>Номер складского места</text></view>
			<view class="text-title"><text>{{matData.matnr}}</text></view>
			</view>
			<view class="text-box">
			<view class="text-title"><text>商品名称</text></view>
			<view class="text-title"><text>Наименование товара</text></view>
			<view class="text-title">{{matData.maktx}}</view>
			</view>
			<view class="text-box">
			<view class="text-title"><text>规格</text></view>
			<view class="text-title"><text>Спецификация</text></view>
			<view class="text-title">{{matData.specs}}</view>
			</view>
			<view class="text-box">
			<view class="text-title"><text>合同号</text></view>
			<view class="text-title"><text>Номер партии</text></view>
			<view class="text-title"><input type="text" v-model="matData.batch"></view>
			</view>
			<view class="text-box">
			<view class="text-title"><text>数量</text></view>
			<view class="text-title"><text>Количество</text></view>
			<view class="text-title">
			<view>
			<uni-number-box :value="matData.anfme" :max="99999999" color="#747474" @change="changeValue"/>

			@@ -4,17 +4,17 @@
			<view class="search-box">
			<view class="search-area">
			<view class="search-icon"><uni-icons type="search" size="25" color="#a5a5a5"></uni-icons></view>
			<input type="text" v-model="condition" placeholder="请输入商品编码 / 名称"/>
			<input type="text" v-model="condition" placeholder="Пожалуйста, введите код товара / название."/>
			<view class="close-icon" @click="reset()"><uni-icons type="closeempty" size="25" color="#a5a5a5"></uni-icons></view>
			</view>
			<view class="search-btn"><button @click="search(condition)" class="cu-btn bg-blue">搜索</button></view>
			<view class="search-btn"><button @click="search(condition)" class="cu-btn bg-blue">Поиск</button></view>
			</view>
			<checkbox-group @change="checkbox">
			<label v-for="(item,index) in tag" :key="index" class="demo-list bg-false"
			@click="showTag(item.id)">
			<view class="demo-list-right">
			<view class="tag">
			<view class="cu-tag bg-blue ">归类</view>
			<view class="cu-tag bg-blue ">Классификация</view>
			</view>

			<view class="order-ditel"><text class="orderNo">{{item.name}}</text></view>
			@@ -238,7 +238,7 @@
			.search-area {
			display: inline-block;
			background-color: #F1F1F1;
			width: 75%;
			width: 70%;
			height: 70%;
			margin: 15rpx;
			border-radius: 15rpx;

			@@ -38,7 +38,7 @@
			</view>

			<view class="square-none" v-show="matList.length == 0">
			<view class="v-show">暂无更多数据...</view>
			<view class="v-show">Нет дополнительных данных...</view>
			</view>

			<checkbox-group>
			@@ -71,7 +71,7 @@
			</label> -->

			<label class="label-btn" style="width: 150rpx;">
			<button class="cu-btn" @click="resst()">重置</button>
			<button class="cu-btn" @click="resst()">Сброс</button>
			</label>
			<label class="label-btn">
			<button class="cu-btn bg-blue " @click="comb()">下架</button>

			@@ -34,7 +34,7 @@
			</view>
			</view>
			<view class="square-none" v-show="matList.length === 0">
			<view class="v-show">暂无更多数据...</view>
			<view class="v-show">Нет дополнительных данных...</view>
			</view>
			<checkbox-group>
			<view v-for="(item,index) in matList" :key="index" class="data-list bg-false" >
			@@ -50,10 +50,10 @@
			</scroll-view>
			<view class="footer flex justify-around">
			<view>
			<button class="cu-btn lg" @click="resst()">重置</button>
			<button class="cu-btn lg" @click="resst()">Сброс</button>
			</view>
			<view>
			<button class="cu-btn lg pakin-btn bg-blue" @click="comb()">组托</button>
			<button class="cu-btn lg pakin-btn bg-blue" @click="comb()">Группировка поддонов</button>
			</view>
			</view>
			<view>

			@@ -4,7 +4,7 @@
			<view class="square-2">
			<view class="square-title">
			<view class="title-sign"><view class="sign"></view></view>
			<view class="title-text"><text>托盘条码</text></view>
			<view class="title-text"><text>Штрих-код поддона</text></view>
			</view>
			<view class="square-content">
			<view class="content-input">
			@@ -18,7 +18,7 @@
			<view class="square-2">
			<view class="square-title">
			<view class="title-sign"><view class="sign"></view></view>
			<view class="title-text"><text>单据编号</text></view>
			<view class="title-text"><text>Номер документа</text></view>
			</view>
			<view class="square-content">
			<view class="content-input">
			@@ -48,7 +48,7 @@

			</view>
			<view class="square-none" v-show="matList.length === 0">
			<view class="v-show">暂无更多数据...</view>
			<view class="v-show">Нет дополнительных данных...</view>
			</view>

			<checkbox-group @change="checkbox">
			@@ -57,11 +57,11 @@
			<checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
			</label>
			<view class="data-list-left">
			<view class="matnr"><text style="width: 700rpx;">编码：{{item.matnr}}</text></view>
			<view><text style="width: 700rpx;">品名：{{item.maktx}}</text></view>
			<view><text style="width: 700rpx;">批号：{{item.batch}}</text></view>
			<view class="matnr"><text style="width: 700rpx;">Код товара：{{item.matnr}}</text></view>
			<view><text style="width: 700rpx;">Наименование товара：{{item.maktx}}</text></view>
			<view><text style="width: 700rpx;">Номер партии：{{item.batch}}</text></view>
			<view>
			<text style="width: 700rpx;">数量：{{item.anfme}}</text>
			<text style="width: 700rpx;">Количество：{{item.anfme}}</text>
			</view>
			</view>
			<view class="data-list-right">
			@@ -84,10 +84,10 @@
			</label> -->

			<label class="label-btn" style="width: 150rpx;">
			<button class="cu-btn" @click="resst()">重置</button>
			<button class="cu-btn" @click="resst()">Сброс</button>
			</label>
			<label class="label-btn">
			<button class="cu-btn bg-blue " @click="comb()">组托</button>
			<button class="cu-btn bg-blue " @click="comb()">Группировка поддонов</button>
			</label>
			</view>

			@@ -97,10 +97,10 @@
			<view class="revise-box">
			<view class="revise-box-top">
			<view class="color-block-blue"></view>
			<text class="title">组托数量</text>
			<text class="title">Количество сгруппированных поддонов</text>
			</view>
			<view class="text-box">
			<text>可组数量：{{enableQty}}</text>
			<text>Количество, доступное для группировки：{{enableQty}}</text>
			</view>
			<view class="changeBox flex justify-around">
			<view class="num-box">
			@@ -110,7 +110,7 @@
			</view>
			<view class="revise-box-buttom">
			<view>
			<button class="cu-btn bg-blue" @click="confirm()">确认</button>
			<button class="cu-btn bg-blue" @click="confirm()">Подтверждение</button>
			</view>
			</view>

			@@ -340,10 +340,9 @@
			if (res.code === 200) {
			if(res.data) {
			uni.showLoading();
			that.matList = res.data;
			that.matList = res.data[0].combMats;
			that.orderNo = that.order
			that.initAnfme()
			console.log(that.matList)
			}
			} else if (res.code == 403) {
			uni.showToast({title: res.msg, icon: "none", position: 'top'})
			@@ -445,6 +444,9 @@
			<style>
			/* @import "../../colorui/main.css";
			@import "../../colorui/icon.css"; */
			.title-text {
			width: 270px; /* 或你需要的宽度值 */
			}
			.square-1 .lable {
			display: inline-block;
			float: right;

			@@ -50,7 +50,7 @@
			</view>

			<view class="square-none" v-show="matList.length === 0">
			<view class="v-show">暂无更多数据...</view>
			<view class="v-show">Нет дополнительных данных...</view>
			</view>

			<view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
			@@ -73,7 +73,7 @@
			<!-- 底部按钮 -->
			<view class="footer flex justify-around">
			<label class="label-btn" style="width: 150rpx;">
			<button class="cu-btn" @click="resst()">重置</button>
			<button class="cu-btn" @click="resst()">Сброс</button>
			</label>
			<label class="label-btn">
			<button class="cu-btn bg-blue " @click="comb()">启动入库</button>

			@@ -5,7 +5,7 @@
			<view class="searchBox">
			<view class="searchIcon"><uni-icons type="search" size="20" color="#dadada"></uni-icons></view>
			<view class="searchArea">
			<input v-model="locNo" type="text" placeholder=" 库位号" @input="searchByLoc" placeholder-style="line-height: 85rpx;"></view>
			<input v-model="locNo" type="text" placeholder=" Номер места" @input="searchByLoc" placeholder-style="line-height: 85rpx;"></view>
			<view class="closeIcon"><uni-icons type="closeempty" size="20" color="#dadada" @click="removeLocNo"></uni-icons></view>
			</view>
			</view>
			@@ -14,7 +14,7 @@
			<view class="searchBox">
			<view class="searchIcon"><uni-icons type="search" size="20" color="#dadada"></uni-icons></view>
			<view class="searchArea">
			<input v-model="matnr" type="text" placeholder=" 商品编码" @input="searchByMatnr" placeholder-style="line-height: 85rpx;"></view>
			<input v-model="matnr" type="text" placeholder=" По умолчанию" @input="searchByMatnr" placeholder-style="line-height: 85rpx;"></view>
			<view class="closeIcon"><uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr"></uni-icons></view>
			</view>
			</view>
			@@ -48,11 +48,11 @@
			<checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
			</label>
			<view class="data-list-left">
			<view class="matnr"><text style="width: 700rpx;">编码：{{item.matnr}}</text></view>
			<view><text style="width: 700rpx;">品名：{{item.maktx}}</text></view>
			<view><text style="width: 700rpx;">合同号：{{item.batch}}</text></view>
			<view class="matnr"><text style="width: 700rpx;">Код товара：{{item.matnr}}</text></view>
			<view><text style="width: 700rpx;">Наименование товара：{{item.maktx}}</text></view>
			<view><text style="width: 700rpx;">Номер партии：{{item.batch}}</text></view>
			<view>
			<text style="width: 700rpx;">数量：{{item.anfme}}</text>
			<text style="width: 700rpx;">Количество：{{item.anfme}}</text>
			</view>
			</view>
			<view class="data-list-right">
			@@ -64,7 +64,7 @@
			</checkbox-group>
			<!-- 无数据显示 -->
			<view class="square-none" v-show="matList.length === 0">
			<view class="v-show">暂无更多数据...</view>
			<view class="v-show">Нет дополнительных данных...</view>
			</view>
			</view>
			</template>
			@@ -127,7 +127,7 @@
			console.log(that.matList)
			} else {
			uni.showToast({
			title: "暂无更多数据",
			title: "反选</text>",
			position: 'top',
			duration: 1000
			});

			@@ -2,9 +2,9 @@
			<view>
			<scroll-view scroll-y>
			<view class="flex justify-end custom-position">
			<view>
			<!-- <view>
			<image class="img-logo flex solid-bottom " src="../../static/zoneyung.png" mode="widthFix"></image>
			</view>
			</view> -->
			</view>
			<view class="nav-list" >
			<navigator hover-class="none" :url="'/pages/basics/' + item.name" class="nav-li" navigateTo :class="'bg-'+item.color"
			@@ -36,19 +36,19 @@
			// cuIcon: 'copy'
			// },
			{
			title: '组托入库',
			title: 'Группировка поддонов на складе',
			name: 'pakin',
			color: 'blue',
			cuIcon: 'copy'
			},
			{
			title: '订单组托',
			title: 'Группировка поддонов для заказа',
			name: 'order',
			color: 'blue',
			cuIcon: 'goods'
			},
			{
			title: '库存查询',
			title: 'Поиск по местоположению склада',
			name: 'stockQuery',
			color: 'blue',
			cuIcon: 'searchlist'
			@@ -72,12 +72,12 @@
			// color: 'blue',
			// cuIcon: 'video'
			// },
			{
			title: '库存盘点',
			name: 'stoCheck',
			color: 'blue',
			cuIcon: 'safe'
			},
			// {
			// title: '库存盘点',
			// name: 'stoCheck',
			// color: 'blue',
			// cuIcon: 'safe'
			// },
			// {
			// title: '平仓库存盘点',
			// name: 'manStoCheck',

			@@ -9,12 +9,12 @@
			<view class="box padding-lr-xl login-paddingtop" :style="[{animation: 'show ' + 0.6+ 's 1'}]">
			<block v-if="loginWay==1">
			<view class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']">
			<view class="title-login"><text class="cuIcon-people margin-right-xs"></text>账号:</view>
			<input placeholder="请输入账号" name="input" v-model="userName"></input>
			<view class="title-login"><text class="cuIcon-people margin-right-xs"></text></view>
			<input placeholder="Пожалуйста, введите имя пользователя" name="input" v-model="userName"></input>
			</view>
			<view class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']">
			<view class="title-login"><text class="cuIcon-lock margin-right-xs"></text>密码:</view>
			<input class="uni-input" placeholder="请输入密码" :password="!showPassword" v-model="password" />
			<view class="title-login"><text class="cuIcon-lock margin-right-xs"></text></view>
			<input class="uni-input" placeholder="Пожалуйста, введите пароль" :password="!showPassword" v-model="password" />
			<view class="action text-lg">
			<text :class="[showPassword ? 'cuIcon-attention' : 'cuIcon-attentionforbid']" @click="changePassword"></text>
			</view>
			@@ -22,15 +22,15 @@
			<view class="flex margin-xs justify-between">
			<checkbox-group class="rember">
			<label>
			<checkbox value="cb" :checked="rember" @tap="rember = !rember" style="transform:scale(0.7)" /><text>记住密码</text>
			<checkbox value="cb" :checked="rember" @tap="rember = !rember" style="transform:scale(0.7)" /><text>Запомнить пароль</text>
			</label>
			</checkbox-group>
			<!-- <text class="changeIP" @click="changeIP()">设置IP</text> -->
			<text class="changeIP" @click="config()">配置</text>
			<text class="changeIP" @click="config()">Запомнить пароль</text>
			</view>
			<view class="flex padding justify-center margin-top">
			<button class="cu-btn bg-blue lg shadow" :loading="loading" :class="[shape=='round'?'round':'']"
			@tap="onLogin"><text space="emsp">{{loading ? "登录中...":" 登录 "}}</text>
			@tap="onLogin"><text space="emsp">{{loading ? "登录中...":" Вход "}}</text>
			</button>
			</view>
			</block>
			@@ -47,21 +47,21 @@
			<view>
			<uni-popup ref="popup" type="right">
			<view class="config">
			<view class="config-title"><text >配置</text></view>
			<view class="config-title"><text >Конфигурация</text></view>
			<view class="config-item">
			<text>ip地址：</text>
			<text>IP-адрес：</text>
			<input v-model="IP" type="text" placeholder="192.168.1.1" placeholder-style="font-size:16rpx;text-indent: 10rpx;">
			</view>
			<view class="config-item">
			<text>端口号：</text>
			<text>Номер порта：</text>
			<input v-model="PORT" type="text" placeholder="8080" placeholder-style="font-size:16rpx;text-indent: 10rpx;">
			</view>
			<view class="config-item">
			<text>项目：</text>
			<input v-model="PROJECT" type="text" placeholder="lywms" placeholder-style="font-size:16rpx;text-indent: 10rpx;">
			<input v-model="PROJECT" type="text" placeholder="elswms" placeholder-style="font-size:16rpx;text-indent: 10rpx;">
			</view>
			<view class="flex justify-around">
			<button class="cu-btn bg-blue lg" @click="configConfirm">确认</button>
			<button class="cu-btn bg-blue lg" @click="configConfirm">Сохранить</button>
			</view>
			</view>
			</uni-popup>
			@@ -237,11 +237,11 @@
			},
			onLogin: function (){
			if(!this.userName \|\| this.userName.length==0){
			uni.showToast({title: '请填写账号',icon: "none"})
			uni.showToast({title: 'Пожалуйста, введите имя пользователя',icon: "none"})
			return;
			}
			if(!this.password \|\| this.password.length==0){
			uni.showToast({title: '请填写密码',icon: "none"})
			uni.showToast({title: 'Пожалуйста, введите пароль',icon: "none"})
			return;
			}
			if(this.baseIP == undefined \|\| this.baseIP == '' ) {
			@@ -261,11 +261,11 @@
			uni.showLoading();
			setTimeout(function(){
			uni.hideLoading();
			uni.showToast({
			title: '登录超时',
			position: 'bottom',
			duration: 1000
			});
			// uni.showToast({
			// title: '登录超时',
			// position: 'bottom',
			// duration: 1000
			// });
			},6000)
			uni.request({
			url: this.baseHttp + this.baseIP + ':' +this.basePORT +"/" +this.baseUrl + '/login.action',

			@@ -2889,7 +2889,7 @@
			_c(
			"uni-view",
			{ staticClass: _vm._$g(47, "sc"), attrs: { _i: 47 } },
			[_vm._v("暂无更多数据...")]
			[_vm._v("Нет дополнительных данных...")]
			)
			],
			1
			@@ -5201,7 +5201,7 @@
			_c(
			"uni-view",
			{ staticClass: _vm._$g(29, "sc"), attrs: { _i: 29 } },
			[_vm._v("暂无更多数据...")]
			[_vm._v("Нет дополнительных данных...")]
			)
			],
			1
			@@ -5967,7 +5967,7 @@
			_c(
			"uni-view",
			{ staticClass: _vm._$g(29, "sc"), attrs: { _i: 29 } },
			[_vm._v("暂无更多数据...")]
			[_vm._v("Нет дополнительных данных...")]
			)
			],
			1
			@@ -7237,7 +7237,7 @@
			_c(
			"uni-view",
			{ staticClass: _vm._$g(31, "sc"), attrs: { _i: 31 } },
			[_vm._v("暂无更多数据...")]
			[_vm._v("Нет дополнительных данных...")]
			)
			],
			1
			@@ -8020,7 +8020,7 @@
			_c(
			"uni-view",
			{ staticClass: _vm._$g(36, "sc"), attrs: { _i: 36 } },
			[_vm._v("暂无更多数据...")]
			[_vm._v("Нет дополнительных данных...")]
			)
			],
			1
			@@ -9795,7 +9795,7 @@
			_c(
			"uni-view",
			{ staticClass: _vm._$g(40, "sc"), attrs: { _i: 40 } },
			[_vm._v("暂无更多数据...")]
			[_vm._v("Нет дополнительных данных...")]
			)
			],
			1
			@@ -10735,7 +10735,7 @@
			_c(
			"uni-view",
			{ staticClass: _vm._$g(30, "sc"), attrs: { _i: 30 } },
			[_vm._v("暂无更多数据...")]
			[_vm._v("Нет дополнительных данных...")]
			)
			],
			1
			@@ -11410,7 +11410,7 @@
			_c(
			"uni-view",
			{ staticClass: _vm._$g(28, "sc"), attrs: { _i: 28 } },
			[_vm._v("暂无更多数据...")]
			[_vm._v("Нет дополнительных данных...")]
			)
			],
			1
			@@ -12062,7 +12062,7 @@
			_c(
			"uni-view",
			{ staticClass: _vm._$g(26, "sc"), attrs: { _i: 26 } },
			[_vm._v("暂无更多数据...")]
			[_vm._v("Нет дополнительных данных...")]
			)
			],
			1
			@@ -12597,7 +12597,7 @@
			_c(
			"uni-view",
			{ staticClass: _vm._$g(26, "sc"), attrs: { _i: 26 } },
			[_vm._v("暂无更多数据...")]
			[_vm._v("Нет дополнительных данных...")]
			)
			],
			1
			@@ -13157,7 +13157,7 @@
			_c(
			"uni-view",
			{ staticClass: _vm._$g(28, "sc"), attrs: { _i: 28 } },
			[_vm._v("暂无更多数据...")]
			[_vm._v("Нет дополнительных данных...")]
			)
			],
			1
			@@ -13845,7 +13845,7 @@
			_c(
			"uni-view",
			{ staticClass: _vm._$g(30, "sc"), attrs: { _i: 30 } },
			[_vm._v("暂无更多数据...")]
			[_vm._v("Нет дополнительных данных...")]
			)
			],
			1