Browse Source

采购列表里面的资产:【生成资产】功能提示异常(实际已经生成资产卡片)
资产卡片里面上传图片后,查看生命周期时图片显示预览图显示异常
资产卡片复制功能异常?请核实!(一直处于加载中,实际已经复制成功)

杨志杰 3 years ago
parent
commit
0e186bf60b

+ 5 - 9
src/components/customer/AssetInstanceSearchDetail.vue

@@ -4,8 +4,8 @@
       <div class="row">
         <div class="col-md-12">
           <h1 class="page-header" style="margin-top: 10px; margin-bottom: 0px">
-            <img
-              :src="
+            <AuthImage
+              :auth-src="
                 Common.getThumbnailImageSrc(
                   assetClassName,
                   showAssetInstance.imageName
@@ -843,6 +843,8 @@
 <script>
 import Common from '../../common/Common.js';
 import { Notify } from 'pc-component-v3';
+import AuthImage from '../../widget/AuthImage.vue';
+
 
 
 
@@ -853,13 +855,7 @@ import AssetInstanceRfidRecordResource from '../../api/asset/AssetInstanceRfidRe
 export default {
 
   components: {
-    
-    
-    
-    
-    
-    
-    
+    AuthImage,
   },
   data: function () {
     this.Common = Common;

+ 1 - 1
src/components/customer/AutoGenerateAsset.vue

@@ -143,7 +143,7 @@ export default {
       AssetOrderResource.generateAsset(_self.modelDatas).then(
         successData => {
           _self.loading=false;
-          if (successData.isSuccess) {
+          if (successData.success) {
             Notify.success('成功', successData.result, false);
           } else {
             Notify.error('失败', successData.result, false);

+ 14 - 10
src/components/customer/CopyProperty.vue

@@ -176,7 +176,7 @@
                 </td>
               </tr>
             </thead>
-            <tbody v-if="assetInstances.length > 0">
+            <tbody v-if="assetInstances != null && assetInstances.length > 0">
               <tr
                 v-for="(item, index) in assetInstances"
                 :key="item.id"
@@ -237,13 +237,12 @@ export default {
     const _self = this;
     // 根据UUID获取资产的id
     var uuid = _self.$route.params.uuid;
-    UserStorageResource.uniqueByKey(uuid + '_modelData').then(str => {
-      // if(str.errorCode != 0) {
-      //   Notify.error('提示', str.errorMessage, false);
-      //   return;
-      // }
-      if (str.data != null) {
-        const modelData = JSON.parse(str.data);
+    UserStorageResource.uniqueByKey(uuid + '_modelData').then(data => {
+      if(data.errorCode != 0) {
+        Notify.error('提示', data.errorMessage, false);
+        return;
+      }else{
+        let modelData = JSON.parse(data.data);
         _self.assetInstanceId = modelData.id;
         _self.findByAssetInstanceId();
       }
@@ -259,7 +258,12 @@ export default {
     findByAssetInstanceId: function () {
       const _self = this;
       AssetInstanceResource.uniqueAssetInstance(_self.assetInstanceId).then(successData => {
-        _self.assetInstance = successData;
+        if(successData.errorCode != 0) {
+          Notify.error('提示', successData.errorMessage, false);
+          return;
+        }else{
+          _self.assetInstance = successData.data;
+        }
       }, errorData => {
         Common.processException(errorData);
       });
@@ -279,7 +283,7 @@ export default {
       _self.loading=true;
       AssetInstanceResource.copy(assetInstanceCopyRequest).then(successData => {
         if (successData.errorCode == 0) {
-          _self.assetInstances = successData.assetInstances;
+          _self.assetInstances = successData.assetSimpleResponses;
           _self.copyIsSuccess = true;
           _self.loading=false;
           Notify.success('资产卡片复制成功', '资产卡片复制成功。', true);