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

pages/erp/receivingfeedback/details.vue

@@ -726,6 +726,7 @@
 								var tranProcessInfo = {}
 								tranProcessInfo.id = that.detailData.id
 								tranProcessInfo.infoId = that.detailData.infoId
+								tranProcessInfo.flag = 1
 								tranProcessInfo.processNo = that.detailData.processNo
 								tranProcessInfo.tranPrice = that.detailData.tranPrice
 								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
@@ -762,6 +763,7 @@
 								var tranProcessInfo = {}
 								tranProcessInfo.id = that.detailData.id
 								tranProcessInfo.infoId = that.detailData.infoId
+								tranProcessInfo.flag = 1
 								tranProcessInfo.processNo = that.detailData.processNo
 								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
 								that.$api.doRequest('post', '/tranProcessInfo/api/insertTranCar', tranProcessInfo).then(res => {
@@ -802,6 +804,7 @@
 								var tranProcessInfo = {}
 								tranProcessInfo.id = that.detailData.id
 								tranProcessInfo.infoId = that.detailData.infoId
+								tranProcessInfo.flag = 1
 								tranProcessInfo.processNo = that.detailData.processNo
 								tranProcessInfo.tranPrice = that.detailData.tranPrice
 								tranProcessInfo.tranCarInfoList = that.tranCarInfoList

pages/task/my_task.vue

@@ -364,7 +364,7 @@
 					data.currentPage = pages
 					data.pageSize = limit
 					data.roleId = this.userInfo.roleIds
-					data.userId = this.userInfo.id
+					data.createUserId = this.userInfo.id
 					data.searchKeyword = searchKeyword
 					url = '/commonUser/query/findHisPageNoticeTasksMy'
 				}