前端

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.104",
-    "versionCode" : 21104,
+    "versionName" : "2.1.105",
+    "versionCode" : 21105,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/erp/index.vue

@@ -139,80 +139,79 @@
 									// }
 								],
 				gridList: [
-					// {
-
-					// 	num: 0,
-					// 	name: '入库',
-					// 	// icon: 'cuIcon-apps',
-					// 	src: '../../static/img/erp/yaoqingyonghu@3x.png',
-					// 	tips: 0,
-					// 	url: '/pages/erp/warehousing/warehousing',
-					// 	show: true
-					// },
-					// {
-					// 	num: 1,
-					// 	name: '待完善入库',
-					// 	// icon: 'cuIcon-calendar',
-					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
-					// 	tips: 0,
-					// 	url: '/pages/erp/improvedWrehousing/improvedWrehousing',
-					// 	show: true
-					// },
-					// {
-					// 	num: 2,
-					// 	name: '出库',
-					// 	// icon: 'cuIcon-copy',
-					// 	src: '../../static/img/erp/shougoujianjin@3x.png',
-					// 	tips: 0,
-					// 	url: '/pages/erp/exWarehousing/exWarehousing',
-					// 	show: true
-					// },
-					// {
-					// 	num: 3,
-					// 	name: '待完善出库',
-					// 	// icon: 'cuIcon-edit',
-					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
-					// 	tips: 0,
-					// 	url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
-					// 	show: true
-					// }
 					{
 						num: 0,
-						name: '入库质检',
+						name: '入库',
 						// icon: 'cuIcon-apps',
 						src: '../../static/img/erp/yaoqingyonghu@3x.png',
 						tips: 0,
-						url: '/pages/erpbusiness/quality_testing?managementType=1',
+						url: '/pages/erp/warehousing/warehousing',
 						show: true
 					},
 					{
 						num: 1,
-						name: '入库检斤',
+						name: '待完善入库',
 						// icon: 'cuIcon-calendar',
 						src: '../../static/img/erp/shougouzhijian@3x.png',
 						tips: 0,
-						url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
+						url: '/pages/erp/improvedWrehousing/improvedWrehousing',
 						show: true
 					},
 					{
 						num: 2,
-						name: '出库检斤',
+						name: '出库',
 						// icon: 'cuIcon-copy',
 						src: '../../static/img/erp/shougoujianjin@3x.png',
 						tips: 0,
-						url: '/pages/erpbusiness/acquisitionInspection/warehouseWeighing',
+						url: '/pages/erp/exWarehousing/exWarehousing',
 						show: true
 					},
 					{
 						num: 3,
-						name: '出库质检',
+						name: '待完善出库',
 						// icon: 'cuIcon-edit',
 						src: '../../static/img/erp/shougouzhijian@3x.png',
 						tips: 0,
-						url: `/pages/erpbusiness/outbound_quality_testing?managementType=3`,
+						url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
 						show: true
 					}
 					// {
+					// 	num: 0,
+					// 	name: '入库质检',
+					// 	// icon: 'cuIcon-apps',
+					// 	src: '../../static/img/erp/yaoqingyonghu@3x.png',
+					// 	tips: 0,
+					// 	url: '/pages/erpbusiness/quality_testing?managementType=1',
+					// 	show: true
+					// },
+					// {
+					// 	num: 1,
+					// 	name: '入库检斤',
+					// 	// icon: 'cuIcon-calendar',
+					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
+					// 	tips: 0,
+					// 	url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
+					// 	show: true
+					// },
+					// {
+					// 	num: 2,
+					// 	name: '出库检斤',
+					// 	// icon: 'cuIcon-copy',
+					// 	src: '../../static/img/erp/shougoujianjin@3x.png',
+					// 	tips: 0,
+					// 	url: '/pages/erpbusiness/acquisitionInspection/warehouseWeighing',
+					// 	show: true
+					// },
+					// {
+					// 	num: 3,
+					// 	name: '出库质检',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
+					// 	tips: 0,
+					// 	url: `/pages/erpbusiness/outbound_quality_testing?managementType=3`,
+					// 	show: true
+					// }
+					// {
 					// 	num: 4,
 					// 	name: '开通业务',
 					// 	// icon: 'cuIcon-edit',

pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue

@@ -169,9 +169,8 @@
 				})
 			},
 			loadData() {
-				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
-					compId: '',
-					personCharge: this.userInfo.phone
+				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelfApp', {
+					compId: this.compId
 				}).then(res => {
 					console.log("warehouseBaseInfo", res)
 					let _resData = res.data.data

pages/user/user.vue

@@ -166,25 +166,7 @@
 						show: true
 					},
 				],
