Merge remote-tracking branch 'origin/master'

src/views/inventory/DeviceReceiveOrderAudit.vue

@@ -61,8 +61,8 @@
         <el-table-column label="领用仓库" prop="fromInvName"></el-table-column>
         <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>
         <el-table-column label="领用日期" prop="createTime"></el-table-column>
-        <el-table-column label="领用人" prop="createUserName"></el-table-column>
-        <el-table-column label="创建人" prop="createUserName"></el-table-column>
+        <el-table-column label="领用人" prop="receiveUserName"></el-table-column>
+        <el-table-column label="创建人" prop="createUser"></el-table-column>
         <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
           <template slot-scope="scope">
             <el-tag>{{ statusMap[scope.row.status] }}</el-tag>

src/views/inventory/DeviceReceiveOrderCompleted.vue

@@ -61,8 +61,8 @@
         <el-table-column label="领用仓库" prop="fromInvName"></el-table-column>
         <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>
         <el-table-column label="领用日期" prop="createTime"></el-table-column>
-        <el-table-column label="领用人" prop="createUserName"></el-table-column>
-        <el-table-column label="创建人" prop="createUserName"></el-table-column>
+        <el-table-column label="领用人" prop="receiveUserName"></el-table-column>
+        <el-table-column label="创建人" prop="createUser"></el-table-column>
         <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
           <template slot-scope="scope">
             <el-tag>{{ statusMap[scope.row.status] }}</el-tag>

src/views/inventory/DeviceReceiveOrderNew.vue

@@ -61,8 +61,8 @@
         <el-table-column label="领用仓库" prop="fromInvName"></el-table-column>
         <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>
         <el-table-column label="领用日期" prop="createTime"></el-table-column>
-        <el-table-column label="领用人" prop="createUserName"></el-table-column>
-        <el-table-column label="创建人" prop="createUserName"></el-table-column>
+        <el-table-column label="领用人" prop="receiveUserName"></el-table-column>
+        <el-table-column label="创建人" prop="createUser"></el-table-column>
         <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
           <template slot-scope="scope">
             <el-tag>{{ statusMap[scope.row.status] }}</el-tag>