From fb0c769022609c0bf1b264b0c135eee900432f70 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 22 十月 2026 18:04:18 +0800
Subject: [PATCH] 1、整理APP端主题变量,统一主色、浅色背景、边框色、页面背景及卡片背景等公共样式 2、排查APP端列表分页情况,区分主列表分页与下拉选择器数据请求 3、补齐考勤记录、考勤异常、考勤汇总、员工社保档案、薪酬核算、薪资发放、班次、节假日、考勤规则、备件台账、领用记录及工序流转等页面分页

---
 src/pages/mes/dv/spare-record/index.vue |   52 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/pages/mes/dv/spare-record/index.vue b/src/pages/mes/dv/spare-record/index.vue
index ed6b9ed..b07549e 100644
--- a/src/pages/mes/dv/spare-record/index.vue
+++ b/src/pages/mes/dv/spare-record/index.vue
@@ -4,42 +4,50 @@
 import { getSpareMovementPage, returnSpare, type SpareMovement } from "../../../../api/mes-operations";
 import { useAuth } from "../../../../stores/auth";
 const { hasPermission, isLoggedIn, state } = useAuth();
-const sparePartId = ref<number>(), repairCode = ref(""), type = ref<number>(), rows = ref<SpareMovement[]>([]), loading = ref(false);
+const sparePartId = ref<number>(), repairCode = ref(""), type = ref<number>(), rows = ref<SpareMovement[]>([]), loading = ref(false), pageNo = ref(1), total = ref(0);
+const pageSize = 15;
 const selected = ref<SpareMovement>(), returnOpen = ref(false), form = reactive({ quantity: 1, remark: "" });
-const labels: Record<number,string> = { 1:"鍒濆搴撳瓨", 2:"鍏ュ簱", 3:"缁翠慨棰嗙敤", 4:"閫�鍥�" };
-const tones: Record<number,string> = { 1:"tag-info", 2:"tag-ok", 3:"tag-warning", 4:"tag-purple" };
+const labels: Record<number, string> = { 1: "鍒濆搴撳瓨", 2: "鍏ュ簱", 3: "缁翠慨棰嗙敤", 4: "閫�鍥�" };
+const tones: Record<number, string> = { 1: "tag-info", 2: "tag-ok", 3: "tag-warning", 4: "tag-purple" };
 const canQuery = computed(() => hasPermission("mes:dv-spare:record"));
 const canReturn = computed(() => hasPermission("mes:dv-spare:return"));
-async function load() {
+const hasMore = computed(() => rows.value.length < total.value);
+async function load(reset = true) {
   if (!state.accessToken || !canQuery.value || loading.value) return;
+  if (reset) { pageNo.value = 1; total.value = 0; }
   loading.value = true;
   try {
-    rows.value = (await getSpareMovementPage(state.accessToken, { pageNo:1, pageSize:100, sparePartId:sparePartId.value, repairCode:repairCode.value.trim() || undefined, type:type.value })).list;
-  } catch (error) {
-    uni.showToast({ title:error instanceof Error ? error.message : "璁板綍鍔犺浇澶辫触", icon:"none" });
-  } finally { loading.value = false; uni.stopPullDownRefresh(); }
+    const data = await getSpareMovementPage(state.accessToken, { pageNo: pageNo.value, pageSize, sparePartId: sparePartId.value, repairCode: repairCode.value.trim() || undefined, type: type.value });
+    rows.value = reset ? (data.list || []) : [...rows.value, ...(data.list || [])];
+    total.value = Number(data.total || 0);
+    if (rows.value.length < total.value) pageNo.value += 1;
+  } catch (error) { uni.showToast({ title: error instanceof Error ? error.message : "璁板綍鍔犺浇澶辫触", icon: "none" }); }
+  finally { loading.value = false; uni.stopPullDownRefresh(); }
 }
