1.资产业务优化

2.大中型台账优化

src/views/assets/allList.vue

@@ -202,10 +202,12 @@ export default {
         // 无条件分页查询
         selectPage() {
             // this.listQuery.selectByDepartment = true;
+            this.listLoading = true;
             this.$api.assets.selectPage(this.listQuery).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;
                 }
+                this.listLoading = false;
             })
         },
         // 条件查询

src/views/assets/archivedList.vue

@@ -229,10 +229,12 @@ export default {
     methods: {
         // 无条件分页查询
         selectArchivedPage() {
+            this.listLoading = true;
             this.$api.assets.selectArchivedPage(this.listQuery).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;
                 }
+                this.listLoading = false;
             })
         },
         // 条件查询

src/views/assets/departmentDoneList.vue

@@ -139,11 +139,13 @@ export default {
     methods: {
         // 无条件分页查询
         getAssetsTaskDoneList() {
+            this.listLoading = true;
             this.listQuery.selectByDepartment = true;
             this.$api.workNodeTaskRecord.getAssetsTaskDoneList(this.listQuery).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;
                 }
+                this.listLoading = false;
             })
         },
         // 条件查询

src/views/assets/departmentTodoList.vue

@@ -198,11 +198,13 @@ export default {
     methods: {
         // 当前用户所属部门的待办分页查询
         selectPage() {
+            this.listLoading = true;
             this.listQuery.selectByDepartment = true;
             this.$api.assets.selectPage(this.listQuery).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;
                 }
+                this.listLoading = false;
             })
         },
         // 条件查询

src/views/assets/doneList.vue

@@ -126,10 +126,12 @@ export default {
     methods: {
         // 无条件分页查询
         getAssetsTaskDoneList() {
+            this.listLoading = true;
             this.$api.workNodeTaskRecord.getAssetsTaskDoneList(this.listQuery).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;
                 }
+                this.listLoading = false;
             })
         },
         // 条件查询

src/views/assets/myOrderList.vue

@@ -773,6 +773,7 @@ export default {
     methods: {
         // 无条件分页查询
         selectMyOrderPage() {
+            this.listLoading = true;
             if (this.selectDate) {
                 this.listQuery.startTime = this.selectDate[0] + ' 00:00:00';
                 this.listQuery.endTime = this.selectDate[1] + ' 23:59:59';
@@ -781,6 +782,7 @@ export default {
                 if (res.code === 200) {
                     this.pageData = res.data;
                 }
+                this.listLoading = false;
             })
         },
         // 条件查询

src/views/assets/repertoryList.vue

@@ -260,6 +260,7 @@ export default {
     methods: {
         // 无条件分页查询
         selectRepertoryPage() {
+            this.listLoading = true;
             if (this.selectDate) {
                 this.listQuery.startTime = this.selectDate[0] + ' 00:00:00';
                 this.listQuery.endTime = this.selectDate[1] + ' 23:59:59';
@@ -273,6 +274,7 @@ export default {
                         this.exportStatus = true;
                     }
                 }
+                this.listLoading = false;
             })
         },
         // 条件查询

src/views/assets/terminateList.vue

@@ -186,10 +186,12 @@ export default {
     methods: {
         // 无条件分页查询
         selectTerminatedPage() {
+            this.listLoading = true;
             this.$api.assets.selectTerminatedPage(this.listQuery).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;
                 }
+                this.listLoading = false;
             })
         },
         // 条件查询

src/views/assets/todoList.vue

@@ -135,7 +135,7 @@
                         @click="batchCommitNode()" round>提交选中流程
                     </el-button>
                 </template>
-                <parentTable :clickRowToPick="true" ref="table" v-loading="listLoading" :data="batchCommitPageData.records"
+                <parentTable :clickRowToPick="true" ref="table" v-loading="batchCommitListLoading" :data="batchCommitPageData.records"
                     slot="table" style="width: 100%;height: 800px;" :selectionChange="handleSelectionChange">
                     <el-table-column align="center" type="selection" claimOrders width="50" border="true">
                     </el-table-column>
@@ -208,6 +208,7 @@ export default {
         return {
             pageData: { records: [] },
             listLoading: false,
+            batchCommitListLoading: false,
             listQuery: {
                 page: 1,
                 size: 10,
@@ -280,10 +281,12 @@ export default {
     methods: {
         // 当前用户待办分页查询
         selectPage() {
+            this.listLoading = true;
             this.$api.assets.selectPage(this.listQuery).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;
                 }
+                this.listLoading = false;
             })
         },
         // 条件查询
@@ -302,12 +305,14 @@ export default {
             }
             this.selectPage();
         },
-        // 当前用户待办分页查询
+        // 当前用户待办批量提交列表分页查询
         selectBatchCommitPage() {
+            this.batchCommitListLoading = true;
             this.$api.assets.selectPage(this.batchCommitListQuery).then(res => {
                 if (res.code === 200) {
                     this.batchCommitPageData = res.data;
                 }
+                this.batchCommitListLoading = false;
             })
         },
         // 条件查询

src/views/statistical/major/ledgerList.vue

@@ -10,7 +10,7 @@
                         :picker-options="pickerOptions" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd"
                         range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
                     </el-date-picker>
-                    <el-input v-model="listQuery.keyWord" placeholder="项目编号/项目名称" clearable
+                    <el-input v-model="listQuery.keyWord" placeholder="关键字搜索" clearable
                         style="width: 200px;margin-right: 20px;float: left;">
                     </el-input>
                     <el-select v-model="listQuery.principalId" filterable placeholder="项目负责人（可搜索）" clearable