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

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -502,6 +502,9 @@
 				this.$router.go(-1)
 			},
 			returnsales() {
+				this.dataList = {
+								taskTypeKey: 1
+							}
 				this.$router.push({
 					path: 'tranManagementWarehouseInOuttask'
 				})

src/views/warehouse/warehouseManagementRecord.vue

@@ -264,7 +264,7 @@
 					</el-table-column>
 					<el-table-column prop="agent" label="经办人">
 					</el-table-column>
-					<el-table-column prop="backOffice" label="内勤"> </el-table-column>
+					<el-table-column prop="backOffice" label="操作人"> </el-table-column>
 					<el-table-column prop="addressUrl" label="附件">
 						<template slot-scope="scope">
 							<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"