diff --git a/src/components/BasicForm/src/BasicFormWmsCount.vue b/src/components/BasicForm/src/BasicFormWmsCount.vue
index eb448b7e2..0f7e1b472 100644
--- a/src/components/BasicForm/src/BasicFormWmsCount.vue
+++ b/src/components/BasicForm/src/BasicFormWmsCount.vue
@@ -24,7 +24,7 @@
>
-
+
{
// 主子表——提交请求
try {
const data = unref(formRef)?.formModel
- emit('submitForm', formType.value, data)
+ const data1 = unref(formRef1)?.formModel
+ emit('submitForm', formType.value, {...data,...data1})
} finally {
formLoading.value = false
}
@@ -753,7 +754,8 @@ const submitForm = async () => {
// 编辑
try {
const data = unref(formRef)?.formModel
- emit('submitForm', formType.value, data)
+ const data1 = unref(formRef1)?.formModel
+ emit('submitForm', formType.value, {...data,...data1})
} finally {
formLoading.value = false
}
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 5ce419c45..06aed60fa 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -702,6 +702,7 @@ const selectChange = (field, val) => {
CountPlanMain.allSchemas.formSchema.forEach((item) => {
if (item.field == 'crontab') {
item.componentProps.disabled = false
+ item.label = '执行周期'
}
if (item.field == 'limitedValue') {
item.componentProps.disabled = true
@@ -713,6 +714,7 @@ const selectChange = (field, val) => {
CountPlanMain.allSchemas.formSchema.forEach((item) => {
if (item.field == 'crontab') {
item.componentProps.disabled = true
+ item.label = ''
}
if (item.field == 'limitedValue') {
item.componentProps.disabled = true