盘点计划

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
       }

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