From 2b31fa203f3435a582be51f45899d99164c9917a Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期四, 09 四月 2026 13:34:59 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/SC/gfzl
---
ruoyi-plus-soybean/src/views/qm/judge/modules/judge-operate-drawer.vue | 100 +++++++++++++++++++++++++++----------------------
1 files changed, 55 insertions(+), 45 deletions(-)
diff --git a/ruoyi-plus-soybean/src/views/qm/judge/modules/judge-operate-drawer.vue b/ruoyi-plus-soybean/src/views/qm/judge/modules/judge-operate-drawer.vue
index 2eb4cbb..82a891e 100644
--- a/ruoyi-plus-soybean/src/views/qm/judge/modules/judge-operate-drawer.vue
+++ b/ruoyi-plus-soybean/src/views/qm/judge/modules/judge-operate-drawer.vue
@@ -1,10 +1,10 @@
<script setup lang="ts">
-import { computed, ref, watch, onMounted } from 'vue';
-import { NSelect, SelectOption } from 'naive-ui';
+import { computed, onMounted, ref, watch } from 'vue';
+import type { SelectOption } from 'naive-ui';
+import { NSelect } from 'naive-ui';
import { jsonClone } from '@sa/utils';
import { fetchCreateJudge, fetchUpdateJudge } from '@/service/api/qm/judge';
import { fetchGetStdList } from '@/service/api/qm/std';
-
import { useFormRules, useNaiveForm } from '@/hooks/common/form';
import { $t } from '@/locales';
@@ -52,7 +52,6 @@
{ label: '杈呮枡', value: 1 }
];
-
const stdOptions = ref<SelectOption[]>([]);
type Model = Api.Qm.JudgeOperateParams;
@@ -61,27 +60,23 @@
function createDefaultModel(): Model {
return {
- matCode: '',
- matName: '',
- status: null,
- stdCod: '',
- cdate: null,
- oper: '',
- des: '',
- category: null,
- typeCode: '',
- typeName: '',
- judgeName: ''
+ matCode: '',
+ matName: '',
+ status: null,
+ stdCod: '',
+ cdate: null,
+ oper: '',
+ des: '',
+ category: null,
+ typeCode: '',
+ typeName: '',
+ judgeName: ''
};
}
-type RuleKey = Extract<
- keyof Model,
- | 'id'
->;
+type RuleKey = Extract<keyof Model, 'id'>;
-const rules: Record<RuleKey, App.Global.FormRule> = {
-};
+const rules: Record<RuleKey, App.Global.FormRule> = {};
function handleUpdateModelWhenEdit() {
model.value = createDefaultModel();
@@ -96,14 +91,14 @@
}
async function fetchStdOptions() {
- const response = await fetchGetStdList({ category: model.value.category });
+ const response = await fetchGetStdList({ category: model.value.category });
const stdListData = response.data?.rows || [];
if (stdListData.length > 0) {
stdOptions.value = stdListData.map((item: Api.Qm.Std) => ({
- label: item.stdName + item.stdCode,
- value: String(item.id)
- }));
+ label: item.stdName + item.stdCode,
+ value: String(item.id)
+ }));
}
}
@@ -114,12 +109,36 @@
// request
if (props.operateType === 'add') {
- const { error } = await fetchCreateJudge({ matCode, matName, status, stdCod, cdate, oper, des, category, typeCode, typeName, judgeName });
+ const { error } = await fetchCreateJudge({
+ matCode,
+ matName,
+ status,
+ stdCod,
+ cdate,
+ oper,
+ des,
+ category,
+ typeCode,
+ typeName,
+ judgeName
+ });
if (error) return;
}
if (props.operateType === 'edit') {
- const { error } = await fetchUpdateJudge({ matCode, matName, status, stdCod, cdate, oper, des, category, typeCode, typeName, judgeName });
+ const { error } = await fetchUpdateJudge({
+ matCode,
+ matName,
+ status,
+ stdCod,
+ cdate,
+ oper,
+ des,
+ category,
+ typeCode,
+ typeName,
+ judgeName
+ });
if (error) return;
}
@@ -138,9 +157,12 @@
}
});
-watch(() => model.value.category, () => {
- fetchStdOptions();
-});
+watch(
+ () => model.value.category,
+ () => {
+ fetchStdOptions();
+ }
+);
</script>
<template>
@@ -157,25 +179,13 @@
<NInput v-model:value="model.matName" placeholder="璇疯緭鍏ョ墿鏂欑墝鍙�" />
</NFormItem>
<NFormItem label="鐗╂枡绫诲瀷" path="category">
- <NSelect
- v-model:value="model.category"
- :options="categoryOptions"
- placeholder="璇烽�夋嫨鐗╂枡绫诲瀷"
- />
+ <NSelect v-model:value="model.category" :options="categoryOptions" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷" />
</NFormItem>
<NFormItem label="鐘舵��" path="status">
- <NSelect
- v-model:value="model.status"
- :options="statusOptions"
- placeholder="璇烽�夋嫨鐘舵��"
- />
+ <NSelect v-model:value="model.status" :options="statusOptions" placeholder="璇烽�夋嫨鐘舵��" />
</NFormItem>
<NFormItem label="鍒ゅ畾瑙勭▼" path="stdCod">
- <NSelect
- v-model:value="model.stdCod"
- :options="stdOptions"
- placeholder="璇烽�夋嫨鍒ゅ畾瑙勭▼"
- />
+ <NSelect v-model:value="model.stdCod" :options="stdOptions" placeholder="璇烽�夋嫨鍒ゅ畾瑙勭▼" />
</NFormItem>
<NFormItem label="鍒涘缓鏃堕棿" path="cdate">
<NDatePicker
--
Gitblit v1.9.3