+
@@ -169,7 +169,7 @@
-
+
@@ -193,7 +193,7 @@
-
+
@@ -234,7 +234,7 @@ export default{
formParam:{
trainOrgId:null,
trainOrgName:null,
- status: 0,
+ isParent: 1,
remark:null,
orgName: null,
orgId: null,
@@ -244,31 +244,25 @@ export default{
leveOneArray: [],
leveTwoArray: [],
leveThreeArray: [],
- parentId: null,
+ code: null,
affiliationOrgList: [],
},
- orgList: [],
})
const PlaceOfPayList = ref([
- { value: 1, label: "一级审批人" },
- { value: 2, label: "二级审批人" },
- { value: 3, label: "三级审批人" },
+ { value: '1', label: "一级审批人" },
+ { value: '2', label: "二级审批人" },
+ { value: '3', label: "三级审批人" },
])
const PlaceOfPayListTwo = ref([
- { value: 1, label: "一级审批人" },
+ { value: '1', label: "一级审批人" },
])
- const AddContentList = (val) => {
- console.log(val,'val')
- state.orgList = val
- state.formParam.affiliationOrgList = val
- }
const selectRadio = (val)=>{
if(val.target.value == 1){
state.formParam.leveOneArray = []
state.formParam.leveTwoArray = []
state.formParam.leveThreeArray = []
}
- state.formParam.parentId = null
+ state.formParam.code = null
}
const columns = ref([
{
@@ -343,7 +337,7 @@ const orgColumns = ref([
customRender: (text) => {
return (
- {isSelect == 1 ? `${text.record.isSelect} (${text.record.orgName})` : "否 (-)"}
+ {text.record.isSelect == 1 ? `${text.record.isSelect} (${text.record.orgName})` : "否 (-)"}
)
}
@@ -451,7 +445,7 @@ const getTableDate = (obj) => {
state.formParam={
trainOrgId:null,
trainOrgName:null,
- status: 0,
+ isParent: 0,
remark:null,
orgName: null,
orgId: null,
@@ -461,7 +455,7 @@ const getTableDate = (obj) => {
leveOneArray: [],
leveTwoArray: [],
leveThreeArray: [],
- parentId: null,
+ code: null,
affiliationOrgList: []
}
}
@@ -478,12 +472,8 @@ const getTableDate = (obj) => {
}
//保存
const createTeacherDialog = async () => {
- if(state.formParam.status){
- state.formParam.status = state.formParam.parentId
- }
+ console.log(state.formParam,'state.formParam')
state.formParam.affiliationUserList = [...state.formParam?.actArray,...state.formParam?.leveOneArray,...state.formParam?.leveTwoArray,...state.formParam?.leveThreeArray]
- state.formParam.orgId = state.orgList?.map(item=>item.id).join(',')
- state.formParam.orgName = state.orgList?.map(item=>item.name).join(',')
const formItemNames = Object.keys(rules);
for(let i=0;i {
const rules = {
trainOrgId: [{ required: true, message: '',log:'培训发生组织编号不能为空' }],
trainOrgName: [{ required: true, message: '',log:'培训发生组织名称不能为空' }],
- parentId: [{ required: true, message: '',log:'根节点不能为空' }],
+ code: [{ required: true, message: '',log:'根节点不能为空' }],
actValue: [{ required: true, message: '',log:'组织担当不能为空' }],
leveOneValue: [{ required: true, message: '"',log:'一级审批人不能为空' }],
@@ -531,7 +521,6 @@ const getTableDate = (obj) => {
getTableDate,
searchSubmit,
selectRadio,
- AddContentList,
PlaceOfPayList,
PlaceOfPayListTwo,
searchReset,