前端

App.vue

@@ -124,10 +124,10 @@
 				}).show();
 				var userInfo = uni.getStorageSync("userInfo")
 				var that = this
-				this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
+				this.$api.doRequest('get', '/newNoticeTask/query/noticeTasks').then(res => {
 					if (res.data.data) {
 						let name = 'myTip';
-						let value = res.data.data.task;
+						let value = res.data.data.total;
 						that.$store.commit('$uStore', {
 							name,
 							value
@@ -139,7 +139,7 @@
 							})
 						}
 						name = 'taskTip';
-						value = res.data.data.task;
+						value = res.data.data.total;
 						that.$store.commit('$uStore', {
 							name,
 							value

common/appUpdate.js

@@ -13,8 +13,7 @@ export default function appUpdate() {
 	    	imei: "1"
 	    },
 	    method: 'GET',
-	    success: (res) => {		
-			var that=this
+	    success: (res) => {			
 	    	if (res.statusCode === 200) {
 				console.log("uni.request update success",res)
 				plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
@@ -74,6 +73,7 @@ export default function appUpdate() {
 												plus.nativeUI.toast("重启成功");
 											}
 										})
+										plus.runtime.restart();
 									}, function(e) {
 										console.log(e)
 										plus.nativeUI.toast(`热更新失败:${e.message}`);

config/index.js

@@ -3,6 +3,8 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	baseUrlNew: 'http://192.168.1.117:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://192.168.1.119:9100/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/business/business.vue

@@ -164,10 +164,10 @@
 			uni.removeTabBarBadge({
 				index: 4
 			})
-			this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
+			this.$api.doRequest('get', '/newNoticeTask/query/noticeTasks').then(res => {
 				if (res.data.data) {
 					let name = 'myTip';
-					let value = res.data.data.task;
+					let value = res.data.data.total;
 					that.$store.commit('$uStore', {
 						name,
 						value
@@ -179,7 +179,7 @@
 						})
 					}
 					name = 'taskTip';
-					value = res.data.data.task;
+					value = res.data.data.total;
 					that.$store.commit('$uStore', {
 						name,
 						value

pages/erpbusiness/edit_quality_testing.vue

@@ -17,7 +17,9 @@
 			<view class="c-row ">
 				<view class="title">客户</view>
 				<view class="con-list">
-					{{gridList.customerName}}({{gridList.customerPhone}})
+					<view  @click='gocustomer'>
+						{{gridList.customerName}}({{gridList.customerPhone}})
+					</view>
 				</view>
 			</view>
 			<view class="c-row ">
@@ -359,9 +361,30 @@
 			this.gridList.gradeKey = this.gradeList[0].key
 		},
 		onShow() {
-
+			if (uni.getStorageSync('checkcustomer')) {
+			
+				let _customerInfo = uni.getStorageSync('checkcustomer')
+				if (_customerInfo.shipperName) {
+					this.gridList.identityId = _customerInfo.id
+					//点击登记客户
+					this.gridList.customerName = _customerInfo.shipperName
+					this.gridList.customerPhone = _customerInfo.shipperPhone
+					this.gridList.carNumber=_customerInfo.carNo
+				} else {
+					//点击搜索客户
+					this.gridList.customerName = _customerInfo.customerName
+					this.gridList.customerPhone = _customerInfo.customerPhone
+				}
+			
+				this.gridList.customerNumberCard = _customerInfo.customerNumberCard
+			}
 		},
 		methods: {
+			gocustomer() {
+				uni.navigateTo({
+					url: '/pages/erpbusiness/customer?cangid=' + this.cangid + '&warehouseName=' + this.gridList.warehouseName + '&goodsName=' + this.gridList.goodsName+'&status=edit'
+				})
+			},
 			print() {
 				uni.navigateTo({
 					url: '/pages/erpbusiness/bleConnect'

pages/erpbusiness/index.vue

@@ -226,11 +226,11 @@
 				this.username = this.userInfo.userName
 				this.userphone = this.userInfo.phone
 				var that = this
-				this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
+				this.$api.doRequest('get', '/newNoticeTask/query/noticeTasks').then(res => {
 					console.log("noticeNumber", res)
 					if (res.data.data) {
 						let name = 'myTip';
-						let value = res.data.data.task;
+						let value = res.data.data.total;
 						that.$store.commit('$uStore', {
 							name,
 							value
@@ -242,7 +242,7 @@
 							})
 						}
 						name = 'taskTip';
-						value = res.data.data.task;
+						value = res.data.data.total;
 						that.$store.commit('$uStore', {
 							name,
 							value

pages/grain_pulse/home.vue

@@ -208,10 +208,10 @@
 			uni.removeTabBarBadge({
 				index: 4
 			})
-			this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
+			this.$api.doRequest('get', '/newNoticeTask/query/noticeTasks').then(res => {
 				if (res.data.data) {
 					let name = 'myTip';
-					let value = res.data.data.task;
+					let value = res.data.data.total;
 					that.$store.commit('$uStore', {
 						name,
 						value
@@ -223,7 +223,7 @@
 						})
 					}
 					name = 'taskTip';
-					value = res.data.data.task;
+					value = res.data.data.total;
 					that.$store.commit('$uStore', {
 						name,
 						value

pages/sale/information.vue

@@ -193,11 +193,11 @@
 			uni.removeTabBarBadge({
 				index: 4
 			})
-			this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
+			this.$api.doRequest('get', '/newNoticeTask/query/noticeTasks').then(res => {
 				console.log("noticeNumber", res)
 				if (res.data.data) {
 					let name = 'myTip';
-					let value = res.data.data.task;
+					let value = res.data.data.total;
 					that.$store.commit('$uStore', {
 						name,
 						value
@@ -209,7 +209,7 @@
 						})
 					}
 					name = 'taskTip';
-					value = res.data.data.task;
+					value = res.data.data.total;
 					that.$store.commit('$uStore', {
 						name,
 						value

pages/task/audit/acquisition_settlement_approval.vue

@@ -16,7 +16,7 @@
 				<view class="infoData">{{updateDate}}</view>
 			</view>
 		</view>
-		<view class='content1'>
+	<!-- 	<view class='content1'>
 			<view class='row content-item'>
 				<view class="left" style="color: #878C9C ;">仓库</view>
 				<view class="right">{{warehouseName}}</view>
@@ -34,6 +34,113 @@
 					</view>
 				</view>
 			</view>
+		</view> -->
+		<view class="content1">
+			<view class="title">
+				销售外勤 张三
+			</view>
+			<view class="row">
+				<view class="left">请款金额（元）</view>
+				<view class="left">1000</view>
+			</view>
+			<view class="row">
+				<view class="left">大写</view>
+				<view class="left">1000</view>
+			</view>
+			<view class="row">
+				<view class="left">车（数）</view>
+				<view class="left">20</view>
+			</view>
+			<view class="row">
+				<view class="left">合计重量（吨）</view>
+				<view class="left">20</view>
+			</view>
+			<view class="row">
+				<view class="left">平均单价（元吨）</view>
+				<view class="left">20</view>
+			</view>
+			<view class="row">
+				<view class="left">平均单价指标</view>
+			</view>
+			<view class="row">
+				<view class="left">容重（%）</view>
+				<view class="left">20</view>
+			</view>
+			
+			<view class="row">
+				<view class="left">水分（%）</view>
+				<view class="left">20</view>
+			</view>
+			
+			<view class="row">
+				<view class="left">杂质（%）</view>
+				<view class="left">20</view>
+			</view>
+			
+			<view class="row">
+				<view class="left">热损伤（%）</view>
+				<view class="left">20</view>
+			</view>
+			<view class="row">
+				<view class="left">霉变粒（%）</view>
+				<view class="left">20</view>
+			</view>
+			<view class="row" style="border-bottom:0">
+				<view class="left">不完善粒（%）</view>
+				<view class="left">20</view>
+			</view>
+			
+			<!-- <view class="row row-bottom">
+				<view class="left">水分（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
+					placeholder="输入水分占比"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">容重（克/升）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.bulkDensity' class="right-bottom"
+					placeholder="输入容重"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">热损伤（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.jiaorenli' class="right-bottom"
+					placeholder="输入热损伤占比"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">杂质（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.impurity' class="right-bottom"
+					placeholder="输入杂质占比"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">霉变粒（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.mildewGrain' class="right-bottom"
+					placeholder="输入霉变粒占比"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">不完善粒（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.imperfectGrain' class="right-bottom"
+					placeholder="输入不完善粒占比"></input>
+			</view> -->
+		</view>
+		<view class="content2">
+			<view v-for="(item,index) in 4" :key='index'>
+				<view class="row">
+					<view class="left">
+						<view class="item1">
+							<image :src="src" style="width: 100rpx;height: 100rpx;border-radius: 500%;"></image>
+						</view>
+						<view class="item2">
+							<view class="name">张三</view>
+							<view class="status">发起审批</view>
+						</view>
+						
+					</view>
+					<view class="right">
+						02-18 10:20
+					</view>
+				</view>
+				<view class="row-line" v-if="index!=3"></view>
+			</view>
+			
 		</view>
 		<view v-if='show' class="shade">
 			<view class="wrap">
@@ -56,9 +163,8 @@
 		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<!-- getRoles("acquisitionQuality.initial") -->
-			<u-button v-if='isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button v-if='isSHowBtn' @click='pass' type="success" class="btn2">通过</u-button>
+			<u-button @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button @click='pass' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -71,13 +177,14 @@
 	export default {
 		data() {
 			return {
+				src:'https://www.uviewui.com/index/banner_1920x1080.png',
 				isSHowBtn: true,
 				height: 200,
 				autoHeight: true,
 				border: false,
 				title: '',
 				show: false,
-				auditMind:'',
+				auditMind: '',
 				id: "",
 				currentPage: 1,
 				pageSize: 100,
@@ -89,7 +196,7 @@
 			}
 		},
 		onBackPress(e) {
-			if(this.everyCheck){
+			if (this.everyCheck) {
 				uni.navigateTo({
 					url: "/pages/task/my_task"
 				})
@@ -97,7 +204,7 @@
 			}
 		},
 		onLoad(options) {
-			this.id = options.id
+			this.vesselId = options.vesselId
 			this.everyCheck = uni.getStorageSync("everyTask")
 			this.isSHowBtn = options.isShowbtn
 		},
@@ -109,25 +216,13 @@
 		},
 		methods: {
 			getList() {
-				//查仓库名
-				this.$api.doRequest('get', '/paymentManagement/getInfo', {
-					id: this.id
-				}).then(res => {
-					if (res.data.code == 200) {
-						this.status = res.data.data.approveStatus
-						this.updateDate = res.data.data.updateDate
-						this.warehouseName = res.data.data.warehouseName
-						this.$api.doRequest('get', '/paymentManagement/selectPaymentManagement', {
-							currentPage: this.currentPage,
-							pageSize: this.pageSize,
-							searchType: '1',//searchType:1待审核
-							warehouseName: res.data.data.warehouseName,
-							managementType: 1
-						}).then(res1 => {
-							if (res1.data.code == 200) {
-								this.List = res1.data.data.records
-							}
-						})
+				// /workflow/query/workflowDefinitions
+				// /workflow/query/workflowInfo
+				this.$api.doRequest('post', '/paymentManagement/exportPhone', {
+					warehouseName: this.vesselId,
+				}).then(res1 => {
+					if (res1.data.code == 200) {
+						// this.List = res1.data.data.records
 					}
 				})
 			},
@@ -177,13 +272,13 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.audit(that.List[0], 0, true)
+								that.audit(that.List, 0, true)
 							}
 						}
 					})
 				}
 			},
-			audit(item, index, status, status2, reason) {
+			audit(list, index, status, status2, reason) {
 				uni.showLoading({
 					title: "审核中"
 				})
@@ -198,16 +293,20 @@
 							}
 						})
 					} else {
-						this.$api.doRequest('post', '/workflow/api/handle', {
-							taskId: item.taskId,
-							approved: status,
-							auditMind: this.auditMind ? this.auditMind : "",
-							needReapply: status2 ? true : false
-						}).then(res => {
-							if (res.data.code == 200) {
-								this.audit(this.List[index + 1], index + 1, status, status2, reason)
-							}
-						})
+						for (var i = 0; i < this.List.length; i++) {
+							this.$api.doRequest('post', '/workflow/api/handle', {
+								taskId: this.List[i].taskId,
+								approved: status,
+								auditMind: this.auditMind ? this.auditMind : "",
+								needReapply: status2 ? true : false
+							}).then(res => {
+								if (res.data.code == 200) {
+									// this.audit(this.List[index + 1], index + 1, status, status2, reason)
+									this.$api.msg('通过成功')
+								}
+							})
+						}
+
 					}
 				} else {
 					if (status == true) {
@@ -238,41 +337,43 @@
 	}
 
 	.content1 {
+		font-size: 28rpx;
+		color: #333333;
 		margin-top: 30rpx;
-
-		.content-item {
+		padding: 20rpx;
+		// .content-item {
 			border-radius: 20rpx;
 			background: white;
-			padding: 40rpx 20rpx;
-			margin-bottom: 30rpx;
-		}
+		// 	padding: 40rpx 20rpx;
+		// 	margin-bottom: 30rpx;
+		// }
 
-		.title {
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #333333;
-			margin: 30rpx 0;
-		}
+		// .title {
+		// 	font-size: 32rpx;
+		// 	font-weight: 600;
+		// 	color: #333333;
+		// 	margin: 30rpx 0;
+		// }
 
-		.goodsInfoCss {
-			font-size: 28rpx;
-			font-weight: 600;
-			color: #878C9C;
-			margin: 26rpx 10rpx;
-		}
+		// .goodsInfoCss {
+		// 	font-size: 28rpx;
+		// 	font-weight: 600;
+		// 	color: #878C9C;
+		// 	margin: 26rpx 10rpx;
+		// }
 
-		.priceCss {
-			font-size: 40rpx;
-			margin: 26rpx 10rpx;
-			color: #22C572;
-			font-weight: 600;
-		}
+		// .priceCss {
+		// 	font-size: 40rpx;
+		// 	margin: 26rpx 10rpx;
+		// 	color: #22C572;
+		// 	font-weight: 600;
+		// }
 
 		.row {
 			display: flex;
 			justify-content: space-between;
 			border-bottom: 1px solid #EEEEEE;
-
+			padding:20rpx 0;
 			.right,
 			input {
 				font-size: 28rpx;
@@ -280,6 +381,41 @@
 			}
 		}
 	}
+	.content2{
+		background: white;
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		padding: 20rpx;
+		.row{
+			display: flex;
+			justify-content: space-between;
+			.left{
+				display: flex;
+				align-items: center;
+				.item2{
+					margin-left: 20rpx;
+					.name{
+						font-size: 32rpx;
+						font-weight: 800;
+					}
+					.status{
+						color: #6CC48C;
+					}
+				}
+			}
+			.right{
+				color: #B0B1B5;
+			}
+			
+		}
+		.row-line{
+			width: 1px;
+			height: 30px;
+			background: #F2F2F2;
+			margin: 10rpx 50rpx;
+			
+		}
+	}
 
 	.bottom-btn {
 		width: 100%;
@@ -403,6 +539,7 @@
 		right: 0;
 		color: #22C572;
 	}
+
 	.u-textarea-style {
 		margin: 20rpx;
 		background: #F9F9FA;
@@ -410,7 +547,7 @@
 		border: 1px solid #EEEEEE;
 		padding: 10rpx 20rpx;
 		position: relative;
-	
+
 		.right-bottom {
 			position: absolute;
 			right: 20rpx;

pages/task/my_task.vue

@@ -22,7 +22,13 @@
 				<view v-if="item.showRow" class="guess-item">
 					<view class="title flex align-item-center">
 						<view>
-							<view class="title-row1">{{item.department}}:</view>
+							<view v-if='statusFlag==1' class="title-row1">待审批
+								<text v-if='item.vesselId' >（{{item.vesselId}}）</text>
+							</view>
+							<view v-if='statusFlag==3' class="title-row1">已审批
+								<text v-if='item.vesselId'>（{{item.vesselId}}）</text>
+							</view>
+							
 							<view style='font-size:12px;color:#878C9C;'>{{item.createDate}}</view>
 						</view>
 						<text v-if='statusFlag==1' style='color:#FE6430;'>{{item.messageTitle}}</text>
@@ -334,7 +340,7 @@
 					uni.hideLoading()
 				})
 			},
-			getIndexBuyData(status) {
+			getIndexBuyData(status) {debugger
 				const that = this
 				var pages = that.pages
 				var limit = that.limit
@@ -382,8 +388,11 @@
 							}
 							// if(_str.businessType=='TRADE'){
 							// 	_str.showRow = false
-							// }
-							this.taskInfo[i].department = this.taskInfo[i].messageContent.split(' ')[0]
+							// }.split(' ')[0]
+							this.taskInfo[i].department = this.taskInfo[i].messageTitle
+							if(this.taskInfo[i].messageContent.split(' ').length > 1){
+								this.taskInfo[i].messageContent = this.taskInfo[i].messageContent.split(' ')[1]
+							}
 							if (this.taskInfo[i].businessType == 'WAREHOUSE') {
 								if (this.taskInfo[i].businessCode == 'INOUTTASK-TASK-APPROVE') {
 									this.taskInfo[i].messageTitle = '出入库任务'
@@ -525,7 +534,7 @@
 				} else if (item.businessCode == 'PAYMENT-MANAGEMENT-APPROVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/acquisition_settlement_approval?id=${item.businessId}&isShowbtn=true`
+							url: `/pages/task/audit/acquisition_settlement_approval?vesselId=${item.vesselId}`
 						})
 
 					} else {
@@ -767,6 +776,7 @@
 	.title-row1 {
 		font-size: 34rpx;
 		font-weight:600;
+		
 	}
 
 	.row2 {

pages/tran/tran.vue

@@ -132,10 +132,10 @@
 				uni.removeTabBarBadge({
 					index: 4
 				})
-				this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
+				this.$api.doRequest('get', '/newNoticeTask/query/noticeTasks').then(res => {
 					if (res.data.data) {
 						let name = 'myTip';
-						let value = res.data.data.task;
+						let value = res.data.data.total;
 						that.$store.commit('$uStore', {
 							name,
 							value
@@ -147,7 +147,7 @@
 							})
 						}
 						name = 'taskTip';
-						value = res.data.data.task;
+						value = res.data.data.total;
 						that.$store.commit('$uStore', {
 							name,
 							value

pages/user/contractLook/inventoryCost.vue

@@ -13,8 +13,12 @@
 					<view class="font">价值（元）</view>
 				</view>
 				<view class="goods-table-content" v-for="(item1,index1) in item.goodList">
-					<view class="font" :class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">{{item1.goodsName}}</view>
-					<view class="font" :class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">{{item1.storage}}</view>
+					<view class="font" :class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">
+						{{item1.goodsName}}
+					</view>
+					<view class="font" :class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">
+						{{item1.storage}}
+					</view>
 					<view class="font">{{item1.cost}}</view>
 				</view>
 			</view>
@@ -44,17 +48,22 @@
 		</u-modal>
 		<u-calendar v-model="show" :mode="mode" @change="change" range-color='#22C572' btn-type='success'
 			range-bg-color='rgba(25, 190, 107, 0.13)' active-bg-color='#22C572'></u-calendar>
+		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
+			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 
 <script>
-	 import helper from '@/common/helper.js'; 
+	import helper from '@/common/helper.js';
 	import {
 		mapState
 	} from 'vuex';
 	export default {
 		data() {
 			return {
+				isShowAlert: false,
+				content: '当前登录身份已失效，请重新登录！',
 				parameter: {
 					startDate: "",
 					endDate: '',
@@ -84,7 +93,16 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
-			selectDate() {				this.show = true
+			alertBtn() {
+				uni.navigateTo({
+					url: '/pages/public/login'
+				})
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			},
+			selectDate() {
+				this.show = true
 			},
 			change(e) {
 				this.parameter.startDate = e.startDate
@@ -137,41 +155,50 @@
 				this.isShowDetailBtn = true
 			},
 			init() {
-				uni.showLoading({
-					title: '正在加载'
-				})
-				this.$api.doRequest('get', '/costManagementInfo/selectCostManagementInfo', {
-					compId: uni.getStorageSync('pcUserInfo').compId,
-					warehouseType: 1
-				}).then(res => {
-					uni.hideLoading()
-					const results = this.makeGroupData(res.data.data, function(item) {
-						return [item.warehouseName];
-					});
-					console.log('this.costList')
-					console.log(this.costList)
-					let _data = []
-					for (let i = 0; i < results.length; i++) {
-						let _obj = {}
-						_obj.warehouseName = results[i][0].warehouseName
-						// 大于两条添加合计行
-						if (results[i].length > 1) {
-							let _price = 0
-							for (let k = 0; k < results[i].length; k++) {
-								_price += results[i][k].storage
+				debugger
+				if (!this.hasLogin) {
+					this.isShowAlert = true;
+				} else {
+					uni.showLoading({
+						title: '正在加载'
+					})
+					this.$api.doRequest('get', '/costManagementInfo/selectCostManagementInfo', {
+						compId: uni.getStorageSync('pcUserInfo').compId,
+						warehouseType: 1
+					}).then(res => {
+						uni.hideLoading()
+						if (res.data.data) {
+							const results = this.makeGroupData(res.data.data, function(item) {
+								return [item.warehouseName];
+							});
+							console.log('this.costList')
+							console.log(this.costList)
+							let _data = []
+							for (let i = 0; i < results.length; i++) {
+								let _obj = {}
+								_obj.warehouseName = results[i][0].warehouseName
+								// 大于两条添加合计行
+								if (results[i].length > 1) {
+									let _price = 0
+									for (let k = 0; k < results[i].length; k++) {
+										_price += results[i][k].storage
+									}
+									_price = _price.toFixed(2)
+									results[i].push({
+										'goodsName': '合计',
+										'storage': _price
+									})
+								}
+								_obj.goodList = results[i]
+								_data.push(_obj)
 							}
-							_price = _price.toFixed(2)
-							results[i].push({
-								'goodsName': '合计',
-								'storage': _price
-							})
+							console.log(_data)
+							this.costList = _data
 						}
-						_obj.goodList = results[i]
-						_data.push(_obj)
-					}
-					console.log(_data)
-					this.costList = _data
-				})
+
+					})
+				}
+
 			},
 			makeGroupData(array, fn) {
 				const groups = {};
@@ -190,14 +217,15 @@
 </script>
 
 <style scoped lang="scss">
-	.active{
+	.active {
 		font-size: 32rpx;
 		font-weight: 700;
 	}
+
 	.modal-row {
 		display: flex;
 		justify-content: space-between;
-		padding: 10rpx 60rpx ;
+		padding: 10rpx 60rpx;
 		margin-top: 20rpx;
 		margin-bottom: 20rpx;
 	}

pages/user/report.vue

@@ -26,6 +26,7 @@
 			</view>
 		</view>
 		<view class="move-content">
+			
 			<view class="content2 content-wrap">
 				<view class="row1">
 					<view class="left title">
@@ -152,18 +153,6 @@
 					</view>
 				</view>
 			</view>
-			<view class="content3 content-wrap">
-				<view class="title" @click="goToPage(4)">粮食品种占比</view>
-				<u-line color="#EEEEEE" class="u-line" />
-				<qiun-data-charts type="line" class='line-chart' :chartData="chartData" :opts='zringoptions'
-					background="none" :ontouch="true" />
-			</view>
-			<view class="content4 content-wrap">
-				<view class="title">在途信息统计表</view>
-				<u-line color="#EEEEEE" class="u-line" />
-				<qiun-data-charts type="column" class='line-chart' :chartData="carChartData" :opts='ringoptions'
-					background="none" />
-			</view>
 			<view class="content5 content-wrap" @click="goToPage(5)">
 				<view class="title">库存头寸（吨）</view>
 				<u-line color="#EEEEEE" class="u-line" />
@@ -212,11 +201,24 @@
 					</view>
 				</view>
 			</view>
-			<view class="content6 content-wrap">
+			<view class="content3 content-wrap">
+				<view class="title" @click="goToPage(4)">粮食品种占比</view>
+				<u-line color="#EEEEEE" class="u-line" />
+				<qiun-data-charts type="line" class='line-chart' :chartData="chartData" :opts='zringoptions'
+					background="none" :ontouch="true" />
+			</view>
+			<view class="content4 content-wrap">
+				<view class="title">在途信息统计表</view>
+				<u-line color="#EEEEEE" class="u-line" />
+				<qiun-data-charts type="column" class='line-chart' :chartData="carChartData" :opts='ringoptions'
+					background="none" />
+			</view>
+			
+			<!-- <view class="content6 content-wrap">
 				<view class="title">库点流向分布</view>
 				<u-line color="#EEEEEE" class="u-line" />
 				<iframe class='map' :src='url'></iframe>
-			</view>
+			</view> -->
 
 			<!-- 	<view class="content7">
 				<maoScroll :data="ztList" :showNum="showNum" :lineHeight="lineHeight" :animationScroll="animationScroll"
@@ -235,7 +237,7 @@
 					</template>
 				</maoScroll>
 			</view> -->
-			<view class="content7">
+			<!-- <view class="content7">
 				<view ref='scroll' class='scroll' :style="{'top':'-'+scrollTop+'px'}">
 					<view class="row1" v-for="(item,index) in ztList">
 						<view class="zt">
@@ -243,13 +245,12 @@
 						</view>
 						<view>{{item.startName}}</view>
 						→
-						<!-- <img src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/jiantou.png" alt=""> -->
 						<view class="">
 							{{item.endName}}
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 
 		<u-select v-model="showDate" mode="mutil-column" confirm-color='#22C572' :list="dateList" @confirm="confirm">

pages/user/user.vue

@@ -308,11 +308,11 @@
 				this.username = this.userInfo.userName?this.userInfo.userName:uni.getStorageSync("userInfo").data.userName
 				this.userphone = this.userInfo.phone?this.userInfo.phone:uni.getStorageSync("userInfo").data.phone
 				var that = this
-				this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
+				this.$api.doRequest('get', '/newNoticeTask/query/noticeTasks').then(res => {
 					console.log("noticeNumber", res)
 					if (res.data.data) {
 						let name = 'myTip';
-						let value = res.data.data.task;
+						let value = res.data.data.total;
 						that.$store.commit('$uStore', {
 							name,
 							value
@@ -324,7 +324,7 @@
 							})
 						}
 						name = 'taskTip';
-						value = res.data.data.task;
+						value = res.data.data.total;
 						that.$store.commit('$uStore', {
 							name,
 							value

websocket_sdk.js

@@ -299,7 +299,7 @@ export default class Websocket {
 				})
 			}
 			uni.request({
-			    url: baseUrlNew + '/notice/query/noticeNumber',
+			    url: baseUrlNew + '/newNoticeTask/query/noticeTasks',
 			    data: {
 			    	
 			    },
@@ -307,7 +307,7 @@ export default class Websocket {
 			    success: (res) => {			
 					if (res.data.data) {
 			    		let name = 'myTip';
-			    		let value = res.data.data.task;
+			    		let value = res.data.data.total;
 			    		store.commit('$uStore', {
 			    			name,
 			    			value
@@ -319,7 +319,7 @@ export default class Websocket {
 							})
 						}
 			    		name = 'taskTip';
-			    		value = res.data.data.task;
+			    		value = res.data.data.total;
 			    		store.commit('$uStore', {
 			    			name,
 			    			value