style：产能报表-删除状态字段

feat：生产管理模块-筛选条件添加“更多”按钮
6 changed files with 102 additions and 57 deletions
--- a/src/views/mes/capacityReport/index.vue
+++ b/src/views/mes/capacityReport/index.vue
@ -35,18 +35,7 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item :label="t('EquipmentManagement.CapacityReport.deviceStatus')" prop="deviceStatus">
-        <el-select
-          v-model="queryParams.deviceStatus"
-          :placeholder="t('EquipmentManagement.CapacityReport.placeholderDeviceStatus')"
-          clearable
-          class="!w-240px"
-        >
-          <el-option :label="t('EquipmentManagement.EquipmentLedger.normal')" :value="0" />
-          <el-option :label="t('EquipmentManagement.EquipmentLedger.stop')" :value="1" />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="t('EquipmentManagement.CapacityReport.workshop')" prop="workshop">
+      <el-form-item :label="t('EquipmentManagement.CapacityReport.workshop')" prop="workshop" v-show="showAllFilters">
        <el-input
          v-model="queryParams.workshop"
          :placeholder="t('EquipmentManagement.CapacityReport.placeholderWorkshop')"
@ -55,6 +44,14 @@
          class="!w-240px"
        />
      </el-form-item>
+    
+      <el-form-item v-if="filterCount > 3">
+        <el-button plain @click="toggleFilters">
+          <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
+          {{ showAllFilters ? '收起' : '更多' }}
+        </el-button>
+      </el-form-item>
+    
      <el-form-item>
        <el-button @click="handleQuery">
          <Icon icon="ep:search" class="mr-5px" /> {{ t('common.query') }}
@ -84,16 +81,6 @@
      <el-table-column :label="t('EquipmentManagement.CapacityReport.deviceCode')" align="center" prop="deviceCode" sortable />
      <el-table-column :label="t('EquipmentManagement.CapacityReport.deviceName')" align="center" prop="deviceName" sortable />
      <el-table-column :label="t('EquipmentManagement.CapacityReport.deviceType')" align="center" prop="typeName" sortable />
-      <el-table-column :label="t('EquipmentManagement.CapacityReport.deviceStatus')" align="center" prop="deviceStatus" sortable>
-        <template #default="scope">
-          <el-switch
-            :model-value="isDeviceLedgerEnabled(scope.row)"
-            :loading="Boolean(deviceStatusUpdatingMap[scope.row.id])"
-            inline-prompt
-            @change="(val) => handleDeviceStatusChange(scope.row, val)"
-          />
-        </template>
-      </el-table-column>
      <el-table-column :label="t('EquipmentManagement.CapacityReport.ratedCapacity')" align="center" prop="ratedCapacity" sortable />
      <el-table-column :label="t('EquipmentManagement.CapacityReport.reportCapacity')" align="center" prop="reportCapacity" sortable />
      <el-table-column :label="t('EquipmentManagement.CapacityReport.actualCapacity')" align="center" prop="actualCapacity" sortable />
@ -127,36 +114,17 @@ const queryParams = reactive({
  deviceCode: undefined,
  deviceName: undefined,
  deviceType: undefined,
-  deviceStatus: undefined,
  workshop: undefined
 })
 const queryFormRef = ref()
 const exportLoading = ref(false)
+const showAllFilters = ref(false) // 是否显示所有筛选框
+const filterCount = 4 // 筛选框数量
 const selectedIds = ref<number[]>([])
-const deviceStatusUpdatingMap = ref<Record<number, boolean>>({})

