验证调整

src/views/lecturer/LecturerFee.vue

@@ -154,14 +154,13 @@
           <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item label="讲师名称" name="teacher">
-                <SearchTeacher v-model:value="formParam.teacher" v-model:lable="formParam.orgName"
-                v-model:system="formParam.systemName" v-model:level="formParam.levelName"></SearchTeacher>
-                            
+               <SearchTeacher v-model:value="formParam.name" v-model:lable="formParam.orgName"
+                v-model:system="tSystemNames" v-model:level="formParam.tLevelId"></SearchTeacher>
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="讲师工号" name="teacherNo">
-                <a-input class="draitem"  v-model:value="searchParam.teacherNo"  disabled
+              <a-form-item label="讲师工号" name="name">
+                <a-input class="draitem"  v-model:value="searchParam.name"  disabled
                   placeholder="请输入后讲师工号" allowClear showSearch> 
                 </a-input>
               </a-form-item>
@@ -171,34 +170,37 @@
           <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item label="讲师组织" name="departId">
-                <a-popover title="讲师组织">
-                  <template #content>
-                    {{ formParam.departId }}
-                  </template>
-                  <a-input disabled v-model:value="formParam.departId" class="draitem"
-                    placeholder="自动带出讲师的组织,展示主要部分,鼠标浮上去展示所有" allowClear showSearch>
-                  </a-input>
-                </a-popover>
+                <a-form-item label="讲师组织" name="orgName">
+              <a-popover>
+                <template #content>
+                  {{ formParam.orgName }}.
+                </template>
+
+                <a-input disabled v-model:value="formParam.orgName" class="draitem"
+                  placeholder="自动带出讲师的组织,展示主要部分,鼠标浮上去展示所有" allowClear showSearch>
+                </a-input>
+              </a-popover>
+            </a-form-item>
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="讲师体系" name="systemId">
-                <a-select disabled  class="draitem" v-model:value="formParam.tsystemid" placeholder="请选择讲师体系"
-                  :options="lecturerSystemList">
-                </a-select>
-              </a-form-item>
+              <a-form-item label="讲师体系" name="tSystemName">
+              <!-- <a-select class="draitem" v-model:value="formParam.tSystemName" placeholder="请选择讲师体系" allowClear
+                @change="changetlevel" .:options="LecturerSystemList">
+              </a-select> -->
+              <a-input disabled v-model:value="tSystemNames.systemName" class="draitem"
+                  placeholder="自动带出讲师的体系" allowClear showSearch>
+                </a-input>
+            </a-form-item>
             </a-col>
           </a-row>
           <!-- 讲师级别 levelId   讲师发薪地  payrollPlaceName-->
           <a-row :gutter="16">
             <a-col :span="12">
-              <a-form-item label="讲师级别"  name="levelName">
-                <!-- <a-select disabled class="draitem" v-model:value="formParam.levelId" placeholder="请选择讲师级别"
-                  :options="getLevelList">
-                </a-select> -->
-                <a-input disabled v-model:value="formParam.levelName" class="draitem"
-                    placeholder="自动带出讲师的级别" allowClear showSearch>
-                  </a-input>
+              <a-form-item label="讲师级别"  name="tLevelId">
+                <a-select class="draitem" v-model:value="formParam.tLevelId" placeholder="请选择讲师级别" allowClear
+                   :options="tSystemNames.levelVoList" @change="handleformlevel">
+                </a-select>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -362,7 +364,7 @@
     <a-descriptions-item label="费用类型">"费用类型(未命名)"</a-descriptions-item>
     <a-descriptions-item label="课程类型">{{formParam.courseType==1?'项目开课' :formParam.courseType==2 ?'路径开课':formParam.courseType==3 ?'面授开课':''}}</a-descriptions-item>
     <a-descriptions-item label="课程名称">{{formParam.courseName}}</a-descriptions-item>
-    <a-descriptions-item label="授课时长  ">{{formParam.teachingTime}}</a-descriptions-item>
+    <a-descriptions-item label="授课时长  ">{{formParam.teachingDate}}</a-descriptions-item>
     <a-descriptions-item label="授课/课程日期  ">{{formParam.teachingDate}}</a-descriptions-item>
     <a-descriptions-item label="参训人数  ">{{formParam.studys}}</a-descriptions-item>
     <a-descriptions-item label="评分  ">{{formParam.score}}</a-descriptions-item>
@@ -518,7 +520,11 @@
           status:null,
           pageNo: "1",
           pageSize: "10",
-        }
+        },
+        tSystemNames:{
+        systemName:null,
+        levelVoList: []
+      },
       })
      //费用类型
      const courseTypeList=ref([
@@ -557,7 +563,7 @@
             };
             array.push(obj);
           });
-          LecturerSystemList.value = array;
+          lecturerSystemList.value = array;
         }
       })
     }
@@ -889,35 +895,47 @@ console.log( "讲师体系id" +val);
           }
         }) 
       }
