wms_app.git - Gitblit

parent: 1cf0d631 | 补丁 | 提交 | ignore whitespace

whycq

2023-05-22 881616e9071567ab24ba0c590dd8a2e59b6c307c

6个文件已修改

	pages/home/home.vue	126 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/mat/matSelected.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/order/orderPakin.vue	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/order/orderPutDown.vue	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/order/orderPutOn.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/pakin/pakin.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pages/home/home.vue

@@ -26,34 +26,34 @@
                        cuIcon: 'pullup',
                        url: '/pakin/pakin'
                    },
                    // {
                    //     title: '订单入库',
                    //     name: 'orderPakin',
                    //     color: 'blue',
                    //     cuIcon: 'pullup',
                    //     url: '/order/orderPakin'
                    // },
                    // {
                    //     title: '打印',
                    //     name: 'print',
                    //     color: 'purple',
                    //     cuIcon: 'text',
                    //     url: '/print/print'
                    // },
                    // {
                    //     title: '订单上架',
                    //     name: 'orderPutOn',
                    //     color: 'mauve',
                    //     cuIcon: 'pullup',
                    //     url: '/order/orderPutOn'
                    // },
                    // {
                    //     title: '订单下架',
                    //     name: 'orderPutDown',
                    //     color: 'pink',
                    //     cuIcon: 'pulldown',
                    //     url: '/order/orderPutDown'
                    // },
                    {
                        title: '订单入库',
                        name: 'orderPakin',
                        color: 'blue',
                        cuIcon: 'pullup',
                        url: '/order/orderPakin'
                    },
                    {
                        title: '打印',
                        name: 'print',
                        color: 'purple',
                        cuIcon: 'text',
                        url: '/print/print'
                    },
                    {
                        title: '订单上架',
                        name: 'orderPutOn',
                        color: 'mauve',
                        cuIcon: 'pullup',
                        url: '/order/orderPutOn'
                    },
                    {
                        title: '订单下架',
                        name: 'orderPutDown',
                        color: 'pink',
                        cuIcon: 'pulldown',
                        url: '/order/orderPutDown'
                    },
                    {
                        title: '库存查询',
                        name: 'stockQuery',
@@ -61,41 +61,41 @@
                        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: '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: 'logOut',

 pages/mat/matSelected.vue

@@ -13,14 +13,14 @@
                <view class="form-item-desc"><text>规格</text></view>
                <view class="form-item-content"><text>{{mat.specs}}</text></view>
            </view>
            <view class="form-item">
            <!-- <view class="form-item">
                <view class="form-item-desc"><text>批号</text></view>
                <view class="form-item-content">
                    <view class="form-input">
                        <input type="text" v-model="mat.batch">
                    </view>
                </view>
            </view>
            </view> -->
            <view class="form-item">
                <view class="form-item-desc"><text>数量</text></view>
                <view class="form-item-content">

 pages/order/orderPakin.vue

@@ -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>
        <!-- 弹窗 -->
        <!-- 修改数量 -->
@@ -82,10 +82,10 @@
                                style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
                        </view>
                    </view>
                    <view class="popup-item">
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                    </view>
                    </view> -->
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">
@@ -113,7 +113,7 @@
                <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
            </uni-popup>
        </view>
        <!-- 确认组托 -->
        <!-- 确认入库 -->
        <view>
            <uni-popup ref="combConfirm" type="dialog">
                <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
@@ -273,7 +273,7 @@
            combConfirm(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否现在组托!'
                this.content = '是否现在入库!'
                this.$refs.combConfirm.open()
            },
            comb() {
@@ -291,7 +291,7 @@
                }
                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;
                    }
@@ -310,7 +310,7 @@
                        var res = result.data
                        if (res.code === 200) {
                            that.resst();
                            that.messageText = "组托成功"
                            that.messageText = "入库成功"
                            that.messageToggle('success')
                        } else if (res.code == 403) {
                            that.messageText = res.msg

 pages/order/orderPutDown.vue

@@ -64,7 +64,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>
        <!-- 弹窗 -->
        <!-- 修改数量 -->
@@ -80,10 +80,10 @@
                                style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
                        </view>
                    </view>
                    <view class="popup-item">
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                    </view>
                    </view> -->
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">
@@ -111,7 +111,7 @@
                <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
            </uni-popup>
        </view>
        <!-- 确认组托 -->
        <!-- 确认下架 -->
        <view>
            <uni-popup ref="combConfirm" type="dialog">
                <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
@@ -292,7 +292,7 @@
            combConfirm(type) {
                this.msgType = type
                this.title = '警告'
                this.content = '是否现在组托!'
                this.content = '是否现在下架!'
                this.$refs.combConfirm.open()
            },
            comb() {
@@ -310,7 +310,7 @@
                }
                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;
                    }
