Merge remote-tracking branch 'origin/master'

2 years ago · 967fe4cf5e
parent 34b60e8c58 c2beaf4df2
commit 967fe4cf5e
2 changed files with 3 additions and 1 deletions
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/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,
      };
--- a/src/views/inventory/inner/innerCodeDetail.vue
+++ b/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>