-      //保存
-      const createTeacherDialog = () => {
-        state.formParam.teachingDate= state.formParam.teachingDate!==null? dayjs(new Date(state.formParam.teachingDate).getTime()).format("YYYY-MM-DD"): "",
-      formRef.value
-        .validate()
-        .then(() => {
-          if (state.vf == false) {
-            updateTeacherFee(state.formParam).then(response => {
-          message.success("修改成功");
-          state.teacherdialog = false;
-          cancel()
-      getTableDate();
-        });
+      async function validateField(name) {
+      return new Promise((resolve) => {
+        formRef.value.validateFields([name])
+          .then(() => {
+            resolve(false);
+          })
+          .catch(() => {
+            resolve(true);
+          });
+      });
+    }
+    //保存
+    const createTeacherDialog = async () => {
+      state.formParam.tSystemName = state.tSystemNames.systemName
+      const formItemNames = Object.keys(rules);
+      for(let i=0;i<formItemNames.length;i++){
+        const result = await validateField(formItemNames[i]);
+        if (result) {
+          return message.error(rules[formItemNames[i]][0].log)
+        }
       }
-      else {
-        addTeacherFee(state.formParam)
-          .then((res) => {
-            message.success("保存成功");
+      state.formParam = {...state.formParam,...state.tSystemNames}
+      if (state.vf == false) {
+        updateTeacherFee(state.formParam).then(response => {
+            message.success("修改成功");
             state.teacherdialog = false;
             cancel()
-      getTableDate();
-          }).catch((err) => {
-            console.log(err);
+            getTableDate(); 
           });
         }
-        })
-        .catch(() => {
-          console.log('error', error);
-        });
+        else {
+          addTeacherFee(state.formParam)
+            .then((res) => {
+              message.success("保存成功");
+              state.teacherdialog = false;
+              cancel()
+        getTableDate(); 
+            }).catch((err) => {
+              console.log(err);
+            });
+        }
     };
       //删除弹窗
       // const deleteModal = (record) => {
@@ -988,7 +1006,7 @@ console.log( "讲师体系id" +val);
           tsystemid:null,
           levelId:null,
           payrollPlaceName:null,
-          // 费用类型 : null
+          tSystemName: null,
           teacherpayrollPlace:null,
           teachingDate:null,
           defaultTeachingTime:null,
@@ -1073,26 +1091,26 @@ console.log( "讲师体系id" +val);
       state.formParam.defaultTeachingTime = state.formParam.defaultTeachingTime.replace(/\D/g, '');
     }
       const rules = {
-        name: [{ required: true, message: '讲师不能为空' }],
-        teacherNo: [{ required: true, message: '讲师工号不能为空' }],
-        departId: [{ required: true, message: '讲师组织不能为空' }],
-        systemId: [{ required: true, message: '讲师体系不能为空' }],
-        levelName: [{ required: true, message: ' 讲师级别 不能为空' }],
-        payrollPlaceName: [{ required: true, message: '讲师发薪地 不能为空' }],
-        courseType: [{ required: true, message: '费用类型不能为空' }],
-        courseName: [{ required: true, message: '课程名称不能为空' }],
-        teachingDate: [{ required: true, message: '授课日期不能为空' }],
-        defaultTeachingTime: [{ required: true, message: ' 授课时长不能为空' }],
-        studys: [{ required: true, message: ' 参训人数不能为空' }],
-        score: [{ required: true, message: ' 评分不能为空' }],
-        score: [{ required: true, message: '课酬基准 不能为空' }],
-        expense: [{ required: true, message: '计划费用不能为空' }],
+        name: [{ required: true, message:'',log: '讲师不能为空' }],
+        teacherNo: [{ required: true, message: '',log:'讲师工号不能为空' }],
+        departId: [{ required: true, message: '',log:'讲师组织不能为空' }],
+        tSystemName: [{ required: true, message:'',log: '讲师体系不能为空' }],
+        tLevelId: [{ required: true, message:'',log: ' 讲师级别 不能为空' }],
+        payrollPlaceName: [{ required: true, message:'',log: '讲师发薪地 不能为空' }],
+        courseType: [{ required: true, message: '',log:'费用类型不能为空' }],
+        courseName: [{ required: true, message:'',log: '课程名称不能为空' }],
+        teachingDate: [{ required: true, message:'',log: '授课日期不能为空' }],
+        defaultTeachingTime: [{ required: true, message:'',log: ' 授课时长不能为空' }],
+        studys: [{ required: true, message: '',log:' 参训人数不能为空' }],
+        score: [{ required: true, message:'',log: ' 评分不能为空' }],
+        score: [{ required: true, message:'',log: '课酬基准 不能为空' }],
+        expense: [{ required: true, message: '',log:'计划费用不能为空' }],
   
       }
       function managerChange(e, l, d, t, orgName) {
       console.log(e, l);
       state.searchParam.teacherNo = d;
-      state.searchParam.teacherName = t;
+      state.searchParam.teacherNo = t;
       // state.searchParam.trainorgName=orgName
     }
     const handleImport = () => {
@@ -1298,12 +1316,15 @@ const column = ref([
       },
         
       ])
+      const handleformlevel = (val) => {
+      state.formParam.tlevelName = state.tSystemNames.levelVoList.find(item=>item.id===val)?.levelName
+    }
       //导出功能
       const handleExport = ()=>{
         window.open (
           `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherExpense?pageNo=${
             state.searchParam.pageNo
-          }&pageSize=${state.searchParam.pageSizess}&name=${
+          }&pageSize=${state.searchParam.pageSize}&name=${
             state.searchParam.name ? state.searchParam.name : ""
           }&tsystemid=${ state.searchParam.tsystemid ?  state.searchParam.tsystemid : ""}&levelId=${
             state.searchParam.levelId ? state.searchParam.levelId : ""
@@ -1396,6 +1417,8 @@ const column = ref([
         searchResetdrawer,
         column,
         tableDatas,
+        handleformlevel,
+        validateField,
       }
     },
   };