#
whycq
2024-07-29 21ad7745a981656da1be4c1f63644c707be9153c
#
6个文件已修改
2个文件已添加
236 ■■■■ 已修改文件
App.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.vue 158 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/logOut.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/login.vue 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/pakin/pakin.vue 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/img/logo1.png 补丁 | 查看 | 原始文档 | blame | 历史
static/img/logo2.png 补丁 | 查看 | 原始文档 | blame | 历史
App.vue
@@ -125,7 +125,7 @@
    .nav-list {
        display: flex;
        flex-wrap: wrap;
        padding: 0px 40upx 0px;
        padding: 0px 80upx 0px;
        justify-content: space-between;
        margin-top: 20px;
    }
@@ -133,7 +133,7 @@
    .nav-li {
        padding: 30upx;
        border-radius: 12upx;
        width: 36%;
        width: 90%;
        margin: 0 2.5% 40upx;
        /* background-image: url(https://cdn.nlark.com/yuque/0/2019/png/280374/1552996358352-assets/web-upload/cc3b1807-c684-4b83-8f80-80e5b8a6b975.png); */
        background-size: cover;
pages.json
@@ -3,7 +3,7 @@
        {
            "path": "pages/login/login",
            "style": {
                "navigationBarTitleText": "登 录"
                "navigationBarTitleText": "登 錄"
            }
        },
        {
@@ -33,7 +33,7 @@
        {
            "path": "pages/pakin/pakin",
            "style": {
                "navigationBarTitleText": "组 托"
                "navigationBarTitleText": "組 托"
            }
        },
        {
pages/home/home.vue
@@ -25,7 +25,7 @@
                elements: [],
                elements2: [
                    {
                        title: '组托入库',
                        title: '組托入庫',
                        name: 'pakin',
                        color: 'cyan',
                        cuIcon: 'pullup',
@@ -38,85 +38,85 @@
                    //     cuIcon: 'order',
                    //     url: '/pakin/pickAgain'
                    // },
                    // {
                    //     title: '订单入库',
                    //     name: 'orderPakin',
                    //     color: 'red',
                    //     cuIcon: 'pullup',
                    //     url: '/order/orderPakin'
                    // },
                    // {
                    //     title: '组托上架',
                    //     name: 'putOn',
                    //     color: 'orange',
                    //     cuIcon: 'pullup',
                    //     url: '/pakin/putOn'
                    // },
                    // {
                    //     title: '打印',
                    //     name: 'print',
                    //     color: 'purple',
                    //     cuIcon: 'text',
                    //     url: '/print/print'
                    // },
                    // {
                    //     title: '订单上架',
                    //     name: 'orderPutOn',
                    //     color: 'yellow',
                    //     cuIcon: 'pullup',
                    //     url: '/order/orderPutOn'
                    // },
                    // {
                    //     title: '订单下架',
                    //     name: 'orderPutDown',
                    //     color: 'olive',
                    //     cuIcon: 'pulldown',
                    //     url: '/order/orderPutDown'
                    // },
                    // {
                    //     title: '库存查询',
                    //     name: 'stockQuery',
                    //     color: 'green',
                    //     cuIcon: 'check',
                    //     url: '/stock/stockQuery'
                    // },
                    // {
                    //     title: '盘点',
                    //     name: 'stockCheck',
                    //     color: 'red',
                    //     cuIcon: 'post',
                    //     url: '/stock/stockCheck'
                    // },
                    // {
                    //     title: '商品打印',
                    //     name: 'matList',
                    //     color: 'orange',
                    //     cuIcon: 'post',
                    //     url: '/mat/matList'
                    // },
                    // {
                    //     title: '补货',
                    //     name: 'restock',
                    //     color: 'yellow',
                    //     cuIcon: 'punch',
                    //     url: '/stock/restock'
                    // },
                    // {
                    //     title: '转全板',
                    //     name: 'piking',
                    //     color: 'olive',
                    //     cuIcon: 'order',
                    //     url: '/pakin/piking'
                    // },
                    // {
                    //     title: '换板绑定',
                    //     name: 'changePallet',
                    //     color: 'green',
                    //     cuIcon: 'order',
                    //     url: '/stock/changePallet'
                    // },
                    {
                        title: '订单入库',
                        name: 'orderPakin',
                        color: 'red',
                        cuIcon: 'pullup',
                        url: '/order/orderPakin'
                    },
                    {
                        title: '组托上架',
                        name: 'putOn',
                        color: 'orange',
                        cuIcon: 'pullup',
                        url: '/pakin/putOn'
                    },
                    {
                        title: '打印',
                        name: 'print',
                        color: 'purple',
                        cuIcon: 'text',
                        url: '/print/print'
                    },
                    {
                        title: '订单上架',
                        name: 'orderPutOn',
                        color: 'yellow',
                        cuIcon: 'pullup',
                        url: '/order/orderPutOn'
                    },
                    {
                        title: '订单下架',
                        name: 'orderPutDown',
                        color: 'olive',
                        cuIcon: 'pulldown',
                        url: '/order/orderPutDown'
                    },
                    {
                        title: '库存查询',
                        name: 'stockQuery',
                        color: 'green',
                        cuIcon: 'check',
                        url: '/stock/stockQuery'
                    },
                    {
                        title: '盘点',
                        name: 'stockCheck',
                        color: 'red',
                        cuIcon: 'post',
                        url: '/stock/stockCheck'
                    },
                    {
                        title: '商品打印',
                        name: 'matList',
                        color: 'orange',
                        cuIcon: 'post',
                        url: '/mat/matList'
                    },
                    {
                        title: '补货',
                        name: 'restock',
                        color: 'yellow',
                        cuIcon: 'punch',
                        url: '/stock/restock'
                    },
                    {
                        title: '转全板',
                        name: 'piking',
                        color: 'olive',
                        cuIcon: 'order',
                        url: '/pakin/piking'
                    },
                    {
                        title: '换板绑定',
                        name: 'changePallet',
                        color: 'green',
                        cuIcon: 'order',
                        url: '/stock/changePallet'
                    },
                    {
                        title: '退出登录',
                        title: '退出登錄',
                        name: 'logOut',
                        color: 'grey',
                        cuIcon: 'exit',
pages/login/logOut.vue
@@ -5,7 +5,7 @@
    export default {
        mounted() {
            uni.showToast({
                title: '注销成功',
                title: '註銷成功',
                duration: 1000
            })
            setTimeout(() => {
pages/login/login.vue
@@ -9,7 +9,7 @@
        <!-- logo -->
        <view class="logo">
            <view class="logo-box">
                <image src="../../static/img/logo.png" mode="aspectFit"></image>
                <image src="../../static/img/logo1.png" mode="aspectFit"></image>
            </view>
        </view>
        <view class="content">
@@ -18,7 +18,7 @@
                <view class="box-icon">
                    <uni-icons type="person" size="20" color="#707070"></uni-icons>
                </view>
                <view class="box-text">账号:</view>
                <view class="box-text">賬號:</view>
                <view class="box-input">
                    <input type="text" placeholder="请输入账号" v-model="user.userName" 
                    placeholder-style="font-size:14px;color:#ccc;">
@@ -30,7 +30,7 @@
                <view class="box-icon">
                    <uni-icons type="locked" size="20" color="#707070"></uni-icons>
                </view>
                <view class="box-text">密码:</view>
                <view class="box-text">密碼:</view>
                <view class="box-input">
                    <input :password="!showPassword" placeholder="请输入密码" v-model="user.password"
                    placeholder-style="font-size:14px;color:#ccc;" >
@@ -43,7 +43,7 @@
            <!-- 记住密码 -->
            <view class="check">
                <view class="check-left">
                    <view>记住密码</view>
                    <view>記住密碼</view>
                </view>
                <view class="check-right">
                    <switch :checked='remberPassword' color="#FFCC33" style="zoom:.5" @change="remberChange"/>
@@ -73,12 +73,12 @@
                        <view class="popup-item-right"><input type="text" v-model="url.port"></view>
                    </view>
                    <view class="popup-item">
                        <view class="popup-item-left">项目:</view>
                        <view class="popup-item-left">URL:</view>
                        <view class="popup-item-right"><input type="text" v-model="url.project"></view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="close">取消</view>
                        <view class="btn-right" @click="settingConfirm">确认</view>
                        <view class="btn-right" @click="settingConfirm">確認</view>
                    </view>
                </view>
            </uni-popup>
@@ -122,7 +122,7 @@
                },
                load: {
                    loading: false,
                    btnText: '登录'
                    btnText: '登錄'
                },
                msgType: 'success',
                filename: '',
@@ -177,7 +177,7 @@
                    fail(result) {
                        uni.showToast({
                            icon: 'error',
                            title: '请求失败'
                            title: '請求失敗'
                        })
                    },
                    data: {
@@ -190,7 +190,7 @@
                    success(result) {
                        if (result.statusCode === 404) {
                            uni.showToast({
                                title: '登录失败',
                                title: '登錄失敗',
                                icon: "error"
                            })
                            return
@@ -198,7 +198,7 @@
                        let res = result.data
                        if (res.code === 200) {
                            that.load.loading = true;
                            that.load.btnText = '登录中';
                            that.load.btnText = '登錄中';
                            uni.setStorageSync('token', res.data.token);
                            if(that.remberPassword){
                                uni.setStorageSync('user', that.user);
@@ -207,7 +207,7 @@
                            }
                            setTimeout(() => {
                                uni.showToast({
                                    title: '登录成功'
                                    title: '登錄成功'
                                })
                                setTimeout(() => {
                                    uni.reLaunch({
@@ -261,7 +261,7 @@
                        var res = res.data
                        if (res.data) {
                            that.filename = res.data.path
                            that.dialogContent = '发现新版本:' + res.data.version + ', 是否立即更新'
                            that.dialogContent = '發現新版本:' + res.data.version + ', 是否立即更新'
                            that.$refs.upVersion.open()
                        } else {
                            uni.showToast({
pages/pakin/pakin.vue
@@ -2,12 +2,12 @@
    <view>
        <view class="code">
            <view class="item">
                <view class="code-decs">托盘码:</view>
                <view class="code-decs">托盤碼:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="barcode" :focus="barcodeFocus"
                    @input="barcodeInput()">
            </view>
            <view class="item">
                <view class="code-decs">物料码:</view>
                <view class="code-decs">物料碼:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="matnr" :focus="matFocus" @input="findMat()">
                <view class="item-right">
                    <button></button>
@@ -27,7 +27,7 @@
                        <view class="left-item">{{i + 1}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">编码:</view>
                        <view class="desc">編碼:</view>
                        <view class="left-item">
                            <uni-tag :text="item.matnr" type="primary"></uni-tag>
                        </view>
@@ -37,11 +37,11 @@
                        <view class="left-item">{{item.maktx}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">规格:</view>
                        <view class="desc">規格:</view>
                        <view class="left-item">{{item.specs}}</view>
                    </view>
                    <view class="list-left-item">
                        <view class="desc">批号:</view>
                        <view class="desc">批號:</view>
                        <view class="left-item">
                            <uni-tag :text="item.batch" type="warning"></uni-tag>
                        </view>
@@ -53,7 +53,7 @@
                        </view>
                    </view> -->
                    <view class="list-left-item">
                        <view class="desc">数量:</view>
                        <view class="desc">數量:</view>
                        <view class="left-item">{{item.anfme}}</view>
                    </view>
                </view>
@@ -66,7 +66,7 @@
        <!-- 底部操作按钮 -->
        <view class="buttom">
            <button size="mini" @click="reset('warn')">重置</button>
            <button size="mini" type="primary" @click="combConfirm('warn')">组托</button>
            <button size="mini" type="primary" @click="combConfirm('warn')">組托</button>
        </view>
        <!-- 弹窗 -->
        <!-- 修改数量 -->
@@ -76,14 +76,14 @@
                    <!-- 标题 -->
                    <view class="title">修改</view>
                    <view class="popup-item">
                        <view class="popup-item-left">编码:</view>
                        <view class="popup-item-left">編碼:</view>
                        <view class="popup-item-right">
                            <input type="text" v-model="matnr" disabled="true"
                                style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
                        </view>
                    </view>
                    <view class="popup-item">
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-left">批號:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                    </view>
                    <!-- <view class="popup-item">
@@ -91,7 +91,7 @@
                        <view class="popup-item-right"><input type="text" v-model="weight"></view>
                    </view> -->
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-left">數量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">
                            <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
                        </view>
@@ -120,14 +120,14 @@
        <!-- 确认组托 -->
        <view>
            <uni-popup ref="combConfirm" type="dialog">
                <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
                <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="確認" :title="title" :content="content"
                    @confirm="comb" @close="combClose"></uni-popup-dialog>
            </uni-popup>
        </view>
        <!-- 确认重置 -->
        <view>
            <uni-popup ref="resetConfirm" type="dialog">
                <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
                <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="確認" :title="title" :content="content"
                    @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
            </uni-popup>
        </view>
@@ -177,7 +177,7 @@
                    var len = this.barcode.length
                    if (len != 8) {
                        uni.showToast({
                            title: '托盘码有误请重试',
                            title: '托盤碼有誤請重試',
                            icon: "none",
                            position: 'top'
                        });
@@ -331,7 +331,7 @@
                this.removeNum  = i
                this.msgType = type
                this.title = '警告'
                this.content = '是否移除当前商品!'
                this.content = '是否移除當前商品!'
                this.$refs.alertDialog.open(i)
            },
            // 确认移除
@@ -362,7 +362,7 @@
            combConfirm(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否现在组托!'
                this.content = '是否現在組托!'
                this.$refs.combConfirm.open()
            },
            combClose() {
@@ -372,18 +372,18 @@
                uni.vibrateShort();
                let that = this;
                if (that.barcode === '') {
                    this.messageText = "请扫描托盘条码"
                    this.messageText = "請掃描托盤條碼"
                    this.messageToggle('error')
                    return;
                }
                if (that.dataList.length === 0) {
                    this.messageText = "请添加商品列表"
                    this.messageText = "請添加商品列表"
                    this.messageToggle('error')
                    return;
                }
                for (var i = 0; i < that.dataList.length; i++) {
                    if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
                        this.messageText = that.dataList[i].matnr + '组托数量不能为0'
                        this.messageText = that.dataList[i].matnr + '組托數量不能為0'
                        this.messageToggle('error')
                        return;
                    }
@@ -402,11 +402,11 @@
                        var res = result.data
                        if (res.code === 200) {
                            that.resst();
                            that.messageText = "组托成功"
                            that.messageText = "組托成功"
                            that.messageToggle('success')
                            const innerAudioContext = uni.createInnerAudioContext();
                            innerAudioContext.src = '/static/music/pakinOk.mp3';
                            innerAudioContext.play()
                            // const innerAudioContext = uni.createInnerAudioContext();
                            // innerAudioContext.src = '/static/music/pakinOk.mp3';
                            // innerAudioContext.play()
                        } else if (res.code == 403) {
                            that.messageText = res.msg
                            that.messageToggle('error')
static/img/logo1.png
static/img/logo2.png