wms_app.git - Gitblit

parent: e01b85d2 | 补丁 | 提交 | ignore whitespace

whycq

2023-09-18 f01d077604d4cb07a556c32881301ef87a79a7c6

6个文件已修改

	App.vue	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	main.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages.json	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/home/home.vue	241 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/login/login.vue	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	uni.scss	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 App.vue

@@ -114,7 +114,10 @@
    }
</script>

<style>
<style lang="scss">
    /* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
    @import "@/uni_modules/uview-ui/index.scss";
	
    @import "static/css/colorUi/icon.css";
    /*每个页面公共css */
    body {

 main.js

@@ -12,6 +12,9 @@
import Mock from '@/common/mock/index.js';
Vue.prototype.$Mock = Mock;

import uView from '@/uni_modules/uview-ui'
Vue.use(uView)

App.mpType = 'app'

try {

 pages.json

@@ -1,5 +1,10 @@

{
    "easycom": {
            "^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
        },
    "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
		
        {
            "path": "pages/login/login",
            "style": {
@@ -165,6 +170,24 @@
            }
        },
        {
            "path": "pages/out/checkOut",
            "style": {
                "navigationBarTitleText": "出库确认"
            }
        },
        {
            "path": "pages/out/stockOut",
            "style": {
                "navigationBarTitleText": "退库确认"
            }
        },
        {
            "path": "pages/out/handIn",
            "style": {
                "navigationBarTitleText": "手动入库"
            }
        },
        {
            "path": "pages/login/logOut",
            "style": {
                "navigationBarTitleText": "退出登录"

 pages/home/home.vue

@@ -25,124 +25,145 @@
                elements: [],
                elements2: [
                    {
                        title: '组托入库',
                        name: 'pakin',
                        title: '出库确认',
                        name: 'checkOut',
                        color: 'cyan',
                        cuIcon: 'pullup',
                        url: '/pakin/pakin'
                        url: '/out/checkOut'
                    },
                    {
                        title: '再次拣料',
                        name: 'changePallet',
                        color: 'green',
                        cuIcon: 'order',
                        url: '/pakin/pickAgain'
                    },
                    {
                        title: 'AGV组托',
                        name: 'AGVPakin',
                        title: '退库确认',
                        name: 'stockOut',
                        color: 'blue',
                        cuIcon: 'pullup',
                        url: '/tzsk/AGV/AGVPakin'
                        url: '/out/stockOut'
                    },
                    {
                        title: 'AGV上架绑定',
                        name: 'AGVPakinBing',
                        color: 'mauve',
                        // cuIcon: 'pullup',
                        url: '/tzsk/AGV/AGVPakinBing'
                    },
                    {
                        title: 'AGV启动入库',
                        name: 'AGVStart',
                        color: 'pink',
                        // cuIcon: 'pullup',
                        url: '/tzsk/AGV/AGVStart'
                    },
                    {
                        title: 'AGV上架组托',
                        name: 'AGVPakinOn',
                        color: 'brown',
                        // cuIcon: 'pullup',
                        url: '/tzsk/AGV/AGVPakinOn'
                    },
                    {
                        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',
                        title: '手动入库',
                        name: 'handIn',
                        color: 'olive',
                        cuIcon: 'pulldown',
                        url: '/order/orderPutDown'
                        cuIcon: 'pullup',
                        url: '/out/handIn'
                    },
                    {
                        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: 'pakin',
                    //     color: 'cyan',
                    //     cuIcon: 'pullup',
                    //     url: '/pakin/pakin'
                    // },
                    // {
                    //     title: '再次拣料',
                    //     name: 'changePallet',
                    //     color: 'green',
                    //     cuIcon: 'order',
                    //     url: '/pakin/pickAgain'
                    // },
                    // {
                    //     title: 'AGV组托',
                    //     name: 'AGVPakin',
                    //     color: 'blue',
                    //     cuIcon: 'pullup',
                    //     url: '/tzsk/AGV/AGVPakin'
                    // },
                    // {
                    //     title: 'AGV上架绑定',
                    //     name: 'AGVPakinBing',
                    //     color: 'mauve',
                    //     // cuIcon: 'pullup',
                    //     url: '/tzsk/AGV/AGVPakinBing'
                    // },
                    // {
                    //     title: 'AGV启动入库',
                    //     name: 'AGVStart',
                    //     color: 'pink',
                    //     // cuIcon: 'pullup',
                    //     url: '/tzsk/AGV/AGVStart'
                    // },
                    // {
                    //     title: 'AGV上架组托',
                    //     name: 'AGVPakinOn',
                    //     color: 'brown',
                    //     // cuIcon: 'pullup',
                    //     url: '/tzsk/AGV/AGVPakinOn'
                    // },
                    // {
                    //     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: 'logOut',
@@ -158,7 +179,9 @@
        onShow() {
            this.baseUrl = uni.getStorageSync('baseUrl');
            this.token = uni.getStorageSync('token');
            this.getAuth()
            setTimeout(()=>{
                this.getAuth()
            },10)
        },
        methods: {
            getAuth() {

 pages/login/login.vue

@@ -66,15 +66,15 @@
                    <view class="title">配置</view>
                    <view class="popup-item">
                        <view class="popup-item-left">IP:</view>
                        <view class="popup-item-right"><input type="text" v-model="url.ip"></view>
                        <view class="popup-item-right"><input type="text" v-model="Lurl.ip"></view>
                    </view>
                    <view class="popup-item">
                        <view class="popup-item-left">端口:</view>
                        <view class="popup-item-right"><input type="text" v-model="url.port"></view>
                        <view class="popup-item-right"><input type="text" v-model="Lurl.port"></view>
                    </view>
                    <view class="popup-item">
                        <view class="popup-item-left">项目:</view>
                        <view class="popup-item-right"><input type="text" v-model="url.project"></view>
                        <view class="popup-item-right"><input type="text" v-model="Lurl.project"></view>
                    </view>
                    <view class="btn">
                        <view class="btn-left" @click="close">取消</view>
@@ -110,7 +110,7 @@
                showPassword: false,
                value: '',
                remberPassword: true,
                url: {
                Lurl: {
                    ip: '',
                    port: '',
                    project: ''
@@ -131,13 +131,13 @@
        },
        onLoad() {
            this.user = uni.getStorageSync('user')
            this.url = uni.getStorageSync('url')
            this.Lurl = uni.getStorageSync('Lurl')
            this.baseUrl = uni.getStorageSync('baseUrl')
            if (!this.user) {
                this.user = {userName: '',password: ''}
            }
            if (!this.url) {
                this.url = {ip: '',port: '',project: ''}
            if (!this.Lurl) {
                this.Lurl = {ip: '',port: '',project: ''}
            }
        },
        onShow () {
@@ -165,9 +165,9 @@
            },
            // 保存ip
            settingConfirm() {
                this.baseUrl = "http://" + this.url.ip + ':' + this.url.port + '/' + this.url.project
                this.baseUrl = "http://" + this.Lurl.ip + ':' + this.Lurl.port + '/' + this.Lurl.project
                uni.setStorageSync('baseUrl', this.baseUrl);
                uni.setStorageSync('url', this.url);
                uni.setStorageSync('Lurl', this.Lurl);
                this.$refs.inputDialog.close()
            },
            onLogin() {
@@ -252,9 +252,9 @@
                    return
                }
                
                let url = that.baseUrl + '/appVersion/checkUpdate/' + that.version + '/' + type
                let Lurl = that.baseUrl + '/appVersion/checkUpdate/' + that.version + '/' + type
                uni.request({
                    url: url,
                    url: Lurl,
                    method: 'GET',
                    success(res) {
                        console.log(res);

 uni.scss

@@ -12,6 +12,9 @@
 * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
 */

/* uView uni.scss */
@import '@/uni_modules/uview-ui/theme.scss';

/* 颜色变量 */

/* 行为相关颜色 */

			@@ -114,7 +114,10 @@
			}
			</script>

			<style>
			<style lang="scss">
			/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
			@import "@/uni_modules/uview-ui/index.scss";

			@import "static/css/colorUi/icon.css";
			/每个页面公共css /
			body {

			@@ -12,6 +12,9 @@
			import Mock from '@/common/mock/index.js';
			Vue.prototype.$Mock = Mock;

			import uView from '@/uni_modules/uview-ui'
			Vue.use(uView)

			App.mpType = 'app'

			try {

			@@ -1,5 +1,10 @@

			{
			"easycom": {
			"^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
			},
			"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages

			{
			"path": "pages/login/login",
			"style": {
			@@ -165,6 +170,24 @@
			}
			},
			{
			"path": "pages/out/checkOut",
			"style": {
			"navigationBarTitleText": "出库确认"
			}
			},
			{
			"path": "pages/out/stockOut",
			"style": {
			"navigationBarTitleText": "退库确认"
			}
			},
			{
			"path": "pages/out/handIn",
			"style": {
			"navigationBarTitleText": "手动入库"
			}
			},
			{
			"path": "pages/login/logOut",
			"style": {
			"navigationBarTitleText": "退出登录"

			@@ -25,124 +25,145 @@
			elements: [],
			elements2: [
			{
			title: '组托入库',
			name: 'pakin',
			title: '出库确认',
			name: 'checkOut',
			color: 'cyan',
			cuIcon: 'pullup',
			url: '/pakin/pakin'
			url: '/out/checkOut'
			},
			{
			title: '再次拣料',
			name: 'changePallet',
			color: 'green',
			cuIcon: 'order',
			url: '/pakin/pickAgain'
			},
			{
			title: 'AGV组托',
			name: 'AGVPakin',
			title: '退库确认',
			name: 'stockOut',
			color: 'blue',
			cuIcon: 'pullup',
			url: '/tzsk/AGV/AGVPakin'
			url: '/out/stockOut'
			},
			{
			title: 'AGV上架绑定',
			name: 'AGVPakinBing',
			color: 'mauve',
			// cuIcon: 'pullup',
			url: '/tzsk/AGV/AGVPakinBing'
			},
			{
			title: 'AGV启动入库',
			name: 'AGVStart',
			color: 'pink',
			// cuIcon: 'pullup',
			url: '/tzsk/AGV/AGVStart'
			},
			{
			title: 'AGV上架组托',
			name: 'AGVPakinOn',
			color: 'brown',
			// cuIcon: 'pullup',
			url: '/tzsk/AGV/AGVPakinOn'
			},
			{
			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',
			title: '手动入库',
			name: 'handIn',
			color: 'olive',
			cuIcon: 'pulldown',
			url: '/order/orderPutDown'
			cuIcon: 'pullup',
			url: '/out/handIn'
			},
			{
			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: 'pakin',
			// color: 'cyan',
			// cuIcon: 'pullup',
			// url: '/pakin/pakin'
			// },
			// {
			// title: '再次拣料',
			// name: 'changePallet',
			// color: 'green',
			// cuIcon: 'order',
			// url: '/pakin/pickAgain'
			// },
			// {
			// title: 'AGV组托',
			// name: 'AGVPakin',
			// color: 'blue',
			// cuIcon: 'pullup',
			// url: '/tzsk/AGV/AGVPakin'
			// },
			// {
			// title: 'AGV上架绑定',
			// name: 'AGVPakinBing',
			// color: 'mauve',
			// // cuIcon: 'pullup',
			// url: '/tzsk/AGV/AGVPakinBing'
			// },
			// {
			// title: 'AGV启动入库',
			// name: 'AGVStart',
			// color: 'pink',
			// // cuIcon: 'pullup',
			// url: '/tzsk/AGV/AGVStart'
			// },
			// {
			// title: 'AGV上架组托',
			// name: 'AGVPakinOn',
			// color: 'brown',
			// // cuIcon: 'pullup',
			// url: '/tzsk/AGV/AGVPakinOn'
			// },
			// {
			// 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: 'logOut',
			@@ -158,7 +179,9 @@
			onShow() {
			this.baseUrl = uni.getStorageSync('baseUrl');
			this.token = uni.getStorageSync('token');
			this.getAuth()
			setTimeout(()=>{
			this.getAuth()
			},10)
			},
			methods: {
			getAuth() {

			@@ -66,15 +66,15 @@
			<view class="title">配置</view>
			<view class="popup-item">
			<view class="popup-item-left">IP:</view>
			<view class="popup-item-right"><input type="text" v-model="url.ip"></view>
			<view class="popup-item-right"><input type="text" v-model="Lurl.ip"></view>
			</view>
			<view class="popup-item">
			<view class="popup-item-left">端口:</view>
			<view class="popup-item-right"><input type="text" v-model="url.port"></view>
			<view class="popup-item-right"><input type="text" v-model="Lurl.port"></view>
			</view>
			<view class="popup-item">
			<view class="popup-item-left">项目:</view>
			<view class="popup-item-right"><input type="text" v-model="url.project"></view>
			<view class="popup-item-right"><input type="text" v-model="Lurl.project"></view>
			</view>
			<view class="btn">
			<view class="btn-left" @click="close">取消</view>
			@@ -110,7 +110,7 @@
			showPassword: false,
			value: '',
			remberPassword: true,
			url: {
			Lurl: {
			ip: '',
			port: '',
			project: ''
			@@ -131,13 +131,13 @@
			},
			onLoad() {
			this.user = uni.getStorageSync('user')
			this.url = uni.getStorageSync('url')
			this.Lurl = uni.getStorageSync('Lurl')
			this.baseUrl = uni.getStorageSync('baseUrl')
			if (!this.user) {
			this.user = {userName: '',password: ''}
			}
			if (!this.url) {
			this.url = {ip: '',port: '',project: ''}
			if (!this.Lurl) {
			this.Lurl = {ip: '',port: '',project: ''}
			}
			},
			onShow () {
			@@ -165,9 +165,9 @@
			},
			// 保存ip
			settingConfirm() {
			this.baseUrl = "http://" + this.url.ip + ':' + this.url.port + '/' + this.url.project
			this.baseUrl = "http://" + this.Lurl.ip + ':' + this.Lurl.port + '/' + this.Lurl.project
			uni.setStorageSync('baseUrl', this.baseUrl);
			uni.setStorageSync('url', this.url);
			uni.setStorageSync('Lurl', this.Lurl);
			this.$refs.inputDialog.close()
			},
			onLogin() {
			@@ -252,9 +252,9 @@
			return
			}

			let url = that.baseUrl + '/appVersion/checkUpdate/' + that.version + '/' + type
			let Lurl = that.baseUrl + '/appVersion/checkUpdate/' + that.version + '/' + type
			uni.request({
			url: url,
			url: Lurl,
			method: 'GET',
			success(res) {
			console.log(res);

			@@ -12,6 +12,9 @@
			* 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
			*/

			/* uView uni.scss */
			@import '@/uni_modules/uview-ui/theme.scss';

			/* 颜色变量 */

			/* 行为相关颜色 */