eims-ui/apps/web-antd/src/views/eims/inventory-detail/data.tsx
@@ -55,7 +55,7 @@ fixed: 'left', slots: { default: ({ row }) => { return renderDict(row.status, DictEnum.EIMS_INVENTORY_DETAIL_STATU); return row.status === null || row.status === '' ? '' : renderDict(row.status, DictEnum.EIMS_INVENTORY_DETAIL_STATU); } } }, eims-ui/apps/web-antd/src/views/eims/inventory-detail/index.vue
@@ -29,7 +29,7 @@ // 未盘点 const noCheck = ref<string>('未盘'); // 查询添加盘点标记过滤 const checkFilter = ref<string>(); const checkFilter = ref<string>(''); const formOptions: VbenFormProps = { commonConfig: { @@ -42,7 +42,7 @@ wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', handleReset: async () => { selectTypeId.value = []; checkFilter.value = undefined; checkFilter.value = ''; // eslint-disable-next-line no-use-before-define const { formApi, reload } = tableApi; await formApi.resetForm(); @@ -102,15 +102,15 @@ const data0 = data.filter((item) => { return item.status === '' || item.status === null || item.status === '0'; }); if (data0 !== null && data0.length > 0) { noCheck.value = `未盘(${data0.length})`; } // 不点击已盘和未盘时才更新已盘和未盘的统计数据 if (checkFilter.value === '') { noCheck.value = data0 !== null && data0.length > 0 ? `未盘(${data0.length})` : `未盘(0)`; const data1 = data.filter((item) => { return item.status !== '' && item.status !== null && item.status === '1'; }); if (data1 !== null && data1.length > 0) { check.value = `已盘(${data1.length})`; check.value = data1 !== null && data1.length > 0 ? `已盘(${data1.length})` : `已盘(0)`; } }); } } @@ -163,25 +163,18 @@ } }); } function handleDownloadExcel() { commonDownloadExcel(inventoryDetailExport, '盘点明细', tableApi.formApi.form.values, { fieldMappingTime: formOptions.fieldMappingTime }); } function getImportStatus(row: any) { const importStatus = row.importStatus === null || row.importStatus; return importStatus ? '未导入' : '已导入'; } function getInventoryFlag(row: any) { const inventoryFlag = row.inventoryFlag === null || row.inventoryFlag; return inventoryFlag ? '未盘点' : '已盘点'; } function handleQuery(isChecked: string) { checkFilter.value = isChecked; tableApi.query(); } const { hasAccessByRoles } = useAccess(); const isSuperAdmin = computed(() => hasAccessByRoles(['superadmin'])); </script> @@ -189,7 +182,8 @@ <template> <Page :auto-content-height="true"> <div class="flex h-full gap-[8px]"> <EquTypeTree v-model:select-dept-id="selectTypeId" class="w-[260px]" @reload="() => tableApi.reload()" @select="() => tableApi.reload()" /> <EquTypeTree v-model:select-dept-id="selectTypeId" class="w-[260px]" @reload="() => tableApi.reload()" @select="() => tableApi.reload()" /> <BasicTable class="flex-1 overflow-hidden" table-title="盘点明细列表"> <template #toolbar-tools> <Space> @@ -212,23 +206,17 @@ <template #action="{ row }"> <Space> <ghost-button :disabled="!isSuperAdmin" v-access:code="['eims:inventory:edit']" @click.stop="handleEdit(row)"> <ghost-button :disabled="!isSuperAdmin" v-access:code="['eims:inventory:edit']" @click.stop="handleEdit(row)"> {{ $t('pages.common.edit') }} </ghost-button> <Popconfirm :get-popup-container="getVxePopupContainer" placement="left" title="确认删除？" @confirm="handleDelete(row)"> <Popconfirm :get-popup-container="getVxePopupContainer" placement="left" title="确认删除？" @confirm="handleDelete(row)"> <ghost-button :disabled="!isSuperAdmin" danger v-access:code="['eims:inventory:remove']" @click.stop=""> {{ $t('pages.common.delete') }} </ghost-button> </Popconfirm> </Space> </template> <template #importStatus="{ row }"> <span>{{ getImportStatus(row) }}</span> </template> <template #inventoryFlag="{ row }"> <span>{{ getInventoryFlag(row) }}</span> </template> </BasicTable> </div> eims/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java
@@ -43,4 +43,9 @@ */ String EIMS_EQU_UNIT = "eims_equ_unit"; /** * 设备导入状态 */ String EIMS_IMPORT_STATUS = "equ_import_status"; } eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsInventoryDetailController.java
@@ -6,6 +6,10 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.eims.domain.bo.EimsEquBo; import org.dromara.eims.domain.vo.EimsEquVo; import org.dromara.eims.service.IEimsEquService; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -35,6 +39,7 @@ public class EimsInventoryDetailController extends BaseController { private final IEimsInventoryDetailService eimsInventoryDetailService; private final IEimsEquService equService; /** * 查询盘点明细列表 @@ -88,6 +93,14 @@ @RepeatSubmit() @PutMapping() public R<Void> edit(@Validated(EditGroup.class) @RequestBody EimsInventoryDetailBo bo) { //TODO 验证-首次盘点，需要修改设备导入状态 新导入->已确认 if(bo.getStatus().equals("1")){ //已盘 EimsEquVo eimsEquVo = equService.queryById(bo.getEquId()); EimsEquBo eimsEquBo = new EimsEquBo(); eimsEquVo.setImportStatus("1"); // 设置为 已确认 BeanUtils.copyProperties(eimsEquVo,eimsEquBo); equService.updateByBo(eimsEquBo); } return toAjax(eimsInventoryDetailService.updateByBo(bo)); }
@@ -171,7 +171,7 @@ /** * 附件 */ private String attachments; private Long attachId; /** * 资料 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsEquBo.java
@@ -171,7 +171,7 @@ * 附件 */ @ExcelProperty(value = "附件") private String attachments; private Long attachId; /** * 资料 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquImportVo.java
@@ -130,7 +130,7 @@ * 附件 */ @ExcelProperty(value = "附件") private String attachments; private Long attachId; /** * 资料 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquVo.java
@@ -147,7 +147,7 @@ * 附件 */ @ExcelProperty(value = "附件") private String attachments; private Long attachId; /** eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java
@@ -92,6 +92,9 @@ EimsEquBo equ = BeanUtil.toBean(equVo, EimsEquBo.class); // TODO 校验 //ValidatorUtils.validate(equ); //添加字段默认属性 equ.setImportStatus(dictService.getDictValue(CacheConstants.EIMS_IMPORT_STATUS,"新导入")); equ.setCreateBy(operUserId); equService.insertByBo(equ); successNum++;
