3.0.63 修复批量变动loading问题

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-eam-v3",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.62",
+  "version": "3.0.63",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

src/components/archive/AssetBatchOperationQuery.vue

@@ -2,20 +2,21 @@
   <div class="grid-container">
     <div class="grid-item-1">
       <Navbar
-        :title="$t('lang.AssetBatchOperationQuery.batchOfAssets') + changeTypeName"
+        :title="
+          $t('lang.AssetBatchOperationQuery.batchOfAssets') + changeTypeName
+        "
         :is-go-back="false"
       />
     </div>
 
     <div class="grid-item-2">
-      <div
-        class="row"
-        style="margin-top: 10px"
-      >
+      <div class="row" style="margin-top: 10px">
         <div class="col-md-12">
           <div class="form-inline">
             <div class="form-group m-form-group">
-              <label for="assetName" class="m-form-group-label">{{ $t('lang.AssetBatchOperationQuery.assetName') }}</label>
+              <label for="assetName" class="m-form-group-label">{{
+                $t("lang.AssetBatchOperationQuery.assetName")
+              }}</label>
               <div class="form-inline-div">
                 <input
                   id="assetName"
@@ -28,7 +29,9 @@
               </div>
             </div>
             <div class="form-group m-form-group">
-              <label for="assetNo" class="m-form-group-label">{{ $t('lang.AssetBatchOperationQuery.assetNumber') }}</label>
+              <label for="assetNo" class="m-form-group-label">{{
+                $t("lang.AssetBatchOperationQuery.assetNumber")
+              }}</label>
               <div class="form-inline-div">
                 <input
                   id="assetNo"
@@ -41,7 +44,9 @@
               </div>
             </div>
             <div class="form-group m-form-group">
-              <label for="no" class="m-form-group-label">{{ $t('lang.AssetBatchOperationQuery.cardNumber') }}</label>
+              <label for="no" class="m-form-group-label">{{
+                $t("lang.AssetBatchOperationQuery.cardNumber")
+              }}</label>
               <div class="form-inline-div">
                 <input
                   id="no"
@@ -54,7 +59,9 @@
               </div>
             </div>
             <div class="form-group m-form-group">
-              <label for="type" class="m-form-group-label">{{ $t('lang.AssetBatchOperationQuery.type') }}</label>
+              <label for="type" class="m-form-group-label">{{
+                $t("lang.AssetBatchOperationQuery.type")
+              }}</label>
               <div class="form-inline-div">
                 <input
                   id="type"
@@ -67,18 +74,17 @@
               </div>
             </div>
             <div class="form-group m-form-group">
-              <button
-                class="btn btn-primary m-btn"
-                @click="resetQuery"
-              >
-                {{ $t('lang.AssetBatchOperationQuery.query') }}
+              <button class="btn btn-primary m-btn" @click="resetQuery">
+                {{ $t("lang.AssetBatchOperationQuery.query") }}
               </button>
               <button
                 type="button"
                 class="btn btn-success m-btn"
                 @click="addToCache"
               >
-                {{ $t('lang.AssetBatchOperationQuery.joinToBe') }}{{ changeTypeName }}{{ $t('lang.AssetBatchOperationQuery.detailedList') }}
+                {{ $t("lang.AssetBatchOperationQuery.joinToBe")
+                }}{{ changeTypeName
+                }}{{ $t("lang.AssetBatchOperationQuery.detailedList") }}
               </button>
               <button
                 type="button"
@@ -86,7 +92,9 @@
                 style="text-align: right"
                 @click="goto"
               >
-                {{ $t('lang.AssetBatchOperationQuery.openToWait') }}{{ changeTypeName }}{{ $t('lang.AssetBatchOperationQuery.detailedList') }}
+                {{ $t("lang.AssetBatchOperationQuery.openToWait")
+                }}{{ changeTypeName
+                }}{{ $t("lang.AssetBatchOperationQuery.detailedList") }}
                 <span class="badge">{{ count }}</span>
               </button>
             </div>
@@ -96,7 +104,10 @@
     </div>
 
     <div class="grid-item-3">
-      <table :id="tableId" class="fixed-table table table-striped table-bordered">
+      <table
+        :id="tableId"
+        class="fixed-table table table-striped table-bordered"
+      >
         <thead>
           <tr>
             <th style="width: 40px">