-const isDeviceLedgerEnabled = (row: CapacityReportVO) => {
-  return Number(row.deviceStatus) === 0
-}
-
-const handleDeviceStatusChange = async (row: CapacityReportVO, value: boolean) => {
-  if (!row?.id) return
-  const oldValue = Number(row.deviceStatus)
-  const nextValue = value ? 0 : 1
-  row.deviceStatus = nextValue
-  deviceStatusUpdatingMap.value[row.id] = true
-  try {
-    await DeviceLedgerApi.updateDeviceLedger({
-      id: row.id,
-      deviceStatus: nextValue
-    })
-    message.success(t('common.updateSuccess'))
-  } catch {
-    row.deviceStatus = oldValue
-    message.error(t('common.updateFail'))
-  } finally {
-    deviceStatusUpdatingMap.value[row.id] = false
-  }
+/** 切换筛选框展开/折叠 */
+const toggleFilters = () => {
+  showAllFilters.value = !showAllFilters.value
 }

 const getList = async () => {
--- a/src/views/mes/feedingrecord/index.vue
+++ b/src/views/mes/feedingrecord/index.vue
@ -40,7 +40,7 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item :label="t('ProductionPlan.FeedingRecord.searchUserLabel')" prop="userId">
+      <el-form-item :label="t('ProductionPlan.FeedingRecord.searchUserLabel')" prop="userId" v-show="showAllFilters">
        <el-input
          v-model="queryParams.userId"
          :placeholder="t('ProductionPlan.FeedingRecord.searchUserPlaceholder')"
@ -49,7 +49,7 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item :label="t('ProductionPlan.FeedingRecord.searchRemarkLabel')" prop="remark">
+      <el-form-item :label="t('ProductionPlan.FeedingRecord.searchRemarkLabel')" prop="remark" v-show="showAllFilters">
        <el-input
          v-model="queryParams.remark"
          :placeholder="t('ProductionPlan.FeedingRecord.searchRemarkPlaceholder')"
@ -58,6 +58,14 @@
          class="!w-240px"
        />
      </el-form-item>
+    
+      <el-form-item v-if="filterCount > 3">
+        <el-button plain @click="toggleFilters">
+          <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
+          {{ showAllFilters ? '收起' : '更多' }}
+        </el-button>
+      </el-form-item>
+    
      <el-form-item>
        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> {{ t('ProductionPlan.FeedingRecord.buttonSearchText') }}</el-button>
        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> {{ t('ProductionPlan.FeedingRecord.buttonResetText') }}</el-button>
@ -214,6 +222,13 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
+const showAllFilters = ref(false) // 是否显示所有筛选框
+const filterCount = 4 // 筛选框数量
+
+/** 切换筛选框展开/折叠 */
+const toggleFilters = () => {
+  showAllFilters.value = !showAllFilters.value
+}

 /** 查询列表 */
 const getList = async () => {
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@ -18,22 +18,30 @@
          <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id" />
        </el-select>
      </el-form-item>
-      <el-form-item :label="t('ProductionPlan.Plan.searchRemarkLabel')" prop="remark">
+      <el-form-item :label="t('ProductionPlan.Plan.searchRemarkLabel')" prop="remark" v-show="showAllFilters">
        <el-input v-model="queryParams.remark" :placeholder="t('ProductionPlan.Plan.searchRemarkPlaceholder')" clearable
          @keyup.enter="handleQuery" class="!w-180px" />
      </el-form-item>
-      <el-form-item :label="t('ProductionPlan.Plan.searchPlanStartLabel')" prop="planStartTime">
+      <el-form-item :label="t('ProductionPlan.Plan.searchPlanStartLabel')" prop="planStartTime" v-show="showAllFilters">
        <el-date-picker v-model="queryParams.planStartTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
          @change="handleQuery" :start-placeholder="t('ProductionPlan.Plan.searchPlanStartStartPlaceholder')"
          :end-placeholder="t('ProductionPlan.Plan.searchPlanStartEndPlaceholder')"
          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px" />
      </el-form-item>
-      <el-form-item :label="t('ProductionPlan.Plan.searchPlanEndLabel')" prop="planEndTime">
+      <el-form-item :label="t('ProductionPlan.Plan.searchPlanEndLabel')" prop="planEndTime" v-show="showAllFilters">
        <el-date-picker v-model="queryParams.planEndTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
          @change="handleQuery" :start-placeholder="t('ProductionPlan.Plan.searchPlanEndStartPlaceholder')"
          :end-placeholder="t('ProductionPlan.Plan.searchPlanEndEndPlaceholder')"
          :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-button plain @click="toggleFilters">
+          <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
+          {{ showAllFilters ? '收起' : '更多' }}
+        </el-button>
+      </el-form-item>
+    
      <el-form-item>
        <el-button @click="handleQuery">
          <Icon icon="ep:search" class="mr-5px" /> {{ t('ProductionPlan.Plan.buttonSearchText') }}
@ -321,6 +329,14 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
+const showAllFilters = ref(false) // 是否显示所有筛选框
+const filterCount = 4 // 筛选框数量
+
+/** 切换筛选框展开/折叠 */
+const toggleFilters = () => {
+  showAllFilters.value = !showAllFilters.value
+}
+
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
 const storeDialogVisible = ref(false) // 入库仓库选择弹窗
 const storeWarehouseId = ref<number>() // 选中的仓库ID
--- a/src/views/mes/productionReport/index.vue
+++ b/src/views/mes/productionReport/index.vue
@ -41,7 +41,7 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item :label="t('ProductionReport.Index.searchRemarkLabel')" prop="remark">
+      <el-form-item :label="t('ProductionReport.Index.searchRemarkLabel')" prop="remark" v-show="showAllFilters">
        <el-input
          v-model="queryParams.remark"
          :placeholder="t('ProductionReport.Index.searchRemarkPlaceholder')"
@ -50,7 +50,7 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item :label="t('ProductionReport.Index.searchCreateTimeLabel')" prop="createTime">
+      <el-form-item :label="t('ProductionReport.Index.searchCreateTimeLabel')" prop="createTime" v-show="showAllFilters">
        <el-date-picker
          v-model="queryParams.createTime"
          @change="handleQuery"
@ -62,6 +62,14 @@
          class="!w-240px"
        />
      </el-form-item>
+    
+      <el-form-item v-if="filterCount > 3">
+        <el-button plain @click="toggleFilters">
+          <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
+          {{ showAllFilters ? '收起' : '更多' }}
+        </el-button>
+      </el-form-item>
+    
      <el-form-item>
        <el-button @click="handleQuery">
          <Icon icon="ep:search" class="mr-5px" /> {{ t('ProductionReport.Index.buttonSearch') }}
@ -170,6 +178,13 @@ const queryParams = reactive({
 })
 const queryFormRef = ref()
 const exportLoading = ref(false)
+const showAllFilters = ref(false) // 是否显示所有筛选框
+const filterCount = 4 // 筛选框数量
+
+/** 切换筛选框展开/折叠 */
+const toggleFilters = () => {
+  showAllFilters.value = !showAllFilters.value
+}

 const activeStatusTab = ref('')

--- a/src/views/mes/task/index.vue
+++ b/src/views/mes/task/index.vue
@ -42,7 +42,7 @@
        />
      </el-form-item>

-      <el-form-item :label="t('ProductionPlan.Task.searchRemarkLabel')" prop="remark">
+      <el-form-item :label="t('ProductionPlan.Task.searchRemarkLabel')" prop="remark" v-show="showAllFilters">
        <el-input
          v-model="queryParams.remark"
          :placeholder="t('ProductionPlan.Task.searchRemarkPlaceholder')"
@ -51,7 +51,7 @@
          class="!w-180px"
        />
      </el-form-item>
-      <el-form-item :label="t('ProductionPlan.Task.searchCreateTimeLabel')" prop="createTime">
+      <el-form-item :label="t('ProductionPlan.Task.searchCreateTimeLabel')" prop="createTime" v-show="showAllFilters">
        <el-date-picker
          v-model="queryParams.createTime"
          @change="handleQuery"
@ -63,6 +63,14 @@
          class="!w-280px"
        />
      </el-form-item>
+    
+      <el-form-item v-if="filterCount > 3">
+        <el-button plain @click="toggleFilters">
+          <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
+          {{ showAllFilters ? '收起' : '更多' }}
+        </el-button>
+      </el-form-item>
+    
      <el-form-item>
        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> {{ t('ProductionPlan.Task.buttonSearchText') }}</el-button>
        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> {{ t('ProductionPlan.Task.buttonResetText') }}</el-button>
@ -221,6 +229,13 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
+const showAllFilters = ref(false) // 是否显示所有筛选框
+const filterCount = 4 // 筛选框数量
+
+/** 切换筛选框展开/折叠 */
+const toggleFilters = () => {
+  showAllFilters.value = !showAllFilters.value
+}

 /** 查询列表 */
 const getList = async () => {
--- a/src/views/mes/tasksummary/index.vue
+++ b/src/views/mes/tasksummary/index.vue
@ -23,18 +23,26 @@ v-model="queryParams.deliveryDate" value-format="YYYY-MM-DD HH:mm:ss" @change="h
          :end-placeholder="t('ProductionPlan.TaskSummary.searchDeliveryEndPlaceholder')"
          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px" />
      </el-form-item>
-      <el-form-item :label="t('ProductionPlan.TaskSummary.searchRemarkLabel')" prop="remark">
+      <el-form-item :label="t('ProductionPlan.TaskSummary.searchRemarkLabel')" prop="remark" v-show="showAllFilters">
        <el-input
 v-model="queryParams.remark" :placeholder="t('ProductionPlan.TaskSummary.searchRemarkPlaceholder')"
          clearable @keyup.enter="handleQuery" class="!w-240px" />
      </el-form-item>
-      <el-form-item :label="t('ProductionPlan.TaskSummary.searchCreateTimeLabel')" prop="createTime">
+      <el-form-item :label="t('ProductionPlan.TaskSummary.searchCreateTimeLabel')" prop="createTime" v-show="showAllFilters">
        <el-date-picker
 v-model="queryParams.createTime" @change="handleQuery" value-format="YYYY-MM-DD HH:mm:ss"
          type="daterange" :start-placeholder="t('ProductionPlan.TaskSummary.searchCreateTimeStartPlaceholder')"
          :end-placeholder="t('ProductionPlan.TaskSummary.searchCreateTimeEndPlaceholder')"
          :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-button plain @click="toggleFilters">
+          <Icon :icon="showAllFilters ? 'ep:arrow-up' : 'ep:arrow-down'" class="mr-5px" />
+          {{ showAllFilters ? '收起' : '更多' }}
+        </el-button>
+      </el-form-item>
+    
      <el-form-item>
        <el-button @click="handleQuery">
          <Icon icon="ep:search" class="mr-5px" /> {{ t('ProductionPlan.TaskSummary.buttonSearchText') }}
@ -171,6 +179,14 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
+const showAllFilters = ref(false) // 是否显示所有筛选框
+const filterCount = 4 // 筛选框数量
+
+/** 切换筛选框展开/折叠 */
+const toggleFilters = () => {
+  showAllFilters.value = !showAllFilters.value
+}
+
 const { push } = useRouter()
 const taskScheduleDialogRef = ref()
 const deliveryDateFormatter = (_row: any, _column: any, value: any) => {
Author	SHA1	Message	Date
黄伟杰	1bdd5c276f	style：产能报表-删除状态字段	1 week ago
黄伟杰	e68b934593	feat：生产管理模块-筛选条件添加“更多”按钮	1 week ago