讲师管理bug

src/components/project/LookExternalLecturer.vue

@@ -173,7 +173,7 @@ export default{
         customRender: (value) => {
           return (
             <div>
-              {dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm")}
+              {value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
             </div>
           );
         },

src/components/project/LookInsideLecturer.vue

@@ -165,6 +165,8 @@ export default{
           if(val){
             const id = props.id
             TeacherSystem(id)
+          }else{
+            state.formParam = {}
           }
         })
     const isOrgNames = (val) => {
@@ -233,7 +235,7 @@ export default{
         customRender: (value) => {
           return (
             <div>
-              {dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm")}
+              {value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
             </div>
           );
         },

src/views/lecturer/Organization.vue

@@ -216,6 +216,20 @@
                   </AddApprover>
             </a-form-item>
           </a-col>
+          <a-col :span="12" v-if="formParam.isParent==0">
+            <a-form-item name="isConSelect">
+              <template v-slot:label>
+                <img
+                  style="margin-right:4px;width: 7px;height: 7px"
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+                审批流程是否加担当
+              </template>
+              <a-select v-model:value="formParam.isContains" placeholder="请选择审批流程是否加担当"
+                :options="isConSelect" allowClear showSearch/>
+            </a-form-item>
+          </a-col>
           <a-col :span="12">
             <a-form-item label="备注" >
               <a-input v-model:value="formParam.remark" showCount :maxlength="200"
@@ -330,6 +344,7 @@ export default{
         leveTwoArray: [],
         leveThreeArray: [],
         code: null,
+        isContains: null,
         affiliationOrgList: [],
       },
     })
@@ -338,6 +353,10 @@ export default{
       { value: '2', label: "二级审批" },
       { value: '3', label: "三级审批" },
     ])
+    const isConSelect = ref([
+      { value: '1', label: "是" },
+      { value: '0', label: "否" },
+    ])
     const placeData = () => {
       lecturer.parentList().then(res=>{
         if(res.data.code == 200){
@@ -691,6 +710,7 @@ const getTableDate = (obj) => {
         leveTwoArray: [],
         leveThreeArray: [],
         code: null,
+        isContains: null,
         affiliationOrgList: [],
       }
     }
@@ -722,7 +742,12 @@ const getTableDate = (obj) => {
     state.formParam.affiliationName = state.formParam.affiliationName?.trim()
     state.formParam.affiliationUserList = [...state.formParam?.actArray,...state.formParam?.leveOneArray,...state.formParam?.leveTwoArray,...state.formParam?.leveThreeArray]
     state.formParam.orglistName = state.formParam.affiliationOrgList?.map(item=>item.id).join(',')
-    const formItemNames = Object.keys(rules);
+    let formItemNames = Object.keys(rules);
+    if(state.formParam.isParent == 0){
+      formItemNames = formItemNames.filter(item=>item!='leveOneValue')
+    }else{
+      formItemNames = formItemNames.filter(item=>item!='isContains')
+    }
     for(let i=0;i<formItemNames.length;i++){
       // const result = await validateField(formItemNames[i]);
       const result = state.formParam[formItemNames[i]]
@@ -777,6 +802,7 @@ const getTableDate = (obj) => {
       code: [{ required: true, message: '',log:'请选择根节点',log2:'请选择审批层级' }],
       actValue: [{ required: true, message: '',log:'请选择组织担当' }],
       leveOneValue: [{ required: true, message: '',log:'请选择一级审批人' }],
+      isContains: [{ required: true, message: '',log:'请选择审批流程是否加担当' }],
       orglistName: [{ required: true, message: '',log:'请选择管理组织' }],
 
     }
@@ -800,6 +826,7 @@ const getTableDate = (obj) => {
         searchSubmit,
         selectRadio,
         PlaceOfPayList,
+        isConSelect,
         PlaceOfPayListTwo,
         placeData,
         searchReset,