@@ -108,21 +119,51 @@
                 @change="selectAll()"
               />
             </th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.assetName') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.assetNumber') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.cardNumber') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.ownerDepartment') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.useDepartment') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.type') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.projectName') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.assetCategory') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.originalValue') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.placeOfPlacement') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.aLocationToBePlacedIn') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.startDate') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.user') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.specificationUser') }}</th>
-            <th style="width: 150px">{{ $t('lang.AssetBatchOperationQuery.usageStatus') }}</th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.assetName") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.assetNumber") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.cardNumber") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.ownerDepartment") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.useDepartment") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.type") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.projectName") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.assetCategory") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.originalValue") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.placeOfPlacement") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.aLocationToBePlacedIn") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.startDate") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.user") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.specificationUser") }}
+            </th>
+            <th style="width: 150px">
+              {{ $t("lang.AssetBatchOperationQuery.usageStatus") }}
+            </th>
           </tr>
         </thead>
         <tbody v-if="assetDtos.length > 0">
@@ -144,7 +185,11 @@
             <td>{{ item.assetNo }}</td>
             <td>{{ item.no }}</td>
             <td>{{ item.clientName }}&nbsp;{{ item.organizationName }}</td>
-            <td>{{ item.responseClientName }}&nbsp;{{ item.responseOrganizationName }}</td>
+            <td>
+              {{ item.responseClientName }}&nbsp;{{
+                item.responseOrganizationName
+              }}
+            </td>
             <td>{{ item.type }}</td>
             <td>{{ item.projectItemName }}</td>
             <td>{{ item.categoryName }}</td>
@@ -165,7 +210,6 @@
           v-if="pagination.last_page > 0"
           :pagination="pagination"
           :callback="getDatas"
-                        
           :show-head-and-tail="true"
         />
       </div>
@@ -180,19 +224,8 @@ import AssetBatchOperationQueueResource from '../../api/asset/AssetBatchOperatio
 import Common from '../../common/Common.js';
 import { Uuid } from 'pc-component-v3';
 
