style: 修改设备管理中设备关键件的新增/编辑弹框样式

src/views/mes/criticalComponent/CriticalComponentForm.vue

@@ -1,6 +1,13 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="720px">
+  <div class="critical-component-panel">
-    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px" v-loading="formLoading">
+    <div class="critical-component-panel__header">
+      <div class="critical-component-panel__title">{{ dialogTitle }}</div>
+      <el-button text @click="closeForm">
+        <Icon icon="ep:close" />
+      </el-button>
+    </div>
+    <div class="critical-component-dialog" v-loading="formLoading">
+      <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px">
         <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.code')" prop="code">
           <el-row :gutter="10" style="width: 100%">
             <el-col :xs="24" :sm="18" :md="16" :lg="14" :xl="12">
@@ -53,11 +60,6 @@
           />
         </el-form-item>
         <el-row :gutter="16">
-        <!-- <el-col :span="24">
-          <el-form-item label="资产编号" prop="id">
-            <el-input v-model="formData.id" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col> -->
           <el-col :span="12" >
             <el-form-item  :label="t('EquipmentManagement.EquipmentKeyItems.qrcode')" prop="qrcodeUrl">
               <QrcodeActionCard
@@ -94,11 +96,12 @@
           />
         </el-form-item>
       </el-form>
-    <template #footer>
+    </div>
-      <el-button @click="dialogVisible = false">{{ t('common.cancel') }}</el-button>
+    <div class="critical-component-footer">
+      <el-button @click="closeForm">{{ t('common.cancel') }}</el-button>
       <el-button type="primary" @click="submitForm" :disabled="formLoading">{{ t('common.ok') }}</el-button>
-    </template>
+    </div>
-  </Dialog>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -111,7 +114,6 @@ defineOptions({ name: 'CriticalComponentForm' })
 const { t } = useI18n()
 const message = useMessage()
 
-const dialogVisible = ref(false)
 const dialogTitle = ref('')
 const formLoading = ref(false)
 const formType = ref<'create' | 'update'>('create')
@@ -198,8 +200,10 @@ const handleQrcodeRefreshSuccess = async (data: any) => {
   formData.value.code = detail?.code ?? formData.value.code
 }
 
