diff --git a/src/components/project/LookExternalLecturer.vue b/src/components/project/LookExternalLecturer.vue
index 60273ec2..e18fbea6 100644
--- a/src/components/project/LookExternalLecturer.vue
+++ b/src/components/project/LookExternalLecturer.vue
@@ -173,7 +173,7 @@ export default{
customRender: (value) => {
return (
- {dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm")}
+ {value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
);
},
diff --git a/src/components/project/LookInsideLecturer.vue b/src/components/project/LookInsideLecturer.vue
index 962927a6..1c483547 100644
--- a/src/components/project/LookInsideLecturer.vue
+++ b/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 (
- {dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm")}
+ {value.record?.teachingDate?dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm"):'-'}
);
},
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index 20a44139..bde3154a 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -216,6 +216,20 @@
+
+
+
+
+ 审批流程是否加担当
+
+
+
+
{
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 {
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,