@@ -329,7 +329,7 @@
                        var res = result.data
                        if (res.code === 200) {
                            that.resst();
                            that.messageText = "组托成功"
                            that.messageText = "下架成功"
                            that.messageToggle('success')
                        } else if (res.code == 403) {
                            that.messageText = res.msg

 pages/order/orderPutOn.vue

@@ -80,10 +80,10 @@
                                style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
                        </view>
                    </view>
                    <view class="popup-item">
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                    </view>
                    </view> -->
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">

 pages/pakin/pakin.vue

@@ -76,10 +76,10 @@
                                style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
                        </view>
                    </view>
                    <view class="popup-item">
                        <view class="popup-item-left">合同号:</view>
                    <!-- <view class="popup-item">
                        <view class="popup-item-left">批号:</view>
                        <view class="popup-item-right"><input type="text" v-model="batch"></view>
                    </view>
                    </view> -->
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">

			@@ -26,34 +26,34 @@
			cuIcon: 'pullup',
			url: '/pakin/pakin'
			},
			// {
			// title: '订单入库',
			// name: 'orderPakin',
			// color: 'blue',
			// cuIcon: 'pullup',
			// url: '/order/orderPakin'
			// },
			// {
			// title: '打印',
			// name: 'print',
			// color: 'purple',
			// cuIcon: 'text',
			// url: '/print/print'
			// },
			// {
			// title: '订单上架',
			// name: 'orderPutOn',
			// color: 'mauve',
			// cuIcon: 'pullup',
			// url: '/order/orderPutOn'
			// },
			// {
			// title: '订单下架',
			// name: 'orderPutDown',
			// color: 'pink',
			// cuIcon: 'pulldown',
			// url: '/order/orderPutDown'
			// },
			{
			title: '订单入库',
			name: 'orderPakin',
			color: 'blue',
			cuIcon: 'pullup',
			url: '/order/orderPakin'
			},
			{
			title: '打印',
			name: 'print',
			color: 'purple',
			cuIcon: 'text',
			url: '/print/print'
			},
			{
			title: '订单上架',
			name: 'orderPutOn',
			color: 'mauve',
			cuIcon: 'pullup',
			url: '/order/orderPutOn'
			},
			{
			title: '订单下架',
			name: 'orderPutDown',
			color: 'pink',
			cuIcon: 'pulldown',
			url: '/order/orderPutDown'
			},
			{
			title: '库存查询',
			name: 'stockQuery',
			@@ -61,41 +61,41 @@
			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: '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: 'logOut',

			@@ -13,14 +13,14 @@
			<view class="form-item-desc"><text>规格</text></view>
			<view class="form-item-content"><text>{{mat.specs}}</text></view>
			</view>
			<view class="form-item">
			<!-- <view class="form-item">
			<view class="form-item-desc"><text>批号</text></view>
			<view class="form-item-content">
			<view class="form-input">
			<input type="text" v-model="mat.batch">
			</view>
			</view>
			</view>
			</view> -->
			<view class="form-item">
			<view class="form-item-desc"><text>数量</text></view>
			<view class="form-item-content">

			@@ -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>
			<!-- 弹窗 -->
			<!-- 修改数量 -->
			@@ -82,10 +82,10 @@
			style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
			</view>
			</view>
			<view class="popup-item">
			<!-- <view class="popup-item">
			<view class="popup-item-left">批号:</view>
			<view class="popup-item-right"><input type="text" v-model="batch"></view>
			</view>
			</view> -->
			<view class="popup-item">
			<view class="popup-item-left">数量:</view>
			<view class="popup-item-right" style="border: none;justify-content: center;">
			@@ -113,7 +113,7 @@
			<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
			</uni-popup>
			</view>
			<!-- 确认组托 -->
			<!-- 确认入库 -->
			<view>
			<uni-popup ref="combConfirm" type="dialog">
			<uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
			@@ -273,7 +273,7 @@
			combConfirm(type) {
			this.msgType = type
			this.title = '警告'
			this.content = '是否现在组托!'
			this.content = '是否现在入库!'
			this.$refs.combConfirm.open()
			},
			comb() {
			@@ -291,7 +291,7 @@
			}
			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;
			}
			@@ -310,7 +310,7 @@
			var res = result.data
			if (res.code === 200) {
			that.resst();
			that.messageText = "组托成功"
			that.messageText = "入库成功"
			that.messageToggle('success')
			} else if (res.code == 403) {
			that.messageText = res.msg

			@@ -64,7 +64,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>
			<!-- 弹窗 -->
			<!-- 修改数量 -->
			@@ -80,10 +80,10 @@
			style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
			</view>
			</view>
			<view class="popup-item">
			<!-- <view class="popup-item">
			<view class="popup-item-left">批号:</view>
			<view class="popup-item-right"><input type="text" v-model="batch"></view>
			</view>
			</view> -->
			<view class="popup-item">
			<view class="popup-item-left">数量:</view>
			<view class="popup-item-right" style="border: none;justify-content: center;">
			@@ -111,7 +111,7 @@
			<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
			</uni-popup>
			</view>
			<!-- 确认组托 -->
			<!-- 确认下架 -->
			<view>
			<uni-popup ref="combConfirm" type="dialog">
			<uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
			@@ -292,7 +292,7 @@
			combConfirm(type) {
			this.msgType = type
			this.title = '警告'
			this.content = '是否现在组托!'
			this.content = '是否现在下架!'
			this.$refs.combConfirm.open()
			},
			comb() {
			@@ -310,7 +310,7 @@
			}
			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;
			}
			@@ -329,7 +329,7 @@
			var res = result.data
			if (res.code === 200) {
			that.resst();
			that.messageText = "组托成功"
			that.messageText = "下架成功"
			that.messageToggle('success')
			} else if (res.code == 403) {
			that.messageText = res.msg

			@@ -76,10 +76,10 @@
			style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
			</view>
			</view>
			<view class="popup-item">
			<view class="popup-item-left">合同号:</view>
			<!-- <view class="popup-item">
			<view class="popup-item-left">批号:</view>
			<view class="popup-item-right"><input type="text" v-model="batch"></view>
			</view>
			</view> -->
			<view class="popup-item">
			<view class="popup-item-left">数量:</view>
			<view class="popup-item-right" style="border: none;justify-content: center;">