Room 修改成 Location

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-eam-v3",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
@@ -15,7 +15,7 @@
   "peerDependencies": {
     "ant-design-vue": "^3.2.15",
     "moment": "^2.29.4",
-    "pc-component-v3": "^1.0.39",
+    "pc-component-v3": "^1.0.44",
     "v-tooltip": "^4.0.0-beta.17",
     "vue-select": "^4.0.0-beta.6"
   },

src/api/asset/AssetInstanceResource.js

@@ -255,7 +255,7 @@ export default {
    * 工具作者: 杨志杰
    * 盘点 
    */
-  check: function (assetInstanceIds, checkId, roomId) {
+  check: function (assetInstanceIds, checkId, locationId) {
     var requestUrl = 'AssetInstanceResource/check';
 
     var formData = {};
@@ -265,8 +265,8 @@ export default {
     if (checkId != null) {
       formData.checkId = checkId;
     }
-    if (roomId != null) {
-      formData.roomId = roomId;
+    if (locationId != null) {
+      formData.locationId = locationId;
     }
 
     return new Promise((resolve, reject) => {
@@ -661,7 +661,7 @@ export default {
    * 工具作者: 杨志杰
    * 查询一定时间内和存放地点所有读写器记录的资产 
    */
-  getAssetByTime: function (startTime, endTime, roomId) {
+  getAssetByTime: function (startTime, endTime, locationId) {
     var requestUrl = 'AssetInstanceResource/getAssetByTime';
     var paramCount = 0;
     if (startTime != null) {
@@ -674,9 +674,9 @@ export default {
       requestUrl += ('endTime=' + endTime);
       paramCount++;
     }
-    if (roomId != null) {
+    if (locationId != null) {
       requestUrl += (paramCount > 0) ? '&' : '?';
-      requestUrl += ('roomId=' + roomId);
+      requestUrl += ('locationId=' + locationId);
       paramCount++;
     }
 

src/api/asset/ClientOrganizationRoomUserResource.js

@@ -3,7 +3,7 @@ import { Common } from 'pc-component-v3';
 /**
  * 工具类自动生成的API，请勿做任何修改，请勿做任何修改，请勿做任何修改（重要的事情说3遍）
  * 工具作者: 杨志杰
- * ClientOrganizationRoomUserResource 
+ * ClientOrganizationLocationUserResource 
  */
 export default {
 
@@ -13,7 +13,7 @@ export default {
 	 * 自动生成数据 
 	 */
   generateDatas: function(){
-    var requestUrl = 'api/ClientOrganizationRoomUserResource/generateDatas';
+    var requestUrl = 'api/ClientOrganizationLocationUserResource/generateDatas';
 
 
     return new Promise((resolve, reject) => {
@@ -43,8 +43,8 @@ export default {
 	 * 工具作者: 杨志杰
 	 * 保存公司+部门+营业场所+部门经理+资产管理员 
 	 */
-  saveClientOrganizationRoomUser: function(clientOrganizationRoomUserSaveRequsets){
-    var requestUrl = 'api/ClientOrganizationRoomUserResource/saveClientOrganizationRoomUser';
+  saveClientOrganizationLocationUser: function(clientOrganizationLocationUserSaveRequsets){
+    var requestUrl = 'api/ClientOrganizationLocationUserResource/saveClientOrganizationLocationUser';
 
 
     return new Promise((resolve, reject) => {
@@ -54,7 +54,7 @@ export default {
         contentType: 'application/json',
 				
 				
-        data: JSON.stringify(clientOrganizationRoomUserSaveRequsets),
+        data: JSON.stringify(clientOrganizationLocationUserSaveRequsets),
 				
         beforeSend: function(request) {
           Common.addTokenToRequest(request);

src/components/AssetBasicSetting.vue

@@ -101,7 +101,7 @@
           }}</label>
           <div class="input-group">
             <ImageEditor
-              :class-name="'com.leanwo.prodog.model.asset.AssetConfig'"
+              :class-name="'com.leanwo.prodog.asset.model.AssetConfig'"
               :record-id="assetConfigDto.id"
               :field-name="'imageName'"
               :readonly="isdisable"
@@ -503,7 +503,7 @@
         }}</label>
         <div class="input-group">
           <ImageEditor
-            :class-name="'com.leanwo.prodog.model.asset.AssetConfig'"
+            :class-name="'com.leanwo.prodog.asset.model.AssetConfig'"
             :record-id="assetConfigDto.id"
             :field-name="'imageName'"
             :readonly="isdisable"
@@ -521,7 +521,7 @@
         }}</label>
         <div class="input-group">
           <ImageEditor
-            :class-name="'com.leanwo.prodog.model.asset.AssetConfig'"
+            :class-name="'com.leanwo.prodog.asset.model.AssetConfig'"
             :record-id="assetConfigDto.id"
             :field-name="'imageName2'"
             :readonly="isdisable"
@@ -539,7 +539,7 @@
         }}</label>
         <div class="input-group">
           <ImageEditor
-            :class-name="'com.leanwo.prodog.model.asset.AssetConfig'"
+            :class-name="'com.leanwo.prodog.asset.model.AssetConfig'"
             :record-id="assetConfigDto.id"
             :field-name="'imageName3'"
             :readonly="isdisable"
@@ -557,7 +557,7 @@
         }}</label>
         <div class="input-group">
           <ImageEditor
-            :class-name="'com.leanwo.prodog.model.asset.AssetConfig'"
+            :class-name="'com.leanwo.prodog.asset.model.AssetConfig'"
             :record-id="assetConfigDto.id"
             :field-name="'imageName4'"
             :readonly="isdisable"
@@ -575,7 +575,7 @@
         }}</label>
         <div class="input-group">
           <ImageEditor
-            :class-name="'com.leanwo.prodog.model.asset.AssetConfig'"
+            :class-name="'com.leanwo.prodog.asset.model.AssetConfig'"
             :record-id="assetConfigDto.id"
             :field-name="'imageName5'"
             :readonly="isdisable"

src/components/archive/AssetBatchOperationOrganization.vue

@@ -76,12 +76,12 @@
                   style="width: 115px"
                 >{{ $t('lang.AssetBatchOperationOrganization.newStorageLocation') }}</label>
                 <SearchWidget
-                  :info-window-no="roomInfoWindowNo"
-                  :field="roomField"
-                  :field-value="roomFieldValue"
-                  :display-name="roomField.listDisplayFieldName"
-                  :where-clause-source="roomWhereClauseSource"
-                  @value-changed="roomValueChanged"
+                  :info-window-no="locationInfoWindowNo"
+                  :field="locationField"
+                  :field-value="locationFieldValue"
+                  :display-name="locationField.listDisplayFieldName"
+                  :where-clause-source="locationWhereClauseSource"
+                  @value-changed="locationValueChanged"
                 />
               </div>
               <div class="form-group">
@@ -201,8 +201,8 @@ export default {
           defaultDataDimensionTypeValueNo: '2',
         }],
       },
-      roomInfoWindowNo: 109494,
-      roomWhereClauseSource: {
+      locationInfoWindowNo: 109494,
+      locationWhereClauseSource: {
         customerDataDimensions:[{
           fieldName: 'client.id',
           dataDimensionTypeNo: '202201191757',
@@ -227,7 +227,7 @@ export default {
         name: '',
         listDisplayFieldName: 'name',
       },
-      roomField: {
+      locationField: {
         name: '',
         listDisplayFieldName: 'ar.name',
       },
@@ -245,7 +245,7 @@ export default {
         displayValue: [''],
         fieldType: 'Key',
       },
-      roomFieldValue: {
+      locationFieldValue: {
         id: null,
         displayValue: [''],
         fieldType: 'Key',
@@ -257,9 +257,9 @@ export default {
       },
       checked: false,
       reason: '',
-      roomList: [],
-      roomId: undefined,
-      roomSelected: undefined,
+      locationList: [],
+      locationId: undefined,
+      locationSelected: undefined,
       organizationName: undefined,
       responsibilityOrganizationName: undefined,
       loading: false,
@@ -318,9 +318,9 @@ export default {
     /**
          * 存放地点选择框change事件
          */
-    roomValueChanged: function (newResponsibilityFieldValue) {
+    locationValueChanged: function (newResponsibilityFieldValue) {
       var _self = this;
-      this.roomFieldValue = newResponsibilityFieldValue;
+      this.locationFieldValue = newResponsibilityFieldValue;
     },
 
     /**
@@ -385,7 +385,7 @@ export default {
       var _self = this;
       let organizationId = null;
       let responseOrganizationId = null;
-      let roomId = null;
+      let locationId = null;
       let responsibleUserId = null;
 
       if (_self.organizationFieldValue == undefined || _self.organizationFieldValue.id == undefined) {
@@ -408,8 +408,8 @@ export default {
         return;
       }
 
-      if (_self.roomFieldValue != null && _self.roomFieldValue.id != null) {
-        roomId = _self.roomFieldValue.id;
+      if (_self.locationFieldValue != null && _self.locationFieldValue.id != null) {
+        locationId = _self.locationFieldValue.id;
       }
 
       if (_self.userFieldValue != null && _self.userFieldValue.id != null) {
@@ -422,7 +422,7 @@ export default {
           item.organizationId = organizationId;
           item.responseOrganizationId = responseOrganizationId;
           item.reason = _self.reason;
-          item.roomId = roomId;
+          item.locationId = locationId;
           item.responsibleUserInId = responsibleUserId;
         });
       }

src/components/archive/AssetBatchOperationQuery.vue

@@ -118,7 +118,7 @@
             <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.aRoomToBePlacedIn') }}</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>
@@ -150,7 +150,7 @@
             <td>{{ item.categoryName }}</td>
             <td>{{ item.orginalValue }}</td>
             <td>{{ item.savePosition }}</td>
-            <td>{{ item.roomName }}</td>
+            <td>{{ item.locationName }}</td>
             <td>{{ item.depreciationStartDate }}</td>
             <td>{{ item.useUserName }}</td>
             <td>{{ item.useUserNameInput }}</td>

src/components/archive/AssetBatchOperationQueue.vue

@@ -24,7 +24,7 @@
               <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.aRoomToBePlacedIn') }}</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>
@@ -55,7 +55,7 @@
               <td>{{ item.assetSimpleDto.categoryName }}</td>
               <td>{{ item.assetSimpleDto.orginalValue }}</td>
               <td>{{ item.assetSimpleDto.savePosition }}</td>
-              <td>{{ item.assetSimpleDto.roomName }}</td>
+              <td>{{ item.assetSimpleDto.locationName }}</td>
               <td>{{ item.assetSimpleDto.depreciationStartDate }}</td>
               <td>{{ item.assetSimpleDto.useUserName }}</td>
               <td>{{ item.assetSimpleDto.useUserNameInput }}</td>

src/components/customer/AssetByRfid.vue

@@ -93,7 +93,7 @@
                   <td>{{ item.assetNo }}</td>
                   <td>{{ item.category }}</td>
                   <td>{{ item.epc }}</td>
-                  <td>{{ item.roomName }}</td>
+                  <td>{{ item.locationName }}</td>
                   <td>{{ item.depreciationStartDate }}</td>
                   <td>{{ item.description }}</td>
                 </tr>
@@ -133,11 +133,11 @@ export default {
     return {
       startDate: undefined,
       endDate: undefined,
-      roomId: null,
+      locationId: null,
       assetInstances: [],
       field: {
         name: '',
-        listFieldNames: 'room.name',
+        listFieldNames: 'location.name',
       },
       fieldValue: {
         id: null,
@@ -170,7 +170,7 @@ export default {
       }
       var loginInfo = localStorage.getItem('#LoginInfo');
       var loginData = JSON.parse(loginInfo);
-      var roomId = _self.roomId;
+      var locationId = _self.locationId;
       var whereClause = ' assetInstance.clientId=' + loginData.loginClientId;
       var str = '';
       var epcs = [];
@@ -185,8 +185,8 @@ export default {
           str = str + epcs[i] + ' , ';
         }
       }
-      if (roomId != null) {
-        str = str + ' and ai.roomId = ' + roomId;
+      if (locationId != null) {
+        str = str + ' and ai.locationId = ' + locationId;
       }
       whereClause = whereClause + str;
       console.log(whereClause);
@@ -204,7 +204,7 @@ export default {
     valueChanged: function (newFieldValue) {
       console.log(newFieldValue);
       this.fieldValue = newFieldValue;
-      this.roomId = newFieldValue.id;
+      this.locationId = newFieldValue.id;
     },
     /**
      * 搜索
@@ -218,7 +218,7 @@ export default {
         data: {
           startTime: _self.startDate,
           endTime: _self.endDate,
-          roomId: _self.roomId,
+          locationId: _self.locationId,
         },
         beforeSend: function (request) {
           Common.addTokenToRequest(request);

src/components/customer/AssetDetailList.vue

@@ -657,8 +657,8 @@ export default {
           align: 'center',
         },
         {
-          dataIndex: 'roomName',
-          title: this.$t('lang.AssetDetailList.placementRoom'),
+          dataIndex: 'locationName',
+          title: this.$t('lang.AssetDetailList.placementLocation'),
           width: 200,
           align: 'center',
         },

src/components/customer/AssetInstanceSearchDetail.vue

@@ -142,8 +142,8 @@
           </div>
           <div class="col-md-3">
             <div>
-              <strong>{{ $t("lang.AssetInstanceSearchDetail.placementRoom") }}：{{
-                showAssetInstance.roomName
+              <strong>{{ $t("lang.AssetInstanceSearchDetail.placementLocation") }}：{{
+                showAssetInstance.locationName
               }}</strong>
             </div>
           </div>
@@ -606,7 +606,7 @@
                     <tr v-for="(item, index) in imageInfos" :key="item.id">
                       <td>{{ index + 1 }}</td>
                       <td>{{ item.date }}</td>
-                      <td>{{ item.room }}</td>
+                      <td>{{ item.location }}</td>
                       <td>
                         <button
                           class="btn btn-primary"
@@ -876,7 +876,7 @@ export default {
       },
       showPager: false, // 是否显示分页
       assetInstances: [],
-      assetClassName: 'com.leanwo.prodog.model.asset.AssetInstance',
+      assetClassName: 'com.leanwo.prodog.asset.model.AssetInstance',
       showAssetInstance: '',
       activeContent: 1,
       imageInfos: [],
@@ -1116,27 +1116,27 @@ export default {
       var arr = [];
       for (var i = 0; i < data.length; i++) {
         var newItem = data[i];
-        var newRoom = newItem.room;
+        var newLocation = newItem.location;
 
-        var hasSameRoom = false;
+        var hasSameLocation = false;
         for (var j = 0; j < arr.length; j++) {
           var oldItem = arr[j];
-          var oldRoom = oldItem.room;
-          if (oldRoom == newRoom) {
-            hasSameRoom = true;
+          var oldLocation = oldItem.location;
+          if (oldLocation == newLocation) {
+            hasSameLocation = true;
             break;
           }
         }
 
         var arrLen = arr.length;
-        var lastRoom = undefined;
+        var lastLocation = undefined;
         if (arrLen >= 1) {
-          lastRoom = arr[arrLen - 1].room;
+          lastLocation = arr[arrLen - 1].location;
         }
 
-        if (!hasSameRoom) {
+        if (!hasSameLocation) {
           arr.push(newItem);
-        } else if (hasSameRoom && newRoom != lastRoom) {
+        } else if (hasSameLocation && newLocation != lastLocation) {
           arr.push(newItem);
         } else {
           var oldDate = new Date(arr[arrLen - 1].date);

src/components/customer/AssetInventoryOverallSearch.vue

@@ -136,7 +136,7 @@
                 {{ $t("lang.AssetInventorySearch.placeOfPlacement") }}
               </th>
               <th style="width: 100px">
-                {{ $t("lang.AssetInventorySearch.placementRoom") }}
+                {{ $t("lang.AssetInventorySearch.placementLocation") }}
               </th>
               <th style="width: 100px">
                 {{ $t("lang.AssetInventorySearch.unitOfMeasurement") }}
@@ -182,7 +182,7 @@
               <td>{{ assetInstance.projectItemName }}</td>
               <td>{{ assetInstance.orginalValue }}</td>
               <td>{{ assetInstance.savePosition }}</td>
-              <td>{{ assetInstance.roomName }}</td>
+              <td>{{ assetInstance.locationName }}</td>
               <td>{{ assetInstance.computationUnitName }}</td>
               <td>{{ assetInstance.useUserName }}</td>
               <td>{{ assetInstance.useStatusName }}</td>

src/components/customer/AssetInventoryRandomSearch.vue

@@ -144,11 +144,11 @@
               <div>放置位置</div>
               <SearchWidget
                 :info-window-no="'109494'"
-                :field="roomField"
-                :field-value="roomFieldValue"
-                :display-name="roomField.listFieldNames"
+                :field="locationField"
+                :field-value="locationFieldValue"
+                :display-name="locationField.listFieldNames"
                 :where-clause-source="whereClauseSource"
-                @value-changed="roomValueChanged"
+                @value-changed="locationValueChanged"
               />
             </div>
           </div>
@@ -206,7 +206,7 @@
                 {{ $t("lang.AssetInventorySearch.placeOfPlacement") }}
               </th>
               <th style="width: 100px">
-                {{ $t("lang.AssetInventorySearch.placementRoom") }}
+                {{ $t("lang.AssetInventorySearch.placementLocation") }}
               </th>
               <th style="width: 100px">
                 {{ $t("lang.AssetInventorySearch.unitOfMeasurement") }}
@@ -269,7 +269,7 @@
               <td>{{ assetInstance.projectItemName }}</td>
               <td>{{ assetInstance.orginalValue }}</td>
               <td>{{ assetInstance.savePosition }}</td>
-              <td>{{ assetInstance.roomName }}</td>
+              <td>{{ assetInstance.locationName }}</td>
               <td>{{ assetInstance.computationUnitName }}</td>
               <td>{{ assetInstance.useUserName }}</td>
               <td>{{ assetInstance.useStatusName }}</td>
@@ -410,11 +410,11 @@ export default {
       assetInventoryCategoryIds: [], // 盘点单中已经选中的资产类别
       assetInventoryProjectItemIds: [], // 盘点单中已经选择的项目
 
-      roomField: {
+      locationField: {
         name: '',
         listFieldNames: 'name',
       },
-      roomFieldValue: {
+      locationFieldValue: {
         id: {},
         displayValue: [''],
         fieldType: 'Key',
@@ -480,12 +480,12 @@ export default {
     /**
      * 选择的房间发生了改变
      */
-    roomValueChanged: function (newFieldValue) {
-      this.roomFieldValue = newFieldValue;
-      if (this.roomFieldValue != null) {
-        this.filter.roomId = this.roomFieldValue.id;
+    locationValueChanged: function (newFieldValue) {
+      this.locationFieldValue = newFieldValue;
+      if (this.locationFieldValue != null) {
+        this.filter.locationId = this.locationFieldValue.id;
       } else {
-        this.filter.roomId = null;
+        this.filter.locationId = null;
       }
     },
 

src/components/customer/AssetInventoryStep5.vue

@@ -115,8 +115,8 @@
 
               <div>放置位置</div>
               <SearchWidget
-                :info-window-no="'109494'" :field-value="roomFieldValue" :display-name="roomField.listFieldNames"
-                :where-clause-source="whereClauseSource" @value-changed="roomValueChanged"
+                :info-window-no="'109494'" :field-value="locationFieldValue" :display-name="locationField.listFieldNames"
+                :where-clause-source="whereClauseSource" @value-changed="locationValueChanged"
               />
             </div>
           </div>
@@ -169,7 +169,7 @@
                 {{ $t("lang.AssetInventorySearch.placeOfPlacement") }}
               </th>
               <th style="width: 100px">
-                {{ $t("lang.AssetInventorySearch.placementRoom") }}
+                {{ $t("lang.AssetInventorySearch.placementLocation") }}
               </th>
               <th style="width: 100px">
                 {{ $t("lang.AssetInventorySearch.unitOfMeasurement") }}
@@ -222,7 +222,7 @@
               <td>{{ assetInstance.projectItemName }}</td>
               <td>{{ assetInstance.orginalValue }}</td>
               <td>{{ assetInstance.savePosition }}</td>
-              <td>{{ assetInstance.roomName }}</td>
+              <td>{{ assetInstance.locationName }}</td>
               <td>{{ assetInstance.computationUnitName }}</td>
               <td>{{ assetInstance.useUserName }}</td>
               <td>{{ assetInstance.useStatusName }}</td>
@@ -339,7 +339,7 @@
                 {{ $t("lang.AssetInventorySearch.placeOfPlacement") }}
               </th>
               <th style="width: 100px">
-                {{ $t("lang.AssetInventorySearch.placementRoom") }}
+                {{ $t("lang.AssetInventorySearch.placementLocation") }}
               </th>
               <th style="width: 100px">
                 {{ $t("lang.AssetInventorySearch.unitOfMeasurement") }}
@@ -397,7 +397,7 @@
               <!-- <td>{{ assetInstance.projectItemName }}</td>
               <td>{{ assetInstance.orginalValue }}</td>
               <td>{{ assetInstance.savePosition }}</td>
-              <td>{{ assetInstance.roomName }}</td>
+              <td>{{ assetInstance.locationName }}</td>
               <td>{{ assetInstance.computationUnitName }}</td>
               <td>{{ assetInstance.useUserName }}</td>
               <td>{{ assetInstance.useStatusName }}</td>
@@ -483,11 +483,11 @@ export default {
       assetInventoryCategoryIds: [], // 盘点单中已经选中的资产类别
       assetInventoryProjectItemIds: [], // 盘点单中已经选择的项目
 
-      roomField: {
+      locationField: {
         name: '',
         listFieldNames: 'name',
       },
-      roomFieldValue: {
+      locationFieldValue: {
         id: {},
         displayValue: [''],
         fieldType: 'Key',
@@ -669,12 +669,12 @@ export default {
     /**
        * 选择的房间发生了改变
        */
-    roomValueChanged: function(newFieldValue) {
-      this.roomFieldValue = newFieldValue;
-      if (this.roomFieldValue != null) {
-        this.filter.roomId = this.roomFieldValue.id;
+    locationValueChanged: function(newFieldValue) {
+      this.locationFieldValue = newFieldValue;
+      if (this.locationFieldValue != null) {
+        this.filter.locationId = this.locationFieldValue.id;
       } else {
-        this.filter.roomId = null;
+        this.filter.locationId = null;
       }
     },
 

src/components/customer/AssetLabelPrint.vue

@@ -88,7 +88,7 @@
           <div class="form-inline-div">
             <InfoSearchWidget
               :where-clause="'o.id in (:EnvOrgnizationIdList)'" :info-window-no="289190"
-              :title-name="'存放地点'" :field-value="placeSiteFieldValue" :display-name="'room.name'"
+              :title-name="'存放地点'" :field-value="placeSiteFieldValue" :display-name="'location.name'"
               class="m-form-input" @value-changed="placeSiteValueChanged($event, placeSiteFieldValue)"
             />
           </div>
@@ -886,19 +886,19 @@ export default {
 </style>
 
 <style scoped>
-    .room_img {
+    .location_img {
         width: 150px;
         height: 100px;
         float: left;
         margin-right: 10px;
     }
 
-    .room_img img {
+    .location_img img {
         width: 100%;
         height: 100%;
     }
 
-    .room_img span {
+    .location_img span {
         position: relative;
         right: -130px;
         top: -100px;

src/components/customer/InventoryDataProcessingStep4.vue

@@ -1,16 +1,16 @@
 <template>
   <div>
-    <AmisWidget :amis-window-no="amisWindowNo" />
+    <LowcodeWidget :lowcode-window-no="lowcodeWindowNo" />
     <a-button type="primary" @click="previous">上一步</a-button>
   </div>
 </template>
 <script>
-import { AmisWidget } from 'pc-component-v3';
+import { LowcodeWidget } from 'pc-component-v3';
 
 
 export default {
   components: {
-    AmisWidget,
+    LowcodeWidget,
   },
 
   props: {
@@ -20,7 +20,7 @@ export default {
 
   data: function() {
     return {
-      'amisWindowNo': '20220516_164216',
+      'lowcodeWindowNo': '20220516_164216',
     };
   },
 

src/customer/InventoryAssetInstanceSearch.vue

@@ -58,7 +58,7 @@
                 {{ $t('lang.InventoryAssetInstanceSearch.assetNumber') }}:{{ item.resultValue.assetNo==""?"无":item.resultValue.assetNo }};
 
                 {{ $t('lang.InventoryAssetInstanceSearch.assetCategory') }}:{{ item.resultValue.categoryName==""?"无":item.resultValue.categoryName }};
-                {{ $t('lang.InventoryAssetInstanceSearch.storageLocation') }}:{{ item.resultValue.roomName==""?"无":item.resultValue.roomName }};
+                {{ $t('lang.InventoryAssetInstanceSearch.storageLocation') }}:{{ item.resultValue.locationName==""?"无":item.resultValue.locationName }};
 
                 {{ $t('lang.InventoryAssetInstanceSearch.cost') }}:{{ item.resultValue.orginalValue==""?"无":item.resultValue.orginalValue }};
                                 
@@ -115,7 +115,7 @@ export default {
       assetInstances: [],
       assetInstancesTotalSize: 0,
       assetInstancesLoaded: false,
-      assetClassName: 'com.leanwo.prodog.model.asset.AssetInstance',
+      assetClassName: 'com.leanwo.prodog.asset.model.AssetInstance',
       activeContent: 1,
       imageInfos: [],
       historyEvents: [],

src/locales/en-US.json

@@ -302,7 +302,7 @@
       "personliable": "Personliable",
       "user": "User",
       "userInput": "User Input",
-      "placementRoom": "Placement Room",
+      "placementLocation": "Placement Location",
       "placeOfPlacement": "Place Of Placement",
       "accuntingSubject": "Accunting Subject",
       "thereArePictures": "There Are Pictures"
@@ -440,7 +440,7 @@
       "subordinateToTheProject": "Subordinate To The Project",
       "originalValue": "Cost",
       "placeOfPlacement": "Location Of Placement",
-      "placementRoom": "Placement Room",
+      "placementLocation": "Placement Location",
       "unitOfMeasurement": "Unit Of Measurement",
       "usageStatus": "Usage Status",
       "user": "User",
@@ -871,7 +871,7 @@
       "assetCategory": "Asset Category",
       "originalValue": "Original Value",
       "placeOfPlacement": "Place Of Placement",
-      "aRoomToBePlacedIn": "A Room To Be Placed In",
+      "aLocationToBePlacedIn": "A Location To Be Placed In",
       "startDate": "Start Date",
       "user": "User",
       "specificationUser": "Specification User (Input)",
@@ -888,7 +888,7 @@
       "assetCategory": "Asset Category",
       "originalValue": "Original Value",
       "placeOfPlacement": "Place Of Placement",
-      "aRoomToBePlacedIn": "A Room To Be Placed In",
+      "aLocationToBePlacedIn": "A Location To Be Placed In",
       "startDate": "Start Date",
       "user": "User",
       "userInput": "User(Input)",

src/locales/zh-CN.json

@@ -389,7 +389,7 @@
       "personliable": "责任人",
       "user": "使用人",
       "userInput": "使用人(录入)",
-      "placementRoom": "放置房间",
+      "placementLocation": "放置房间",
       "placeOfPlacement": "放置地点",
       "accuntingSubject": "会计科目",
       "thereArePictures": "有图片"
@@ -527,7 +527,7 @@
       "subordinateToTheProject": "所属项目",
       "originalValue": "原值",
       "placeOfPlacement": "放置地点",
-      "placementRoom": "放置房间",
+      "placementLocation": "放置房间",
       "unitOfMeasurement": "计量单位",
       "user": "使用人",
       "usageStatus": "使用状况",

src/main.js

@@ -58,61 +58,61 @@ function render(props = {}) {
  * @param  {[type]} (to, from,         next [description]
  * @return {[type]}      [description]
  */
-router.beforeEach((to, from, next) => {
-  let funtionAccessDtos = [];
-  if (to.matched.some(function (item) {
-
-    // 判断是否需要登录才可以访问
-    if (item.meta.loginRequired) {
-      if (item.meta.functionAccessArray != undefined || item.meta.functionAccessArray != null) {
-        funtionAccessDtos = item.meta.functionAccessArray;
-      }
-      if (funtionAccessDtos != null) {
-        funtionAccessDtos.forEach(funtionAccessDto => {
-          if(typeof (funtionAccessDto.itemNo) === 'string'){
-            funtionAccessDto.itemNo = [funtionAccessDto.itemNo];
-          }
-        });
-      }
-    }
-    return item.meta.loginRequired;
-  })) {
-    // 判断是否已登录		
-    var token = $.cookie('token');
-    if (token == undefined || token.length == 0) {
-      // 如果没有登录则直接返回
-      next('/login');
-    } else {
-
-      console.log(funtionAccessDtos);
-      // 判断该路由需要具备”xxx”功能-“x1”功能项，”xxx”功能-“x2“功能项，”yyy”功能-“y1”功能项访问权限的用户才可以访问
-      $.ajax({
-        url: Common.getApiURL(
-          'RoleResourceV3/canVisitFunctionAccess',
-        ),
-        type: 'post',
-        dataType: 'json',
-        contentType: 'application/json',
-        data: JSON.stringify(funtionAccessDtos),
-        beforeSend: function (request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function (data) {
-          if (data.errorCode === 0 && data.data === true) {
-            next();
-          } else {
-            next('/desktop/no-role');
-          }
-        },
-        error: function (XMLHttpRequest, textStatus, errorThrown) {
-          Common.processException(XMLHttpRequest, textStatus, errorThrown);
-        },
-      });
-
-    }
-  } else {
-    next();
-  }
-});
+// router.beforeEach((to, from, next) => {
+//   let funtionAccessDtos = [];
+//   if (to.matched.some(function (item) {
+
+//     // 判断是否需要登录才可以访问
+//     if (item.meta.loginRequired) {
+//       if (item.meta.functionAccessArray != undefined || item.meta.functionAccessArray != null) {
+//         funtionAccessDtos = item.meta.functionAccessArray;
+//       }
+//       if (funtionAccessDtos != null) {
+//         funtionAccessDtos.forEach(funtionAccessDto => {
+//           if(typeof (funtionAccessDto.itemNo) === 'string'){
+//             funtionAccessDto.itemNo = [funtionAccessDto.itemNo];
+//           }
+//         });
+//       }
+//     }
+//     return item.meta.loginRequired;
+//   })) {
+//     // 判断是否已登录		
+//     var token = $.cookie('token');
+//     if (token == undefined || token.length == 0) {
+//       // 如果没有登录则直接返回
+//       next('/login');
+//     } else {
+
+//       console.log(funtionAccessDtos);
+//       // 判断该路由需要具备”xxx”功能-“x1”功能项，”xxx”功能-“x2“功能项，”yyy”功能-“y1”功能项访问权限的用户才可以访问
+//       $.ajax({
+//         url: Common.getApiURL(
+//           'RoleResourceV3/canVisitFunctionAccess',
+//         ),
+//         type: 'post',
+//         dataType: 'json',
+//         contentType: 'application/json',
+//         data: JSON.stringify(funtionAccessDtos),
+//         beforeSend: function (request) {
+//           Common.addTokenToRequest(request);
+//         },
+//         success: function (data) {
+//           if (data.errorCode === 0 && data.data === true) {
+//             next();
+//           } else {
+//             next('/desktop/no-role');
+//           }
+//         },
+//         error: function (XMLHttpRequest, textStatus, errorThrown) {
+//           Common.processException(XMLHttpRequest, textStatus, errorThrown);
+//         },
+//       });
+
+//     }
+//   } else {
+//     next();
+//   }
+// });
 
 render({});