-				gridList1: [{
-						num: 0,
-						name: 'ERP业务',
-						// icon: 'cuIcon-copy',
-						src: '../../static/img/myimg/erp.png',
-						tips: 0,
-						url: `/pages/erp/index`,
-						show: true
-					},
-					{
-						num: 1,
-						name: '入库管理',
-						// name: '收购业务',
-						// icon: 'cuIcon-copy',
-						src: '../../static/img/myimg/sg.png',
-						tips: 0,
-						url: `/pages/erpbusiness/index`,
-						show: true
-					},
+				gridList1: [
 					// {
 					// 	num: 2,
 					// 	name: '我的票据',
@@ -248,23 +230,41 @@
 					// 	url: `/pages/user/depotAcquisition/depotAcquisition`,
 					// 	show: true
 					// },
-					
+					// {
+					// 	num: 2,
+					// 	name: '我的合同',
+					// 	// icon: 'cuIcon-calendar',
+					// 	src: '../../static/img/sign/myContract@2x.png',
+					// 	tips: 0,
+					// 	url: '/pageB/contract/contract',
+					// 	show: true
+					// },
+					{
+						num: 0,
+						name: 'ERP业务',
+						// icon: 'cuIcon-copy',
+						src: '../../static/img/myimg/erp.png',
+						tips: 0,
+						url: `/pages/erp/index`,
+						show: true
+					},
 					{
 						num: 1,
-						name: '我的票据',
-						// icon: 'cuIcon-news',
-						src: '../../static/img/sign/piaoju@3x.png',
+						// name: '入库管理',
+						name: '收购业务',
+						// icon: 'cuIcon-copy',
+						src: '../../static/img/myimg/sg.png',
 						tips: 0,
-						url: `/pages/bill/index`,
+						url: `/pages/erpbusiness/index`,
 						show: true
 					},
 					{
 						num: 2,
-						name: '我的合同',
-						// icon: 'cuIcon-calendar',
-						src: '../../static/img/sign/myContract@2x.png',
+						name: '我的票据',
+						// icon: 'cuIcon-news',
+						src: '../../static/img/sign/piaoju@3x.png',
 						tips: 0,
-						url: '/pageB/contract/contract',
+						url: `/pages/bill/index`,
 						show: true
 					},
 					{
@@ -287,67 +287,67 @@
 					},
 					{
 						num: 5,
-						name: '数据报表',
-						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/shujubaobiao@2x.png',
-						tips: 0,
-						url: `/pages/user/report`,
-						show: false
-					},
-					{
-						num: 6,
-						name: '库点监控',
-						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/kudianjiankong@2x.png',
-						tips: 0,
-						url: `/pages/user/depotMonitoring`,
-						show: false
-					},
-					{
-						num: 7,
-						name: '打卡',
+						name: '库点收购',
 						// icon: 'cuIcon-edit',
 						src: '../../static/img/sign/daka@3x.png',
 						tips: 0,
-						url: `/pages/clock/the_clock`,
-						show: true
-					},
-					{
-						num: 8,
-						name: '请假',
-						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/qingjia@3x.png',
-						tips: 0,
-						url: `/pages/leave/the_leave`,
-						show: true
-					},
-					{
-						num: 9,
-						name: '加油',
-						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/jiayou.png',
-						tips: 0,
-						url: `/pages/fuelfilling/the_fuel_filling`,
+						url: `/pages/user/depotAcquisition/depotAcquisition`,
 						show: true
 					},
 					{
-						num: 10,
-						name: '短途记录',
+						num: 6,
+						name: '数据报表',
 						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/duantujilu.png',
+						src: '../../static/img/sign/shujubaobiao@2x.png',
 						tips: 0,
-						url: `/pages/shortDistance/short_distance_record`,
+						url: `/pages/user/report`,
 						show: true
 					},
 					{
-						num: 11,
-						name: '库点收购',
+						num: 7,
+						name: '库点监控',
 						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/kdsg.png',
+						src: '../../static/img/sign/kudianjiankong@2x.png',
 						tips: 0,
-						url: `/pages/user/depotAcquisition/depotAcquisition`,
+						url: `/pages/user/depotMonitoring`,
 						show: true
 					},
+					// {
+					// 	num: 9,
+					// 	name: '打卡',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/sign/kdsg.png',
+					// 	tips: 0,
+					// 	url: `/pages/clock/the_clock`,
+					// 	show: true
+					// },
+					// {
+					// 	num: 10,
+					// 	name: '请假',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/sign/kdsg.png',
+					// 	tips: 0,
+					// 	url: `/pages/leave/the_leave`,
+					// 	show: true
+					// },
+					// {
+					// 	num: 11,
+					// 	name: '加油',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/sign/kdsg.png',
+					// 	tips: 0,
+					// 	url: `/pages/fuelfilling/the_fuel_filling`,
+					// 	show: true
+					// },
+					// {
+					// 	num: 10,
+					// 	name: '短途记录',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/sign/kdsg.png',
+					// 	tips: 0,
+					// 	url: `/pages/shortDistance/short_distance_record`,
+					// 	show: true
+					// }
 				],
 				showTran: true,
 				companyId: 1,
@@ -576,25 +576,25 @@
 			},
 			loadData() {
 				// 工厂价格
-				let that = this
-				that.$api.request('news', 'getFactoryPriceInfo', {
-					category: this.category,
-					page: 1,
-					limit: 99999
-				}, failres => {
-					that.$api.msg(failres.errmsg)
-					this.isLoadMore = false
-					this.loadStatus = 'nomore'
-					if (this.pages > 1) {
-						this.pages = 1
-					}
-					uni.hideLoading()
-				}).then(res => {
-					let data = res.data
-					that.plantList = data
-					// that.makeScrollData(that.plantList, 8)
-					uni.hideLoading()
-				})
+				// let that = this
+				// that.$api.request('news', 'getFactoryPriceInfo', {
+				// 	category: this.category,
+				// 	page: 1,
+				// 	limit: 99999
+				// }, failres => {
+				// 	that.$api.msg(failres.errmsg)
+				// 	this.isLoadMore = false
+				// 	this.loadStatus = 'nomore'
+				// 	if (this.pages > 1) {
+				// 		this.pages = 1
+				// 	}
+				// 	uni.hideLoading()
+				// }).then(res => {
+				// 	let data = res.data
+				// 	that.plantList = data
+				// 	// that.makeScrollData(that.plantList, 8)
+				// 	uni.hideLoading()
+				// })
 				// const that = this
 				// if(uni.getStorageSync("PageCur")){
 				// 	that.PageCur = uni.getStorageSync("PageCur");