-function startReturn(row: SpareMovement) { selected.value=row; form.quantity=Number(row.returnableQuantity||1); form.remark=""; returnOpen.value=true; }
+function loadMore() { if (hasMore.value) load(false); }
+function changeType(value: string | number) { type.value = Number(value) || undefined; load(true); }
+function startReturn(row: SpareMovement) { selected.value = row; form.quantity = Number(row.returnableQuantity || 1); form.remark = ""; returnOpen.value = true; }
 async function submitReturn() {
-  if (!state.accessToken || !selected.value?.id || form.quantity<=0 || form.quantity>Number(selected.value.returnableQuantity) || !form.remark.trim()) return uni.showToast({title:"璇峰~鍐欐纭暟閲忓拰閫�鍥炲師鍥�",icon:"none"});
+  if (!state.accessToken || !selected.value?.id || form.quantity <= 0 || form.quantity > Number(selected.value.returnableQuantity) || !form.remark.trim()) return uni.showToast({ title: "璇峰~鍐欐纭暟閲忓拰閫�鍥炲師鍥�", icon: "none" });
   try {
-    await returnSpare(state.accessToken,{requestKey:Date.now()+"-"+Math.random(),originalId:selected.value.id,quantity:Number(form.quantity),remark:form.remark});
-    returnOpen.value=false; uni.showToast({title:"閫�鍥炴垚鍔�",icon:"success"}); await load();
-  } catch(error) { uni.showToast({title:error instanceof Error?error.message:"閫�鍥炲け璐�",icon:"none"}); }
+    await returnSpare(state.accessToken, { requestKey: Date.now() + "-" + Math.random(), originalId: selected.value.id, quantity: Number(form.quantity), remark: form.remark });
+    returnOpen.value = false; uni.showToast({ title: "閫�鍥炴垚鍔�", icon: "success" }); await load(true);
+  } catch (error) { uni.showToast({ title: error instanceof Error ? error.message : "閫�鍥炲け璐�", icon: "none" }); }
 }
-onLoad(query => { sparePartId.value=query.sparePartId?Number(query.sparePartId):undefined; });
-onShow(load); onPullDownRefresh(load);
+onLoad(query => { sparePartId.value = query.sparePartId ? Number(query.sparePartId) : undefined; });
+onShow(() => load(true));
+onPullDownRefresh(() => load(true));
 </script>
 <template><view class="page">
   <template v-if="isLoggedIn">
-    <view v-if="canQuery" class="search"><input v-model="repairCode" placeholder="鎼滅储缁翠慨鍗曞彿" confirm-type="search" @confirm="load" /><picker :range="['鍏ㄩ儴','鍒濆搴撳瓨','鍏ュ簱','缁翠慨棰嗙敤','閫�鍥�']" @change="type=$event.detail.value?Number($event.detail.value):undefined;load()"><view class="type-picker">{{type?labels[type]:'鍏ㄩ儴绫诲瀷'}}<text>鈻�</text></view></picker></view>
-    <scroll-view v-if="canQuery" class="content" scroll-y>
+    <view v-if="canQuery" class="search"><input v-model="repairCode" placeholder="鎼滅储缁翠慨鍗曞彿" confirm-type="search" @confirm="load(true)" /><picker :range="['鍏ㄩ儴','鍒濆搴撳瓨','鍏ュ簱','缁翠慨棰嗙敤','閫�鍥�']" @change="changeType($event.detail.value)"><view class="type-picker">{{type?labels[type]:'鍏ㄩ儴绫诲瀷'}}<text>鈻�</text></view></picker></view>
+    <scroll-view v-if="canQuery" class="content" scroll-y @scrolltolower="loadMore">
       <view v-for="row in rows" :key="row.id" class="row">
         <view class="head"><view><text class="name">{{row.sparePartName||'澶囦欢'}}</text><text>{{row.sparePartCode||'鏆傛棤缂栫爜'}}</text></view><view class="status-wrap"><text :class="['status',tones[Number(row.type)]]">{{labels[Number(row.type)]||'搴撳瓨鍙樺姩'}}</text></view></view>
         <view class="grid"><text>鏁伴噺锛歿{row.quantity??0}} {{row.unit||''}}</text><text>搴撳瓨锛歿{row.beforeQuantity??'--'}} 鈫� {{row.afterQuantity??'--'}}</text><text>缁翠慨鍗曪細{{row.repairCode||'--'}}</text><text>璁惧锛歿{row.machineryName||'--'}}</text><text>棰嗙敤浜猴細{{row.receiverName||'--'}}</text><text>鏃堕棿锛歿{row.createTime||'--'}}</text><text class="full">澶囨敞锛歿{row.remark||'--'}}</text></view>
         <view v-if="canReturn&&row.type===3&&Number(row.returnableQuantity)>0" class="actions"><button @click="startReturn(row)">閫�鍥烇紙鍙�� {{row.returnableQuantity}}锛�</button></view>
       </view>
-      <view v-if="!rows.length" class="state">{{loading?'鍔犺浇涓�...':'鏆傛棤棰嗙敤璁板綍'}}</view>
+      <view v-if="!rows.length" class="state">{{loading?'鍔犺浇涓�...':'鏆傛棤棰嗙敤璁板綍'}}</view><view v-else class="state more">{{loading?'鍔犺浇涓�...':hasMore?'涓婃媺鍔犺浇鏇村':'娌℃湁鏇村浜�'}}</view>
     </scroll-view>
     <view v-else class="state">鏆傛棤棰嗙敤璁板綍鏌ョ湅鏉冮檺</view>
   </template>
