From ec1dded308c62a90bfc6d9efdc34304d873342f4 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 02 十一月 2026 17:22:35 +0800
Subject: [PATCH] feat(app): 对齐蓝羽纸业已有功能

---
 src/pages/energy/alert/index.vue  | 1048 ---------------------------------------------
 src/pages/crm/business/form.vue   |    8 
 src/pages/energy/record/index.vue |  110 ----
 src/pages/sale/order/form.vue     |   10 
 src/api/energy.ts                 |   17 
 src/pages/energy/record/form.vue  |  133 -----
 6 files changed, 64 insertions(+), 1,262 deletions(-)

diff --git a/src/api/energy.ts b/src/api/energy.ts
index 14d13e8..dc5a289 100644
--- a/src/api/energy.ts
+++ b/src/api/energy.ts
@@ -117,3 +117,20 @@
 export function checkEnergyAlerts(accessToken: string, date: string) {
   return request<{ sent: number; failed: number }>(`/energy/alert/check${query({ date })}`, { method: "POST", header: header(accessToken) });
 }
+/** 钃濈窘绾镐笟鑳借�楃鐞嗭細璁¢噺鐐规妱琛ㄤ笌棰勮閲囩敤 MES 鑳借�楁帴鍙c�� */
+export interface BlueEnergyMeterOption { id: number; code?: string; name?: string; energyType?: number; energyTypeName?: string; unit?: string; workshopName?: string; lineName?: string; }
+export interface BlueEnergyMeter extends BlueEnergyMeterOption { ratio?: number; }
+export interface BlueEnergyRecord { id?: number; meterId?: number; meterCode?: string; meterName?: string; energyType?: number; energyTypeName?: string; unit?: string; workshopName?: string; lineName?: string; ratio?: number; recordDate?: string; prevReading?: number; reading?: number; usageAmount?: number; price?: number; cost?: number; sourceName?: string; remark?: string; createTime?: string; }
+export interface BlueEnergyAlert { id?: number; alertNo?: string; meterName?: string; energyTypeName?: string; alertTypeName?: string; alertLevel?: number; alertLevelName?: string; alertDate?: string; objectName?: string; actualValue?: number; thresholdValue?: number; unit?: string; content?: string; status?: number; statusName?: string; handleUserName?: string; handleTime?: string; handleRemark?: string; createTime?: string; }
+export function getBlueEnergyMeterList(accessToken: string) { return request<BlueEnergyMeterOption[]>("/mes/em/meter/simple-list", { header: header(accessToken) }); }
+export function getBlueEnergyMeter(accessToken: string, id: number) { return request<BlueEnergyMeter>(`/mes/em/meter/get${query({ id })}`, { header: header(accessToken) }); }
+export function getBlueEnergyRecordPage(accessToken: string, params: { pageNo: number; pageSize: number; meterId?: number; recordDate?: string }) { return request<PageResult<BlueEnergyRecord>>(`/mes/em/record/page${query(params)}`, { header: header(accessToken) }); }
+export function getBlueEnergyRecord(accessToken: string, id: number) { return request<BlueEnergyRecord>(`/mes/em/record/get${query({ id })}`, { header: header(accessToken) }); }
+export function getBlueEnergyLastReading(accessToken: string, meterId: number, recordDate: string, excludeId?: number) { return request<{ prevReading?: number }>(`/mes/em/record/last-reading${query({ meterId, recordDate, excludeId })}`, { header: header(accessToken) }); }
+export function createBlueEnergyRecord(accessToken: string, data: BlueEnergyRecord) { return request<number>("/mes/em/record/create", { method: "POST", data: data as Record<string, unknown>, header: header(accessToken) }); }
+export function updateBlueEnergyRecord(accessToken: string, data: BlueEnergyRecord) { return request<boolean>("/mes/em/record/update", { method: "PUT", data: data as Record<string, unknown>, header: header(accessToken) }); }
+export function deleteBlueEnergyRecord(accessToken: string, id: number) { return request<boolean>(`/mes/em/record/delete${query({ id })}`, { method: "DELETE", header: header(accessToken) }); }
+export function getBlueEnergyAlertPage(accessToken: string, params: { pageNo: number; pageSize: number; status?: number; beginDate?: string; endDate?: string }) { return request<PageResult<BlueEnergyAlert>>(`/mes/em/alert/page${query(params)}`, { header: header(accessToken) }); }
+export function getBlueEnergyAlert(accessToken: string, id: number) { return request<BlueEnergyAlert>(`/mes/em/alert/get${query({ id })}`, { header: header(accessToken) }); }
+export function handleBlueEnergyAlert(accessToken: string, id: number, handleRemark: string) { return request<boolean>("/mes/em/alert/handle", { method: "PUT", data: { id, handleRemark }, header: header(accessToken) }); }
+export function checkBlueEnergyAlerts(accessToken: string, beginDate: string, endDate: string) { return request<number>(`/mes/em/alert/check${query({ beginDate, endDate })}`, { method: "POST", header: header(accessToken) }); }
diff --git a/src/pages/crm/business/form.vue b/src/pages/crm/business/form.vue
index de700c0..b11a66a 100644
--- a/src/pages/crm/business/form.vue
+++ b/src/pages/crm/business/form.vue
@@ -58,12 +58,8 @@
   const materialOptions = computed(() => materials.value.map(item => materialOptionText(item)));
   function recalculate() {
     form.totalProductPrice = productTotal.value;
-    form.totalPrice = Number(
-      (
-        (productTotal.value * (100 - Number(form.discountPercent ?? 0))) /
-        100
-      ).toFixed(2)
-    );
+    const discountPercent = Number(form.discountPercent ?? 0);
+    form.totalPrice = Number((discountPercent > 0 ? productTotal.value * discountPercent / 100 : productTotal.value).toFixed(2));
   }
   function changeDiscount(value: string) {
     form.discountPercent = Number(value || 0);
diff --git a/src/pages/energy/alert/index.vue b/src/pages/energy/alert/index.vue
index ccc3468..a1b0678 100644
--- a/src/pages/energy/alert/index.vue
+++ b/src/pages/energy/alert/index.vue
@@ -1,1037 +1,15 @@
 <script setup lang="ts">
-  import { computed, reactive, ref } from "vue";
-  import { onPullDownRefresh, onShow } from "@dcloudio/uni-app";
-  import {
-    checkEnergyAlerts,
-    deleteEnergyAlertRule,
-    getEnergyAlertLogs,
-    getEnergyAlertRecipients,
-    getEnergyAlertRules,
-    saveEnergyAlertRule,
-    type EnergyAlertLog,
-    type EnergyAlertMetric,
-    type EnergyAlertRecipient,
-    type EnergyAlertRule,
-  } from "../../../api/energy";
-  import { useAuth } from "../../../stores/auth";
-  import {
-    energyInfo,
-    energyName,
-    energyOptions,
-    isAmountMetric,
-    metricName,
-    metricOptions,
-    numberText,
-    productOptions,
-    today,
-  } from "../shared";
-
-  const { hasPermission, isLoggedIn, state } = useAuth();
-  // 鐪熷疄鎺ュ彛浼樺厛锛涗粎鏈湴涓存椂鎺掓煡鎺ュ彛涓嶅彲鐢ㄦ椂鎵嬪姩鏀逛负 true銆�
-  const USE_MOCK_ALERT_DATA = false;
-  const tab = ref<"rules" | "logs">("rules");
-  const rules = ref<EnergyAlertRule[]>([]);
-  const logs = ref<EnergyAlertLog[]>([]);
-  const recipients = ref<EnergyAlertRecipient[]>([]);
-  const rulePage = reactive({ pageNo: 1, total: 0 });
-  const logPage = reactive({ pageNo: 1, total: 0 });
-  const logFilters = reactive<{ date?: string; status?: "SENT" | "FAILED" }>({});
-  const keyword = ref("");
-  const checkDate = ref(today());
-  const loading = ref(false);
-  const saving = ref(false);
-  const checking = ref(false);
-  const showForm = ref(false);
-  const loadError = ref("");
-  const form = reactive<EnergyAlertRule>(initial());
-  const canCreate = computed(() => hasPermission("energy:alert:create"));
-  const canUpdate = computed(() => hasPermission("energy:alert:update"));
-  const canDelete = computed(() => hasPermission("energy:alert:delete"));
-  const canCheck = computed(() => hasPermission("energy:alert:check"));
-  const ruleHasMore = computed(() => rules.value.length < rulePage.total);
-  const logHasMore = computed(() => logs.value.length < logPage.total);
-  const filteredRules = computed(() =>
-    rules.value.filter(
-      item => !keyword.value.trim() || item.name.includes(keyword.value.trim())
-    )
-  );
-  const thresholdUnit = computed(() =>
-    isAmountMetric(form.metric) ? "鍏�" : energyInfo[form.energyType].unit
-  );
-  const statusOptions = [
-    { label: "鍙戦�佹垚鍔�", value: "SENT" },
-    { label: "鍙戦�佸け璐�", value: "FAILED" },
-  ];
-  const mockRecipients: EnergyAlertRecipient[] = [
-    { id: 1, nickname: "瓒呯骇绠$悊鍛�" },
-    { id: 2, nickname: "鐢熶骇涓荤" },
-    { id: 3, nickname: "璁惧涓荤" },
-  ];
-  const mockRules: EnergyAlertRule[] = [
-    {
-      id: 1001,
-      name: "鐕曠獫鐢熶骇鍖烘瘡鏃ョ敤姘撮璀�",
-      energyType: "WATER",
-      usageArea: "鐕曠獫鐢熶骇鍖�",
-      productCategory: "鐕曠獫",
-      metric: "QUANTITY",
-      threshold: 120,
-      enabled: true,
-      recipientIds: [1, 2],
-    },
-    {
-      id: 1002,
-      name: "鍔ㄥ姏绔欐瘡鏈堢敤鐢佃垂鐢ㄩ璀�",
-      energyType: "ELECTRICITY",
-      usageArea: "鍔ㄥ姏绔�",
-      productCategory: "鍏敤鑳借��",
-      metric: "MONTH_AMOUNT",
-      threshold: 8000,
-      enabled: true,
-      recipientIds: [1, 3],
-    },
-    {
-      id: 1003,
-      name: "鐏弻鍖鸿捀姹界敤閲忛璀�",
-      energyType: "STEAM",
-      usageArea: "鐏弻鍖�",
-      productCategory: "婊嬭ˉ鍝佸師娴�",
-      metric: "QUANTITY",
-      threshold: 18,
-      enabled: false,
-      recipientIds: [2],
-    },
-  ];
-  const mockLogs: EnergyAlertLog[] = [
-    {
-      id: 2001,
-      ruleName: "鐕曠獫鐢熶骇鍖烘瘡鏃ョ敤姘撮璀�",
-      recordDate: today(),
-      energyType: "WATER",
-      scope: "鐕曠獫鐢熶骇鍖� / 鐕曠獫",
-      metric: "QUANTITY",
-      periodType: "DAY",
-      actualValue: 132.5,
-      threshold: 120,
-      recipientName: "鐢熶骇涓荤",
-      status: "SENT",
-      errorMessage: "",
-      createTime: `${today()} 09:20`,
-    },
-    {
-      id: 2002,
-      ruleName: "鍔ㄥ姏绔欐瘡鏈堢敤鐢佃垂鐢ㄩ璀�",
-      recordDate: today(),
-      energyType: "ELECTRICITY",
-      scope: "鍔ㄥ姏绔� / 鍏敤鑳借��",
-      metric: "MONTH_AMOUNT",
-      periodType: "MONTH",
-      actualValue: 8420.6,
-      threshold: 8000,
-      recipientName: "璁惧涓荤",
-      status: "SENT",
-      errorMessage: "",
-      createTime: `${today()} 09:21`,
-    },
-    {
-      id: 2003,
-      ruleName: "鐏弻鍖鸿捀姹界敤閲忛璀�",
-      recordDate: today(),
-      energyType: "STEAM",
-      scope: "鐏弻鍖� / 婊嬭ˉ鍝佸師娴�",
-      metric: "QUANTITY",
-      periodType: "DAY",
-      actualValue: 21.2,
-      threshold: 18,
-      recipientName: "鐢熶骇涓荤",
-      status: "FAILED",
-      errorMessage: "妯℃嫙閫氱煡鍙戦�佸け璐�",
-      createTime: `${today()} 09:22`,
-    },
-  ];
-
-  function initial(): EnergyAlertRule {
-    return {
-      name: "",
-      energyType: "WATER",
-      metric: "QUANTITY",
-      threshold: 1,
-      enabled: true,
-      recipientIds: [],
-      usageArea: "",
-      productCategory: undefined,
-    };
-  }
-  function resetForm(data?: EnergyAlertRule) {
-    Object.keys(form).forEach(
-      key => delete (form as unknown as Record<string, unknown>)[key]
-    );
-    Object.assign(
-      form,
-      data ? { ...data, recipientIds: [...data.recipientIds] } : initial()
-    );
-  }
-  function pickEnergy(index: number) {
-    form.energyType = energyOptions[index].value;
-  }
-  function pickMetric(index: number) {
-    form.metric = metricOptions[index].value;
-  }
-  function pickProduct(index: number) {
-    form.productCategory = productOptions[index];
-  }
-  function pickStatus(index: number) {
-    logFilters.status = statusOptions[index].value as "SENT" | "FAILED";
-  }
-  function toggleRecipient(id: number) {
-    form.recipientIds = form.recipientIds.includes(id)
-      ? form.recipientIds.filter(item => item !== id)
-      : form.recipientIds.concat(id);
-  }
-  function recipientNames(ids: number[]) {
-    return (
-      ids
-        .map(
-          id =>
-            recipients.value.find(user => user.id === id)?.nickname ||
-            `鐢ㄦ埛 ${id}`
-        )
-        .join("銆�") || "--"
-    );
-  }
-  function metricUnit(metric: EnergyAlertMetric, energyType = form.energyType) {
-    return isAmountMetric(metric) ? "鍏�" : energyInfo[energyType].unit;
-  }
-  function validForm() {
-    if (!form.name?.trim()) return "璇疯緭鍏ヨ鍒欏悕绉�";
-    if (!(Number(form.threshold) > 0)) return "闃堝�煎繀椤诲ぇ浜庨浂";
-    if (!form.recipientIds.length || form.recipientIds.length > 50)
-      return "璇烽�夋嫨 1 鑷� 50 浣嶆帴鏀朵汉";
-    return "";
-  }
-  async function loadRecipients() {
-    if (USE_MOCK_ALERT_DATA) {
-      recipients.value = mockRecipients;
-      return;
-    }
-    if (!state.accessToken || recipients.value.length) return;
-    recipients.value = await getEnergyAlertRecipients(state.accessToken);
-  }
-  async function openForm(row?: EnergyAlertRule) {
-    if (!USE_MOCK_ALERT_DATA && !state.accessToken) return;
-    try {
-      await loadRecipients();
-      resetForm(row);
-      showForm.value = true;
-    } catch (error) {
-      uni.showToast({
-        title: error instanceof Error ? error.message : "鎺ユ敹浜哄姞杞藉け璐�",
-        icon: "none",
-      });
-    }
-  }
-  async function saveRule() {
-    if ((!USE_MOCK_ALERT_DATA && !state.accessToken) || saving.value) return;
-    const warning = validForm();
-    if (warning) return uni.showToast({ title: warning, icon: "none" });
-    saving.value = true;
-    try {
-      if (USE_MOCK_ALERT_DATA) {
-        const payload = {
-          ...form,
-          id: form.id || Date.now(),
-          name: form.name.trim(),
-          usageArea: form.usageArea?.trim() || undefined,
-          threshold: Number(form.threshold),
-        };
-        const index = mockRules.findIndex(item => item.id === payload.id);
-        if (index >= 0) mockRules.splice(index, 1, payload);
-        else mockRules.unshift(payload);
-        uni.showToast({ title: "淇濆瓨鎴愬姛", icon: "success" });
-        showForm.value = false;
-        await loadRules(true);
-        return;
-      }
-      await saveEnergyAlertRule(state.accessToken, {
-        ...form,
-        name: form.name.trim(),
-        usageArea: form.usageArea?.trim() || undefined,
-        threshold: Number(form.threshold),
-      });
-      uni.showToast({ title: "淇濆瓨鎴愬姛", icon: "success" });
-      showForm.value = false;
-      await loadRules(true);
-    } catch (error) {
-      uni.showToast({
-        title: error instanceof Error ? error.message : "淇濆瓨澶辫触",
-        icon: "none",
-      });
-    } finally {
-      saving.value = false;
-    }
-  }
-  async function remove(row: EnergyAlertRule) {
-    if ((!USE_MOCK_ALERT_DATA && !state.accessToken) || !row.id) return;
-    const ok = await new Promise<boolean>(resolve =>
-      uni.showModal({
-        title: "纭鍒犻櫎",
-        content: "鍒犻櫎姝よ鍒欙紵鍘嗗彶閫氱煡璁板綍浠嶄細淇濈暀銆�",
-        success: res => resolve(res.confirm),
-      })
-    );
-    if (!ok) return;
-    try {
-      if (USE_MOCK_ALERT_DATA) {
-        const index = mockRules.findIndex(item => item.id === row.id);
-        if (index >= 0) mockRules.splice(index, 1);
-        uni.showToast({ title: "鍒犻櫎鎴愬姛", icon: "success" });
-        await loadRules(true);
-        return;
-      }
-      await deleteEnergyAlertRule(state.accessToken, row.id);
-      uni.showToast({ title: "鍒犻櫎鎴愬姛", icon: "success" });
-      await loadRules(true);
-    } catch (error) {
-      uni.showToast({
-        title: error instanceof Error ? error.message : "鍒犻櫎澶辫触",
-        icon: "none",
-      });
-    }
-  }
-  async function checkNow() {
-    if ((!USE_MOCK_ALERT_DATA && !state.accessToken) || checking.value) return;
-    if (!checkDate.value || checkDate.value > today())
-      return uni.showToast({ title: "璇烽�夋嫨浠婂ぉ鎴栦箣鍓嶇殑鏃ユ湡", icon: "none" });
-    checking.value = true;
-    try {
-      if (USE_MOCK_ALERT_DATA) {
-        mockLogs.unshift({
-          id: Date.now(),
-          ruleName: "鎵嬪姩妫�鏌ユā鎷熻褰�",
-          recordDate: checkDate.value,
-          energyType: "WATER",
-          scope: "鍏ㄩ儴鍖哄煙 / 鍏ㄩ儴浜у搧",
-          metric: "QUANTITY",
-          periodType: "DAY",
-          actualValue: 126,
-          threshold: 120,
-          recipientName: "瓒呯骇绠$悊鍛�",
-          status: "SENT",
-          errorMessage: "",
-          createTime: `${checkDate.value} 10:00`,
-        });
-        uni.showToast({ title: "妫�鏌ュ畬鎴愶細鍙戦��1鏉★紝澶辫触0鏉�", icon: "success" });
-        tab.value = "logs";
-        logFilters.date = checkDate.value;
-        await loadLogs(true);
-        return;
-      }
-      const result = await checkEnergyAlerts(state.accessToken, checkDate.value);
-      uni.showToast({
-        title: `妫�鏌ュ畬鎴愶細鍙戦��${result.sent}鏉★紝澶辫触${result.failed}鏉,
-        icon: result.failed ? "none" : "success",
-      });
-      tab.value = "logs";
-      logFilters.date = checkDate.value;
-      await loadLogs(true);
-    } catch (error) {
-      uni.showToast({
-        title: error instanceof Error ? error.message : "妫�鏌ュけ璐�",
-        icon: "none",
-      });
-    } finally {
-      checking.value = false;
-    }
-  }
-  async function loadRules(reset = false) {
-    if ((!USE_MOCK_ALERT_DATA && !state.accessToken) || loading.value) return;
-    if (reset) {
-      rulePage.pageNo = 1;
-      rules.value = [];
-    }
-    loading.value = true;
-    loadError.value = "";
-    try {
-      if (USE_MOCK_ALERT_DATA) {
-        const pageSize = 10;
-        const start = (rulePage.pageNo - 1) * pageSize;
-        const list = mockRules
-          .slice(start, start + pageSize)
-          .map(item => ({ ...item, recipientIds: [...item.recipientIds] }));
-        rulePage.total = mockRules.length;
-        rules.value = reset ? list : rules.value.concat(list);
-        rulePage.pageNo += 1;
-        return;
-      }
-      const result = await getEnergyAlertRules(state.accessToken, {
-        pageNo: rulePage.pageNo,
-        pageSize: 10,
-      });
-      rulePage.total = result.total || 0;
-      rules.value = reset
-        ? result.list || []
-        : rules.value.concat(result.list || []);
-      rulePage.pageNo += 1;
-    } catch (error) {
-      loadError.value =
-        error instanceof Error ? error.message : "棰勮瑙勫垯鍔犺浇澶辫触";
-    } finally {
-      loading.value = false;
-    }
-  }
-  async function loadLogs(reset = false) {
-    if ((!USE_MOCK_ALERT_DATA && !state.accessToken) || loading.value) return;
-    if (reset) {
-      logPage.pageNo = 1;
-      logs.value = [];
-    }
-    loading.value = true;
-    loadError.value = "";
-    try {
-      if (USE_MOCK_ALERT_DATA) {
-        const pageSize = 10;
-        const source = mockLogs.filter(
-          item =>
-            (!logFilters.date || item.recordDate === logFilters.date) &&
-            (!logFilters.status || item.status === logFilters.status)
-        );
-        const start = (logPage.pageNo - 1) * pageSize;
-        const list = source.slice(start, start + pageSize);
-        logPage.total = source.length;
-        logs.value = reset ? list : logs.value.concat(list);
-        logPage.pageNo += 1;
-        return;
-      }
-      const result = await getEnergyAlertLogs(state.accessToken, {
-        pageNo: logPage.pageNo,
-        pageSize: 10,
-        date: logFilters.date,
-        status: logFilters.status,
-      });
-      logPage.total = result.total || 0;
-      logs.value = reset
-        ? result.list || []
-        : logs.value.concat(result.list || []);
-      logPage.pageNo += 1;
-    } catch (error) {
-      loadError.value =
-        error instanceof Error ? error.message : "閫氱煡璁板綍鍔犺浇澶辫触";
-    } finally {
-      loading.value = false;
-    }
-  }
-  function load(reset = false) {
-    return tab.value === "rules" ? loadRules(reset) : loadLogs(reset);
-  }
-  function switchTab(value: "rules" | "logs") {
-    tab.value = value;
-    load(true);
-  }
-  function clearLogFilters() {
-    logFilters.date = undefined;
-    logFilters.status = undefined;
-    loadLogs(true);
-  }
-
-  onShow(async () => {
-    if (isLoggedIn.value) {
-      await load(true);
-      loadRecipients().catch(() => undefined);
-    }
-  });
-  onPullDownRefresh(async () => {
-    await load(true);
-    uni.stopPullDownRefresh();
-  });
+import { computed, reactive, ref } from "vue";
+import { onPullDownRefresh, onShow } from "@dcloudio/uni-app";
+import { checkBlueEnergyAlerts, getBlueEnergyAlert, getBlueEnergyAlertPage, handleBlueEnergyAlert, type BlueEnergyAlert } from "../../../api/energy";
+import { useAuth } from "../../../stores/auth";
+const { hasPermission, isLoggedIn, state } = useAuth(); const rows = ref<BlueEnergyAlert[]>([]), pageNo = ref(1), total = ref(0), loading = ref(false), checking = ref(false), handling = ref(false), loadError = ref(""); const filters = reactive({ beginDate: "", endDate: "", status: undefined as number | undefined }); const dialog = ref<BlueEnergyAlert>(); const handleRemark = ref(""); const showCheck = ref(false); const checkRange = reactive({ beginDate: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toISOString().slice(0,10), endDate: new Date().toISOString().slice(0,10) });
+const canQuery = computed(() => isLoggedIn.value), canHandle = computed(() => hasPermission("mes:em-alert:handle")), hasMore = computed(() => rows.value.length < total.value); const statusText = (value?: number) => value === 0 ? "寰呭鐞�" : "宸插鐞�"; const levelClass = (level?: number) => level === 3 ? "red" : level === 2 ? "orange" : "blue";
+async function load(reset=false) { if (!state.accessToken || loading.value) return; if(reset){pageNo.value=1;rows.value=[];} loading.value=true;loadError.value="";try{const data=await getBlueEnergyAlertPage(state.accessToken,{pageNo:pageNo.value,pageSize:15,status:filters.status,beginDate:filters.beginDate||undefined,endDate:filters.endDate||undefined});total.value=data.total||0;rows.value=reset?data.list||[]:rows.value.concat(data.list||[]);pageNo.value+=1;}catch(error){loadError.value=error instanceof Error?error.message:"鑳借�楅璀﹀姞杞藉け璐�";}finally{loading.value=false;}}
+async function openDetail(row: BlueEnergyAlert){if(!state.accessToken||!row.id)return;try{dialog.value=await getBlueEnergyAlert(state.accessToken,row.id);handleRemark.value=dialog.value.handleRemark||"";}catch(error){uni.showToast({title:error instanceof Error?error.message:"璇︽儏鍔犺浇澶辫触",icon:"none"});}}
+async function handle(){if(!state.accessToken||!dialog.value?.id||!handleRemark.value.trim())return uni.showToast({title:"璇峰~鍐欏鐞嗚鏄�",icon:"none"});handling.value=true;try{await handleBlueEnergyAlert(state.accessToken,dialog.value.id,handleRemark.value.trim());uni.showToast({title:"棰勮宸插鐞�",icon:"success"});dialog.value=undefined;load(true);}catch(error){uni.showToast({title:error instanceof Error?error.message:"澶勭悊澶辫触",icon:"none"});}finally{handling.value=false;}}
+async function check(){if(!state.accessToken)return;checking.value=true;try{const count=await checkBlueEnergyAlerts(state.accessToken,checkRange.beginDate,checkRange.endDate);uni.showToast({title:`妫�娴嬪畬鎴愶紝鍏辨娴� ${count||0} 鏉,icon:"none"});showCheck.value=false;load(true);}catch(error){uni.showToast({title:error instanceof Error?error.message:"妫�娴嬪け璐�",icon:"none"});}finally{checking.value=false;}}
+onShow(()=>load(true));onPullDownRefresh(async()=>{await load(true);uni.stopPullDownRefresh();});
 </script>
-
-<template>
-  <view class="page">
-    <template v-if="isLoggedIn">
-      <view class="tip">姣忔棩鎸囨爣鎸夊ぉ姹囨�伙紝姣忔湀鎸囨爣鎸夎嚜鐒舵湀姹囨�伙紱鍚屼竴瑙勫垯銆佺粺璁″懆鏈熷拰鎺ユ敹浜哄彧鎴愬姛閫氱煡涓�娆°��</view>
-      <view class="check-card">
-        <view class="field"><text>妫�鏌ユ棩鏈�</text>
-          <picker mode="date"
-                  :value="checkDate"
-                  :end="today()"
-                  @change="checkDate=$event.detail.value">
-            <view class="picker"><text>{{ checkDate }}</text><text>鈥�</text></view>
-          </picker>
-        </view>
-        <button v-if="canCheck"
-                :loading="checking"
-                :disabled="checking"
-                @click="checkNow">妫�鏌ラ璀� / 閲嶈瘯澶辫触閫氱煡</button>
-      </view>
-      <view class="tabs"><text :class="{active:tab==='rules'}"
-              @click="switchTab('rules')">棰勮瑙勫垯</text><text :class="{active:tab==='logs'}"
-              @click="switchTab('logs')">閫氱煡璁板綍</text></view>
-      <template v-if="tab==='rules'">
-        <view class="search"><input v-model="keyword"
-                 placeholder="鎼滅储瑙勫垯鍚嶇О"
-                 confirm-type="search" /><text v-if="keyword"
-                @click="keyword=''">娓呴櫎</text></view>
-        <scroll-view class="content"
-                     scroll-y
-                     lower-threshold="80"
-                     @scrolltolower="ruleHasMore&&loadRules()">
-          <view v-if="loadError"
-                class="state error"
-                @click="loadRules(true)">{{ loadError }}锛岀偣鍑婚噸璇�</view>
-          <template v-else-if="filteredRules.length">
-            <view v-for="row in filteredRules"
-                  :key="row.id"
-                  class="row">
-              <view class="head">
-                <view><text class="name">{{ row.name }}</text><text>{{ row.usageArea || '鍏ㄩ儴鍖哄煙' }} / {{ row.productCategory || '鍏ㄩ儴浜у搧' }}</text></view>
-                <view class="status-wrap"><text :class="['status', row.enabled ? 'tag-green' : 'tag-gray']">{{ row.enabled ? '鍚敤' : '鍋滅敤' }}</text></view>
-              </view>
-              <view class="tags"><text :class="['pill', energyInfo[row.energyType].tone]">{{ energyName(row.energyType) }}</text><text class="pill tag-blue">{{ metricName(row.metric) }}</text></view>
-              <view class="grid">
-                <text>闃堝�硷細{{ numberText(row.threshold) }} {{ metricUnit(row.metric, row.energyType) }}</text>
-                <text>鎺ユ敹浜猴細{{ recipientNames(row.recipientIds) }}</text>
-              </view>
-              <view class="actions">
-                <button v-if="canUpdate"
-                        @click="openForm(row)">缂栬緫</button>
-                <button v-if="canDelete"
-                        class="danger"
-                        @click="remove(row)">鍒犻櫎</button>
-              </view>
-            </view>
-            <text class="more">{{ loading ? '鍔犺浇涓�...' : ruleHasMore ? '涓婃媺鍔犺浇鏇村' : '娌℃湁鏇村浜�' }}</text>
-          </template>
-          <view v-else
-                class="state">{{ loading ? '鍔犺浇涓�...' : '鏆傛棤棰勮瑙勫垯' }}</view>
-        </scroll-view>
-        <button v-if="canCreate"
-                class="fab"
-                @click="openForm()">
-          <view />
-        </button>
-      </template>
-      <template v-else>
-        <view class="filters">
-          <view class="field"><text>缁熻鏃ユ湡</text>
-            <picker mode="date"
-                    :value="logFilters.date || ''"
-                    :end="today()"
-                    @change="logFilters.date=$event.detail.value">
-              <view class="picker"><text>{{ logFilters.date || '鍏ㄩ儴鏃ユ湡' }}</text><text>鈥�</text></view>
-            </picker>
-          </view>
-          <view class="field"><text>鍙戦�佺粨鏋�</text>
-            <picker :range="statusOptions"
-                    range-key="label"
-                    @change="pickStatus(Number($event.detail.value))">
-              <view class="picker"><text>{{ logFilters.status === 'SENT' ? '鍙戦�佹垚鍔�' : logFilters.status === 'FAILED' ? '鍙戦�佸け璐�' : '鍏ㄩ儴缁撴灉' }}</text><text>鈥�</text></view>
-            </picker>
-          </view>
-          <view class="filter-actions"><button @click="loadLogs(true)">鏌ヨ</button><button @click="clearLogFilters">閲嶇疆</button></view>
-        </view>
-        <scroll-view class="content"
-                     scroll-y
-                     lower-threshold="80"
-                     @scrolltolower="logHasMore&&loadLogs()">
-          <view v-if="loadError"
-                class="state error"
-                @click="loadLogs(true)">{{ loadError }}锛岀偣鍑婚噸璇�</view>
-          <template v-else-if="logs.length">
-            <view v-for="row in logs"
-                  :key="row.id"
-                  class="row">
-              <view class="head">
-                <view><text class="name">{{ row.ruleName }}</text><text>{{ row.periodType === 'MONTH' ? row.recordDate.slice(0,7) : row.recordDate }} 路 {{ metricName(row.metric) }}</text></view>
-                <view class="status-wrap"><text :class="['status', row.status === 'SENT' ? 'tag-green' : 'tag-red']">{{ row.status === 'SENT' ? '鍙戦�佹垚鍔�' : '鍙戦�佸け璐�' }}</text></view>
-              </view>
-              <view class="grid">
-                <text>鑳芥簮 / 鑼冨洿锛歿{ energyName(row.energyType) }} / {{ row.scope || '--' }}</text>
-                <text>瀹為檯 / 闃堝�硷細{{ numberText(row.actualValue) }} / {{ numberText(row.threshold) }} {{ metricUnit(row.metric, row.energyType) }}</text>
-                <text>鎺ユ敹浜猴細{{ row.recipientName || '--' }}</text>
-                <text>鍒涘缓鏃堕棿锛歿{ row.createTime || '--' }}</text>
-              </view>
-              <view v-if="row.errorMessage"
-                    class="reason">澶辫触鍘熷洜锛歿{ row.errorMessage }}</view>
-            </view>
-            <text class="more">{{ loading ? '鍔犺浇涓�...' : logHasMore ? '涓婃媺鍔犺浇鏇村' : '娌℃湁鏇村浜�' }}</text>
-          </template>
-          <view v-else
-                class="state">{{ loading ? '鍔犺浇涓�...' : '鏆傛棤棰勮閫氱煡璁板綍' }}</view>
-        </scroll-view>
-      </template>
-    </template>
-    <view v-else
-          class="state">鐧诲綍鍚庢煡鐪嬭兘鑰楅璀�</view>
-    <view v-if="showForm"
-          class="modal-mask">
-      <view class="modal">
-        <view class="modal-head"><text>{{ form.id ? '缂栬緫棰勮瑙勫垯' : '鏂板棰勮瑙勫垯' }}</text><text @click="showForm=false">脳</text></view>
-        <scroll-view class="modal-body"
-                     scroll-y>
-          <view class="field"><text>瑙勫垯鍚嶇О <text class="required">*</text></text><input v-model="form.name"
-                   placeholder="渚嬪锛氱嚂绐濈敓浜у尯姣忔棩鐢ㄦ按棰勮"
-                   maxlength="100" /></view>
-          <view class="field"><text>鑳芥簮</text>
-            <picker :range="energyOptions"
-                    range-key="label"
-                    @change="pickEnergy(Number($event.detail.value))">
-              <view class="picker"><text>{{ energyName(form.energyType) }}</text><text>鈥�</text></view>
-            </picker>
-          </view>
-          <view class="field"><text>缁熻鎸囨爣</text>
-            <picker :range="metricOptions"
-                    range-key="label"
-                    @change="pickMetric(Number($event.detail.value))">
-              <view class="picker"><text>{{ metricName(form.metric) }}</text><text>鈥�</text></view>
-            </picker>
-          </view>
-          <view class="field"><text>浣跨敤鍖哄煙</text><input v-model="form.usageArea"
-                   placeholder="鐣欑┖缁熻鍏ㄩ儴鍖哄煙"
-                   maxlength="100" /></view>
-          <view class="field"><text>浜у搧绫诲埆</text>
-            <picker :range="productOptions"
-                    @change="pickProduct(Number($event.detail.value))">
-              <view class="picker"><text>{{ form.productCategory || '鍏ㄩ儴浜у搧' }}</text><text>鈥�</text></view>
-            </picker>
-          </view>
-          <view class="field"><text>{{ form.metric.startsWith('MONTH_') ? '姣忔湀' : '姣忔棩' }}闃堝�硷紙{{ thresholdUnit }}锛� <text class="required">*</text></text><input :value="String(form.threshold ?? '')"
-                   type="digit"
-                   placeholder="澶т簬姝ゅ�兼椂閫氱煡"
-                   @input="form.threshold=Number($event.detail.value || 0)" /></view>
-          <view class="field"><text>鍚敤瑙勫垯</text>
-            <switch :checked="form.enabled"
-                    @change="form.enabled=$event.detail.value" />
-          </view>
-          <view class="recipient-title">閫氱煡鎺ユ敹浜� <text class="required">*</text></view>
-          <view class="recipient-list">
-            <text v-for="user in recipients"
-                  :key="user.id"
-                  :class="{active:form.recipientIds.includes(user.id)}"
-                  @click="toggleRecipient(user.id)">{{ user.nickname }}</text>
-          </view>
-        </scroll-view>
-        <view class="modal-actions"><button @click="showForm=false">鍙栨秷</button><button :loading="saving"
-                  :disabled="saving"
-                  @click="saveRule">纭</button></view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<style lang="scss" scoped>
-  .page {
-    height: 100vh;
-    display: flex;
-    flex-direction: column;
-    padding: 0 30rpx;
-    box-sizing: border-box;
-    overflow: hidden;
-    background: #f3f6fb;
-  }
-  .tip {
-    flex: none;
-    margin: 20rpx 0 14rpx;
-    padding: 18rpx 22rpx;
-    color: #66778c;
-    font-size: 24rpx;
-    line-height: 1.55;
-    background: #fff7e8;
-    border: 1rpx solid #f4dcad;
-    border-radius: 16rpx;
-  }
-  .check-card,
-  .filters {
-    flex: none;
-    margin-bottom: 16rpx;
-    overflow: hidden;
-    background: #fff;
-    border-radius: 16rpx;
-    box-shadow: 0 8rpx 20rpx rgba(43, 69, 107, 0.06);
-  }
-  .check-card button {
-    margin: 18rpx 22rpx;
-    color: #fff;
-    font-size: 25rpx;
-    background: var(--color-primary, #1769d8);
-    border-radius: 12rpx;
-  }
-  .check-card button::after,
-  .filter-actions button::after,
-  .actions button::after,
-  .fab::after,
-  .modal-actions button::after {
-    border: 0;
-  }
-  .tabs {
-    display: flex;
-    flex: none;
-    gap: 14rpx;
-    margin-bottom: 16rpx;
-  }
-  .tabs text {
-    padding: 12rpx 24rpx;
-    color: #52677f;
-    font-size: 25rpx;
-    background: #fff;
-    border-radius: 999rpx;
-  }
-  .tabs .active {
-    color: var(--color-primary, #1769d8);
-    font-weight: 600;
-    background: #eaf2ff;
-  }
-  .search {
-    display: flex;
-    align-items: center;
-    flex: none;
-    height: 78rpx;
-    margin-bottom: 16rpx;
-    padding: 0 20rpx;
-    background: #fff;
-    border-radius: 16rpx;
-    box-shadow: 0 8rpx 20rpx rgba(43, 69, 107, 0.06);
-  }
-  .search input {
-    min-width: 0;
-    flex: 1;
-    color: #1e3049;
-    font-size: 27rpx;
-  }
-  .search text {
-    flex: none;
-    color: var(--color-primary, #1769d8);
-    font-size: 24rpx;
-  }
-  .content {
-    height: 0;
-    flex: 1;
-    padding-bottom: 132rpx;
-    box-sizing: border-box;
-  }
-  .field {
-    display: flex;
-    align-items: center;
-    min-height: 82rpx;
-    padding: 0 22rpx;
-    gap: 18rpx;
-    border-bottom: 1rpx solid #eef1f5;
-  }
-  .field > text:first-child {
-    width: 190rpx;
-    flex: none;
-    color: #33455d;
-    font-size: 25rpx;
-  }
-  .field input,
-  .field picker,
-  .picker {
-    min-width: 0;
-    flex: 1;
-    color: #1e3049;
-    font-size: 25rpx;
-  }
-  .field input {
-    text-align: right;
-  }
-  .picker {
-    display: flex;
-    width: 100%;
-    align-items: center;
-    justify-content: space-between;
-    gap: 12rpx;
-    color: #65758a;
-  }
-  .picker text:first-child {
-    min-width: 0;
-    flex: 1;
-    overflow: hidden;
-    text-align: right;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .picker text:last-child {
-    flex: none;
-    width: 24rpx;
-    color: #8092a7;
-    font-size: 34rpx;
-    text-align: right;
-  }
-  .filter-actions {
-    display: flex;
-    gap: 16rpx;
-    padding: 18rpx 22rpx;
-  }
-  .filter-actions button {
-    flex: 1;
-    margin: 0;
-    color: var(--color-primary, #1769d8);
-    font-size: 25rpx;
-    background: var(--color-primary-soft, #edf5ff);
-    border-radius: 12rpx;
-  }
-  .filter-actions button:first-child {
-    color: #fff;
-    background: var(--color-primary, #1769d8);
-  }
-  .row {
-    padding: 24rpx 22rpx 20rpx;
-    margin-bottom: 18rpx;
-    background: #fff;
-    border-radius: 16rpx;
-    box-shadow: 0 10rpx 24rpx rgba(43, 69, 107, 0.08);
-  }
-  .head {
-    display: flex;
-    align-items: flex-start;
-    justify-content: space-between;
-    gap: 16rpx;
-  }
-  .head > view:first-child {
-    display: flex;
-    min-width: 0;
-    flex: 1;
-    flex-direction: column;
-    gap: 8rpx;
-  }
-  .head > view:first-child text:last-child {
-    overflow: hidden;
-    color: #78879b;
-    font-size: 23rpx;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .name {
-    overflow: hidden;
-    color: #20334c;
-    font-size: 30rpx;
-    font-weight: 600;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .status-wrap {
-    display: flex;
-    align-items: center;
-    flex: none;
-    height: 48rpx;
-  }
-  .status,
-  .pill {
-    display: inline-flex;
-    align-items: center;
-    height: 36rpx;
-    padding: 0 16rpx;
-    font-size: 22rpx;
-    border-radius: 999rpx;
-    white-space: nowrap;
-  }
-  .tags {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 10rpx;
-    margin-top: 14rpx;
-  }
-  .grid {
-    display: grid;
-    grid-template-columns: 1fr;
-    gap: 10rpx;
-    padding: 16rpx 0;
-    margin-top: 14rpx;
-    color: #66778c;
-    font-size: 23rpx;
-    border-top: 1rpx solid #edf1f6;
-    border-bottom: 1rpx solid #edf1f6;
-  }
-  .grid text {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .reason {
-    margin-top: 14rpx;
-    padding: 14rpx 16rpx;
-    color: #c65050;
-    font-size: 23rpx;
-    line-height: 1.5;
-    background: #fff7f7;
-    border-radius: 10rpx;
-  }
-  .actions {
-    display: flex;
-    justify-content: flex-end;
-    gap: 12rpx;
-    padding-top: 16rpx;
-  }
-  .actions button {
-    min-height: 50rpx;
-    padding: 0 16rpx;
-    margin: 0;
-    color: var(--color-primary, #1769d8);
-    font-size: 22rpx;
-    line-height: 48rpx;
-    background: var(--color-primary-soft, #f5f8ff);
-    border: 1rpx solid var(--color-primary-border, #8ab3ee);
-    border-radius: 8rpx;
-  }
-  .actions .danger {
-    color: #c65050;
-    background: #fff7f7;
-    border-color: #e3a0a0;
-  }
-  .more,
-  .state {
-    display: block;
-    padding: 35rpx;
-    color: #8795a8;
-    font-size: 26rpx;
-    text-align: center;
-  }
-  .error {
-    color: #c3654d;
-  }
-  .required {
-    color: #e34b4b;
-  }
-  .tag-blue {
-    color: var(--color-primary, #1769d8);
-    background: var(--color-primary-soft, #eef6ff);
-    border: 1rpx solid var(--color-primary-border, #c9e1ff);
-  }
-  .tag-orange {
-    color: #b06a00;
-    background: #fff6df;
-    border: 1rpx solid #f0d390;
-  }
-  .tag-green {
-    color: #0e9663;
-    background: #e9fbf2;
-    border: 1rpx solid #b8eed4;
-  }
-  .tag-red {
-    color: #c65050;
-    background: #fff7f7;
-    border: 1rpx solid #efb7b7;
-  }
-  .tag-gray {
-    color: #7a8797;
-    background: #f4f6f8;
-    border: 1rpx solid #dbe2ea;
-  }
-  .fab {
-    position: fixed;
-    right: 30rpx;
-    bottom: calc(32rpx + env(safe-area-inset-bottom));
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 104rpx; height: 104rpx; min-height: 104rpx;
-    padding: 0;
-    margin: 0;
-    background: var(--color-primary, #1769d8);
-    border-radius: 50%;
-    box-shadow: 0 12rpx 24rpx rgba(23, 105, 216, 0.3);
-  }
-  .fab view,
-  .fab view::before {
-    display: block;
-    width: 38rpx;
-    height: 8rpx;
-    background: #fff;
-    border-radius: 4rpx;
-    content: "";
-  }
-  .fab view {
-    position: relative;
-  }
-  .fab view::before {
-    position: absolute;
-    transform: rotate(90deg);
-  }
-  .modal-mask {
-    position: fixed;
-    inset: 0;
-    z-index: 20;
-    display: flex;
-    align-items: flex-end;
-    background: rgba(21, 34, 50, 0.42);
-  }
-  .modal {
-    width: 100%;
-    max-height: 88vh;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    background: #f3f6fb;
-    border-radius: 24rpx 24rpx 0 0;
-  }
-  .modal-head {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 28rpx 30rpx;
-    color: #20334c;
-    font-size: 31rpx;
-    font-weight: 700;
-    background: #fff;
-  }
-  .modal-head text:last-child {
-    color: #7f8fa4;
-    font-size: 42rpx;
-    font-weight: 400;
-  }
-  .modal-body {
-    max-height: 68vh;
-    padding: 20rpx 30rpx;
-    box-sizing: border-box;
-  }
-  .modal-body .field {
-    background: #fff;
-  }
-  .modal-body .field:first-child {
-    border-radius: 16rpx 16rpx 0 0;
-  }
-  .recipient-title {
-    padding: 26rpx 4rpx 14rpx;
-    color: #20334c;
-    font-size: 27rpx;
-    font-weight: 600;
-  }
-  .recipient-list {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 14rpx;
-    padding: 18rpx;
-    background: #fff;
-    border-radius: 16rpx;
-  }
-  .recipient-list text {
-    padding: 10rpx 20rpx;
-    color: #53677f;
-    font-size: 24rpx;
-    background: #f3f6fb;
-    border: 1rpx solid transparent;
-    border-radius: 999rpx;
-  }
-  .recipient-list .active {
-    color: var(--color-primary, #1769d8);
-    background: #eaf2ff;
-    border-color: #b9d7ff;
-  }
-  .modal-actions {
-    display: flex;
-    gap: 16rpx;
-    padding: 18rpx 30rpx calc(18rpx + env(safe-area-inset-bottom));
-    background: #fff;
-  }
-  .modal-actions button {
-    flex: 1;
-    margin: 0;
-    color: #52677f;
-    font-size: 28rpx;
-    background: #f3f6fb;
-    border-radius: 12rpx;
-  }
-  .modal-actions button:last-child {
-    color: #fff;
-    background: var(--color-primary, #1769d8);
-  }
-</style>
+<template><view class="page"><template v-if="canQuery"><view class="filters"><view class="field"><text>寮�濮嬫棩鏈�</text><picker mode="date" :value="filters.beginDate" @change="filters.beginDate=$event.detail.value"><view class="picker">{{ filters.beginDate||'涓嶉檺' }} <text>鈥�</text></view></picker></view><view class="field"><text>缁撴潫鏃ユ湡</text><picker mode="date" :value="filters.endDate" @change="filters.endDate=$event.detail.value"><view class="picker">{{ filters.endDate||'涓嶉檺' }} <text>鈥�</text></view></picker></view><view class="actions"><button @click="load(true)">鏌ヨ</button><button v-if="canHandle" @click="showCheck=true">閲嶆柊妫�娴�</button></view></view><scroll-view class="content" scroll-y lower-threshold="80" @scrolltolower="hasMore&&load()"><view v-if="loadError" class="state error" @click="load(true)">{{loadError}}锛岀偣鍑婚噸璇�</view><template v-else-if="rows.length"><view v-for="row in rows" :key="row.id" class="row" @click="openDetail(row)"><view class="head"><view><text class="name">{{row.alertNo||row.meterName||'鑳借�楅璀�'}}</text><text>{{row.alertDate||'--'}} 路 {{row.alertTypeName||'--'}}</text></view><text :class="['tag',levelClass(row.alertLevel)]">{{row.alertLevelName||'鏅��'}}</text></view><view class="grid"><text>璁¢噺鐐�/瀵硅薄锛歿{row.meterName||row.objectName||'--'}}</text><text>瀹為檯/闃堝�硷細{{row.actualValue??'--'}}{{row.unit||''}} / {{row.thresholdValue??'--'}}{{row.unit||''}}</text><text>鐘舵�侊細{{row.statusName||statusText(row.status)}}</text><text>棰勮鍐呭锛歿{row.content||'--'}}</text></view><view v-if="row.status===0&&canHandle" class="actions"><button @click.stop="openDetail(row)">澶勭悊</button></view></view><text class="more">{{loading?'鍔犺浇涓�...':hasMore?'涓婃媺鍔犺浇鏇村':'娌℃湁鏇村浜�'}}</text></template><view v-else class="state">{{loading?'鍔犺浇涓�...':'鏆傛棤鑳借�楅璀�'}}</view></scroll-view></template><view v-else class="state">鐧诲綍鍚庢煡鐪嬭兘鑰楅璀�</view><view v-if="dialog" class="mask"><view class="dialog"><view class="title"><text>{{dialog.status===0&&canHandle?'澶勭悊鑳借�楅璀�':'鏌ョ湅鑳借�楅璀�'}}</text><text @click="dialog=undefined">脳</text></view><scroll-view class="body" scroll-y><view class="detail"><text>棰勮缂栧彿锛歿{dialog.alertNo||'--'}}</text><text>璁¢噺鐐�/瀵硅薄锛歿{dialog.meterName||dialog.objectName||'--'}}</text><text>棰勮绫诲瀷锛歿{dialog.alertTypeName||'--'}}</text><text>棰勮绾у埆锛歿{dialog.alertLevelName||'--'}}</text><text>棰勮鍐呭锛歿{dialog.content||'--'}}</text><text v-if="dialog.handleUserName">澶勭悊浜猴細{{dialog.handleUserName}} {{dialog.handleTime||''}}</text></view><view v-if="dialog.status===0&&canHandle" class="remark"><text>澶勭悊璇存槑 <text class="required">*</text></text><textarea v-model="handleRemark" placeholder="濡傦細宸插畨鎺掓淇�佹洿鎹㈠瘑灏佷欢绛�"/></view><view v-else-if="dialog.handleRemark" class="detail"><text>澶勭悊璇存槑锛歿{dialog.handleRemark}}</text></view></scroll-view><view class="dialog-actions"><button @click="dialog=undefined">鍏抽棴</button><button v-if="dialog.status===0&&canHandle" :loading="handling" @click="handle">纭澶勭悊</button></view></view></view><view v-if="showCheck" class="mask"><view class="dialog small"><view class="title"><text>閲嶆柊妫�娴嬭兘鑰楅璀�</text><text @click="showCheck=false">脳</text></view><view class="field"><text>寮�濮嬫棩鏈�</text><picker mode="date" :value="checkRange.beginDate" @change="checkRange.beginDate=$event.detail.value"><view class="picker">{{checkRange.beginDate}} <text>鈥�</text></view></picker></view><view class="field"><text>缁撴潫鏃ユ湡</text><picker mode="date" :value="checkRange.endDate" @change="checkRange.endDate=$event.detail.value"><view class="picker">{{checkRange.endDate}} <text>鈥�</text></view></picker></view><view class="dialog-actions"><button @click="showCheck=false">鍙栨秷</button><button :loading="checking" @click="check">寮�濮嬫娴�</button></view></view></view></view></template>
+<style lang="scss" scoped>.page{height:100vh;display:flex;flex-direction:column;padding:20rpx 30rpx;box-sizing:border-box;overflow:hidden;background:#f3f6fb}.filters{margin-bottom:16rpx;overflow:hidden;background:#fff;border-radius:16rpx}.field{display:flex;align-items:center;min-height:82rpx;padding:0 22rpx;gap:18rpx;border-bottom:1rpx solid #eef1f5}.field>text:first-child{width:150rpx;color:#33455d;font-size:25rpx}.field picker,.picker{flex:1;color:#65758a;font-size:25rpx}.picker{display:flex;justify-content:space-between}.actions{display:flex;justify-content:flex-end;gap:16rpx;padding:16rpx 22rpx}.actions button,.dialog-actions button{margin:0;color:#fff;font-size:25rpx;background:var(--color-primary,#1769d8);border-radius:10rpx}.actions button:last-child,.dialog-actions button:first-child{color:#52677f;background:#f3f6fb}.content{height:0;flex:1}.row{padding:24rpx 22rpx 20rpx;margin-bottom:18rpx;background:#fff;border-radius:16rpx;box-shadow:0 10rpx 24rpx rgba(43,69,107,.08)}.head{display:flex;justify-content:space-between;gap:16rpx}.head>view{display:flex;min-width:0;flex:1;flex-direction:column;gap:8rpx}.head>view text:last-child{color:#78879b;font-size:23rpx}.name{overflow:hidden;color:#20334c;font-size:30rpx;font-weight:600;text-overflow:ellipsis;white-space:nowrap}.tag{height:36rpx;padding:0 16rpx;font-size:22rpx;line-height:36rpx;border-radius:999rpx}.blue{color:#1769d8;background:#eef6ff}.orange{color:#b06a00;background:#fff6df}.red{color:#c65050;background:#fff7f7}.grid{display:grid;gap:10rpx;padding:16rpx 0;margin-top:16rpx;color:#66778c;font-size:23rpx;border-top:1rpx solid #edf1f6}.more,.state{display:block;padding:35rpx;color:#8795a8;font-size:26rpx;text-align:center}.error{color:#c3654d}.mask{position:fixed;inset:0;z-index:20;display:flex;align-items:flex-end;background:rgba(21,34,50,.42)}.dialog{width:100%;max-height:82vh;display:flex;flex-direction:column;overflow:hidden;background:#f3f6fb;border-radius:24rpx 24rpx 0 0}.small{max-height:55vh}.title{display:flex;justify-content:space-between;padding:28rpx 30rpx;color:#20334c;font-size:31rpx;font-weight:700;background:#fff}.title text:last-child{font-size:42rpx;font-weight:400}.body{max-height:55vh;padding:20rpx 30rpx;box-sizing:border-box}.detail,.remark{display:flex;flex-direction:column;gap:16rpx;padding:22rpx;color:#53677f;font-size:25rpx;background:#fff;border-radius:14rpx}.remark{margin-top:16rpx}.remark textarea{width:100%;height:150rpx;margin-top:8rpx}.required{color:#e34b4b}.dialog-actions{display:flex;gap:16rpx;padding:18rpx 30rpx calc(18rpx + env(safe-area-inset-bottom));background:#fff}.dialog-actions button{flex:1}.actions button::after,.dialog-actions button::after{border:0}</style>
\ No newline at end of file
diff --git a/src/pages/energy/record/form.vue b/src/pages/energy/record/form.vue
index 9160d80..985df50 100644
--- a/src/pages/energy/record/form.vue
+++ b/src/pages/energy/record/form.vue
@@ -1,120 +1,23 @@
 <script setup lang="ts">
 import { computed, reactive, ref } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
-import { createEnergyRecord, getEnergyRecord, updateEnergyRecord, type EnergyRecord, type EnergyType } from "../../../api/energy";
+import { createBlueEnergyRecord, getBlueEnergyLastReading, getBlueEnergyMeter, getBlueEnergyMeterList, getBlueEnergyRecord, updateBlueEnergyRecord, type BlueEnergyMeterOption, type BlueEnergyRecord } from "../../../api/energy";
 import { useAuth } from "../../../stores/auth";
-import { areaOptions, energyInfo, energyOptions, numberText, productOptions, purposeOptions, today } from "../shared";
-
-const { hasPermission, state } = useAuth();
-const id = ref<number>();
-const mode = ref<"edit" | "detail">("edit");
-const saving = ref(false);
-const form = reactive<EnergyRecord>(initial());
-const readonly = computed(() => mode.value === "detail");
-const canSave = computed(() => !readonly.value && (id.value ? hasPermission("energy:record:update") : hasPermission("energy:record:create")));
-const estimatedAmount = computed(() => Number(form.quantity || 0) * Number(form.unitPrice || 0));
-const unit = computed(() => energyInfo[form.energyType]?.unit || "");
-
-function initial(): EnergyRecord {
-  return { recordDate: today(), energyType: "WATER", usageArea: "", productCategory: "鐕曠獫", usagePurpose: "", quantity: 1, unitPrice: 0, recorder: "", remark: "" };
-}
-function reset(data: EnergyRecord) {
-  Object.keys(form).forEach(key => delete (form as unknown as Record<string, unknown>)[key]);
-  Object.assign(form, data);
-}
-function pickEnergy(index: number) {
-  form.energyType = energyOptions[index].value;
-}
-function pickProduct(index: number) {
-  form.productCategory = productOptions[index];
-}
-function pickArea(index: number) {
-  form.usageArea = areaOptions[index];
-}
-function pickPurpose(index: number) {
-  form.usagePurpose = purposeOptions[index];
-}
-function num(value: string, fallback = 0) {
-  if (value === "") return fallback;
-  const result = Number(value);
-  return Number.isFinite(result) ? result : fallback;
-}
-function validate() {
-  if (!form.recordDate) return "璇烽�夋嫨缁熻鏃ユ湡";
-  if (!form.energyType) return "璇烽�夋嫨鑳芥簮绫诲瀷";
-  if (!form.usageArea?.trim()) return "璇疯緭鍏ヤ娇鐢ㄥ尯鍩�";
-  if (!form.productCategory) return "璇烽�夋嫨浜у搧绫诲埆";
-  if (!form.usagePurpose?.trim()) return "璇疯緭鍏ョ敤閫�";
-  if (!(Number(form.quantity) > 0)) return "鐢ㄩ噺蹇呴』澶т簬闆�";
-  if (!(Number(form.unitPrice) >= 0)) return "鍗曚环涓嶈兘涓鸿礋鏁�";
-  if (!form.recorder?.trim()) return "璇疯緭鍏ュ綍鍏ヤ汉";
-  return "";
-}
-async function save() {
-  if (!state.accessToken || saving.value) return;
-  const message = validate();
-  if (message) return uni.showToast({ title: message, icon: "none" });
-  saving.value = true;
-  try {
-    const payload: EnergyRecord = {
-      ...form,
-      usageArea: form.usageArea.trim(),
-      usagePurpose: form.usagePurpose.trim(),
-      recorder: form.recorder.trim(),
-      quantity: Number(form.quantity),
-      unitPrice: Number(form.unitPrice),
-    };
-    if (id.value) await updateEnergyRecord(state.accessToken, payload);
-    else await createEnergyRecord(state.accessToken, payload);
-    uni.showToast({ title: "淇濆瓨鎴愬姛", icon: "success" });
-    setTimeout(() => uni.navigateBack(), 500);
-  } catch (error) {
-    uni.showToast({ title: error instanceof Error ? error.message : "淇濆瓨澶辫触", icon: "none" });
-  } finally {
-    saving.value = false;
-  }
-}
-async function loadDetail(recordId: number) {
-  if (!state.accessToken) return;
-  try {
-    const data = await getEnergyRecord(state.accessToken, recordId);
-    reset(data);
-  } catch (error) {
-    uni.showToast({ title: error instanceof Error ? error.message : "璇︽儏鍔犺浇澶辫触", icon: "none" });
-  }
-}
-
-onLoad((query) => {
-  id.value = query?.id ? Number(query.id) : undefined;
-  mode.value = query?.mode === "detail" ? "detail" : "edit";
-  if (id.value) loadDetail(id.value);
-});
+const { hasPermission, state } = useAuth(); const id = ref<number>(), mode = ref<"edit"|"detail">("edit"), saving = ref(false), meters = ref<BlueEnergyMeterOption[]>([]), loading = ref(false);
+const today = () => new Date().toISOString().slice(0,10);
+const form = reactive<BlueEnergyRecord>({ recordDate: today(), prevReading: 0, reading: 0, price: 0, unit: "", remark: "" });
+const readonly = computed(() => mode.value === "detail"), canSave = computed(() => !readonly.value && (id.value ? hasPermission("mes:em-record:update") : hasPermission("mes:em-record:create")));
+const meterText = computed(() => meters.value.find(item => item.id === form.meterId)?.name || form.meterName || "璇烽�夋嫨璁¢噺鐐�");
+const usage = computed(() => Math.max(0, Number(form.reading || 0) - Number(form.prevReading || 0)) * Number(form.ratio || 1)); const cost = computed(() => usage.value * Number(form.price || 0));
+function numberValue(value: string) { const number = Number(value); return Number.isFinite(number) ? number : 0; }
+function reset(data: BlueEnergyRecord) { Object.keys(form).forEach(key => delete (form as Record<string, unknown>)[key]); Object.assign(form, data); }
+async function loadMeters() { if (!state.accessToken) return; meters.value = await getBlueEnergyMeterList(state.accessToken); }
+async function syncMeter() { if (!state.accessToken || !form.meterId) return; const meter = await getBlueEnergyMeter(state.accessToken, form.meterId); Object.assign(form, { meterName: meter.name, meterCode: meter.code, energyType: meter.energyType, energyTypeName: meter.energyTypeName, unit: meter.unit || "", workshopName: meter.workshopName, lineName: meter.lineName, ratio: meter.ratio || 1 }); await syncPrevious(); }
+async function syncPrevious() { if (!state.accessToken || !form.meterId || !form.recordDate) return; const data = await getBlueEnergyLastReading(state.accessToken, form.meterId, form.recordDate, id.value); form.prevReading = data.prevReading || 0; }
+async function pickMeter(index: number) { form.meterId = meters.value[index].id; await syncMeter(); }
+async function save() { if (!state.accessToken || saving.value) return; if (!form.meterId) return uni.showToast({ title: "璇烽�夋嫨璁¢噺鐐�", icon: "none" }); if (!form.recordDate) return uni.showToast({ title: "璇烽�夋嫨鎶勮〃鏃ユ湡", icon: "none" }); if (Number(form.reading) < Number(form.prevReading)) return uni.showToast({ title: "鏈湡璇绘暟涓嶈兘灏忎簬涓婃湡璇绘暟", icon: "none" }); saving.value = true; try { const payload: BlueEnergyRecord = { id: id.value, meterId: form.meterId, recordDate: form.recordDate, reading: Number(form.reading || 0), price: Number(form.price || 0), remark: form.remark || "" }; if (id.value) await updateBlueEnergyRecord(state.accessToken, payload); else await createBlueEnergyRecord(state.accessToken, payload); uni.showToast({ title: "淇濆瓨鎴愬姛", icon: "success" }); setTimeout(() => uni.navigateBack(), 500); } catch (error) { uni.showToast({ title: error instanceof Error ? error.message : "淇濆瓨澶辫触", icon: "none" }); } finally { saving.value = false; } }
+async function init(recordId?: number) { loading.value = true; try { await loadMeters(); if (recordId && state.accessToken) reset(await getBlueEnergyRecord(state.accessToken, recordId)); } catch (error) { uni.showToast({ title: error instanceof Error ? error.message : "鏁版嵁鍔犺浇澶辫触", icon: "none" }); } finally { loading.value = false; } }
+onLoad(query => { id.value = query.id ? Number(query.id) : undefined; mode.value = query.mode === "detail" ? "detail" : "edit"; init(id.value); });
 </script>
-
-<template>
-  <view class="page">
-    <view class="form-card">
-      <view class="section">鑳借�椾俊鎭�</view>
-      <view v-if="id" class="field"><text>璁板綍缂栧彿</text><text class="value">{{ id }}</text></view>
-      <view class="field"><text>缁熻鏃ユ湡 <text class="required">*</text></text><picker v-if="!readonly" mode="date" :value="form.recordDate" :end="today()" @change="form.recordDate=$event.detail.value"><view class="picker"><text>{{ form.recordDate || '璇烽�夋嫨缁熻鏃ユ湡' }}</text><text>鈥�</text></view></picker><text v-else class="value">{{ form.recordDate || '--' }}</text></view>
-      <view class="field"><text>鑳芥簮绫诲瀷 <text class="required">*</text></text><picker v-if="!readonly" :range="energyOptions" range-key="label" @change="pickEnergy(Number($event.detail.value))"><view class="picker"><text>{{ energyInfo[form.energyType]?.name || '璇烽�夋嫨鑳芥簮绫诲瀷' }}</text><text>鈥�</text></view></picker><text v-else class="value">{{ energyInfo[form.energyType]?.name || '--' }}</text></view>
-      <view class="field"><text>浣跨敤鍖哄煙 <text class="required">*</text></text><picker v-if="!readonly" :range="areaOptions" @change="pickArea(Number($event.detail.value))"><view class="picker"><text>{{ form.usageArea || '閫夋嫨寤鸿鍖哄煙' }}</text><text>鈥�</text></view></picker><text v-else class="value">{{ form.usageArea || '--' }}</text></view>
-      <view v-if="!readonly" class="field"><text>鍖哄煙鎵嬭緭</text><input v-model="form.usageArea" placeholder="涔熷彲鎵嬪姩杈撳叆鍖哄煙" /></view>
-      <view class="field"><text>浜у搧绫诲埆 <text class="required">*</text></text><picker v-if="!readonly" :range="productOptions" @change="pickProduct(Number($event.detail.value))"><view class="picker"><text>{{ form.productCategory || '璇烽�夋嫨浜у搧绫诲埆' }}</text><text>鈥�</text></view></picker><text v-else class="value">{{ form.productCategory || '--' }}</text></view>
-      <view class="field"><text>鐢ㄩ�� / 宸ュ簭 <text class="required">*</text></text><picker v-if="!readonly" :range="purposeOptions" @change="pickPurpose(Number($event.detail.value))"><view class="picker"><text>{{ form.usagePurpose || '閫夋嫨寤鸿鐢ㄩ��' }}</text><text>鈥�</text></view></picker><text v-else class="value">{{ form.usagePurpose || '--' }}</text></view>
-      <view v-if="!readonly" class="field"><text>鐢ㄩ�旀墜杈�</text><input v-model="form.usagePurpose" placeholder="涔熷彲鎵嬪姩杈撳叆鐢ㄩ��" /></view>
-      <view class="field"><text>褰曞叆浜� <text class="required">*</text></text><input v-if="!readonly" v-model="form.recorder" placeholder="璇疯緭鍏ュ鍚�" maxlength="50" /><text v-else class="value">{{ form.recorder || '--' }}</text></view>
-      <view class="field"><text>鐢ㄩ噺锛坽{ unit }}锛� <text class="required">*</text></text><input v-if="!readonly" :value="String(form.quantity ?? '')" type="digit" placeholder="璇疯緭鍏ョ敤閲�" @input="form.quantity=num($event.detail.value)" /><text v-else class="value">{{ numberText(form.quantity) }} {{ unit }}</text></view>
-      <view class="field"><text>鍗曚环锛堝厓/{{ unit }}锛� <text class="required">*</text></text><input v-if="!readonly" :value="String(form.unitPrice ?? '')" type="digit" placeholder="璇疯緭鍏ュ崟浠�" @input="form.unitPrice=num($event.detail.value)" /><text v-else class="value">{{ numberText(form.unitPrice, 4) }}</text></view>
-      <view class="field"><text>璐圭敤锛堝厓锛�</text><text class="value strong">{{ numberText(readonly ? form.amount : estimatedAmount, 2) }}</text></view>
-      <view class="field column"><text>澶囨敞</text><textarea v-model="form.remark" :disabled="readonly" maxlength="500" placeholder="濡傝閲忓彛寰勩�佺壒娈婄敤鑳芥儏鍐电瓑" /></view>
-    </view>
-    <button v-if="canSave" class="save" :loading="saving" :disabled="saving" @click="save">淇濆瓨</button>
-    <button v-else-if="readonly && hasPermission('energy:record:update')" class="save" @click="mode='edit'">缂栬緫</button>
-    <view v-else class="state">鏆傛棤淇濆瓨鏉冮檺</view>
-  </view>
-</template>
-
-<style lang="scss" scoped>
-.page{min-height:100vh;padding:24rpx 30rpx 70rpx;box-sizing:border-box;background:#f6f7f9}.form-card{overflow:hidden;background:#fff;border-radius:16rpx}.section{padding:22rpx 24rpx 12rpx;color:var(--color-primary, #1769d8);font-size:25rpx;font-weight:600;background:#f8fbff}.field{display:flex;align-items:center;min-height:96rpx;padding:0 24rpx;gap:20rpx;border-bottom:1rpx solid #eef1f5}.field>text:first-child{width:220rpx;flex:none;color:#33455d;font-size:27rpx}.required{color:#e34b4b}.field input,.field picker,.picker,.value{min-width:0;flex:1;color:#1e3049;font-size:27rpx}.field input,.value{text-align:right}.picker{display:flex;width:100%;align-items:center;justify-content:space-between;gap:12rpx;color:#65758a}.picker text:first-child,.value{min-width:0;flex:1;overflow:hidden;text-align:right;text-overflow:ellipsis;white-space:nowrap}.picker text:last-child{flex:none;width:24rpx;color:#8092a7;font-size:36rpx;text-align:right}.strong{color:var(--color-primary, #1769d8);font-weight:700}.column{align-items:flex-start;flex-direction:column;padding:20rpx 24rpx}.column>text:first-child{width:auto}.column textarea{width:100%;height:150rpx;box-sizing:border-box;font-size:27rpx}.save{margin-top:32rpx;color:#fff;font-size:30rpx;background:var(--color-primary, #1769d8);border-radius:12rpx}.save::after{border:0}.state{padding:38rpx;color:#8795a8;font-size:26rpx;text-align:center}
-</style>
+<template><view class="page"><view class="form-card"><view class="section">鑳借�楁妱琛ㄤ俊鎭�</view><view class="field"><text>璁¢噺鐐� <text class="required">*</text></text><picker v-if="!readonly" :range="meters" range-key="name" @change="pickMeter(Number($event.detail.value))"><view class="picker"><text>{{ meterText }}</text><text>鈥�</text></view></picker><text v-else class="value">{{ meterText }}</text></view><view class="field"><text>鎶勮〃鏃ユ湡 <text class="required">*</text></text><picker v-if="!readonly" mode="date" :value="form.recordDate" @change="form.recordDate=$event.detail.value;syncPrevious()"><view class="picker"><text>{{ form.recordDate || '璇烽�夋嫨鏃ユ湡' }}</text><text>鈥�</text></view></picker><text v-else class="value">{{ form.recordDate || '--' }}</text></view><view class="field"><text>鑳芥簮绫诲瀷</text><text class="value">{{ form.energyTypeName || '--' }}</text></view><view class="field"><text>杞﹂棿 / 浜х嚎</text><text class="value">{{ form.workshopName || '--' }} / {{ form.lineName || '--' }}</text></view><view class="field"><text>涓婃湡璇绘暟</text><text class="value">{{ Number(form.prevReading || 0).toFixed(4) }} {{ form.unit || '' }}</text></view><view class="field"><text>鏈湡璇绘暟 <text class="required">*</text></text><input v-if="!readonly" :value="String(form.reading ?? '')" type="digit" @input="form.reading=numberValue($event.detail.value)" placeholder="璇疯緭鍏ヨ鏁�"/><text v-else class="value">{{ Number(form.reading || 0).toFixed(4) }} {{ form.unit || '' }}</text></view><view class="field"><text>鍗曚环锛堝厓锛�</text><input v-if="!readonly" :value="String(form.price ?? '')" type="digit" @input="form.price=numberValue($event.detail.value)" placeholder="璇疯緭鍏ュ崟浠�"/><text v-else class="value">{{ Number(form.price || 0).toFixed(4) }}</text></view><view class="field"><text>鏈湡鐢ㄩ噺</text><text class="value strong">{{ usage.toFixed(4) }} {{ form.unit || '' }}</text></view><view class="field"><text>璐圭敤锛堝厓锛�</text><text class="value strong">{{ cost.toFixed(2) }}</text></view><view class="field column"><text>澶囨敞</text><textarea v-model="form.remark" :disabled="readonly" placeholder="璇疯緭鍏ュ娉�"/></view></view><button v-if="canSave" class="save" :loading="saving||loading" :disabled="saving||loading" @click="save">淇濆瓨</button><button v-else-if="readonly&&hasPermission('mes:em-record:update')" class="save" @click="mode='edit'">缂栬緫</button></view></template>
+<style lang="scss" scoped>.page{min-height:100vh;padding:24rpx 30rpx 70rpx;background:#f6f7f9}.form-card{overflow:hidden;background:#fff;border-radius:16rpx}.section{padding:22rpx 24rpx 12rpx;color:var(--color-primary,#1769d8);font-size:25rpx;font-weight:600;background:#f8fbff}.field{display:flex;align-items:center;min-height:96rpx;padding:0 24rpx;gap:20rpx;border-bottom:1rpx solid #eef1f5}.field>text:first-child{width:220rpx;flex:none;color:#33455d;font-size:27rpx}.required{color:#e34b4b}.field input,.field picker,.picker,.value{min-width:0;flex:1;color:#1e3049;font-size:27rpx}.field input,.value{text-align:right}.picker{display:flex;justify-content:space-between;color:#65758a}.picker text:first-child,.value{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.picker text:last-child{font-size:36rpx}.strong{color:var(--color-primary,#1769d8);font-weight:700}.column{align-items:flex-start;flex-direction:column;padding:20rpx 24rpx}.column>text:first-child{width:auto}.column textarea{width:100%;height:150rpx}.save{margin-top:32rpx;color:#fff;font-size:30rpx;background:var(--color-primary,#1769d8);border-radius:12rpx}.save::after{border:0}</style>
\ No newline at end of file
diff --git a/src/pages/energy/record/index.vue b/src/pages/energy/record/index.vue
index 4303176..89e05c4 100644
--- a/src/pages/energy/record/index.vue
+++ b/src/pages/energy/record/index.vue
@@ -1,107 +1,17 @@
 <script setup lang="ts">
 import { computed, ref } from "vue";
 import { onPullDownRefresh, onShow } from "@dcloudio/uni-app";
-import { deleteEnergyRecord, getEnergyRecordPage, type EnergyRecord, type EnergyType } from "../../../api/energy";
+import { deleteBlueEnergyRecord, getBlueEnergyRecordPage, type BlueEnergyRecord } from "../../../api/energy";
 import { useAuth } from "../../../stores/auth";
-import { energyInfo, energyName, numberText } from "../shared";
-
 const { hasPermission, isLoggedIn, state } = useAuth();
-const keyword = ref("");
-const rows = ref<EnergyRecord[]>([]);
-const pageNo = ref(1);
-const total = ref(0);
-const loading = ref(false);
-const loadError = ref("");
-const canQuery = computed(() => isLoggedIn.value);
-const canDetail = computed(() => hasPermission("energy:record:query"));
-const canCreate = computed(() => hasPermission("energy:record:create"));
-const canUpdate = computed(() => hasPermission("energy:record:update"));
-const canDelete = computed(() => hasPermission("energy:record:delete"));
+const rows = ref<BlueEnergyRecord[]>([]), pageNo = ref(1), total = ref(0), loading = ref(false), loadError = ref("");
+const canQuery = computed(() => isLoggedIn.value), canCreate = computed(() => hasPermission("mes:em-record:create")), canUpdate = computed(() => hasPermission("mes:em-record:update")), canDelete = computed(() => hasPermission("mes:em-record:delete"));
 const hasMore = computed(() => rows.value.length < total.value);
-
-async function load(reset = false) {
-  if (!state.accessToken || loading.value || !canQuery.value) return;
-  if (reset) { pageNo.value = 1; rows.value = []; }
-  loading.value = true; loadError.value = "";
-  try {
-    const search = keyword.value.trim();
-    const data = await getEnergyRecordPage(state.accessToken, {
-      pageNo: pageNo.value,
-      pageSize: 15,
-      usageArea: search || undefined,
-    });
-    total.value = data.total || 0;
-    rows.value = reset ? (data.list || []) : rows.value.concat(data.list || []);
-    pageNo.value += 1;
-  } catch (error) {
-    loadError.value = error instanceof Error ? error.message : "鑳借�楄褰曞姞杞藉け璐�";
-  } finally {
-    loading.value = false;
-  }
-}
-function go(id?: number, mode: "edit" | "detail" = "edit") {
-  uni.navigateTo({ url: `/pages/energy/record/form${id ? `?id=${id}&mode=${mode}` : ""}` });
-}
-async function remove(row: EnergyRecord) {
-  if (!state.accessToken || !row.id) return;
-  const ok = await new Promise<boolean>(resolve => uni.showModal({ title: "纭鍒犻櫎", content: "纭畾鍒犻櫎杩欐潯鑳借�楄褰曪紵鍒犻櫎鍚庣粺璁℃暟鎹篃浼氭洿鏂般��", success: res => resolve(res.confirm) }));
-  if (!ok) return;
-  try {
-    await deleteEnergyRecord(state.accessToken, row.id);
-    uni.showToast({ title: "鍒犻櫎鎴愬姛", icon: "success" });
-    await load(true);
-  } catch (error) {
-    uni.showToast({ title: error instanceof Error ? error.message : "鍒犻櫎澶辫触", icon: "none" });
-  }
-}
-function unit(type?: EnergyType) {
-  return type ? energyInfo[type]?.unit || "" : "";
-}
-
-onShow(() => load(true));
-onPullDownRefresh(async () => { await load(true); uni.stopPullDownRefresh(); });
+const numberText = (value?: number, digits = 2) => Number(value || 0).toFixed(digits);
+async function load(reset = false) { if (!state.accessToken || loading.value) return; if (reset) { pageNo.value = 1; rows.value = []; } loading.value = true; loadError.value = ""; try { const data = await getBlueEnergyRecordPage(state.accessToken, { pageNo: pageNo.value, pageSize: 15 }); total.value = data.total || 0; rows.value = reset ? data.list || [] : rows.value.concat(data.list || []); pageNo.value += 1; } catch (error) { loadError.value = error instanceof Error ? error.message : "鑳借�楄褰曞姞杞藉け璐�"; } finally { loading.value = false; } }
+function go(id?: number, mode: "edit" | "detail" = "edit") { uni.navigateTo({ url: `/pages/energy/record/form${id ? `?id=${id}&mode=${mode}` : ""}` }); }
+async function remove(row: BlueEnergyRecord) { if (!state.accessToken || !row.id) return; const ok = await new Promise<boolean>(resolve => uni.showModal({ title: "纭鍒犻櫎", content: `纭畾鍒犻櫎 ${row.meterName || "璇ヨ閲忕偣"} 鐨勬妱琛ㄨ褰曪紵`, success: res => resolve(res.confirm) })); if (!ok) return; try { await deleteBlueEnergyRecord(state.accessToken, row.id); uni.showToast({ title: "鍒犻櫎鎴愬姛", icon: "success" }); load(true); } catch (error) { uni.showToast({ title: error instanceof Error ? error.message : "鍒犻櫎澶辫触", icon: "none" }); } }
+onShow(() => load(true)); onPullDownRefresh(async () => { await load(true); uni.stopPullDownRefresh(); });
 </script>
-
-<template>
-  <view class="page">
-    <template v-if="isLoggedIn">
-      <view v-if="canQuery" class="search">
-        <input v-model="keyword" placeholder="鎼滅储浣跨敤鍖哄煙" confirm-type="search" @confirm="load(true)" />
-        <text v-if="keyword" @click="keyword='';load(true)">娓呴櫎</text>
-      </view>
-      <scroll-view v-if="canQuery" class="content" scroll-y lower-threshold="80" @scrolltolower="hasMore&&load()">
-        <view v-if="loadError" class="state error" @click="load(true)">{{ loadError }}锛岀偣鍑婚噸璇�</view>
-        <template v-else-if="rows.length">
-          <view v-for="row in rows" :key="row.id" class="row" @click="go(row.id,'detail')">
-            <view class="head">
-              <view><text class="name">{{ row.usageArea || '鏈~鍐欏尯鍩�' }}</text><text>{{ row.recordDate || '--' }} 路 {{ row.productCategory || '--' }}</text></view>
-              <view class="status-wrap"><text :class="['status', energyInfo[row.energyType]?.tone || 'tag-blue']">{{ energyName(row.energyType) }}</text></view>
-            </view>
-            <view class="grid">
-              <text>鐢ㄩ�旓細{{ row.usagePurpose || '--' }}</text>
-              <text>鐢ㄩ噺锛歿{ numberText(row.quantity) }} {{ unit(row.energyType) }}</text>
-              <text>鍗曚环锛歿{ numberText(row.unitPrice, 4) }} 鍏�/{{ unit(row.energyType) }}</text>
-              <text>璐圭敤锛歿{ numberText(row.amount ?? Number(row.quantity || 0) * Number(row.unitPrice || 0), 2) }} 鍏�</text>
-              <text>褰曞叆浜猴細{{ row.recorder || '--' }}</text>
-              <text>鍒涘缓鏃堕棿锛歿{ row.createTime || '--' }}</text>
-            </view>
-            <view class="actions" @click.stop>
-              <button v-if="canDetail" @click="go(row.id,'detail')">璇︽儏</button>
-              <button v-if="canUpdate" @click="go(row.id)">缂栬緫</button>
-              <button v-if="canDelete" class="danger" @click="remove(row)">鍒犻櫎</button>
-            </view>
-          </view>
-          <text class="more">{{ loading ? '鍔犺浇涓�...' : hasMore ? '涓婃媺鍔犺浇鏇村' : '娌℃湁鏇村浜�' }}</text>
-        </template>
-        <view v-else class="state">{{ loading ? '鍔犺浇涓�...' : keyword ? '娌℃湁鍖归厤鐨勮兘鑰楄褰�' : '鏆傛棤鑳借�楄褰�' }}</view>
-      </scroll-view>
-      <view v-else class="state">鏆傛棤鑳借�楄褰曟煡鐪嬫潈闄�</view>
-    </template>
-    <view v-else class="state">鐧诲綍鍚庢煡鐪嬭兘鑰楄褰�</view>
-    <button v-if="canCreate" class="fab" @click="go()"><view /></button>
-  </view>
-</template>
-
-<style lang="scss" scoped>
-.page{height:100vh;display:flex;flex-direction:column;padding:0 30rpx;box-sizing:border-box;overflow:hidden;background:#f3f6fb}.search{display:flex;align-items:center;height:80rpx;margin:20rpx 0 16rpx;padding:0 20rpx;background:#fff;border-radius:16rpx;box-shadow:0 8rpx 20rpx rgba(43,69,107,.06)}.search input{min-width:0;flex:1;color:#1e3049;font-size:27rpx}.search text{flex:none;color:var(--color-primary, #1769d8);font-size:24rpx}.content{height:0;flex:1;padding-bottom: 132rpx;box-sizing:border-box}.row{padding:24rpx 22rpx 20rpx;margin-bottom:18rpx;background:#fff;border-radius:16rpx;box-shadow:0 10rpx 24rpx rgba(43,69,107,.08)}.head{display:flex;align-items:flex-start;justify-content:space-between;gap:16rpx}.head>view:first-child{display:flex;min-width:0;flex:1;flex-direction:column;gap:8rpx}.head>view:first-child text:last-child{overflow:hidden;color:#78879b;font-size:23rpx;text-overflow:ellipsis;white-space:nowrap}.name{overflow:hidden;color:#20334c;font-size:30rpx;font-weight:600;text-overflow:ellipsis;white-space:nowrap}.status-wrap{display:flex;align-items:center;flex:none;height:48rpx}.status{display:inline-flex;align-items:center;height:36rpx;padding:0 16rpx;font-size:22rpx;border-radius:999rpx;white-space:nowrap}.grid{display:grid;grid-template-columns:1fr 1fr;gap:10rpx 18rpx;padding:16rpx 0;margin-top:16rpx;color:#66778c;font-size:23rpx;border-top:1rpx solid #edf1f6;border-bottom:1rpx solid #edf1f6}.grid text{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.actions{display:flex;flex-wrap:wrap;justify-content:flex-end;gap:12rpx;padding-top:16rpx}.actions button{min-height:50rpx;padding:0 16rpx;margin:0;color:var(--color-primary, #1769d8);font-size:22rpx;line-height:48rpx;background:var(--color-primary-soft, #f5f8ff);border:1rpx solid var(--color-primary-border, #8ab3ee);border-radius:8rpx}.actions .danger{color:#c65050;background:#fff7f7;border-color:#e3a0a0}.actions button::after,.fab::after{border:0}.more,.state{display:block;padding:35rpx;color:#8795a8;font-size:26rpx;text-align:center}.error{color:#c3654d}.tag-blue{color:var(--color-primary, #1769d8);background:var(--color-primary-soft, #eef6ff);border:1rpx solid var(--color-primary-border, #c9e1ff)}.tag-orange{color:#b06a00;background:#fff6df;border:1rpx solid #f0d390}.tag-green{color:#0e9663;background:#e9fbf2;border:1rpx solid #b8eed4}.fab{position:fixed;right:30rpx;bottom:calc(32rpx + env(safe-area-inset-bottom));display:flex;align-items:center;justify-content:center;width: 104rpx; height: 104rpx; min-height: 104rpx;padding:0;margin:0;background:var(--color-primary, #1769d8);border-radius:50%;box-shadow:0 12rpx 24rpx rgba(23,105,216,.3)}.fab view{width:38rpx;height:38rpx;background:linear-gradient(#fff,#fff) center/38rpx 8rpx no-repeat,linear-gradient(#fff,#fff) center/8rpx 38rpx no-repeat}.fab view::before,.fab view::after{display:none;content:none}
-</style>
+<template><view class="page"><template v-if="canQuery"><scroll-view class="content" scroll-y lower-threshold="80" @scrolltolower="hasMore&&load()"><view v-if="loadError" class="state error" @click="load(true)">{{ loadError }}锛岀偣鍑婚噸璇�</view><template v-else-if="rows.length"><view v-for="row in rows" :key="row.id" class="row" @click="go(row.id,'detail')"><view class="head"><view><text class="name">{{ row.meterName || '鏈懡鍚嶈閲忕偣' }}</text><text>{{ row.recordDate || '--' }} 路 {{ row.energyTypeName || '--' }}</text></view><text class="tag">{{ row.unit || '--' }}</text></view><view class="grid"><text>涓婃湡璇绘暟锛歿{ numberText(row.prevReading,4) }}</text><text>鏈湡璇绘暟锛歿{ numberText(row.reading,4) }}</text><text>鐢ㄩ噺锛歿{ numberText(row.usageAmount,4) }} {{ row.unit || '' }}</text><text>璐圭敤锛毬{ numberText(row.cost) }}</text><text>杞﹂棿/浜х嚎锛歿{ row.workshopName || '--' }} / {{ row.lineName || '--' }}</text><text>褰曞叆鏃堕棿锛歿{ row.createTime || '--' }}</text></view><view class="actions" @click.stop><button @click="go(row.id,'detail')">璇︽儏</button><button v-if="canUpdate" @click="go(row.id)">缂栬緫</button><button v-if="canDelete" class="danger" @click="remove(row)">鍒犻櫎</button></view></view><text class="more">{{ loading ? '鍔犺浇涓�...' : hasMore ? '涓婃媺鍔犺浇鏇村' : '娌℃湁鏇村浜�' }}</text></template><view v-else class="state">{{ loading ? '鍔犺浇涓�...' : '鏆傛棤鑳借�楁妱琛ㄨ褰�' }}</view></scroll-view></template><view v-else class="state">鐧诲綍鍚庢煡鐪嬭兘鑰楄褰�</view><button v-if="canCreate" class="fab" @click="go()"><view /></button></view></template>
+<style lang="scss" scoped>.page{height:100vh;display:flex;flex-direction:column;padding:20rpx 30rpx;box-sizing:border-box;overflow:hidden;background:#f3f6fb}.content{height:0;flex:1;padding-bottom:132rpx}.row{padding:24rpx 22rpx 20rpx;margin-bottom:18rpx;background:#fff;border-radius:16rpx;box-shadow:0 10rpx 24rpx rgba(43,69,107,.08)}.head{display:flex;justify-content:space-between;gap:16rpx}.head>view{display:flex;min-width:0;flex:1;flex-direction:column;gap:8rpx}.head>view text:last-child{color:#78879b;font-size:23rpx}.name{overflow:hidden;color:#20334c;font-size:30rpx;font-weight:600;text-overflow:ellipsis;white-space:nowrap}.tag{height:36rpx;padding:0 16rpx;color:var(--color-primary,#1769d8);font-size:22rpx;line-height:36rpx;background:#eef6ff;border-radius:999rpx}.grid{display:grid;grid-template-columns:1fr 1fr;gap:10rpx 18rpx;padding:16rpx 0;margin-top:16rpx;color:#66778c;font-size:23rpx;border-top:1rpx solid #edf1f6;border-bottom:1rpx solid #edf1f6}.grid text{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.actions{display:flex;justify-content:flex-end;gap:12rpx;padding-top:16rpx}.actions button{min-height:50rpx;padding:0 16rpx;margin:0;color:var(--color-primary,#1769d8);font-size:22rpx;line-height:48rpx;background:#f5f8ff;border:1rpx solid #8ab3ee;border-radius:8rpx}.actions .danger{color:#c65050;background:#fff7f7;border-color:#e3a0a0}.actions button::after,.fab::after{border:0}.more,.state{display:block;padding:35rpx;color:#8795a8;font-size:26rpx;text-align:center}.error{color:#c3654d}.fab{position:fixed;right:30rpx;bottom:calc(32rpx + env(safe-area-inset-bottom));width:104rpx;height:104rpx;padding:0;margin:0;background:var(--color-primary,#1769d8);border-radius:50%;box-shadow:0 12rpx 24rpx rgba(23,105,216,.3)}.fab view{width:38rpx;height:38rpx;margin:auto;background:linear-gradient(#fff,#fff) center/38rpx 8rpx no-repeat,linear-gradient(#fff,#fff) center/8rpx 38rpx no-repeat}</style>
\ No newline at end of file
diff --git a/src/pages/sale/order/form.vue b/src/pages/sale/order/form.vue
index b4d5bf8..e59e24c 100644
--- a/src/pages/sale/order/form.vue
+++ b/src/pages/sale/order/form.vue
@@ -146,7 +146,7 @@
       productUnitName: productUnitName(material),
       productPrice: productPrice(material),
       count: item.count || 1,
-      needProduction: item.needProduction ?? 1,
+      needProduction: item.needProduction ?? 0,
     });
     recalc();
   }
@@ -155,7 +155,7 @@
       count: 1,
       productPrice: 0,
       taxPercent: 0,
-      needProduction: 1,
+      needProduction: 0,
       totalProductPrice: 0,
       taxPrice: 0,
       totalPrice: 0,
@@ -197,7 +197,7 @@
           productPrice: numberValue(item.productPrice),
           count: numberValue(item.count),
           taxPercent: numberValue(item.taxPercent),
-          needProduction: item.needProduction ?? 1,
+          needProduction: item.needProduction ?? 0,
           remark: item.remark,
         })),
       };
@@ -270,9 +270,7 @@
                   @change="selectProduct($event, index)"><view class="picker">{{ lineProductText(item) }}<text>鈥�</text></view></picker></view>
         <view class="field"><text>瑙勬牸鍨嬪彿</text><view>{{ item.productSpecification || '鈥�' }}</view></view>
         <view class="field"><text>鍗曚綅</text><view>{{ item.productUnitName || '鈥�' }}</view></view>
-        <view class="field"><text>闇�瑕佺敓浜�</text><radio-group @change="item.needProduction = Number($event.detail.value); recalc()"><label><radio value="1"
-                     :checked="item.needProduction !== 0" />鏄�</label><label><radio value="0"
-                     :checked="item.needProduction === 0" />鍚�</label></radio-group></view>
+        <view class="field"><text>闇�瑕佺敓浜�</text><text class="value">鍚�</text></view>
         <view class="field"><text>鏁伴噺 <text class="required">*</text></text><input v-model.number="item.count"
                  type="digit"
                  placeholder="鏁伴噺"

--
Gitblit v1.9.3