Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/task/audit/freight_settlement_approvalcopy.vue

@@ -333,7 +333,10 @@
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.dataobj = res.data.data
-						this.imglist = this.dataobj.freightAddressUrl.split(',')
+						if(this.dataobj.freightAddressUrl){
+							this.imglist = this.dataobj.freightAddressUrl.split(',')
+						}
+						
 						if (res.data.data.tranTaskInfoList.length > 0) {
 							this.num = 0
 							for (var i = 0; i < res.data.data.tranTaskInfoList.length; i++) {

pages/task/my_task.vue

@@ -420,6 +420,7 @@
 					data.searchKeyword = searchKeyword
 					data.currentPage = pages
 					data.pageSize = limit
+					data.compId = this.pcUserInfo.compId
 					url = '/newNoticeTask/query/noticeTasks'
 				} else if (this.statusFlag == 3) {
 					data.currentPage = pages
@@ -427,6 +428,7 @@
 					data.roleId = this.userInfo.roleIds
 					data.userId = this.userInfo.id
 					data.searchKeyword = searchKeyword
+					data.compId = this.pcUserInfo.compId
 					url = '/commonUser/query/findHisPageNoticeTasks'
 				}
 				else if (this.statusFlag == 5) {
@@ -435,6 +437,7 @@
 					data.roleId = this.userInfo.roleIds
 					data.createUserId = this.userInfo.id
 					data.searchKeyword = searchKeyword
+					data.compId = this.pcUserInfo.compId
 					url = '/commonUser/query/findHisPageNoticeTasksMy'
 				}
 				else if (this.statusFlag == 7) {