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/pro/card/form.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/pages/mes/pro/card/form.vue b/src/pages/mes/pro/card/form.vue
index 6093607..e874fd5 100644
--- a/src/pages/mes/pro/card/form.vue
+++ b/src/pages/mes/pro/card/form.vue
@@ -1,3 +1,3 @@
<script setup lang="ts">
import{computed,reactive,ref}from"vue";import{onLoad}from"@dcloudio/uni-app";import{createCard,createCardProcess,deleteCardProcess,getCard,getCardProcessPage,updateCard,updateCardProcess,type TransferCard,type TransferProcess}from"../../../../api/mes-operations";import{getWorkOrderPage,type WorkOrder}from"../../../../api/production";import{generateAutoCode,getMesItemPage,getProcessSimpleList,getWorkstationPage,type MesMdItem,type MesWorkstation,type ProProcess}from"../../../../api/process-design";import{getHrmUserList,type UserOption}from"../../../../api/hrm";import{useAuth}from"../../../../stores/auth";const{hasPermission,state}=useAuth(),id=ref<number>(),mode=ref("edit"),orders=ref<WorkOrder[]>([]),items=ref<MesMdItem[]>([]),processes=ref<ProProcess[]>([]),stations=ref<MesWorkstation[]>([]),users=ref<UserOption[]>([]),lines=ref<TransferProcess[]>([]),open=ref(false),editing=ref<TransferProcess>(),form=reactive<TransferCard>({code:"",status:0,transferedQuantity:0}),line=reactive<TransferProcess>({sort:1,inputQuantity:0,outputQuantity:0,unqualifiedQuantity:0});const readonly=computed(()=>mode.value==="detail"||form.status!==0),canSave=computed(()=>id.value?hasPermission("mes:pro-card:update"):hasPermission("mes:pro-card:create"));function selectOrder(i:number){const x=orders.value[i];Object.assign(form,{workOrderId:x.id,workOrderCode:x.code,workOrderName:x.name,itemId:x.productId,itemCode:x.productCode,itemName:x.productName,specification:x.productSpecification,unitMeasureName:x.unitMeasureName})}function selectItem(i:number){const x=items.value[i];Object.assign(form,{itemId:x.id,itemCode:x.code,itemName:x.name,specification:x.specification,unitMeasureName:x.unitMeasureName})}async function save(){if(!state.accessToken||!canSave.value||!form.code||!form.workOrderId||!form.itemId)return uni.showToast({title:"璇峰畬鏁村~鍐欏繀濉」",icon:"none"});id.value?await updateCard(state.accessToken,{...form,id:id.value}):id.value=await createCard(state.accessToken,form);uni.showToast({title:"淇濆瓨鎴愬姛",icon:"success"});loadLines()}async function loadLines(){if(state.accessToken&&id.value)lines.value=(await getCardProcessPage(state.accessToken,{pageNo:1,pageSize:100,cardId:id.value})).list}function editLine(x?:TransferProcess){editing.value=x;Object.assign(line,x||{id:undefined,sort:lines.value.length+1,processId:undefined,workstationId:undefined,userId:undefined,inputTime:"",outputTime:"",inputQuantity:0,outputQuantity:0,unqualifiedQuantity:0,remark:""});open.value=true}async function saveLine(){if(!state.accessToken||!id.value||!line.processId)return uni.showToast({title:"璇烽�夋嫨宸ュ簭",icon:"none"});const d={...line,cardId:id.value};editing.value?.id?await updateCardProcess(state.accessToken,{...d,id:editing.value.id}):await createCardProcess(state.accessToken,d);open.value=false;loadLines()}async function removeLine(x:TransferProcess){if(state.accessToken&&x.id){await deleteCardProcess(state.accessToken,x.id);loadLines()}}onLoad(async q=>{id.value=q.id?Number(q.id):undefined;mode.value=q.mode||"edit";if(!state.accessToken)return;const[o,m,p,w,u]=await Promise.all([getWorkOrderPage(state.accessToken,{pageNo:1,pageSize:100}),getMesItemPage(state.accessToken,{pageNo:1,pageSize:100,status:0}),getProcessSimpleList(state.accessToken),getWorkstationPage(state.accessToken,{pageNo:1,pageSize:100,status:0}),getHrmUserList(state.accessToken)]);orders.value=o.list;items.value=m.list;processes.value=p;stations.value=w.list;users.value=u;if(id.value){Object.assign(form,await getCard(state.accessToken,id.value));loadLines()}else form.code=await generateAutoCode(state.accessToken,"PRO_CARD_CODE")});
-</script><template><view class="page"><view class="card"><view class="field"><text>娴佽浆鍗$紪鍙� *</text><input v-model="form.code" :disabled="readonly||!!id"/></view><view class="field"><text>鐢熶骇璁㈠崟 *</text><picker v-if="!readonly" :range="orders" range-key="code" @change="selectOrder($event.detail.value)"><view class="value">{{form.workOrderCode||'璇烽�夋嫨'}} 鈥�</view></picker><text v-else class="value">{{form.workOrderCode}}</text></view><view class="field"><text>浜у搧 *</text><picker v-if="!readonly" :range="items" range-key="name" @change="selectItem($event.detail.value)"><view class="value">{{form.itemName||'璇烽�夋嫨'}} 鈥�</view></picker><text v-else class="value">{{form.itemName}}</text></view><view class="field"><text>鎵规鍙�</text><input v-model="form.batchCode" :disabled="readonly"/></view><view class="field"><text>娴佽浆鏁伴噺 *</text><input v-model.number="form.transferedQuantity" :disabled="readonly" type="digit"/></view><view class="field col"><text>澶囨敞</text><textarea v-model="form.remark" :disabled="readonly"/></view></view><button v-if="!readonly&&canSave" class="save" @click="save">淇濆瓨</button><view v-if="id" class="section"><view class="section-head"><b>宸ュ簭鏄庣粏</b><button v-if="!readonly" @click="editLine()">娣诲姞宸ュ簭</button></view><view v-for="x in lines" :key="x.id" class="line"><b>{{x.sort}}. {{x.processName||x.processCode}}</b><text>宸ヤ綅锛歿{x.workstationName||'--'}}銆�鎿嶄綔浜猴細{{x.nickname||'--'}}</text><text>鎶曞叆 {{x.inputQuantity??0}} / 浜у嚭 {{x.outputQuantity??0}} / 涓嶅悎鏍� {{x.unqualifiedQuantity??0}}</text><text>{{x.inputTime||'--'}} 鑷� {{x.outputTime||'--'}}</text><view v-if="!readonly"><button @click="editLine(x)">缂栬緫</button><button @click="removeLine(x)">鍒犻櫎</button></view></view><view v-if="!lines.length" class="state">鏆傛棤宸ュ簭鏄庣粏</view></view><view v-if="open" class="mask" @click="open=false"><scroll-view class="sheet" scroll-y @click.stop><h3>{{editing?'缂栬緫宸ュ簭':'娣诲姞宸ュ簭'}}</h3><view class="field"><text>椤哄簭</text><input v-model.number="line.sort" type="number"/></view><view class="field"><text>宸ュ簭 *</text><picker :range="processes" range-key="name" @change="line.processId=processes[$event.detail.value].id"><view class="value">{{processes.find(x=>x.id===line.processId)?.name||line.processName||'璇烽�夋嫨'}} 鈥�</view></picker></view><view class="field"><text>宸ヤ綅</text><picker :range="stations" range-key="name" @change="line.workstationId=stations[$event.detail.value].id"><view class="value">{{stations.find(x=>x.id===line.workstationId)?.name||line.workstationName||'璇烽�夋嫨'}} 鈥�</view></picker></view><view class="field"><text>鎿嶄綔浜�</text><picker :range="users" range-key="nickname" @change="line.userId=users[$event.detail.value].id"><view class="value">{{users.find(x=>x.id===line.userId)?.nickname||line.nickname||'璇烽�夋嫨'}} 鈥�</view></picker></view><view class="field"><text>鎶曞叆鏃堕棿</text><input v-model="line.inputTime" placeholder="YYYY-MM-DD HH:mm:ss"/></view><view class="field"><text>浜у嚭鏃堕棿</text><input v-model="line.outputTime" placeholder="YYYY-MM-DD HH:mm:ss"/></view><view class="field"><text>鎶曞叆鏁伴噺</text><input v-model.number="line.inputQuantity" type="digit"/></view><view class="field"><text>浜у嚭鏁伴噺</text><input v-model.number="line.outputQuantity" type="digit"/></view><view class="field"><text>涓嶅悎鏍兼暟閲�</text><input v-model.number="line.unqualifiedQuantity" type="digit"/></view><view class="field col"><text>澶囨敞</text><textarea v-model="line.remark"/></view><button class="save inner" @click="saveLine">淇濆瓨宸ュ簭</button></scroll-view></view></view></template><style lang="scss" scoped>.page{min-height:100vh;padding:24rpx 30rpx;background:#f6f7f9}.card,.section{overflow:hidden;background:#fff;border-radius:16rpx}.section{margin-top:24rpx}.field{display:flex;align-items:center;min-height:96rpx;padding:0 24rpx;gap:20rpx;border-bottom:1rpx solid #eee}.field>text:first-child{width:190rpx}.field input,.field picker,.value{flex:1;text-align:right}.col{align-items:flex-start;flex-direction:column;padding-block:20rpx}.col textarea{width:100%;height:120rpx}.save{margin-top:28rpx;color:#fff;background:#1769d8}.section-head{display:flex;justify-content:space-between;padding:22rpx}.section-head button,.line button{min-height:48rpx;margin:0;color:#1769d8;font-size:22rpx;line-height:46rpx}.line{display:flex;flex-direction:column;gap:8rpx;padding:20rpx;border-top:1rpx solid #eee;color:#66778c;font-size:23rpx}.line>view{display:flex;justify-content:flex-end;gap:10rpx}.state{padding:30rpx;text-align:center}.mask{position:fixed;inset:0;display:flex;align-items:flex-end;background:#0006}.sheet{max-height:85vh;background:#fff}.sheet h3{padding:25rpx}.inner{margin:25rpx 30rpx 50rpx}</style>
\ No newline at end of file
+</script><template><view class="page"><view class="card"><view class="field"><text>娴佽浆鍗$紪鍙� *</text><input v-model="form.code" :disabled="readonly||!!id"/></view><view class="field"><text>鐢熶骇璁㈠崟 *</text><picker v-if="!readonly" :range="orders" range-key="code" @change="selectOrder($event.detail.value)"><view class="value">{{form.workOrderCode||'璇烽�夋嫨'}} 鈥�</view></picker><text v-else class="value">{{form.workOrderCode}}</text></view><view class="field"><text>浜у搧 *</text><picker v-if="!readonly" :range="items" range-key="name" @change="selectItem($event.detail.value)"><view class="value">{{form.itemName||'璇烽�夋嫨'}} 鈥�</view></picker><text v-else class="value">{{form.itemName}}</text></view><view class="field"><text>鎵规鍙�</text><input v-model="form.batchCode" :disabled="readonly"/></view><view class="field"><text>娴佽浆鏁伴噺 *</text><input v-model.number="form.transferedQuantity" :disabled="readonly" type="digit"/></view><view class="field col"><text>澶囨敞</text><textarea v-model="form.remark" :disabled="readonly"/></view></view><button v-if="!readonly&&canSave" class="save" @click="save">淇濆瓨</button><view v-if="id" class="section"><view class="section-head"><b>宸ュ簭鏄庣粏</b><button v-if="!readonly" @click="editLine()">娣诲姞宸ュ簭</button></view><view v-for="x in lines" :key="x.id" class="line"><b>{{x.sort}}. {{x.processName||x.processCode}}</b><text>宸ヤ綅锛歿{x.workstationName||'--'}}銆�鎿嶄綔浜猴細{{x.nickname||'--'}}</text><text>鎶曞叆 {{x.inputQuantity??0}} / 浜у嚭 {{x.outputQuantity??0}} / 涓嶅悎鏍� {{x.unqualifiedQuantity??0}}</text><text>{{x.inputTime||'--'}} 鑷� {{x.outputTime||'--'}}</text><view v-if="!readonly"><button @click="editLine(x)">缂栬緫</button><button @click="removeLine(x)">鍒犻櫎</button></view></view><view v-if="!lines.length" class="state">鏆傛棤宸ュ簭鏄庣粏</view></view><view v-if="open" class="mask" @click="open=false"><scroll-view class="sheet" scroll-y @click.stop><h3>{{editing?'缂栬緫宸ュ簭':'娣诲姞宸ュ簭'}}</h3><view class="field"><text>椤哄簭</text><input v-model.number="line.sort" type="number"/></view><view class="field"><text>宸ュ簭 *</text><picker :range="processes" range-key="name" @change="line.processId=processes[$event.detail.value].id"><view class="value">{{processes.find(x=>x.id===line.processId)?.name||line.processName||'璇烽�夋嫨'}} 鈥�</view></picker></view><view class="field"><text>宸ヤ綅</text><picker :range="stations" range-key="name" @change="line.workstationId=stations[$event.detail.value].id"><view class="value">{{stations.find(x=>x.id===line.workstationId)?.name||line.workstationName||'璇烽�夋嫨'}} 鈥�</view></picker></view><view class="field"><text>鎿嶄綔浜�</text><picker :range="users" range-key="nickname" @change="line.userId=users[$event.detail.value].id"><view class="value">{{users.find(x=>x.id===line.userId)?.nickname||line.nickname||'璇烽�夋嫨'}} 鈥�</view></picker></view><view class="field"><text>鎶曞叆鏃堕棿</text><input v-model="line.inputTime" placeholder="YYYY-MM-DD HH:mm:ss"/></view><view class="field"><text>浜у嚭鏃堕棿</text><input v-model="line.outputTime" placeholder="YYYY-MM-DD HH:mm:ss"/></view><view class="field"><text>鎶曞叆鏁伴噺</text><input v-model.number="line.inputQuantity" type="digit"/></view><view class="field"><text>浜у嚭鏁伴噺</text><input v-model.number="line.outputQuantity" type="digit"/></view><view class="field"><text>涓嶅悎鏍兼暟閲�</text><input v-model.number="line.unqualifiedQuantity" type="digit"/></view><view class="field col"><text>澶囨敞</text><textarea v-model="line.remark"/></view><button class="save inner" @click="saveLine">淇濆瓨宸ュ簭</button></scroll-view></view></view></template><style lang="scss" scoped>.page{min-height:100vh;padding:24rpx 30rpx;background:#f6f7f9}.card,.section{overflow:hidden;background:#fff;border-radius:16rpx}.section{margin-top:24rpx}.field{display:flex;align-items:center;min-height:96rpx;padding:0 24rpx;gap:20rpx;border-bottom:1rpx solid #eee}.field>text:first-child{width:190rpx}.field input,.field picker,.value{flex:1;text-align:right}.col{align-items:flex-start;flex-direction:column;padding-block:20rpx}.col textarea{width:100%;height:120rpx}.save{margin-top:28rpx;color:#fff;background:var(--color-primary, #1769d8)}.section-head{display:flex;justify-content:space-between;padding:22rpx}.section-head button,.line button{min-height:48rpx;margin:0;color:var(--color-primary, #1769d8);font-size:22rpx;line-height:46rpx}.line{display:flex;flex-direction:column;gap:8rpx;padding:20rpx;border-top:1rpx solid #eee;color:#66778c;font-size:23rpx}.line>view{display:flex;justify-content:flex-end;gap:10rpx}.state{padding:30rpx;text-align:center}.mask{position:fixed;inset:0;display:flex;align-items:flex-end;background:#0006}.sheet{max-height:85vh;background:#fff}.sheet h3{padding:25rpx}.inner{margin:25rpx 30rpx 50rpx}</style>
--
Gitblit v1.9.3