-
-
-
-
-
 export default {
-  components: {
-    
-    
-    
-    
-    
-  },
+  components: {},
   data: function () {
     return {
       changeType: '',
@@ -218,7 +251,7 @@ export default {
 
   watch: {
     // 如果路由有变化，会再次执行该方法
-    '$route': 'init',
+    $route: 'init',
   },
 
   mounted: function () {
@@ -227,8 +260,8 @@ export default {
 
   methods: {
     /**
-         * 全选和反选
-         */
+     * 全选和反选
+     */
     selectAll: function () {
       var _self = this;
       if (_self.checked) {
@@ -242,15 +275,17 @@ export default {
       }
     },
     /**
-         * 跳转待转移页面
-         */
+     * 跳转待转移页面
+     */
     goto: function () {
-      this.$router.push({ path: '/eam/assetBatchOperation/' + this.changeType });
+      this.$router.push({
+        path: '/eam/assetBatchOperation/' + this.changeType,
+      });
     },
 
     /**
-         * 重置分页，然后查询
-         */
+     * 重置分页，然后查询
+     */
     resetQuery: function () {
       var _self = this;
       _self.pagination.current_page = 1;
@@ -262,11 +297,11 @@ export default {
      */
     getDatas: function () {
       var _self = this;
-      _self.loading=true;
+      _self.loading = true;
       var param = {
         range: {
           start:
-                        (_self.pagination.current_page - 1) * _self.pagination.per_page,
+            (_self.pagination.current_page - 1) * _self.pagination.per_page,
           length: _self.pagination.per_page,
         },
         name: _self.assetName,
@@ -276,40 +311,37 @@ export default {
       };
       AssetInstanceResource.listByAssetQueryParamDto(param).then(
         baseRangeResponse => {
-          if(baseRangeResponse.errorCode == 0){
+          if (baseRangeResponse.errorCode == 0) {
+            _self.loading = false;
             _self.pagination.total = baseRangeResponse.total;
-            if (baseRangeResponse.datas) {
+            if (baseRangeResponse.datas && baseRangeResponse.datas.length > 0) {
               baseRangeResponse.datas.forEach(item => {
                 item.checked = false;
               });
+              _self.assetDtos = baseRangeResponse.datas;
+              _self.pagination.last_page = Math.ceil(
+                baseRangeResponse.total / baseRangeResponse.length,
+              );
+              _self.getCount();
             }
-            _self.assetDtos = baseRangeResponse.datas;
-            if (
-              baseRangeResponse.datas == undefined ||
-              baseRangeResponse.datas.length == 0
-            ) {
-              return;
-            }
-            _self.pagination.last_page = Math.ceil(
-              baseRangeResponse.total / baseRangeResponse.length,
-            );
+          } else {
+            _self.loading = false;
+            Common.showDialog('提示', baseRangeResponse.errorMessage, 'error');
           }
-          _self.loading=false;
-          _self.getCount();
           _self.fixedTableHeader();
         },
         errorData => {
-          _self.loading=false;
+          _self.loading = false;
           Common.processException(errorData);
         },
       );
     },
     /**
-         * 设置为待转移
-         */
+     * 设置为待转移
+     */
     addToCache: function () {
       var _self = this;
-      _self.loading=true;
+      _self.loading = true;
       this.assetDtos.forEach(function (item) {
         if (item.checked) {
           _self.waitChangeAssetDtos.push(item);
@@ -317,22 +349,30 @@ export default {
       });
 
       if (_self.waitChangeAssetDtos.length < 1) {
-        _self.loading=false;
+        _self.loading = false;
         Common.showDialog('提示', '请选择数据后再提交', 'error');
         return;
       }
 
       if (_self.waitChangeAssetDtos.length > 0) {
-        AssetBatchOperationQueueResource.save(_self.changeType,
+        AssetBatchOperationQueueResource.save(
+          _self.changeType,
           _self.waitChangeAssetDtos,
         ).then(
           baseListResponse => {
-            _self.loading=false;
+            _self.loading = false;
             if (baseListResponse.errorCode == 0) {
-              if(baseListResponse.datas != null && baseListResponse.datas != undefined){
+              if (
+                baseListResponse.datas != null &&
+                baseListResponse.datas != undefined
+              ) {
                 let insertCount = baseListResponse.datas.length;
                 let existCount = _self.waitChangeAssetDtos.length - insertCount;
-                _self.message = insertCount + '条资产加入待转移清单，' + existCount + '条资产已经在待转移清单中。';
+                _self.message =
+                  insertCount +
+                  '条资产加入待转移清单，' +
+                  existCount +
+                  '条资产已经在待转移清单中。';
               }
             }
 
@@ -342,10 +382,10 @@ export default {
               _self.waitChangeAssetDtos.length,
             );
             _self.getDatas();
-            _self.loading=false;
+            _self.loading = false;
           },
           errorData => {
-            _self.loading=false;
+            _self.loading = false;
             Common.processException(errorData);
           },
         );
@@ -355,25 +395,27 @@ export default {
     },
 
     /**
-         * 查询待转移清单的数量
-         */
+     * 查询待转移清单的数量
+     */
     getCount: function () {
       var _self = this;
-      AssetBatchOperationQueueResource.countByUserIdChangeType(_self.changeType).then(
+      AssetBatchOperationQueueResource.countByUserIdChangeType(
+        _self.changeType,
+      ).then(
         baseObjectResponse => {
-          if(baseObjectResponse.errorCode == 0){
+          if (baseObjectResponse.errorCode == 0) {
             _self.count = baseObjectResponse.data;
-          }else{
+          } else {
             Common.showDialog('提示', baseObjectResponse.errorMessage, 'error');
           }
         },
-        errorData => { },
+        errorData => {},
       );
     },
 
     /**
-         * 冻结表头
-         */
+     * 冻结表头
+     */
     fixedTableHeader: function () {
       let _self = this;
       _self.$nextTick(function () {
@@ -385,13 +427,19 @@ export default {
       var _self = this;
       _self.changeType = _self.$route.params.changeType;
       if (_self.changeType == 'organizationChange') {
-        _self.changeTypeName = _self.$t('lang.AssetBatchOperationQuery.departmentChanges');
+        _self.changeTypeName = _self.$t(
+          'lang.AssetBatchOperationQuery.departmentChanges',
+        );
       } else if (_self.changeType == 'assetInstanceScrap') {
         _self.changeTypeName = _self.$t('lang.AssetBatchOperationQuery.scrap');
       } else if (_self.changeType == 'assetInstanceModifyUseStatus') {
-        _self.changeTypeName = _self.$t('lang.AssetBatchOperationQuery.modifyingUsageStatus');
+        _self.changeTypeName = _self.$t(
+          'lang.AssetBatchOperationQuery.modifyingUsageStatus',
+        );
       } else if (_self.changeType == 'assetInstanceModifyContact') {
-        _self.changeTypeName = _self.$t('lang.AssetBatchOperationQuery.modifyingAssetCustodian');
+        _self.changeTypeName = _self.$t(
+          'lang.AssetBatchOperationQuery.modifyingAssetCustodian',
+        );
       }
 
       _self.tableId = Uuid.createUUID();
@@ -415,107 +463,106 @@ export default {
 
 <style scoped>
 .grid-container {
-    display: grid;
-    grid-template-columns: 100%;
-    grid-template-rows: 50px min-content auto 40px;
-    /*视口被均分为 100 单位的 vh 占据整个窗口，扣掉顶部 topNav 的距离后，计算得到 responseOrganizationSelect 的高度*/
-    height: calc(100vh - 80px);
-    width: 100%;
-    overflow: hidden;
-
+  display: grid;
+  grid-template-columns: 100%;
+  grid-template-rows: 50px min-content auto 40px;
+  /*视口被均分为 100 单位的 vh 占据整个窗口，扣掉顶部 topNav 的距离后，计算得到 responseOrganizationSelect 的高度*/
+  height: calc(100vh - 80px);
+  width: 100%;
+  overflow: hidden;
 }
 
 .grid-item-1 {
-    grid-column: 1 / 2;
+  grid-column: 1 / 2;
 }
 
 .grid-item-2 {
-    grid-column: 1 / 2;
-    padding-bottom: 10px;
+  grid-column: 1 / 2;
+  padding-bottom: 10px;
 }
 
 .grid-item-3 {
-    padding-right: 20px;
-    overflow: hidden;
-    grid-row: 3/4;
-    grid-column: 1 / 2;
-    height: 100%;
+  padding-right: 20px;
+  overflow: hidden;
+  grid-row: 3/4;
+  grid-column: 1 / 2;
+  height: 100%;
 }
 
 .grid-item-4 {
-    padding-top: 10px;
-    grid-column: 1 / 2;
+  padding-top: 10px;
+  grid-column: 1 / 2;
 }
 
 .fixed-table {
-    table-layout: fixed;
-    width: 800px !important;
-    min-width: 800px !important;
+  table-layout: fixed;
+  width: 800px !important;
+  min-width: 800px !important;
 }
 
 table.fixed-table tr {
-    height: 40px;
+  height: 40px;
 }
 
 table.fixed-table th,
 table.fixed-table td {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 </style>
 
 <style scoped>
-  .m-form-group {
-    margin-left: 5px !important;
-    margin-right: 5px !important;
-    margin-bottom: 5px !important;
+.m-form-group {
+  margin-left: 5px !important;
+  margin-right: 5px !important;
+  margin-bottom: 5px !important;
 }
 
 @media (max-width: 768px) {
-    .m-form-group-label {
-        text-align: left;
-        padding-right: 10px;
-    }
+  .m-form-group-label {
+    text-align: left;
+    padding-right: 10px;
+  }
 }
 
 @media (min-width: 768px) {
-    .m-form-group-label {
-        width: 100px;
-        text-align: center;
-        padding-right: 10px;
-    }
-
-    .input-switches {
-        width: 100%;
-    }
+  .m-form-group-label {
+    width: 100px;
+    text-align: center;
+    padding-right: 10px;
+  }
+
+  .input-switches {
+    width: 100%;
+  }
 }
 
 .form-control-complex {
-    width: 200px !important;
+  width: 200px !important;
 }
 
 .form-input {
-    border-radius: 4px !important;
+  border-radius: 4px !important;
 }
 
 .m-form-input {
-    border-radius: 4px !important;
-    width: 200px !important;
+  border-radius: 4px !important;
+  width: 200px !important;
 }
 
 .form-inline-div {
-    display: inline-block;
-    height: 34px;
+  display: inline-block;
+  height: 34px;
 }
 
 .m-btn {
-    margin-left: 5px !important;
-    margin-right: 5px !important;
-    margin-bottom: 5px !important;
+  margin-left: 5px !important;
+  margin-right: 5px !important;
+  margin-bottom: 5px !important;
 }
 
 .table-header-right {
-    float: right;
+  float: right;
 }
 </style>

src/components/archive/AssetBatchOperationQueue.vue

@@ -1,8 +1,11 @@
 <template>
-  <div style="height: 100%;">
+  <div style="height: 100%">
     <div class="grid-container">
       <div class="grid-item-1">
-        <table :id="tableId" class="fixed-table table table-striped table-bordered">
+        <table
+          :id="tableId"
+          class="fixed-table table table-striped table-bordered"
+        >
           <thead>
             <tr>
               <th style="width: 40px">
@@ -14,28 +17,55 @@
                   @change="selectAll()"
                 />
               </th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.assetName') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.assetNumber') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.cardNumber') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.ownerDepartment') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.useDepartment') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.type') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.projectName') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.assetCategory') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.originalValue') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.placeOfPlacement') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.aLocationToBePlacedIn') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.startDate') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.user') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.userInput') }}</th>
-              <th style="width: 150px">{{ $t('lang.AssetBatchOperationQueue.usageStatus') }}</th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.assetName") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.assetNumber") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.cardNumber") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.ownerDepartment") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.useDepartment") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.type") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.projectName") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.assetCategory") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.originalValue") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.placeOfPlacement") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.aLocationToBePlacedIn") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.startDate") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.user") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.userInput") }}
+              </th>
+              <th style="width: 150px">
+                {{ $t("lang.AssetBatchOperationQueue.usageStatus") }}
+              </th>
             </tr>
           </thead>
           <tbody v-if="assetChangeWaitDtos.length > 0">
-            <tr 
-              v-for="item in assetChangeWaitDtos"
-              :key="item.id"
-            >
+            <tr v-for="item in assetChangeWaitDtos" :key="item.id">
               <td>
                 <input
                   autocomplete="off"
@@ -48,8 +78,16 @@
               <td>{{ item.assetSimpleResponse.name }}</td>
               <td>{{ item.assetSimpleResponse.assetNo }}</td>
               <td>{{ item.assetSimpleResponse.no }}</td>
-              <td>{{ item.assetSimpleResponse.clientName }}&nbsp;{{ item.assetSimpleResponse.organizationName }}</td>
-              <td>{{ item.assetSimpleResponse.responseClientName }}&nbsp;{{ item.assetSimpleResponse.responseOrganizationName }}</td>
+              <td>
+                {{ item.assetSimpleResponse.clientName }}&nbsp;{{
+                  item.assetSimpleResponse.organizationName
+                }}
+              </td>
+              <td>
+                {{ item.assetSimpleResponse.responseClientName }}&nbsp;{{
+                  item.assetSimpleResponse.responseOrganizationName
+                }}
+              </td>
               <td>{{ item.assetSimpleResponse.type }}</td>
               <td>{{ item.assetSimpleResponse.projectItemName }}</td>
               <td>{{ item.assetSimpleResponse.categoryName }}</td>
@@ -70,7 +108,6 @@
           v-if="pagination.last_page > 0"
           :pagination="pagination"
           :callback="getDatas"
-                            
           :show-head-and-tail="true"
         />
       </div>
@@ -85,15 +122,9 @@ import AssetBatchOperationQueueResource from '../../api/asset/AssetBatchOperatio
 import Common from '../../common/Common.js';
 import { Uuid } from 'pc-component-v3';
 
-
-
-
-
 export default {
-  components: {
-    
-  },
-  
+  components: {},
+
   props: {
     changeType: {
       type: String,
@@ -128,8 +159,8 @@ export default {
 
   methods: {
     /**
-         * 重置分页，然后查询
-         */
+     * 重置分页，然后查询
+     */
     resetQuery: function () {
       var _self = this;
       _self.pagination.current_page = 1;
@@ -137,16 +168,16 @@ export default {
     },
 
     /**
-         * 调拨经手人框change事件
-         */
+     * 调拨经手人框change事件
+     */
     userValueChanged: function (newResponsibilityFieldValue) {
       var _self = this;
       this.userFieldValue = newResponsibilityFieldValue;
     },
 
     /**
-         * 全选和反选
-         */
+     * 全选和反选
+     */
     selectAll: function () {
       var _self = this;
       if (_self.checked) {
@@ -161,52 +192,48 @@ export default {
     },
 
     /**
-         * /查询数据
-         */
+     * /查询数据
+     */
     getDatas: function () {
       var _self = this;
-      _self.loading=true;
+      _self.loading = true;
       var param = {
         range: {
           start:
-                        (_self.pagination.current_page - 1) * _self.pagination.per_page,
+            (_self.pagination.current_page - 1) * _self.pagination.per_page,
           length: _self.pagination.per_page,
         },
         changeType: _self.changeType,
       };
       AssetBatchOperationQueueResource.listByCondition(param).then(
         baseRangeResponse => {
-          if(baseRangeResponse.errorCode == 0){
+          if (baseRangeResponse.errorCode == 0) {
+            _self.loading = false;
             _self.pagination.total = baseRangeResponse.total;
-            if (baseRangeResponse.datas) {
+            if (baseRangeResponse.datas && baseRangeResponse.datas.length > 0) {
               baseRangeResponse.datas.forEach(function (item) {
                 item.checked = false;
               });
+              _self.assetChangeWaitDtos = baseRangeResponse.datas;
+              _self.pagination.last_page = Math.ceil(
+                baseRangeResponse.total / baseRangeResponse.length,
+              );
             }
-            _self.assetChangeWaitDtos = baseRangeResponse.datas;
-            _self.loading=false;
-            if (baseRangeResponse.datas == undefined ||
-                baseRangeResponse.datas.length == 0) {
-              return;
-            }
-            _self.pagination.last_page = Math.ceil(
-              baseRangeResponse.total / baseRangeResponse.length,
-            );
-          }else{
+          } else {
             Common.showDialog('提示', baseRangeResponse.errorMessage, 'error');
           }
           _self.fixedTableHeader();
         },
         errorData => {
-          _self.loading=false;
+          _self.loading = false;
           Common.processException(errorData);
         },
       );
     },
 
     /**
-         * 取消转移
-         */
+     * 取消转移
+     */
     removeAssetChangeWaitDtos: function () {
       var _self = this;
 
@@ -221,29 +248,27 @@ export default {
         Common.showDialog('提示', '请选择数据后再提交', 'error');
         return;
       }
-      _self.loading=true;
+      _self.loading = true;
       if (waitChangeAssetDtos.length > 0) {
-        AssetBatchOperationQueueResource.remove(
-          waitChangeAssetDtos,
-        ).then(
+        AssetBatchOperationQueueResource.remove(waitChangeAssetDtos).then(
           baseListResponse => {
-            if(baseListResponse.errorCode == 0){
+            if (baseListResponse.errorCode == 0) {
               console.log(baseListResponse);
             }
             _self.checked = false;
-            _self.loading=false;
+            _self.loading = false;
             _self.getDatas();
           },
           errorData => {
-            _self.loading=false;
+            _self.loading = false;
           },
         );
       }
     },
 
     /**
-         * 获取转移资产DTO集合
-         */
+     * 获取转移资产DTO集合
+     */
     getAssetChangeDtos: function () {
       var _self = this;
       let assetChangeDtos = [];
@@ -262,8 +287,8 @@ export default {
     },
 
     /**
-         * 冻结表头
-         */
+     * 冻结表头
+     */
     fixedTableHeader: function () {
       let _self = this;
       _self.$nextTick(function () {
@@ -276,40 +301,40 @@ export default {
 
 <style scoped>
 .grid-container {
-    display: grid;
-    grid-template-columns: 100%;
-    grid-template-rows: auto 50px;
-    height: 100%;
-    width: 100%;
-    align-items: end;
+  display: grid;
+  grid-template-columns: 100%;
+  grid-template-rows: auto 50px;
+  height: 100%;
+  width: 100%;
+  align-items: end;
 }
 .grid-item-1 {
-    padding-right: 20px;
-    overflow: hidden;
-    grid-row: 1/2;
-    grid-column: 1 / 2;
-    height: 100%;
+  padding-right: 20px;
+  overflow: hidden;
+  grid-row: 1/2;
+  grid-column: 1 / 2;
+  height: 100%;
 }
 
 .grid-item-2 {
-    grid-row: 2/3;
-    grid-column: 1 / 2;
+  grid-row: 2/3;
+  grid-column: 1 / 2;
 }
 
 .fixed-table {
-    table-layout: fixed;
-    width: 800px !important;
-    min-width: 800px !important;
+  table-layout: fixed;
+  width: 800px !important;
+  min-width: 800px !important;
 }
 
 table.fixed-table tr {
-    height: 40px;
+  height: 40px;
 }
 
 table.fixed-table th,
 table.fixed-table td {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 </style>