From 1f88bf20ed44b7df8ba7d4f4e4d314f8e0a7ba95 Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Fri, 21 Feb 2025 18:48:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=AC=BE=E6=98=8E=E7=BB=86=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/orderys/OrderYsForm.vue    | 68 ++++++++++++++-----
 1 file changed, 52 insertions(+), 16 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue
index 7f498bf..11dacf9 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue
@@ -68,29 +68,32 @@
             <el-col>
               <el-button  type="primary" size="large" @click="onAddItem" v-if="formData.cgTypee==1">新增</el-button>
             </el-col>
-            <el-form ref="subFormRef" :model="formData.orderYsDetails"   label-width="0">
-              <el-table :data="formData.orderYsDetails" class="hl-table">
+            <el-form ref="OrderYsDetailSubFormRef" :model="formData.orderYsDetails"   label-width="0"  >
+              <el-table :data="formData.orderYsDetails" class="hl-table" >
                 <el-table-column type="index" label="序号" align="center" min-width="60" fixed />
-                <el-table-column prop="paymentDate" min-width="150" label="回款日期" align="center">
+                <el-table-column min-width="150" align="center">
+                  <template #header> <span class="hl-table_header">*</span>回款日期 </template>
                   <template #default="scope">
-<!--                    <el-form-item label="回款日期" prop="paymentDate" label-width="90">-->
+                    <el-form-item  prop="paymentDate" >
                       <el-date-picker :disabled="scope.row.id"
                         v-model="scope.row.paymentDate"
                         type="date"
                         value-format=""
                         placeholder="选择回款日期"
                       />
-<!--                    </el-form-item>-->
+                    </el-form-item>
                   </template>
                 </el-table-column>
-                <el-table-column prop="postId" min-width="150" label="回款类型" align="center">
+                <el-table-column min-width="150"  align="center">
+                  <template #header> <span class="hl-table_header">*</span>回款类型 </template>
+
                   <template #default="scope">
-<!--                    <el-form-item label="回款类型" prop="cgType" label-width="90">-->
+                    <el-form-item prop="cgType" >
                       <el-select
                         v-model="scope.row.cgType" :disabled="scope.row.id"
                         placeholder="请选择"
                         clearable
-                        @change="getGradeCost">
+                        @change="getGradeCost" >
                         <el-option
                           v-for="dict in getIntDictOptions(DICT_TYPE.HELI_CGTYPE)"
                           :key="dict.value"
@@ -98,14 +101,15 @@
                           :value="dict.value"
                         />
                       </el-select>
-<!--                    </el-form-item>-->
+                    </el-form-item>
                   </template>
                 </el-table-column>
-                <el-table-column prop="description" min-width="180" label="回款金额" align="center">
+                <el-table-column min-width="180" align="center">
+                  <template #header> <span class="hl-table_header">*</span>回款金额 </template>
                   <template #default="scope">
-<!--                    <el-form-item label="回款金额" prop="cgYishou" label-width="90">-->
-                      <el-input v-model="scope.row.cgYishou" placeholder="请输入回款金额" @change="sum" :disabled="scope.row.id"/>
-<!--                    </el-form-item>-->
+                    <el-form-item prop="cgYishou" >
+                      <el-input v-model="scope.row.cgYishou" placeholder="请输入回款金额" @change="sum" :disabled="scope.row.id"  />
+                    </el-form-item>
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="120" fixed="right">
@@ -158,10 +162,27 @@ const formData = ref({
   rem: undefined,
 
 })
+// const subFormRules = reactive({
+//   paymentDate: [{
+//     required: true,
+//     message: '回款日期不能为空',
+//     trigger: 'blur'
+//   }],
+//   cgType: [{
+//     required: true,
+//     message: '回款类型不能为空',
+//     trigger: 'change'
+//   }],
+//   cgYishou: [{
+//     required: true,
+//     message: '回款金额不能为空',
+//     trigger: 'blur'
+//   }]
+// })
 const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
-
+const OrderYsDetailSubFormRef = ref()
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
@@ -219,7 +240,22 @@ const sum = async () => {
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
-  await formRef.value.validate()
+  // await formRef.value.validate()
+  // await OrderYsDetailSubFormRef.value.validate()
+  for (let i = 0; i < formData.value.orderYsDetails.length; i++) {
+    if (formData.value.orderYsDetails[i].paymentDate==null){
+      message.error('第'+(i+1)+'行回款日期不能为空')
+      return false
+    }
+    if (formData.value.orderYsDetails[i].cgType==null){
+      message.error('第'+(i+1)+'行回款类型不能为空')
+      return false
+    }
+    if (formData.value.orderYsDetails[i].cgYishou==null){
+      message.error('第'+(i+1)+'行回款金额不能为空')
+      return false
+    }
+  }
   if (formData.value.cgYishou!=''&&formData.value.cgYishou!=undefined){
     if (formData.value.cgYishou<formData.value.cgYs&&formData.value.cgTypee==2){
       await message.confirm("已收金额小于应收金额,回款未完成,请确认")
@@ -231,7 +267,7 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = formData.value as unknown as OrderYsApi.OrderYsVO
-    console.log(data)
+
     if (formType.value === 'create') {
       await OrderYsApi.createOrderYs(data)
       message.success(t('common.createSuccess'))