Merge remote-tracking branch 'origin/master'

src/views/basic/corpMaintain/corpMaintain.vue

@@ -213,6 +213,7 @@ export default {
     return {
       query: {
         key: "",
+        corpType: "2",
         page: 1,
         limit: 20,
       },
@@ -303,6 +304,7 @@ export default {
       });
       this.query = {
         key: "",
+        corpType: "2",
         page: 1,
         limit: 20,
       };

src/views/inventory/inner/innerCodeDetail.vue

@@ -42,7 +42,7 @@
         <el-table-column label="序号" type="index" width="50"></el-table-column>
         <el-table-column label="码" prop="udiCode"></el-table-column>
 
-        <el-table-column label="状态" width="120">
+        <el-table-column label="状态" width="120" prop="status">
           <template slot-scope="scope">
             <span>{{ statusMap[scope.row.status] }}</span>
           </template>