From 1193ed5cf72c8d1093d0c061b9eefe61a28b0cb7 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/business/productOrder/components/addOrder.vue | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/src/views/business/productOrder/components/addOrder.vue b/src/views/business/productOrder/components/addOrder.vue
index 35b5181..577a650 100644
--- a/src/views/business/productOrder/components/addOrder.vue
+++ b/src/views/business/productOrder/components/addOrder.vue
@@ -18,7 +18,7 @@
<div style="display: flex; align-items: center; justify-content: space-between;">
<span>{{ a.name }}</span>
<lims-icon name="el-icon-delete"
- style="color: #66b1ff; font-size: 16px; cursor: pointer;"
+ style="color: var(--el-color-primary-light-3); font-size: 16px; cursor: pointer;"
@click.stop="handleDelete(a)">
</lims-icon>
</div>
@@ -171,7 +171,7 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="12">
<el-form-item label="鎶ュ憡浜や粯鏂瑰紡">
<el-radio-group v-model="addObj.reportDelivery" :disabled="active>1" size="small">
<el-radio :value="1" border style="margin-right: 0">鑷彇</el-radio>
@@ -217,7 +217,9 @@
<el-upload ref="orderFileUpload" action="#" :auto-upload="false" multiple :file-list="fileList"
:disabled="active>1" :on-change="handleFileChange" :on-remove="handleFileRemove">
<el-button :disabled="active>1" size="small" type="primary">閫夋嫨闄勪欢</el-button>
- <div slot="tip" class="el-upload__tip">鏀寔澶氭枃浠朵笂浼狅紝鍗曚釜鏂囦欢涓嶈秴杩�200MB</div>
+ <template #tip>
+ <div class="el-upload__tip">鏀寔澶氭枃浠朵笂浼狅紝鍗曚釜鏂囦欢涓嶈秴杩�200MB</div>
+ </template>
</el-upload>
</el-form-item>
</el-col>
@@ -1209,7 +1211,7 @@
...res.data.insOrder
};
if (res.data.standardTreeId) {
- this.$set(this.addObj, 'standardTreeId', res.data.standardTreeId)
+ this.addObj.standardTreeId = res.data.standardTreeId
} else if (this.isEdit) {
this.$message.warning('鍘熸爣鍑嗕笌璁㈠崟妯℃澘鏃犳硶鍞竴鍖归厤锛岃閲嶆柊閫夋嫨妫�娴嬩緷鎹�')
}
@@ -2729,7 +2731,7 @@
<style scoped>
:deep(.warning-row) {
- color: #1890FF;
+ color: var(--el-color-primary);
}
.node_i {
@@ -2739,6 +2741,7 @@
.template-tag-list {
min-height: 32px;
+ align-self: stretch;
display: flex;
align-items: center;
flex-wrap: wrap;
@@ -2747,6 +2750,7 @@
.newju-order-form :deep(.el-form-item) {
display: flex;
+ align-items: center; /* small 鏍囩 24px銆佸唴瀹� 32px锛屼笉灞呬腑灏卞鑷存爣绛炬瘮鍐呭楂樼害 5px */
margin-right: 0;
}
@@ -2766,8 +2770,22 @@
width: 100%;
}
+/* 杈规鍗曢�夌粍锛欵P 榛樿缁欐瘡涓� radio 30px 鍙宠竟璺濓紙鍙竻闆舵渶鍚庝竴涓級锛�
+ 绐勫垪閲屻�岃嚜鍙�/蹇��/鐢靛瓙浼犻�併��3 涓斁涓嶄笅浼氭崲琛岋紱缁熶竴鍘绘帀杈硅窛鏀圭敤 6px gap锛�
+ 涓変釜鎸夐挳鍗冲彲鎺掑湪涓�琛� */
+.newju-order-form :deep(.el-radio-group) {
+ display: inline-flex;
+ align-items: center;
+ flex-wrap: nowrap;
+ gap: 6px;
+}
+
+.newju-order-form :deep(.el-radio-group .el-radio) {
+ margin-right: 0;
+}
+
.empty-template-text {
- color: #909399;
+ color: var(--lims-text-3);
}
/* 濮旀墭鍗曚俊鎭細椤堕儴鎿嶄綔鏍� */
@@ -2778,13 +2796,13 @@
flex-wrap: wrap;
gap: 8px;
padding-bottom: 12px;
- border-bottom: 1px solid #ebeef5;
+ border-bottom: 1px solid var(--el-border-color-light);
}
.order-header__title {
font-size: 16px;
font-weight: bold;
- color: #303133;
+ color: var(--lims-text);
}
.order-header__actions {
@@ -2827,15 +2845,23 @@
width: 100%;
}
-/* append 鍗曞厓鏍肩殑 20px 鍐呰竟璺� + 鎸夐挳 -10px 璐熻竟璺濇槸鎸夐粯璁� 40px 鎸夐挳鏍囧畾鐨勶紝
- small 杈撳叆涓嬫寜閽細姣旇緭鍏ユ楂樸�佷笂涓嬫孩鍑猴紱鏀规垚鎸夐挳鐩存帴鎾戞弧鍗曞厓鏍� */
+/* append 鍗曞厓鏍肩殑 20px 鍐呰竟璺� + 鎸夐挳 -10px 璐熻竟璺濇槸鎸夐粯璁� 40px 鎸夐挳鏍囧畾鐨勩��
+ small 杈撳叆涓嬫寜閽細琚� height:24px + padding 鎸ゅ緱鍐呭鐩掑彧鍓� 6px锛屽浘鏍囧洜姝ゅ亸涓嬶紱
+ 鏀规垚缃戞牸灞呬腑锛氬崟鍏冩牸灞呬腑鎸夐挳锛屾寜閽唴閮ㄥ啀灞呬腑鍥炬爣 */
.order-card :deep(.el-input-group__append) {
- padding: 0;
+ padding: 0 14px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.order-card :deep(.el-input-group__append .el-button) {
+ flex: 0 0 auto;
margin: 0;
- padding: 9px 15px;
+ padding: 4px 8px;
font-size: 12px;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
}
</style>
--
Gitblit v1.9.3