src/locales/en.ts

@@ -1827,8 +1827,6 @@ export default {
       addButtonText: 'Add',
       exportButtonText: 'Export',
       expandButtonText: 'Expand/Collapse',
-      collapseText: 'Collapse',
-      expandText: 'Expand',
       tableCodeColumn: 'Organization Code',
       tableNameColumn: 'Organization Name',
       tableSortColumn: 'Display Order',
@@ -4327,8 +4325,6 @@ export default {
       searchButtonText: 'Search',
       resetButtonText: 'Reset',
       exportButtonText: 'Export',
-      collapseText: 'Collapse',
-      expandText: 'Expand',
 
       tableLineCodeColumn: 'Line Code',
       tableLineNameColumn: 'Line Name',
@@ -4366,8 +4362,6 @@ export default {
       searchButtonText: 'Search',
       resetButtonText: 'Reset',
       exportButtonText: 'Export',
-      collapseText: 'Collapse',
-      expandText: 'Expand',
 
       tableLineCodeColumn: 'Line Code',
       tableLineNameColumn: 'Line Name',

src/locales/zh-CN.ts

@@ -2656,8 +2656,6 @@ export default {
       addButtonText: '新增',
       exportButtonText: '导出',
       expandButtonText: '展开/折叠',
-      collapseText: '收起',
-      expandText: '展开',
       tableCodeColumn: '组织编码',
       tableNameColumn: '组织名称',
       tableSortColumn: '显示顺序',
@@ -4163,8 +4161,6 @@ export default {
       searchButtonText: '搜索',
       resetButtonText: '重置',
       exportButtonText: '导出',
-      collapseText: '收起',
-      expandText: '展开',
 
       tableLineCodeColumn: '产线编码',
       tableLineNameColumn: '产线名称',
@@ -4202,8 +4198,6 @@ export default {
       searchButtonText: '搜索',
       resetButtonText: '重置',
       exportButtonText: '导出',
-      collapseText: '收起',
-      expandText: '展开',
 
       tableLineCodeColumn: '产线编码',
       tableLineNameColumn: '产线名称',

src/views/erp/autocode/AutocodeIndex.vue

@@ -1,56 +1,91 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" min-label-width="68px">
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      min-label-width="68px"
+    >
       <el-form-item :label="t('FactoryModeling.AutocodeRule.searchRuleCodeLabel')" prop="ruleCode">
-        <el-input v-model="queryParams.ruleCode"
+        <el-input
-          :placeholder="t('FactoryModeling.AutocodeRule.searchRuleCodePlaceholder')" clearable
+          v-model="queryParams.ruleCode"
-          @keyup.enter="handleQuery" class="!w-240px" />
+          :placeholder="t('FactoryModeling.AutocodeRule.searchRuleCodePlaceholder')"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
       </el-form-item>
       <el-form-item :label="t('FactoryModeling.AutocodeRule.searchRuleNameLabel')" prop="ruleName">
-        <el-input v-model="queryParams.ruleName"
+        <el-input
-          :placeholder="t('FactoryModeling.AutocodeRule.searchRuleNamePlaceholder')" clearable
+          v-model="queryParams.ruleName"
-          @keyup.enter="handleQuery" class="!w-240px" />
+          :placeholder="t('FactoryModeling.AutocodeRule.searchRuleNamePlaceholder')"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
       </el-form-item>
       <el-form-item :label="t('FactoryModeling.AutocodeRule.searchRuleDescLabel')" prop="ruleDesc">
-        <el-input v-model="queryParams.ruleDesc"
+        <el-input
-          :placeholder="t('FactoryModeling.AutocodeRule.searchRuleDescPlaceholder')" clearable
+          v-model="queryParams.ruleDesc"
-          @keyup.enter="handleQuery" class="!w-240px" />
+          :placeholder="t('FactoryModeling.AutocodeRule.searchRuleDescPlaceholder')"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
       </el-form-item>
 
       <el-form-item :label="t('FactoryModeling.AutocodeRule.searchRemarkLabel')" prop="remark" v-show="showAllFilters">
-        <el-input v-model="queryParams.remark" :placeholder="t('FactoryModeling.AutocodeRule.searchRemarkPlaceholder')"
+        <el-input
-          clearable @keyup.enter="handleQuery" class="!w-240px" />
+          v-model="queryParams.remark"
+          :placeholder="t('FactoryModeling.AutocodeRule.searchRemarkPlaceholder')"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
       </el-form-item>
-      <el-form-item :label="t('FactoryModeling.AutocodeRule.searchIsEnableLabel')" prop="isEnable"
+      <el-form-item :label="t('FactoryModeling.AutocodeRule.searchIsEnableLabel')" prop="isEnable" v-show="showAllFilters">
-        v-show="showAllFilters">
+        <el-select
-        <el-select v-model="queryParams.isEnable"
+          v-model="queryParams.isEnable"
-          :placeholder="t('FactoryModeling.AutocodeRule.searchIsEnablePlaceholder')" clearable class="!w-240px">
+          :placeholder="t('FactoryModeling.AutocodeRule.searchIsEnablePlaceholder')"
-          <el-option v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" :key="dict.value"
+          clearable
-            :label="dict.label" :value="dict.value" />
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
 
       <el-form-item v-if="filterCount > 3">
-        <el-button type="text" class="text-primary" @click="toggleFilters">
+        <el-button plain @click="toggleFilters">
           <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
-          {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+          {{ showAllFilters ? '收起' : '更多' }}
-            t('FactoryModeling.FactoryStructure.expandText') }}
         </el-button>
       </el-form-item>
 
       <el-form-item>
-        <el-button @click="handleQuery">
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> {{ t('FactoryModeling.AutocodeRule.searchButtonText') }}</el-button>
-          <Icon icon="ep:search" class="mr-5px" /> {{ t('FactoryModeling.AutocodeRule.searchButtonText') }}
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> {{ t('FactoryModeling.AutocodeRule.resetButtonText') }}</el-button>
-        </el-button>
+        <el-button
-        <el-button @click="resetQuery">
+          type="primary"
-          <Icon icon="ep:refresh" class="mr-5px" /> {{ t('FactoryModeling.AutocodeRule.resetButtonText') }}
+          plain
-        </el-button>
+          @click="openForm('create')"
-        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['erp:autocode-rule:create']">
+          v-hasPermi="['erp:autocode-rule:create']"
+        >
           <Icon icon="ep:plus" class="mr-5px" /> {{ t('FactoryModeling.AutocodeRule.addButtonText') }}
         </el-button>
-        <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+        <el-button
-          v-hasPermi="['erp:autocode-rule:export']">
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['erp:autocode-rule:export']"
+        >
           <Icon icon="ep:download" class="mr-5px" /> {{ t('FactoryModeling.AutocodeRule.exportButtonText') }}
         </el-button>
       </el-form-item>
@@ -71,27 +106,22 @@
         </template>
       </el-table-column>
       <!-- <el-table-column label="ID" align="center" prop="id" /> -->
-      <el-table-column :label="t('FactoryModeling.AutocodeRule.tableRuleCodeColumn')" align="center" prop="ruleCode"
+      <el-table-column :label="t('FactoryModeling.AutocodeRule.tableRuleCodeColumn')" align="center" prop="ruleCode" width="260px" sortable/>
-        width="260px" sortable />
+      <el-table-column :label="t('FactoryModeling.AutocodeRule.tableRuleNameColumn')" align="center" prop="ruleName" width="200px" sortable/>
-      <el-table-column :label="t('FactoryModeling.AutocodeRule.tableRuleNameColumn')" align="center" prop="ruleName"
-        width="200px" sortable />
       <el-table-column :label="t('FactoryModeling.AutocodeRule.tableBarcodeTypeColumn')" align="center">
         <template #default="scope">
           <el-tag type="primary">{{ getBarcodeTypeLabel(scope.row.barcodeType) }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column :label="t('FactoryModeling.AutocodeRule.tableRuleDescColumn')" align="center" prop="ruleDesc" />
-      <el-table-column :label="t('FactoryModeling.AutocodeRule.tableMaxLengthColumn')" align="center"
+      <el-table-column :label="t('FactoryModeling.AutocodeRule.tableMaxLengthColumn')" align="center" prop="maxLength" />
-        prop="maxLength" />
       <el-table-column :label="t('FactoryModeling.AutocodeRule.tableIsPaddedColumn')" align="center" prop="isPadded">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.ERP_AUTOCODE_IS_PADDING" :value="scope.row.isPadded" />
         </template>
       </el-table-column>
-      <el-table-column :label="t('FactoryModeling.AutocodeRule.tablePaddedCharColumn')" align="center"
+      <el-table-column :label="t('FactoryModeling.AutocodeRule.tablePaddedCharColumn')" align="center" prop="paddedChar" />
-        prop="paddedChar" />
+      <el-table-column :label="t('FactoryModeling.AutocodeRule.tablePaddedMethodColumn')" align="center" prop="paddedMethod">
-      <el-table-column :label="t('FactoryModeling.AutocodeRule.tablePaddedMethodColumn')" align="center"
-        prop="paddedMethod">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.ERP_AUTOCODE_PADDING_TYPE" :value="scope.row.paddedMethod" />
         </template>
@@ -103,26 +133,42 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="t('FactoryModeling.AutocodeRule.tableOperateColumn')" align="center" fixed="right"
+      <el-table-column :label="t('FactoryModeling.AutocodeRule.tableOperateColumn')" align="center" fixed="right" width="200">
-        width="200">
         <template #default="scope">
-          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+          <el-button
-            v-hasPermi="['erp:autocode-rule:update']">
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['erp:autocode-rule:update']"
+          >
             {{ t('FactoryModeling.AutocodeRule.tableEditAction') }}
           </el-button>
-          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['erp:autocode-rule:delete']">
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['erp:autocode-rule:delete']"
+          >
             {{ t('FactoryModeling.AutocodeRule.tableDeleteAction') }}
           </el-button>
-          <el-button link type="primary" @click="handleTestCode(scope.row.ruleCode)"
+          <el-button
-            v-hasPermi="['erp:autocode-rule:update']">
+            link
+            type="primary"
+            @click="handleTestCode(scope.row.ruleCode)"
+            v-hasPermi="['erp:autocode-rule:update']"
+          >
             {{ t('FactoryModeling.AutocodeRule.tableTestCodeAction') }}
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+    <Pagination
-      @pagination="getList" />
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -217,17 +263,17 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch { }
+  } catch {}
 }
 /** 测试编码按钮操作 */
 const handleTestCode = async (ruleCode: string) => {
   try {
-
+  
     // 发起测试
     const data = await AutocodeRuleApi.getTestCode(ruleCode)
     message.success(data)
-
+    
-  } catch { }
+  } catch {}
 }
 
 /** 导出按钮操作 */

src/views/iot/historyData/index.vue

@@ -34,7 +34,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item :label="t('DataCollection.HistoryData.searchLineNameLabel')" prop="lineName" v-show="showAllFilters">
+      <el-form-item :label="t('DataCollection.HistoryData.searchLineNameLabel')" prop="lineName">
         <el-input
           v-model="queryParams.lineName"
           :placeholder="t('DataCollection.HistoryData.searchLineNamePlaceholder')"
@@ -43,12 +43,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item v-if="filterCount > 3">
-        <el-button type="text" class="text-primary" @click="toggleFilters">
-          <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
-          {{ showAllFilters ? t('DataCollection.HistoryData.collapseText') : t('DataCollection.HistoryData.expandText') }}
-        </el-button>
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery">
           <Icon icon="ep:search" class="mr-5px" />
@@ -157,11 +151,6 @@ const loading = ref(true)
 const list = ref<LineDeviceVO[]>([])
 const total = ref(0)
 const exportLoading = ref(false)
-const showAllFilters = ref(false)
-const filterCount = 4
-const toggleFilters = () => {
-  showAllFilters.value = !showAllFilters.value
-}
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,

src/views/iot/realTimeMonitoring/index.vue

@@ -34,7 +34,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item :label="t('DataCollection.RealTimeMonitoring.searchLineNameLabel')" prop="lineName" v-show="showAllFilters">
+      <el-form-item :label="t('DataCollection.RealTimeMonitoring.searchLineNameLabel')" prop="lineName">
         <el-input
           v-model="queryParams.lineName"
           :placeholder="t('DataCollection.RealTimeMonitoring.searchLineNamePlaceholder')"
@@ -43,12 +43,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item v-if="filterCount > 3">
-        <el-button type="text" class="text-primary" @click="toggleFilters">
-          <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
-          {{ showAllFilters ? t('DataCollection.RealTimeMonitoring.collapseText') : t('DataCollection.RealTimeMonitoring.expandText') }}
-        </el-button>
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery">
           <Icon icon="ep:search" class="mr-5px" />
@@ -162,11 +156,6 @@ const loading = ref(true)
 const list = ref<LineDeviceVO[]>([])
 const total = ref(0)
 const exportLoading = ref(false)
-const showAllFilters = ref(false)
-const filterCount = 4
-const toggleFilters = () => {
-  showAllFilters.value = !showAllFilters.value
-}
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,

src/views/mes/bom/index.vue

@@ -54,10 +54,10 @@
         </el-select>
       </el-form-item>
       
-       <el-form-item v-if="filterCount > 3">
+      <el-form-item v-if="filterCount > 3">
-        <el-button type="text" class="text-primary" @click="toggleFilters">
+        <el-button plain @click="toggleFilters">
           <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
-          {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') : t('FactoryModeling.FactoryStructure.expandText') }}
+          {{ showAllFilters ? '收起' : '更多' }}
         </el-button>
       </el-form-item>
       

src/views/mes/capacityReport/index.vue

@@ -46,10 +46,9 @@
       </el-form-item>
     
       <el-form-item v-if="filterCount > 3">
-        <el-button type="text" class="text-primary" @click="toggleFilters">
+        <el-button plain @click="toggleFilters">
           <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
-          {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+          {{ showAllFilters ? '收起' : '更多' }}
-            t('FactoryModeling.FactoryStructure.expandText') }}
         </el-button>
       </el-form-item>
     

src/views/mes/feedingrecord/index.vue

@@ -60,10 +60,9 @@
       </el-form-item>
     
       <el-form-item v-if="filterCount > 3">
-        <el-button type="text" class="text-primary" @click="toggleFilters">
+        <el-button plain @click="toggleFilters">
           <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
-          {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+          {{ showAllFilters ? '收起' : '更多' }}
-            t('FactoryModeling.FactoryStructure.expandText') }}
         </el-button>
       </el-form-item>
     

src/views/mes/organization/index.vue

@@ -71,9 +71,9 @@
       </el-form-item>
     
       <el-form-item v-if="filterCount > 3">
-        <el-button type="text" class="text-primary" @click="toggleFilters">
+        <el-button plain @click="toggleFilters">
           <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
-          {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') : t('FactoryModeling.FactoryStructure.expandText') }}
+          {{ showAllFilters ? '收起' : '更多' }}
         </el-button>
       </el-form-item>
     

src/views/mes/plan/index.vue

@@ -35,11 +35,10 @@
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px" />
       </el-form-item>
     
-     <el-form-item v-if="filterCount > 3">
+      <el-form-item v-if="filterCount > 3">
-        <el-button type="text" class="text-primary" @click="toggleFilters">
+        <el-button plain @click="toggleFilters">
           <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
-          {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+          {{ showAllFilters ? '收起' : '更多' }}
-            t('FactoryModeling.FactoryStructure.expandText') }}
         </el-button>
       </el-form-item>
     

src/views/mes/productionReport/index.vue

@@ -63,11 +63,10 @@
         />
       </el-form-item>
     
-    <el-form-item v-if="filterCount > 3">
+      <el-form-item v-if="filterCount > 3">
-        <el-button type="text" class="text-primary" @click="toggleFilters">
+        <el-button plain @click="toggleFilters">
           <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
-          {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+          {{ showAllFilters ? '收起' : '更多' }}
-            t('FactoryModeling.FactoryStructure.expandText') }}
         </el-button>
       </el-form-item>
     

src/views/mes/task/index.vue

@@ -65,10 +65,9 @@
       </el-form-item>
     
       <el-form-item v-if="filterCount > 3">
-        <el-button type="text" class="text-primary" @click="toggleFilters">
+        <el-button plain @click="toggleFilters">
           <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
-          {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+          {{ showAllFilters ? '收起' : '更多' }}
-            t('FactoryModeling.FactoryStructure.expandText') }}
         </el-button>
       </el-form-item>
     

src/views/mes/tasksummary/index.vue

@@ -37,10 +37,9 @@ v-model="queryParams.createTime" @change="handleQuery" value-format="YYYY-MM-DD
       </el-form-item>
     
       <el-form-item v-if="filterCount > 3">
-        <el-button type="text" class="text-primary" @click="toggleFilters">
+        <el-button plain @click="toggleFilters">
           <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
-          {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+          {{ showAllFilters ? '收起' : '更多' }}
-            t('FactoryModeling.FactoryStructure.expandText') }}
         </el-button>
       </el-form-item>