@@ -48,10 +56,10 @@
 </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;flex:none;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 picker{flex:none}.type-picker{display:flex;align-items:center;gap:8rpx;color:#1769d8;font-size:24rpx}.type-picker text{font-size:18rpx}
+.search{display:flex;flex:none;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 picker{flex:none}.type-picker{display:flex;align-items:center;gap:8rpx;color:var(--color-primary, #1769d8);font-size:24rpx}.type-picker text{font-size:18rpx}
 .content{height:0;flex:1;padding-bottom:60rpx;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}.name{overflow:hidden;color:#20334c;font-size:30rpx;font-weight:600;text-overflow:ellipsis;white-space:nowrap}.head>view:first-child text:last-child{color:#78879b;font-size:23rpx}
-.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;line-height:36rpx;border-radius:999rpx;white-space:nowrap}.tag-info{color:#1769d8;background:#eef6ff;border:1rpx solid #c9e1ff}.tag-ok{color:#17865a;background:#eafaf2;border:1rpx solid #b8efd5}.tag-warning{color:#b06a00;background:#fff6df;border:1rpx solid #f0d390}.tag-purple{color:#7a52c6;background:#f3edff;border:1rpx solid #d4c0ff}
-.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}.grid .full{grid-column:1/3}.actions{display:flex;justify-content:flex-end;padding-top:16rpx}.actions button{min-height:50rpx;padding:0 16rpx;margin:0;color:#1769d8;font-size:22rpx;line-height:48rpx;background:#f5f8ff;border:1rpx solid #8ab3ee;border-radius:8rpx}.actions button::after,.save::after{border:0}.state{display:block;padding:45rpx;color:#8795a8;font-size:26rpx;text-align:center}
-.mask{position:fixed;inset:0;z-index:30;display:flex;align-items:flex-end;background:rgba(18,29,43,.42)}.sheet{width:100%;padding-bottom:40rpx;background:#fff;border-radius:24rpx 24rpx 0 0}.sheet-head{display:flex;align-items:center;justify-content:space-between;height:92rpx;padding:0 30rpx;border-bottom:1rpx solid #edf1f6}.sheet-head text:first-child{color:#20334c;font-size:30rpx;font-weight:600}.sheet-head text:last-child{color:#1769d8;font-size:25rpx}.field{display:flex;align-items:center;min-height:96rpx;padding:0 30rpx;gap:20rpx;border-bottom:1rpx solid #eef1f5}.field>text{width:180rpx;color:#33455d}.field input{flex:1;text-align:right}.column{align-items:flex-start;flex-direction:column;padding-top:20rpx}.column textarea{width:100%;height:120rpx}.save{margin:24rpx 30rpx 0;color:#fff;background:#1769d8;border-radius:12rpx}
+.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;line-height:36rpx;border-radius:999rpx;white-space:nowrap}.tag-info{color:var(--color-primary, #1769d8);background:var(--color-primary-soft, #eef6ff);border:1rpx solid var(--color-primary-border, #c9e1ff)}.tag-ok{color:#17865a;background:#eafaf2;border:1rpx solid #b8efd5}.tag-warning{color:#b06a00;background:#fff6df;border:1rpx solid #f0d390}.tag-purple{color:#7a52c6;background:#f3edff;border:1rpx solid #d4c0ff}
+.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}.grid .full{grid-column:1/3}.actions{display:flex;justify-content:flex-end;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 button::after,.save::after{border:0}.state{display:block;padding:45rpx;color:#8795a8;font-size:26rpx;text-align:center}
+.mask{position:fixed;inset:0;z-index:30;display:flex;align-items:flex-end;background:rgba(18,29,43,.42)}.sheet{width:100%;padding-bottom:40rpx;background:#fff;border-radius:24rpx 24rpx 0 0}.sheet-head{display:flex;align-items:center;justify-content:space-between;height:92rpx;padding:0 30rpx;border-bottom:1rpx solid #edf1f6}.sheet-head text:first-child{color:#20334c;font-size:30rpx;font-weight:600}.sheet-head text:last-child{color:var(--color-primary, #1769d8);font-size:25rpx}.field{display:flex;align-items:center;min-height:96rpx;padding:0 30rpx;gap:20rpx;border-bottom:1rpx solid #eef1f5}.field>text{width:180rpx;color:#33455d}.field input{flex:1;text-align:right}.column{align-items:flex-start;flex-direction:column;padding-top:20rpx}.column textarea{width:100%;height:120rpx}.save{margin:24rpx 30rpx 0;color:#fff;background:var(--color-primary, #1769d8);border-radius:12rpx}
 </style>

--
Gitblit v1.9.3