diff --git a/ruoyi-asset/src/main/java/com/ruoyi/asset/controller/AmsRfidTagController.java b/ruoyi-asset/src/main/java/com/ruoyi/asset/controller/AmsRfidTagController.java index d56bb34..9e5765d 100644 --- a/ruoyi-asset/src/main/java/com/ruoyi/asset/controller/AmsRfidTagController.java +++ b/ruoyi-asset/src/main/java/com/ruoyi/asset/controller/AmsRfidTagController.java @@ -13,8 +13,10 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.asset.domain.AmsAsset; +import com.ruoyi.asset.domain.AmsAssetCategory; import com.ruoyi.asset.domain.AmsRfidTag; import com.ruoyi.asset.domain.RfidBindingContext; +import com.ruoyi.asset.service.IAmsAssetCategoryService; import com.ruoyi.asset.service.IAmsAssetService; import com.ruoyi.asset.service.IAmsRfidTagService; import com.ruoyi.asset.service.IRfidBindingService; @@ -46,6 +48,9 @@ public class AmsRfidTagController extends BaseController @Autowired private IRfidBindingService rfidBindingService; + @Autowired + private IAmsAssetCategoryService amsAssetCategoryService; + @RequiresPermissions("asset:tag:view") @GetMapping() public String tag() @@ -198,8 +203,11 @@ public class AmsRfidTagController extends BaseController */ @RequiresPermissions("asset:tag:bind") @GetMapping("/selectAsset") - public String selectAsset() + public String selectAsset(ModelMap mmap) { + AmsAssetCategory categoryQuery = new AmsAssetCategory(); + categoryQuery.setEnabled("Y"); + mmap.put("categories", amsAssetCategoryService.selectAmsAssetCategoryList(categoryQuery)); return prefix + "/selectAsset"; } diff --git a/ruoyi-asset/src/main/resources/templates/asset/tag/bind.html b/ruoyi-asset/src/main/resources/templates/asset/tag/bind.html index ed0f3d7..3b7c1c9 100644 --- a/ruoyi-asset/src/main/resources/templates/asset/tag/bind.html +++ b/ruoyi-asset/src/main/resources/templates/asset/tag/bind.html @@ -87,7 +87,14 @@ } $("#assetCode").val(selectedAsset.assetCode); $("#assetName").val(selectedAsset.assetName); - $("#assetStatusName").val($.table.selectDictLabel(assetStatusDatas, selectedAsset.assetStatus)); + var statusLabel = ""; + $.each(assetStatusDatas, function(index, dict) { + if (dict.dictValue == ('' + selectedAsset.assetStatus)) { + statusLabel = dict.dictLabel; + return false; + } + }); + $("#assetStatusName").val(statusLabel || selectedAsset.assetStatus); $("#assetLocation").val((selectedAsset.warehouseName || "-") + " / " + (selectedAsset.locationName || "-")); $.modal.close(index); } diff --git a/ruoyi-asset/src/main/resources/templates/asset/tag/selectAsset.html b/ruoyi-asset/src/main/resources/templates/asset/tag/selectAsset.html index fe9c6b5..183bfbb 100644 --- a/ruoyi-asset/src/main/resources/templates/asset/tag/selectAsset.html +++ b/ruoyi-asset/src/main/resources/templates/asset/tag/selectAsset.html @@ -20,7 +20,10 @@