更新

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

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/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

@@ -177,13 +177,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 +198,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) {

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>
@@ -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 = '出入库任务'
@@ -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/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