Merge branch 'master' of http://prodog.leanwo.com:3000/prodog-client-2023/client-eam-v3

package.json

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

src/components/archive/AssetBatchOperationQueue.vue

@@ -45,21 +45,21 @@
                   @click="item.checked = !item.checked"
                 />
               </td>
-              <td>{{ item.assetSimpleDto.name }}</td>
-              <td>{{ item.assetSimpleDto.assetNo }}</td>
-              <td>{{ item.assetSimpleDto.no }}</td>
-              <td>{{ item.assetSimpleDto.clientName }}&nbsp;{{ item.assetSimpleDto.organizationName }}</td>
-              <td>{{ item.assetSimpleDto.responseClientName }}&nbsp;{{ item.assetSimpleDto.responseOrganizationName }}</td>
-              <td>{{ item.assetSimpleDto.type }}</td>
-              <td>{{ item.assetSimpleDto.projectItemName }}</td>
-              <td>{{ item.assetSimpleDto.categoryName }}</td>
-              <td>{{ item.assetSimpleDto.orginalValue }}</td>
-              <td>{{ item.assetSimpleDto.savePosition }}</td>
-              <td>{{ item.assetSimpleDto.locationName }}</td>
-              <td>{{ item.assetSimpleDto.depreciationStartDate }}</td>
-              <td>{{ item.assetSimpleDto.useUserName }}</td>
-              <td>{{ item.assetSimpleDto.useUserNameInput }}</td>
-              <td>{{ item.assetSimpleDto.useStatusName }}</td>
+              <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.type }}</td>
+              <td>{{ item.assetSimpleResponse.projectItemName }}</td>
+              <td>{{ item.assetSimpleResponse.categoryName }}</td>
+              <td>{{ item.assetSimpleResponse.orginalValue }}</td>
+              <td>{{ item.assetSimpleResponse.savePosition }}</td>
+              <td>{{ item.assetSimpleResponse.locationName }}</td>
+              <td>{{ item.assetSimpleResponse.depreciationStartDate }}</td>
+              <td>{{ item.assetSimpleResponse.useUserName }}</td>
+              <td>{{ item.assetSimpleResponse.useUserNameInput }}</td>
+              <td>{{ item.assetSimpleResponse.useStatusName }}</td>
             </tr>
           </tbody>
         </table>
@@ -251,7 +251,7 @@ export default {
       _self.assetChangeWaitDtos.forEach(function (item) {
         if (item.checked) {
           let assetChangeDto = {
-            assetInstanceId: item.assetSimpleDto.id,
+            assetInstanceId: item.assetSimpleResponse.id,
             assetChangeWaitId: item.id,
           };
           assetChangeDtos.push(assetChangeDto);

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;

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);

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);

src/locales/en-US.json

@@ -951,6 +951,7 @@
       "user": "User",
       "userInput": "User(Input)",
       "usageStatus": "Usage Status"
+
     },
     "AssetBatchOperationScrap": {
       "assetConfirmationBatchScrapping": "Asset Confirmation Batch Scrapping",

src/locales/zh-CN.json

@@ -1054,7 +1054,21 @@
       "serialNumber": "序列号",
       "tagNumber": "标签编号",
       "balancingSegment": "公司代码",
-      "description": "资产名称"
+      "description": "资产名称",
+
+      "assetName": "资产名称",
+      "cardNumber": "卡片编号",
+      "ownerDepartment": "所属单位部门",
+      "useDepartment": "使用单位部门",
+      "type": "规格型号",
+      "projectName": "项目名称",
+      "originalValue": "原值",
+      "placeOfPlacement": "放置地点",
+      "aRoomToBePlacedIn": "放置房间",
+      "startDate": "开始使用日期",
+      "user": "使用人",
+      "userInput": "使用人(输入)",
+      "usageStatus": "使用状况"
     },
     "AssetBatchOperationScrap": {
       "assetConfirmationBatchScrapping": "资产确认批量报废",

src/main.js

@@ -52,6 +52,7 @@ instance.use(VTooltip);
 instance.use(PcClientComponent);
 instance.mount('#app-client-eam');
 
+window.app = instance;
 
 /**
  * 路由钩子

webpack.dev.js

@@ -77,6 +77,12 @@ module.exports = WebpackMerge.merge(baseConfig, {
         changeOrigin: true,
         secure: true,
       },
+      '/content': {
+        target: 'http://localhost:83/',
+        ws: false,
+        changeOrigin: true,
+        secure:true,
+      },
       '/dashboard': {
         target: 'http://localhost:83/',
         ws: false,