From 55114074e6dd93aa37e01107543cd6c6cc035f3a Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 28 Jun 2024 09:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicFormWmsCount.vue      | 8 +++++---
 src/views/wms/countManage/count/countPlanMain/index.vue | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

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 @@
     >
       <template #crontab="formSchema1" v-if="fromeWhere == 'countPlan'">
       
-        <crontab v-model="formSchema1.crontab" :disabled="formSchema?.find(item=>item.field == 'crontab')?.componentProps?.disabled "/>
+        <crontab v-if="formSchema1.type=='CYCLE'"  v-model="formSchema1.crontab" :disabled="formSchema?.find(item=>item.field == 'crontab')?.componentProps?.disabled "/>
       </template>
       <template #type="formSchema" v-if="fromeWhere == 'countPlan'">
         <el-select
@@ -745,7 +745,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
       }
@@ -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