From 122ef7b5a195928dd4a10454b50c5695e651076a Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 15 Jul 2025 13:42:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BF=E9=97=AE=E8=B7=AF?=
=?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../directivePackage/DirectivePackageList.vue | 18 +++++-
.../components/ConfigServiceDirective.api.ts | 14 ++---
.../components/DirectivePackageForm.vue | 56 +++++++++++++++----
.../components/DirectivePackageModal.vue | 10 ++--
.../components/ConfigServiceDirective.api.ts | 14 ++---
5 files changed, 80 insertions(+), 32 deletions(-)
diff --git a/src/views/services/directivePackage/DirectivePackageList.vue b/src/views/services/directivePackage/DirectivePackageList.vue
index 221b37b..dcf70b9 100644
--- a/src/views/services/directivePackage/DirectivePackageList.vue
+++ b/src/views/services/directivePackage/DirectivePackageList.vue
@@ -42,12 +42,18 @@
+
+
+ {{ getHHMM(directive.startTimeStr) }}
+ ~
+ {{ getHHMM(directive.endTimeStr) }}
+
+
{{ item.directiveName }}
-
未配置
@@ -83,6 +89,7 @@ import DirectivePackageModal from './components/DirectivePackageModal.vue'
import { list, queryById, deleteOne } from './DirectivePackage.api'
import { Pagination } from 'ant-design-vue';
import { defHttp } from '/@/utils/http/axios';
+import dayjs from "dayjs";
const registerModal = ref();
const searchForm = ref({})
@@ -107,6 +114,15 @@ function handleChangeIzEnabled(record){
searchQuery()
});
}
+
+function getHHMM(value){
+ if(value){
+return dayjs(value).format('HH:mm')
+ }else{
+ return '未配置'
+ }
+
+}
/**
* 搜索
*/
diff --git a/src/views/services/directivePackage/components/ConfigServiceDirective.api.ts b/src/views/services/directivePackage/components/ConfigServiceDirective.api.ts
index 6f651d6..7cfc516 100644
--- a/src/views/services/directivePackage/components/ConfigServiceDirective.api.ts
+++ b/src/views/services/directivePackage/components/ConfigServiceDirective.api.ts
@@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
- list = '/services/serviceDirective/configServiceDirective/list',
- save='/services/serviceDirective/configServiceDirective/add',
- edit='/services/serviceDirective/configServiceDirective/edit',
- deleteOne = '/services/serviceDirective/configServiceDirective/delete',
- deleteBatch = '/services/serviceDirective/configServiceDirective/deleteBatch',
- importExcel = '/services/serviceDirective/configServiceDirective/importExcel',
- exportXls = '/services/serviceDirective/configServiceDirective/exportXls',
+ list = '/services/serviceDirective/list',
+ save='/services/serviceDirective/add',
+ edit='/services/serviceDirective/edit',
+ deleteOne = '/services/serviceDirective/delete',
+ deleteBatch = '/services/serviceDirective/deleteBatch',
+ importExcel = '/services/serviceDirective/importExcel',
+ exportXls = '/services/serviceDirective/exportXls',
}
/**
diff --git a/src/views/services/directivePackage/components/DirectivePackageForm.vue b/src/views/services/directivePackage/components/DirectivePackageForm.vue
index 9be313f..bd13ea2 100644
--- a/src/views/services/directivePackage/components/DirectivePackageForm.vue
+++ b/src/views/services/directivePackage/components/DirectivePackageForm.vue
@@ -11,24 +11,27 @@
-
+
-
-
-
+
+
+
+ -
+
-
+
@@ -44,6 +47,7 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT
import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../DirectivePackage.api';
import { Form } from 'ant-design-vue';
+import dayjs from "dayjs";
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
const props = defineProps({
formDisabled: { type: Boolean, default: false },
@@ -59,15 +63,19 @@ const formData = reactive>({
description: '',
sort: 99,
izEnabled: '0',
+ startTimeStr: '',
+ endTimeStr: '',
});
const { createMessage } = useMessage();
- const labelCol = ref({ xs: { span: 24 }, sm: { span: 8 } });
+ const labelCol = ref({ xs: { span: 24 }, sm: { span: 6 } });
const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 16 } });
+ const labelCol2 = ref({ xs: { span: 24 }, sm: { span: 2 } });
+ const wrapperCol2 = ref({ xs: { span: 24 }, sm: { span: 21 } });
const confirmLoading = ref(false);
//表单验证
const validatorRules = reactive({
- packageName: [{ required: true, message: '请输入服务指令包名称!' },],
- sort: [{ required: true, message: '请输入排序!' }, { pattern: /^\d+$/, message: '请输入整数!' },],
+ // packageName: [{ required: true, message: '请输入服务指令包名称!' },],
+ // sort: [{ required: true, message: '请输入排序!' }, { pattern: /^\d+$/, message: '请输入整数!' },],
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
@@ -103,8 +111,17 @@ function edit(record) {
tmpData[key] = record[key]
}
})
+ console.log("🚀 ~ nextTick ~ tmpData:", tmpData)
//赋值
Object.assign(formData, tmpData);
+
+ if(formData.startTimeStr){
+ formData.startTimeStr = dayjs(formData.startTimeStr,"YYYY-MM-DD hh:mm:ss")
+ }
+ if(formData.endTimeStr){
+ formData.endTimeStr = dayjs(formData.endTimeStr,"YYYY-MM-DD hh:mm:ss")
+ }
+ console.log("🚀 ~ nextTick ~ formData:", formData)
});
}
@@ -145,6 +162,21 @@ async function submitForm(directives) {
if (directives.length > 0) {
model.directives = directives
}
+ if(!model.packageName){
+ createMessage.warning('请填写服务指令包名称');
+ confirmLoading.value = false;
+ return;
+ }
+ if(!model.startTimeStr){
+ createMessage.warning('请选择开始时间');
+ confirmLoading.value = false;
+ return;
+ }
+ if(!model.endTimeStr){
+ createMessage.warning('请选择结束时间');
+ confirmLoading.value = false;
+ return;
+ }
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
diff --git a/src/views/services/directivePackage/components/DirectivePackageModal.vue b/src/views/services/directivePackage/components/DirectivePackageModal.vue
index 8b9c1ae..66844ab 100644
--- a/src/views/services/directivePackage/components/DirectivePackageModal.vue
+++ b/src/views/services/directivePackage/components/DirectivePackageModal.vue
@@ -5,16 +5,16 @@
-
+
-
+
- 引用
+ 引用服务指令包
- 新增
+ 选择服务指令
@@ -25,7 +25,7 @@
- 分类
+ {{directive.instructionTagName}}
diff --git a/src/views/services/serviceTag/components/ConfigServiceDirective.api.ts b/src/views/services/serviceTag/components/ConfigServiceDirective.api.ts
index 6f651d6..7cfc516 100644
--- a/src/views/services/serviceTag/components/ConfigServiceDirective.api.ts
+++ b/src/views/services/serviceTag/components/ConfigServiceDirective.api.ts
@@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
- list = '/services/serviceDirective/configServiceDirective/list',
- save='/services/serviceDirective/configServiceDirective/add',
- edit='/services/serviceDirective/configServiceDirective/edit',
- deleteOne = '/services/serviceDirective/configServiceDirective/delete',
- deleteBatch = '/services/serviceDirective/configServiceDirective/deleteBatch',
- importExcel = '/services/serviceDirective/configServiceDirective/importExcel',
- exportXls = '/services/serviceDirective/configServiceDirective/exportXls',
+ list = '/services/serviceDirective/list',
+ save='/services/serviceDirective/add',
+ edit='/services/serviceDirective/edit',
+ deleteOne = '/services/serviceDirective/delete',
+ deleteBatch = '/services/serviceDirective/deleteBatch',
+ importExcel = '/services/serviceDirective/importExcel',
+ exportXls = '/services/serviceDirective/exportXls',
}
/**