Browse Source

修改动火审批

“yueshang” 2 years ago
parent
commit
0eacbb5c15
2 changed files with 7 additions and 7 deletions
  1. 4 4
      src/views/backend/fireSpecial/index.vue
  2. 3 3
      src/views/backend/fireWork/index.vue

+ 4 - 4
src/views/backend/fireSpecial/index.vue

@@ -103,7 +103,7 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="所属单位" align="center" prop="orgId" />
+      <el-table-column label="所属单位" align="center" prop="orgName" />
       <el-table-column label="人员姓名" align="center" prop="empName" />
       <el-table-column label="性别" align="center" prop="empGender" />
       <el-table-column label="身份证号" align="center" prop="idcardno" />
@@ -309,11 +309,11 @@ export default {
     },
     /** 查询列表 */
     getList() {
-      this.loading = true;
+      // this.loading = true;
       // 执行查询
       getFireSpecialPage(this.queryParams).then((response) => {
-        this.list = response.data.list;
-        this.total = response.data.total;
+        this.list = response.data?response.data.list:[];
+        this.total = response.data?response.data.total:0;
         this.loading = false;
       });
     },

+ 3 - 3
src/views/backend/fireWork/index.vue

@@ -200,11 +200,11 @@ export default {
     },
     /** 查询列表 */
     getList() {
-      this.loading = true;
+      // this.loading = true;
       // 执行查询
       getFireWorkPage(this.queryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
+        this.list = response.data?response.data.list:[];
+        this.total = response.data?response.data.total:0;
         this.loading = false;
       });
     },