3.0.12 修改资产批量查询的操作

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-eam-v3",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "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/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

@@ -71,6 +71,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,