From e97b55310155a2dd691bd698a10295a4d867f60c Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 17 四月 2026 15:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-plus-soybean/src/views/qm/judge-details/modules/judge-details-operate-drawer.vue | 70 +++++++++++-----------------------
1 files changed, 23 insertions(+), 47 deletions(-)
diff --git a/ruoyi-plus-soybean/src/views/qm/judge-details/modules/judge-details-operate-drawer.vue b/ruoyi-plus-soybean/src/views/qm/judge-details/modules/judge-details-operate-drawer.vue
index f573bb8..55fcf0d 100644
--- a/ruoyi-plus-soybean/src/views/qm/judge-details/modules/judge-details-operate-drawer.vue
+++ b/ruoyi-plus-soybean/src/views/qm/judge-details/modules/judge-details-operate-drawer.vue
@@ -39,6 +39,13 @@
return titles[props.operateType];
});
+const clsOptions = [
+ { label: 'A', value: 'A' },
+ { label: 'B', value: 'B' },
+ { label: 'C', value: 'C' },
+ { label: 'D', value: 'D' }
+];
+
type Model = Api.Qm.JudgeDetailsOperateParams;
const model = ref<Model>(createDefaultModel());
@@ -65,12 +72,14 @@
type RuleKey = Extract<keyof Model, 'id'>;
-const rules: Record<RuleKey, App.Global.FormRule> = {};
+const rules: Record<RuleKey, App.Global.FormRule | App.Global.FormRule[]> = {
+ id: createRequiredRule('璇疯緭鍏ョ紪鐮�')
+};
function handleUpdateModelWhenEdit() {
model.value = createDefaultModel();
- if (props.operateType === 'edit' && props.rowData) {
+ if (props.rowData) {
Object.assign(model.value, jsonClone(props.rowData));
}
}
@@ -160,59 +169,26 @@
<NDrawer v-model:show="visible" :title="title" display-directive="show" :width="800" class="max-w-90%">
<NDrawerContent :title="title" :native-scrollbar="false" closable>
<NForm ref="formRef" :model="model" :rules="rules">
- <NFormItem label="缂栫爜" path="id">
- <NInput v-model:value="model.id" placeholder="璇疯緭鍏ョ紪鐮�" />
- </NFormItem>
- <NFormItem label="鍒ゅ畾涓绘爣璇�" path="judgeId">
- <NInput v-model:value="model.judgeId" placeholder="璇疯緭鍏ュ垽瀹氫富鏍囪瘑" />
- </NFormItem>
- <NFormItem label="鍒ゅ畾椤笽TEM" path="itemCod">
- <NInput v-model:value="model.itemCod" placeholder="璇疯緭鍏ュ垽瀹氶」ITEM" />
- </NFormItem>
- <NFormItem label="鍒ゅ畾椤筃AME" path="itemName">
- <NInput v-model:value="model.itemName" placeholder="璇疯緭鍏ュ垽瀹氶」NAME" />
+ <NFormItem label="鍒ゅ畾椤�" path="itemName">
+ <NInput v-model:value="(model.itemName as any)" placeholder="璇疯緭鍏ュ垽瀹氶」" :disabled="operateType === 'edit'" />
</NFormItem>
<NFormItem label="鏍囧噯鍊�" path="value3">
- <NInput v-model:value="model.value3" placeholder="璇疯緭鍏ユ爣鍑嗗��" />
+ <NInputNumber v-model:value="(model.value3 as any)" placeholder="璇疯緭鍏ユ爣鍑嗗��" class="w-full" />
</NFormItem>
- <NFormItem label="鍒ゅ畾鍊�1" path="value1">
- <NInput v-model:value="model.value1" placeholder="璇疯緭鍏ュ垽瀹氬��1" />
+ <NFormItem label="涓嬮檺鍊�" path="value1">
+ <NInputNumber v-model:value="(model.value1 as any)" placeholder="璇疯緭鍏ヤ笅闄愬��" class="w-full" />
</NFormItem>
- <NFormItem label="鍒ゅ畾鍊�2" path="value2">
- <NInput v-model:value="model.value2" placeholder="璇疯緭鍏ュ垽瀹氬��2" />
+ <NFormItem label="涓婇檺鍊�" path="value2">
+ <NInputNumber v-model:value="(model.value2 as any)" placeholder="璇疯緭鍏ヤ笂闄愬��" class="w-full" />
</NFormItem>
- <NFormItem label="缂洪櫡浣嶇疆" path="location">
- <NInput v-model:value="model.location" placeholder="璇疯緭鍏ョ己闄蜂綅缃�" />
+ <NFormItem label="鍒嗗��" path="stdscore">
+ <NInputNumber v-model:value="(model.stdscore as any)" placeholder="璇疯緭鍏ュ垎鍊�" class="w-full" />
</NFormItem>
- <NFormItem label="鍒ゅ畾绾у埆 (A,B,C,D)" path="cls">
- <NInput v-model:value="model.cls" placeholder="璇疯緭鍏ュ垽瀹氱骇鍒� (A,B,C,D)" />
- </NFormItem>
- <NFormItem label="鍒嗗�兼爣鍑� (鎵ｅ垎鏍囧噯锛屽緱鍒嗘爣鍑�),姣斿涓嶅悎鏍间竴娆℃墸澶氬皯鍒�" path="stdscore">
- <NInput
- v-model:value="model.stdscore"
- placeholder="璇疯緭鍏ュ垎鍊兼爣鍑� (鎵ｅ垎鏍囧噯锛屽緱鍒嗘爣鍑�),姣斿涓嶅悎鏍间竴娆℃墸澶氬皯鍒�"
- />
- </NFormItem>
- <NFormItem label="鏍囪姝ら」鏄惁涓哄悎鎴愰」鐩紝姣斿澶栬锛屽疄闄呬笂鍏宠仈浜嗗緢澶氬瓙椤圭洰" path="ismix">
- <NInput
- v-model:value="model.ismix"
- placeholder="璇疯緭鍏ユ爣璁版椤规槸鍚︿负鍚堟垚椤圭洰锛屾瘮濡傚瑙傦紝瀹為檯涓婂叧鑱斾簡寰堝瀛愰」鐩�"
- />
- </NFormItem>
- <NFormItem label="鑻ユ瀛楁鏈塙UID鍊硷紝琛ㄦ槑瀹冨彲鑳戒负鍏朵粬椤圭洰鐨勫瓙椤癸紝姣斿鈥滅┖澶粹��,瀹冧负鐑熸敮澶栬椤圭洰鐨勫瓙椤�" path="rid">
- <NInput
- v-model:value="model.rid"
- placeholder="璇疯緭鍏ヨ嫢姝ゅ瓧娈垫湁UUID鍊硷紝琛ㄦ槑瀹冨彲鑳戒负鍏朵粬椤圭洰鐨勫瓙椤癸紝姣斿鈥滅┖澶粹��,瀹冧负鐑熸敮澶栬椤圭洰鐨勫瓙椤�"
- />
- </NFormItem>
- <NFormItem label="鑼冨洿-澶囩敤" path="category">
- <NInput v-model:value="model.category" placeholder="璇疯緭鍏ヨ寖鍥�-澶囩敤" />
+ <NFormItem label="鍒ゅ畾绾у埆" path="cls">
+ <NSelect v-model:value="(model.cls as any)" :options="clsOptions" placeholder="璇烽�夋嫨鍒ゅ畾绾у埆" />
</NFormItem>
<NFormItem label="澶囨敞" path="decisionDes">
- <NInput v-model:value="model.decisionDes" placeholder="璇疯緭鍏ュ娉�" />
- </NFormItem>
- <NFormItem label="淇敼浜�" path="updateUser">
- <NInput v-model:value="model.updateUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉" />
+ <NInput v-model:value="(model.decisionDes as any)" type="textarea" placeholder="璇疯緭鍏ュ娉�" />
</NFormItem>
</NForm>
<template #footer>
--
Gitblit v1.9.3