Merge pull request 'fix : 修复上传费用校验问题' (#246) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/246

src/views/project-management/implementation/uploadFee.vue

@@ -1,10 +1,10 @@
 <template>
   <baseTitle title="上传费用"></baseTitle>
-  <el-form :model="tableData" ref="form" :rules="rules">
+  <el-form :model="tableForm" ref="form">
-    <el-table :data="tableData" style="width: 100%">
+    <el-table :data="tableForm.tableData" style="width: 100%">
       <el-table-column prop="projectName" label="项目名称">
         <template #default="scope">
-          <el-form-item prop="projectName">
+          <el-form-item prop="projectName" :rules="scope.row.projectName?'1':rules.projectName">
             <el-input v-model="scope.row.projectName" placeholder="请输入项目名称" clearable>
             </el-input>
           </el-form-item>
@@ -12,7 +12,7 @@
       </el-table-column>
       <el-table-column prop="time" label="时间">
         <template #default="scope">
-          <el-form-item prop="time">
+          <el-form-item prop="time" :rules="scope.row.time?'1':rules.time">
             <el-date-picker
                 v-model="scope.row.time"
                 type="date"
@@ -26,7 +26,7 @@
       </el-table-column>
       <el-table-column prop="projectCost" label="项目费用">
         <template #default="scope">
-          <el-form-item prop="projectCost">
+          <el-form-item prop="projectCost" :rules="scope.row.projectCost?'1':rules.projectCost">
             <el-select v-model="scope.row.projectCost" placeholder="请选择费用性质" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('project_cost')"
@@ -40,7 +40,7 @@
       </el-table-column>
       <el-table-column prop="researchStage" label="研发阶段">
         <template #default="scope">
-          <el-form-item prop="researchStage">
+          <el-form-item prop="researchStage"  :rules="scope.row.researchStage?'1':rules.researchStage">
             <el-select v-model="scope.row.researchStage" placeholder="请选择研发阶段" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('research_stage')"
@@ -54,7 +54,7 @@
       </el-table-column>
       <el-table-column prop="digest" label="摘要">
         <template #default="scope">
-          <el-form-item prop="digest">
+          <el-form-item prop="digest" :rules="scope.row.digest?'1':rules.digest">
             <el-input v-model="scope.row.digest" placeholder="请输入摘要" clearable>
             </el-input>
           </el-form-item>
@@ -62,7 +62,7 @@
       </el-table-column>
       <el-table-column prop="afterTax" label="税后余额(元)">
         <template #default="scope">
-          <el-form-item prop="afterTax">
+          <el-form-item prop="afterTax" :rules="scope.row.afterTax?'1':rules.afterTax">
             <el-input v-model="scope.row.afterTax" placeholder="请输入税后余额" clearable>
             </el-input>
           </el-form-item>
@@ -97,7 +97,7 @@ const tagsViewStore = useTagsView()
 const formData = ref({})
 const form = ref()
 const rules = reactive({
-  projectName: [{required: true, message: '请输入项目名称', trigger:["blur", 'change']}],
+  projectName: [{required: true, message: '请输入项目名称', trigger:"blur"}],
   time: [{required: true, message: '请选择时间', trigger: 'blur'}],
   projectCost: [{required: true, message: '请输入项目费用', trigger: 'blur'}],
   researchStage: [{required: true, message: '请输入研发阶段', trigger: 'blur'}],
@@ -115,19 +115,19 @@ const tableData=ref([
     afterTax: ''
   }
 ])
-// const tableForm = reactive({
+const tableForm = reactive({
-//   tableData: [
+  tableData: [
-//     {
+    {
-//       projectId: route.query.id,
+      projectId: route.query.id,
-//       projectName: '',
+      projectName: '',
-//       time: '',
+      time: '',
-//       projectCost: '',
+      projectCost: '',
-//       researchStage: '',
+      researchStage: '',
-//       digest: '',
+      digest: '',
-//       afterTax: ''
+      afterTax: ''
-//     }
+    }
-//   ]
+  ]
-// })
+})
 const handleAdd = () => {
   let row = {
     projectId: route.query.id,
@@ -147,6 +147,7 @@ const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
+    instance.clearValidate()
     console.log('params', tableData.value)
     // const res = addLedger(tableData.value)
     // ElNotification({