From 6f5867bfd5996241004bd606d4fb14ec7bea74da Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Sat, 22 Jun 2024 15:00:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/hr/people/index.ts | 16 ++ src/components/DesignForm/assembly/index.ts | 10 +- src/components/DesignForm/formControlAttr.vue | 101 +++++---- .../DesignForm/public/form/formGroup.vue | 71 +++++- src/widget/index.ts | 5 + src/widget/systemunit/founder.vue | 202 ++++++++++++++++++ src/widget/systemunit/founderTime.vue | 185 ++++++++++++++++ 7 files changed, 534 insertions(+), 56 deletions(-) create mode 100644 src/widget/systemunit/founder.vue create mode 100644 src/widget/systemunit/founderTime.vue diff --git a/src/api/hr/people/index.ts b/src/api/hr/people/index.ts index c5ddd7445..d485bedea 100644 --- a/src/api/hr/people/index.ts +++ b/src/api/hr/people/index.ts @@ -657,3 +657,19 @@ export function editCertificatesContState(data?: delJjlxr) { }) } +//获取人员信息 +export function getPeopleKey(data?: any) { + return request({ + url: '/hrapi/staff/getPeopleKey', + method: 'post', + data: data + }) +} +//获取人员信息 +export function getUserCont(data?: any) { + return request({ + url: '/systemapi/user/get_user_cont', + method: 'get', + data: data + }) +} diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts index 5d922e967..6a662933c 100644 --- a/src/components/DesignForm/assembly/index.ts +++ b/src/components/DesignForm/assembly/index.ts @@ -810,7 +810,7 @@ export default [ icon: 'number', iconFont: 'fa-user-circle-o', control: { - modelValue: 0 + modelValue: "" }, config: {}, styles: { @@ -825,7 +825,7 @@ export default [ icon: 'number', iconFont: 'fa-clock-o', control: { - modelValue: 0 + modelValue: "" }, config: {}, styles: { @@ -840,7 +840,7 @@ export default [ icon: 'number', iconFont: 'fa-clock-o', control: { - modelValue: 0 + modelValue: "" }, config: {}, styles: { @@ -855,7 +855,7 @@ export default [ icon: 'number', iconFont: 'fa-user-circle', control: { - modelValue: 0 + modelValue: "" }, config: {}, styles: { @@ -870,7 +870,7 @@ export default [ icon: 'number', iconFont: 'fa-group', control: { - modelValue: 0 + modelValue: "" }, config: {}, styles: { diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue index d9518656c..2e5655d60 100644 --- a/src/components/DesignForm/formControlAttr.vue +++ b/src/components/DesignForm/formControlAttr.vue @@ -208,7 +208,7 @@ selectvalue = "default", mathFormula = {} }: { control: any;type:any;name:any;item:any;attr:any; config: any,selectvalue:any,mathFormula:any } = controlData.value - // console.log("controlData.value--->",controlData.value) + console.log("controlData.value--->",controlData.value) // console.log("controlData.value-1-->",control,selectvalue) let columnIndex = false // 是否显示序号列 if (type === 'table') { @@ -1047,43 +1047,49 @@ break case 'labelNameVal': if(val != ""){ - chineseToPinyin({title:val,types:8,connector:"",formJson:JSON.stringify(props.formInfo)}) - .then((data:any)=>{ - if(data.code == 0){ - if(data.data != ""){ - if(!fileSignAry.includes(data.data)){ - controlData.value.name = data.data - fileSignAry.push(data.data) - }else{ - let isEnd = true; - do{ - let titleVal = data.data + Rand(10000000,99999999) - if(!fileSignAry.includes(titleVal)){ - controlData.value.name = titleVal; - fileSignAry.push(titleVal); - isEnd=false; - } - }while(isEnd); - } - }else{ - if(!fileSignAry.includes(val)){ - controlData.value.name = val - fileSignAry.push(val) - }else{ - let titleVal = val + Rand(10000000,99999999) - if(!fileSignAry.includes(titleVal)){ - controlData.value.name = titleVal; - fileSignAry.push(titleVal); - } - } - - } - - } - }) - } + let ary = ["founder","founderTime","editTime","owner","deptOrg"] + if (!ary.includes(controlData.value.type)){ + + + chineseToPinyin({title:val,types:8,connector:"",formJson:JSON.stringify(props.formInfo)}) + .then((data:any)=>{ + if(data.code == 0){ + if(data.data != ""){ + if(!fileSignAry.includes(data.data)){ + controlData.value.name = data.data + fileSignAry.push(data.data) + }else{ + let isEnd = true; + do{ + let titleVal = data.data + Rand(10000000,99999999) + if(!fileSignAry.includes(titleVal)){ + controlData.value.name = titleVal; + fileSignAry.push(titleVal); + isEnd=false; + } + }while(isEnd); + } + }else{ + if(!fileSignAry.includes(val)){ + controlData.value.name = val + fileSignAry.push(val) + }else{ + let titleVal = val + Rand(10000000,99999999) + if(!fileSignAry.includes(titleVal)){ + controlData.value.name = titleVal; + fileSignAry.push(titleVal); + } + } + + } + + } + console.log("字段编辑--fileSignAry-111-》",fileSignAry) + }) + } + } - // console.log("字段编辑--fileSignAry--》",fileSignAry) + console.log("字段编辑--fileSignAry--》",controlData.value) break } if (obj.path) { @@ -1488,7 +1494,7 @@ const subUnit = ref() //默认值处理 const digitPageSub = (val:any,envt:any) => { - // console.log("默认值处理--->",val.value,envt,props.formData) + console.log("默认值处理--->",val.value,envt,props.formData) // console.log("默认值处理-1-->",props.formList) // console.log("默认值处理-2-->",props.formConfig) @@ -2612,7 +2618,19 @@ const loadNextPage = () => { } } - +/** +@ 作者: 秦东 +@ 时间: 2024-06-22 13:57:55 +@ 功能: 判断该输入框是否不可编辑 +*/ +const disabledIstrue = (val:string) => { + let ary = ["creater","creater_time","edit_time","owner","org"] + if (ary.includes(val)){ + return true; + }else{ + return false; + } +}