设备管理 UI/UX

设备管理 UI/UX

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/mouldtype/MouldTypeMapper.java

@@ -28,7 +28,7 @@ public interface MouldTypeMapper extends BaseMapperX<MouldTypeDO> {
     }
     default List<Map<String, Object>> selectSimpleList() {
 
-        return selectMaps(new QueryWrapper<MouldTypeDO>().select("id", "name").lambda());
+        return selectMaps(new QueryWrapper<MouldTypeDO>().select("id", "name").eq("status","1").lambda());
 
     }
 }

mes-ui/mes-ui-admin-vue3/src/views/heli/equip/EquipForm.vue

@@ -7,15 +7,29 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="设备名称 唯一" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入设备名称 唯一" />
+      <el-form-item label="设备名称" prop="name">
+        <el-input v-model="formData.name" placeholder="设备名称" />
       </el-form-item>
-      <el-form-item label="模具类型id，对应 base_mould_type 表中的id" prop="mouldTypeId">
-        <el-input v-model="formData.mouldTypeId" placeholder="请输入模具类型id，对应 base_mould_type 表中的id" />
+      <el-form-item label="模具类型" prop="mouldTypeId">
+        <!-- <el-input v-model="formData.mouldTypeId" placeholder="模具类型" /> -->
+        <el-select v-model="formData.mouldTypeId" clearable placeholder="模具类型" class="!w-800px">
+          <el-option
+            v-for="dict in mouldTypeList"
+            :key="dict.id"
+            :label="dict.name"
+            :value="dict.id"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="状态,1表示正常，2表示禁用，默认是1" prop="status">
+      <el-form-item label="状态" prop="status">
         <el-radio-group v-model="formData.status">
-          <el-radio label="1">请选择字典生成</el-radio>
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
         </el-radio-group>
       </el-form-item>
     </el-form>
@@ -26,7 +40,9 @@
   </Dialog>
 </template>
 <script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as EquipApi from '@/api/heli/equip'
+import * as MouldTypeApi from '@/api/heli/mouldtype'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -43,16 +59,20 @@ const formData = ref({
 })
 const formRules = reactive({
   name: [{ required: true, message: '设备名称 唯一不能为空', trigger: 'blur' }],
-  mouldTypeId: [{ required: true, message: '模具类型id，对应 base_mould_type 表中的id不能为空', trigger: 'blur' }],
+  mouldTypeId: [{ required: true, message: '模具类型不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 
+const mouldTypeList = ref([])
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+
+  mouldTypeList.value =  await MouldTypeApi.getSimpList()
+
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -95,7 +115,7 @@ const resetForm = () => {
     id: undefined,
     name: undefined,
     mouldTypeId: undefined,
-    status: undefined,
+    status: 1,
   }
   formRef.value?.resetFields()
 }

mes-ui/mes-ui-admin-vue3/src/views/heli/equip/index.vue

@@ -18,9 +18,9 @@
         />
       </el-form-item>
       <el-form-item label="模具类型" prop="mouldTypeId">
-        <el-select v-model="queryParams.mouldTypeId" placeholder="启用状态" clearable class="!w-240px">
+        <el-select v-model="queryParams.mouldTypeId" placeholder="模具类型" clearable class="!w-240px">
           <el-option v-for="dict in mouldTypeList" :key="dict.id" :label="dict.name"
-            :value="dict.name" />
+            :value="dict.id" />
         </el-select>
       </el-form-item>
       <el-form-item label="启用状态" prop="pnStatus">
@@ -41,15 +41,6 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['heli:equip:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -58,8 +49,16 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="设备名称" align="center" prop="name" />
-      <el-table-column label="模具类型" align="center" prop="mouldTypeId" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="模具类型" align="center" prop="mouldTypeId" >
+        <template #default="scope">
+          {{ mouldTypeList.find((mould) => mould.id == scope.row.mouldTypeId)?.name }}
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button