From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/order/ProcessAttribute.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/ProcessAttribute.vue b/north-glass-erp/northglass-erp/src/components/sd/order/ProcessAttribute.vue
index e7c57c9..1ddb7d9 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/ProcessAttribute.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/ProcessAttribute.vue
@@ -2,7 +2,8 @@
<div style="width: 100%">
<template v-for="(itme, index) in dataCollection" :key="index">
- <div style="width: 90%;height: 120px;margin: auto;;background-color: aliceblue;">
+ <el-card style="width: 95%;height: 120px;margin: auto">
+
<div style="width: 200px;font-size: 18px;text-align: left;">{{itme.process_name}}</div>
<div style="display: flex;margin-top: 10px">
<template v-for="(itme1, index) in itme.detail" :key="index">
@@ -13,6 +14,7 @@
v-model="dataList[itme.process_type][itme1.process_type]"
placeholder=""
clearable
+ filterable
style="width: 120px"
>
<el-option
@@ -33,13 +35,13 @@
</div>
</template>
</div>
- </div>
+ </el-card>
<br>
</template>
<div style="margin-top: 10px">
- <el-button @click="emitParent()" style="width: 80px;height: 30px" type="primary" size="small">淇濆瓨</el-button>
+ <el-button @click="emitParent()" style="width: 80px;height: 30px" type="primary" size="small">{{$t('basicData.save')}}</el-button>
</div>
</div>
@@ -188,7 +190,7 @@
if(dataList.value.edgingProcess.edgingType!=null){
emit('getEdgingProcess', dataList.value,dataList.value.edgingProcess.edgingType)
}else{
- ElMessage.error(t('璇烽�夋嫨纾ㄨ竟绫诲瀷'))
+ ElMessage.error(t('order.msg.pleaseProcessType'))
}
}
--
Gitblit v1.8.0