+let openRequestId = 0
+
 const open = async (type: 'create' | 'update', id?: number) => {
-  dialogVisible.value = true
+  const currentOpenId = ++openRequestId
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
@@ -207,6 +211,7 @@ const open = async (type: 'create' | 'update', id?: number) => {
     formLoading.value = true
     try {
       const detail = await CriticalComponentApi.getCriticalComponent(id)
+      if (currentOpenId !== openRequestId) return
       const templateJson = detail?.templateJson
       const parsedTemplateJson = typeof templateJson === 'string'
         ? JSON.parse(templateJson)
@@ -232,7 +237,12 @@ const open = async (type: 'create' | 'update', id?: number) => {
 
 defineExpose({ open })
 
-const emit = defineEmits(['success'])
+const emit = defineEmits(['success', 'closed'])
+
+const closeForm = () => {
+  openRequestId++
+  emit('closed')
+}
 
 const submitForm = async () => {
   await formRef.value.validate()
@@ -245,11 +255,64 @@ const submitForm = async () => {
       await CriticalComponentApi.updateCriticalComponent(formData.value)
       message.success(t('common.updateSuccess'))
     }
-    dialogVisible.value = false
     emit('success')
+    closeForm()
   } finally {
     formLoading.value = false
   }
 }
 </script>
-<style scoped lang="scss"></style>
+
+<style lang="scss" scoped>
+.critical-component-panel {
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: var(--el-box-shadow-light);
+}
+
+.critical-component-panel__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 20px;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.critical-component-panel__title {
+  color: #1f2937;
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.critical-component-dialog {
+  max-height: calc(100vh - 220px);
+  padding: 20px 20px 0;
+  padding-right: 16px;
+  overflow-y: auto;
+}
+
+.critical-component-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+  width: 100%;
+  padding: 16px 20px 20px;
+  border-top: 1px solid #ebeef5;
+}
+
+@media (max-width: 768px) {
+  .critical-component-panel__header {
+    padding: 14px 16px;
+  }
+
+  .critical-component-dialog {
+    max-height: none;
+    padding: 16px 16px 0;
+    overflow-y: visible;
+  }
+
+  .critical-component-footer {
+    padding: 16px;
+  }
+}
+</style>

src/views/mes/criticalComponent/index.vue

@@ -1,33 +1,62 @@
 <template>
+  <div class="critical-component-page">
+    <template v-if="!formVisible">
       <ContentWrap>
         <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" min-label-width="68px">
           <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.code')" prop="code">
             <el-input
-v-model="queryParams.code" :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderCode')"
+              v-model="queryParams.code"
-          clearable @keyup.enter="handleQuery" class="!w-240px" />
+              :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderCode')"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
           </el-form-item>
           <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.name')" prop="name">
             <el-input
-v-model="queryParams.name" :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderName')"
+              v-model="queryParams.name"
-          clearable @keyup.enter="handleQuery" class="!w-240px" />
+              :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderName')"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
           </el-form-item>
-      <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.description')" prop="description" v-show="showAllFilters">
+          <el-form-item
+            :label="t('EquipmentManagement.EquipmentKeyItems.description')"
+            prop="description"
+            v-show="showAllFilters"
+          >
             <el-input
               v-model="queryParams.description"
-          :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderDescription')" clearable
+              :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderDescription')"
-          @keyup.enter="handleQuery" class="!w-240px" />
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
           </el-form-item>
           <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.remark')" prop="remark" v-show="showAllFilters">
             <el-input
               v-model="queryParams.remark"
-          :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderRemark')" clearable
+              :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderRemark')"
-          @keyup.enter="handleQuery" class="!w-240px" />
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
           </el-form-item>
-      <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.createTime')" prop="createTime" v-show="showAllFilters">
+          <el-form-item
+            :label="t('EquipmentManagement.EquipmentKeyItems.createTime')"
+            prop="createTime"
+            v-show="showAllFilters"
+          >
             <el-date-picker
-v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+              v-model="queryParams.createTime"
-          :start-placeholder="t('common.startTimeText')" :end-placeholder="t('common.endTimeText')"
+              value-format="YYYY-MM-DD HH:mm:ss"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-220px" />
+              type="daterange"
+              :start-placeholder="t('common.startTimeText')"
+              :end-placeholder="t('common.endTimeText')"
+              :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+              class="!w-220px"
+            />
           </el-form-item>
           <el-form-item v-if="filterCount > 3">
             <el-button type="text" class="text-primary" @click="toggleFilters">
@@ -49,8 +78,12 @@ v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="datera
               {{ t('action.add') }}
             </el-button>
             <el-button
-type="danger" plain @click="handleBatchDelete" :disabled="!selectedIds.length"
+              type="danger"
-          v-hasPermi="['mes:critical-component:delete']">
+              plain
+              @click="handleBatchDelete"
+              :disabled="!selectedIds.length"
+              v-hasPermi="['mes:critical-component:delete']"
+            >
               <Icon icon="ep:delete" class="mr-5px" />
               {{ t('EquipmentManagement.EquipmentKeyItems.batchDelete') }}
             </el-button>
@@ -59,8 +92,12 @@ type="danger" plain @click="handleBatchDelete" :disabled="!selectedIds.length"
               {{ t('action.import') }}
             </el-button>
             <el-button
-type="success" plain @click="handleExport" :loading="exportLoading"
+              type="success"
-          v-hasPermi="['mes:critical-component:export']">
+              plain
+              @click="handleExport"
+              :loading="exportLoading"
+              v-hasPermi="['mes:critical-component:export']"
+            >
               <Icon icon="ep:download" class="mr-5px" />
               {{ t('action.export') }}
             </el-button>
@@ -70,42 +107,81 @@ type="success" plain @click="handleExport" :loading="exportLoading"
 
       <ContentWrap>
         <el-table
-v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
+          v-loading="loading"
-      @selection-change="handleSelectionChange">
+          :data="list"
+          :stripe="true"
+          :show-overflow-tooltip="true"
+          @selection-change="handleSelectionChange"
+        >
           <el-table-column type="selection" width="55" />
           <el-table-column
-:label="t('EquipmentManagement.EquipmentKeyItems.code')" align="center" prop="code"
+            :label="t('EquipmentManagement.EquipmentKeyItems.code')"
-        min-width="140"  sortable />
+            align="center"
+            prop="code"
+            min-width="140"
+            sortable
+          />
           <el-table-column
-:label="t('EquipmentManagement.EquipmentKeyItems.name')" align="center" prop="name"
+            :label="t('EquipmentManagement.EquipmentKeyItems.name')"
-        min-width="140"  sortable />
+            align="center"
+            prop="name"
+            min-width="140"
+            sortable
+          />
           <el-table-column
-        :label="t('EquipmentManagement.EquipmentKeyItems.deviceSpec')" align="center" prop="deviceSpec"
+            :label="t('EquipmentManagement.EquipmentKeyItems.deviceSpec')"
-        min-width="140"  sortable />
+            align="center"
+            prop="deviceSpec"
+            min-width="140"
+            sortable
+          />
           <el-table-column
-:label="t('EquipmentManagement.EquipmentKeyItems.description')" align="center" prop="description"
+            :label="t('EquipmentManagement.EquipmentKeyItems.description')"
-        min-width="180" />
+            align="center"
+            prop="description"
+            min-width="180"
+          />
           <el-table-column
-:label="t('EquipmentManagement.EquipmentKeyItems.count')" align="center" prop="count"
+            :label="t('EquipmentManagement.EquipmentKeyItems.count')"
-        min-width="180" />
+            align="center"
+            prop="count"
+            min-width="180"
+          />
           <el-table-column
-:label="t('EquipmentManagement.EquipmentKeyItems.remark')" align="center" prop="remark"
+            :label="t('EquipmentManagement.EquipmentKeyItems.remark')"
-        min-width="180" />
+            align="center"
+            prop="remark"
+            min-width="180"
+          />
           <el-table-column
-:label="t('EquipmentManagement.EquipmentKeyItems.createTime')" align="center" prop="createTime"
+            :label="t('EquipmentManagement.EquipmentKeyItems.createTime')"
-        :formatter="dateFormatter" width="180"  sortable />
+            align="center"
+            prop="createTime"
+            :formatter="dateFormatter"
+            width="180"
+            sortable
+          />
           <el-table-column
-:label="t('EquipmentManagement.EquipmentKeyItems.operate')" align="center" width="140"
+            :label="t('EquipmentManagement.EquipmentKeyItems.operate')"
-        fixed="right">
+            align="center"
+            width="140"
+            fixed="right"
+          >
             <template #default="scope">
               <el-button
-link type="primary" @click="openForm('update', scope.row.id)"
+                link
-            v-hasPermi="['mes:critical-component:update']">
+                type="primary"
+                @click="openForm('update', scope.row.id)"
+                v-hasPermi="['mes:critical-component:update']"
+              >
                 {{ t('EquipmentManagement.EquipmentKeyItems.edit') }}
               </el-button>
               <el-button
-link type="danger" @click="handleDelete(scope.row.id)"
+                link
-            v-hasPermi="['mes:critical-component:delete']">
+                type="danger"
+                @click="handleDelete(scope.row.id)"
+                v-hasPermi="['mes:critical-component:delete']"
+              >
                 {{ t('EquipmentManagement.EquipmentKeyItems.delete') }}
               </el-button>
             </template>
@@ -113,43 +189,17 @@ link type="danger" @click="handleDelete(scope.row.id)"
         </el-table>
 
         <Pagination
-:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+          :total="total"
-      @pagination="getList" />
+          v-model:page="queryParams.pageNo"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+        />
       </ContentWrap>
+    </template>
 
-  <CriticalComponentForm ref="formRef" @success="getList" />
+    <CriticalComponentForm v-else ref="formRef" @success="getList" @closed="formVisible = false" />
-
-  <Dialog v-model="importDialogVisible" :title="t('action.import')" width="400">
-    <el-upload
-ref="uploadRef" v-model:file-list="importFileList"
-      :action="importUrl + '?updateSupport=' + updateSupport" :auto-upload="false" :disabled="importLoading"
-      :headers="uploadHeaders" :limit="1" :on-error="handleImportError" :on-exceed="handleImportExceed"
-      :on-success="handleImportSuccess" accept=".xlsx, .xls" drag>
-      <Icon icon="ep:upload" />
-      <div class="el-upload__text">
-        将文件拖到此处，或点击上传
-      </div>
-      <template #tip>
-        <div class="el-upload__tip text-center">
-          <div class="el-upload__tip">
-            <el-checkbox v-model="updateSupport" />
-            是否更新已存在的数据
-          </div>
-          <span>仅支持 .xlsx, .xls 格式</span>
-          <el-link
-:underline="false" style="font-size: 12px; vertical-align: baseline" type="primary"
-            @click="importTemplate">
-            下载导入模板
-          </el-link>
   </div>
 </template>
-    </el-upload>
-    <template #footer>
-      <el-button :disabled="importLoading" type="primary" @click="submitImport">{{ t('common.ok') }}</el-button>
-      <el-button @click="importDialogVisible = false">{{ t('common.cancel') }}</el-button>
-    </template>
-  </Dialog>
-</template>
 
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
@@ -231,8 +281,12 @@ const handleSelectionChange = (rows: CriticalComponentVO[]) => {
 }
 
 const formRef = ref()
-const openForm = (type: 'create' | 'update', id?: number) => {
+const formVisible = ref(false)
-  formRef.value.open(type, id)
+
+const openForm = async (type: 'create' | 'update', id?: number) => {
+  formVisible.value = true
+  await nextTick()
+  formRef.value?.open(type, id)
 }
 
 const openImport = () => {
@@ -309,7 +363,7 @@ const handleImportSuccess = async (response: any) => {
         .join('<br />')
       await ElMessageBox.alert(`以下编码导入失败：<br />${detail}`, t('common.confirmTitle'), {
         type: 'error',
-        dangerouslyUseHTMLString: true,
+        dangerouslyUseHTMLString: true
       })
     } else {
       message.success('导入成功')