Browse Source

Merge branch 'qin_v10_master'

lwx_14
超级管理员 1 year ago
parent
commit
665f8012c2
  1. 16
      src/api/hr/people/index.ts
  2. 52
      src/components/DesignForm/assembly/index.ts
  3. 2
      src/components/DesignForm/dragControlApp.vue
  4. 70
      src/components/DesignForm/formControlPropertiNew.vue
  5. 2
      src/components/DesignForm/formControlProperties.vue
  6. 33
      src/views/hr/archives/archivescont.vue
  7. 43
      src/views/hr/archives/basicinformation/appraisalrecord.vue
  8. 24
      src/views/hr/archives/basicinformation/certificates.vue
  9. 2
      src/views/hr/archives/basicinformation/charactercolor.vue
  10. 80
      src/views/hr/archives/basicinformation/employmentrelations.vue
  11. 28
      src/views/hr/archives/basicinformation/jobtitle.vue
  12. 45
      src/views/hr/archives/basicinformation/rewardsandpunishments.vue
  13. 56
      src/views/hr/archives/basicinformation/talentinventory.vue
  14. 44
      src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue

16
src/api/hr/people/index.ts

@ -464,9 +464,9 @@ export function getCharacterColor(data?: contNumber):any {
}
// 获取奖惩记录
export function getRewardsAndPunishmentsCont(data?: contId) {
export function getRewardsAndPunishmentsCont(data?: any) {
return request({
url: '/hrapi/',
url: '/hrapi/staff/rewPunList',
method: 'post',
data: data
})
@ -496,9 +496,9 @@ export function editRewardsAndPunishmentsContState(data?: delJjlxr) {
})
}
//获取考评记录
export function getAppraisalrecordCont(data?: contId) {
export function getAppraisalrecordCont(data?: any) {
return request({
url: '/hrapi/',
url: '/hrapi/staff/assessmentRecords',
method: 'post',
data: data
})
@ -563,7 +563,7 @@ export function editTalentinventoryContState(data?: delJjlxr) {
//获取用工关系
export function getEmploymentrelationsCont(data?: contId) {
return request({
url: '/hrapi/',
url: '/hrapi/staff/peopleEmploymentRelationship',
method: 'post',
data: data
})
@ -595,7 +595,7 @@ export function editEmploymentrelationsContState(data?: delJjlxr) {
//获取职称信息
export function getJobtitleCont(data?: contId) {
return request({
url: '/hrapi/',
url: '/hrapi/staff/peopleTitle',
method: 'post',
data: data
})
@ -625,9 +625,9 @@ export function editJobtitleContState(data?: delJjlxr) {
})
}
//获取证书信息
export function getCertificatesCont(data?: contId) {
export function getCertificatesCont(data?: any) {
return request({
url: '/hrapi/',
url: '/hrapi/staff/peopleHonor',
method: 'post',
data: data
})

52
src/components/DesignForm/assembly/index.ts

@ -23,6 +23,7 @@ export default [
{
type: 'title',
label: '标题',
unitName: '标题',
icon: 'title',
iconFont: 'fa-header',
control: {
@ -38,6 +39,7 @@ export default [
{
type: 'digitpage',
label: '数值',
unitName: '数值',
icon: 'money',
iconFont: 'fa-money',
control: {
@ -62,6 +64,7 @@ export default [
{
type: 'input',
label: '单行文本',
unitName: '单行文本',
icon: 'input',
iconFont: 'fa-text-width',
control: {
@ -79,6 +82,7 @@ export default [
{
type: 'textarea',
label: '多行文本',
unitName: '多行文本',
icon: 'textarea',
iconFont: 'fa-text-height',
control: {
@ -94,6 +98,7 @@ export default [
{
type: 'radio',
label: '单选框组',
unitName: '单选框组',
icon: 'radio',
iconFont: 'fa-dot-circle-o',
control: {
@ -113,6 +118,7 @@ export default [
{
type: 'checkbox',
label: '多选框组',
unitName: '多选框组',
icon: 'checkbox',
iconFont: 'fa-check-square-o',
control: {
@ -132,6 +138,7 @@ export default [
{
type: 'select',
label: '下拉选择框',
unitName: '下拉选择框',
icon: 'select',
iconFont: 'fa-toggle-down',
control: {
@ -152,6 +159,7 @@ export default [
{
type: 'cascader',
label: '级联选择器',
unitName: '级联选择器',
icon: 'cascader',
iconFont: 'fa-sitemap',
control: {
@ -168,6 +176,7 @@ export default [
{
type: 'datePicker',
label: '日期选择器',
unitName: '日期选择器',
icon: 'todo',
iconFont: 'fa-calendar',
control: {
@ -184,6 +193,7 @@ export default [
{
type: 'timePicker',
label: '时间选择器',
unitName: '时间选择器',
icon: 'time',
iconFont: 'fa-clock-o',
control: {
@ -199,6 +209,7 @@ export default [
{
type: 'txt',
label: '文字描述',
unitName: '文字描述',
icon: 'text',
iconFont: 'fa-file-word-o',
control: {
@ -214,6 +225,7 @@ export default [
{
type: 'organization',
label: '联系地址',
unitName: '联系地址',
icon: 'marker',
iconFont: 'fa-map-marker',
control: {
@ -228,6 +240,7 @@ export default [
{
type: 'switch',
label: '开关',
unitName: '开关',
icon: 'switch',
iconFont: 'fa-toggle-on',
control: {
@ -255,11 +268,13 @@ export default [
{
type: 'button',
label: '按钮',
unitName: '按钮',
icon: 'button',
iconFont: 'fa-square-o',
control: {
label: '保存'
label: '保存',
},
config: {},
styles: {
divStyle: {},
@ -270,6 +285,7 @@ export default [
{
type: 'inputNumber',
label: '计数器',
unitName: '计数器',
icon: 'number',
iconFont: 'fa-sort-numeric-asc',
control: {
@ -285,6 +301,7 @@ export default [
{
type: 'description',
label: '描述说明',
unitName: '描述说明',
icon: 'number',
iconFont: 'fa-question-circle-o',
control: {
@ -314,6 +331,7 @@ export default [
{
type: 'grid',
label: '格栅布局',
unitName: '格栅布局',
icon: 'grid',
iconFont: 'fa-th-large',
columns: [
@ -338,6 +356,7 @@ export default [
{
type: 'card',
label: '卡片布局',
unitName: '卡片布局',
icon: 'card',
iconFont: 'fa-credit-card',
list: [],
@ -353,6 +372,7 @@ export default [
{
type: 'flex',
label: '弹性布局',
unitName: '弹性布局',
icon: 'flex',
iconFont: 'fa-file-text-o',
list: [],
@ -370,6 +390,7 @@ export default [
{
type: 'div',
label: '容器',
unitName: '容器',
icon: 'div',
iconFont: '',
control: {},
@ -384,11 +405,13 @@ export default [
{
type: 'tabs',
label: '标签页',
unitName: '标签页',
icon: 'tabs',
iconFont: 'fa-folder-o',
columns: [
{
label: 'Tab1',
unitName: '',
list: []
}
],
@ -404,6 +427,7 @@ export default [
{
type: 'divider',
label: '分割线',
unitName: '分割线',
icon: 'divider',
iconFont: '',
control: {},
@ -424,6 +448,7 @@ export default [
{
type: 'lowcodeImage',
label: '图片',
unitName: '图片',
icon: '',
iconFont: 'fa-photo',
control: {
@ -457,6 +482,7 @@ export default [
{
type: 'videoUpAndPlay',
label: '视频',
unitName: '视频',
icon: '',
iconFont: 'fa-play-circle',
control: {
@ -493,6 +519,7 @@ export default [
type: 'upload',
label: '文件',
unitName: '文件',
icon: 'image',
iconFont: 'fa-file-image-o',
control: {
@ -509,6 +536,7 @@ export default [
{
type: 'urllink',
label: '链接',
unitName: '链接',
icon: 'link',
iconFont: 'fa-link',
control: {
@ -523,6 +551,7 @@ export default [
{
type: 'table',
label: '子表',
unitName: '子表',
icon: 'table',
iconFont: 'fa-table',
list: [],
@ -542,6 +571,7 @@ export default [
{
type: 'baidumap',
label: '地图',
unitName: '地图',
icon: 'map',
iconFont: 'fa-map-o',
control: {
@ -556,6 +586,7 @@ export default [
{
type: 'slider',
label: '滑块',
unitName: '滑块',
icon: 'slider',
iconFont: 'fa-sliders',
control: {
@ -571,6 +602,7 @@ export default [
{
type: 'rate',
label: '评分',
unitName: '评分',
icon: 'rate',
iconFont: 'fa-star-o',
control: {
@ -586,6 +618,7 @@ export default [
{
type: 'tinymce',
label: '富文本',
unitName: '富文本',
icon: 'tinymce',//
iconFont: 'fa-list-alt',
control: {
@ -601,6 +634,7 @@ export default [
{
type: 'lowcodeCarsusel',
label: '轮播图',
unitName: '轮播图',
icon: '',
iconFont: 'fa-window-restore',
control: {
@ -630,6 +664,7 @@ export default [
{
type: 'signaturemap',
label: '签名板',
unitName: '签名板',
icon: 'faedit',
iconFont: 'fa-edit',
control: {
@ -644,6 +679,7 @@ export default [
{
type: 'lowcodeTransfer',
label: '穿梭框',
unitName: '穿梭框',
icon: '',
iconFont: 'fa-arrows-h',
control: {
@ -651,12 +687,14 @@ export default [
fixedOptions: [{
id: 'thefirstrootnode',
label: '根节点1',
unitName: '',
disabled: false,
children: []
},
{
id: 'thesecondrootnode',
label: '根节点2',
unitName: '',
disabled: false,
children: []
}]
@ -672,6 +710,7 @@ export default [
type: 'colorPicker',
label: '取色器',
unitName: '取色器',
icon: 'color',
iconFont: '',
control: {
@ -687,6 +726,7 @@ export default [
{
type: 'treeSelect',
label: '树形控件',
unitName: '树形控件',
icon: 'tree2',
iconFont: '',
control: {
@ -706,6 +746,7 @@ export default [
{
type: 'associatedForms',
label: '关联表单',
unitName: '关联表单',
icon: '',
iconFont: 'fa-wpforms',
control: {
@ -730,6 +771,7 @@ export default [
{
type: 'component',
label: '自定义组件',
unitName: '自定义组件',
icon: 'component',
iconFont: 'fa-cubes',
control: {
@ -761,6 +803,7 @@ export default [
{
type: 'serialNumber',
label: '编码',
unitName: '编码',
icon: 'number',
iconFont: 'fa-list-ol',
control: {
@ -777,6 +820,7 @@ export default [
{
type: 'expand-user',
label: '选择用户',
unitName: '选择用户',
icon: 'user',
iconFont: 'fa-user-o',
control: {
@ -793,6 +837,7 @@ export default [
{
type: 'orgCentent',
label: '选择组织',
unitName: '选择组织',
icon: 'sliders',
iconFont: 'fa-sliders',
control: {
@ -807,6 +852,7 @@ export default [
{
type: 'founder',
label: '创建人',
unitName: '创建人',
icon: 'number',
iconFont: 'fa-user-circle-o',
control: {
@ -822,6 +868,7 @@ export default [
{
type: 'founderTime',
label: '创建时间',
unitName: '创建时间',
icon: 'number',
iconFont: 'fa-clock-o',
control: {
@ -837,6 +884,7 @@ export default [
{
type: 'editTime',
label: '修改时间',
unitName: '修改时间',
icon: 'number',
iconFont: 'fa-clock-o',
control: {
@ -852,6 +900,7 @@ export default [
{
type: 'owner',
label: '拥有者',
unitName: '拥有者',
icon: 'number',
iconFont: 'fa-user-circle',
control: {
@ -867,6 +916,7 @@ export default [
{
type: 'deptOrg',
label: '所属部门',
unitName: '所属部门',
icon: 'number',
iconFont: 'fa-group',
control: {

2
src/components/DesignForm/dragControlApp.vue

@ -73,7 +73,7 @@ const emits = defineEmits<{
@ 功能: 启用和禁用版本
*/
const enableOrDisable = (val?:any) =>{
console.log("启用和禁用版本",val)
// console.log("",val)
emits('versionUpdateForm', val)
}
/**

70
src/components/DesignForm/formControlPropertiNew.vue

@ -204,7 +204,7 @@ const formAttr = computed(() => {
]
})
const attrList = computed(() => {
// console.log("controlData.value-1-->",controlData.value)
console.log("controlData.value-1-->",controlData.value)
if (Object.keys(controlData.value).length) {
const {
control = {},
@ -214,10 +214,11 @@ const attrList = computed(() => {
item = {},
attr = {},
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-1-->",control,selectvalue)
mathFormula = {},
unitName
}: { control: any;type:any;name:any;item:any;attr:any; config: any,selectvalue:any,mathFormula:any,unitName:any } = controlData.value
console.log("controlData.value--->",controlData.value)
console.log("controlData.value-1-->",unitName)
let columnIndex = false //
if (type === 'table') {
//
@ -228,6 +229,12 @@ const attrList = computed(() => {
}
const temp =reactive<PublicAtrr[]>([
{
label: '组件类型',
value: unitName,
placeholder: '组件类型',
path: 'unitName'
},
{
label: '自定义Class',
value: config.className,
@ -1387,7 +1394,7 @@ const tableColumnAdd = (val: string) => {
//
const checkboxRequired = computed(() => {
const val = controlData.value && controlData.value.item?.rules
console.log("校验规则必填勾选设置",val && val.length > 0)
// console.log("",val && val.length > 0)
if(val && val.length > 0){
return true
}else{
@ -1540,7 +1547,7 @@ const eventClick = (type: string, tooltip?: string) => {
defineExpose({ getFormFieldBySource })
//
const isNotWrite = (val:any) =>{
console.log("判断输入框是否可写--->",val,props.customerformid)
// console.log("--->",val,props.customerformid)
if(val.key === "name" && props.customerformid != ""){
return true
}
@ -1586,13 +1593,13 @@ const updataDigit = (key:string,val:any) => {
// console.log("-1-->",props.formList)
// console.log("-2-->",props.formConfig)
// console.log("--3->",props.formOtherData)
console.log("默认值处理--4->",val)
// console.log("--4->",val)
formConfig.value[key] = {
mathsFormula:val.mathsFormula,
takingMethod:val.takingMethod,
digit:val.digit
}
console.log("返回值处理--->",formConfig.value)
// console.log("--->",formConfig.value)
attrList.value.forEach((item:any)=>{
// console.log("--1->",item)
if(item.type == "digitpage"){
@ -1652,7 +1659,7 @@ const videoIndex = ref(0);
//
function videoUploadErr(error: Error, uploadFile: UploadFile, uploadFiles: UploadFiles){
alert("上传失败,请重试")
console.log("上传失败"+error);
// console.log(""+error);
}
//liwenxuan 20240108 vidioupload end
@ -1684,9 +1691,9 @@ const showImagePreview = ref(false)
if(controlData.value.type==='lowcodeCarsusel'){
const carsuselConfigData:CarsuselConfig[] = controlData.value.control.carsuselConfigArr
carsuselConfigData.forEach(element => {
//console.log(element)
// console.log(element)
if(element.imgId==''){
//console.log("imgid")
// console.log("imgid")
let onlyNumber = uuidv4().replaceAll('-','').toString(); //
element.imgId = onlyNumber;
}
@ -1695,21 +1702,21 @@ const showImagePreview = ref(false)
controlData.value.control.fillRoles[0].id = uuidv4().replaceAll('-','').toString();
}
// start
//console.log(controlData.value.name)
// console.log(controlData.value.name)
resDataForGlxxszExceptself1 = JSON.parse(JSON.stringify(resDataForGlxxszExceptself));
//console.log(resDataForGlxxszExceptself1)
// console.log(resDataForGlxxszExceptself1)
for(let i = 0;i<resDataForGlxxszExceptself1.length;i++){
let strArr:[string] = resDataForGlxxszExceptself1[i].id.split(":")
//console.log(strArr)
// console.log(strArr)
let str = strArr[strArr.length-1]
//console.log(str)
// console.log(str)
if(str==newVal){
resDataForGlxxszExceptself1.splice(i, 1); // 使1
i--; //
}
}
//console.log(resDataForGlxxszExceptself1)
// console.log(resDataForGlxxszExceptself1)
if(getAssociatedFormsCurrentFieldTreeData.treeAttrs!=undefined){
associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [{
id: 'rootid_'+getAssociatedFormsCurrentFieldTreeData.label,
@ -2031,7 +2038,7 @@ function formidChangedOptionsValue3(){
arr = arr.filter( (item: { label: any }) => item.label == data.treeAttrs.onlyToShowTableId )
arr = arr[0].children
//console.log(arr)
// console.log(arr)
asfasfFieldTreeOptionsValue3.value = [{
id: 'rootid_'+data.label,
label: '关联的表单-'+data.label,
@ -2075,9 +2082,9 @@ let resDataForGlxxszExceptself: any[] = []
let resDataForGlxxszExceptself1: any[] = []
let getAssociatedFormsCurrentFieldTreeData:any
getAssociatedFormsCurrentFieldTree().then(({ data }) => {
//console.log(data)
// console.log(data)
getAssociatedFormsCurrentFieldTreeData = JSON.parse(JSON.stringify(data))
//console.log(getAssociatedFormsCurrentFieldTreeData)
// console.log(getAssociatedFormsCurrentFieldTreeData)
if(data.id==="cfid为空"){
//alert("cfid")
}else{
@ -2095,7 +2102,7 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value));
//console.log(resDataForGlxxszExceptself)
// console.log(resDataForGlxxszExceptself)
@ -2147,7 +2154,7 @@ getAssociatedFormsOrgAndManTree().then(({ data }) => {
const roleTree = ref<Tree[]>()
getAssociatedFormsRoleTree().then(({ data }) => {
let resData = ref(data.children)
//console.log("roleTree=============="+resData.value);
// console.log("roleTree=============="+resData.value);
roleTree.value = [{
id: data.id,
//label: data.label,
@ -2558,7 +2565,7 @@ function optionsTypeChanged(){
]
const layouytStyle = reactive<any>(controlData.value.styles)
watch(()=>layouytStyle,(val : any)=>{
console.log("监听样式处理",val)
// console.log("",val)
controlData.value.styles = val
// Object.assign(store.controlAttr.styles.divStyle, val)
},
@ -2595,7 +2602,7 @@ const handleAvatarSuccess: UploadProps['onSuccess'] = (
}
const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
console.log("beforeAvatarUpload",rawFile.type)
// console.log("beforeAvatarUpload",rawFile.type)
if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/jpg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/gif' && rawFile.type !== 'image/icon') {
ElMessage.error('请上传以下格式的图片(jpg、jpeg、png、gif、icon)!'+rawFile.type)
return false
@ -2625,7 +2632,7 @@ const gainFormGroupList = () =>{
}
customerFormGroupList(sendInfo)
.then((data)=>{
console.log("获取表单分组",data)
// console.log("",data)
formGroup.value = data.data
})
.finally(()=>{
@ -2704,7 +2711,7 @@ const disabledIstrue = (val:string) => {
<!-- <div class=""><h3>通用属性</h3></div> -->
<el-divider content-position="left">通用属性</el-divider>
<template v-for="(item, index) in attrList" :key="index">
<el-form-item :label="item.label" class="form_cont">
<el-select
@ -3038,7 +3045,16 @@ const disabledIstrue = (val:string) => {
</el-row>
<el-row v-else-if="item.path === 'unitName'">
<el-input
:type="item.inputStyle"
v-model="item.value"
:placeholder="item.placeholder"
disabled
/>
</el-row>
<el-input
v-else

2
src/components/DesignForm/formControlProperties.vue

@ -1527,7 +1527,7 @@ const disabledIstrue = (val:string) => {
<el-tab-pane label="字段配置" name="first">
<el-scrollbar class="formAttributeBox">
<el-form size="small" class="form">
<el-divider content-position="left">通用属性</el-divider>
<el-divider content-position="left">通用2属性</el-divider>
<template v-for="(item, index) in attrList" :key="index">
<el-form-item :label="item.label" class="form_cont">
<el-select

33
src/views/hr/archives/archivescont.vue

@ -9,22 +9,22 @@
*/
import UserContent from "@/views/hr/archives/basicinformation/content.vue";
import EditUserContent from "@/views/hr/archives/basicinformation/editcontent.vue";
import OrgNexus from "@/views/hr/archives/basicinformation/orgnexus.vue";
import EmergencyContactPage from "@/views/hr/archives/basicinformation/emergencycontact.vue";
import WorkingCouplePage from "@/views/hr/archives/basicinformation/workingcouple.vue";
import FamilyMembers from "@/views/hr/archives/basicinformation/familymembers.vue";
import EducationalExperience from "@/views/hr/archives/basicinformation/educationalexperience.vue";
import InnerWork from "@/views/hr/archives/basicinformation/innerwork.vue";
import OutsideWork from "@/views/hr/archives/basicinformation/outsideWork.vue";
import Editpwd from "@/views/hr/archives/basicinformation/editpwd.vue";
import EditOrg from "@/views/hr/archives/basicinformation/editorg.vue";
import OrgNexus from "@/views/hr/archives/basicinformation/orgnexus.vue"; //
import EmergencyContactPage from "@/views/hr/archives/basicinformation/emergencycontact.vue"; //
import WorkingCouplePage from "@/views/hr/archives/basicinformation/workingcouple.vue"; //
import FamilyMembers from "@/views/hr/archives/basicinformation/familymembers.vue"; //
import EducationalExperience from "@/views/hr/archives/basicinformation/educationalexperience.vue"; //
import InnerWork from "@/views/hr/archives/basicinformation/innerwork.vue"; //
import OutsideWork from "@/views/hr/archives/basicinformation/outsideWork.vue"; //
import Editpwd from "@/views/hr/archives/basicinformation/editpwd.vue"; //
import EditOrg from "@/views/hr/archives/basicinformation/editorg.vue"; //
import CharacterColor from "@/views/hr/archives/basicinformation/charactercolor.vue";
import Rewardsandpunishments from "@/views/hr/archives/basicinformation/rewardsandpunishments.vue";
import Appraisalrecord from "@/views/hr/archives/basicinformation/appraisalrecord.vue";
import Talentinventory from "@/views/hr/archives/basicinformation/talentinventory.vue";
import Employmentrelations from "@/views/hr/archives/basicinformation/employmentrelations.vue";
import Jobtitle from "@/views/hr/archives/basicinformation/jobtitle.vue";
import Certificates from "@/views/hr/archives/basicinformation/certificates.vue";
import Rewardsandpunishments from "@/views/hr/archives/basicinformation/rewardsandpunishments.vue"; //
import Appraisalrecord from "@/views/hr/archives/basicinformation/appraisalrecord.vue"; //
import Talentinventory from "@/views/hr/archives/basicinformation/talentinventory.vue"; //
import Employmentrelations from "@/views/hr/archives/basicinformation/employmentrelations.vue"; //
import Jobtitle from "@/views/hr/archives/basicinformation/jobtitle.vue"; //
import Certificates from "@/views/hr/archives/basicinformation/certificates.vue"; //
import { archivesCont } from "@/api/hr/people/type";
@ -169,7 +169,8 @@ function getjtcyList() {
userConting.interests = data.data.interests;
userConting.bloodtype = data.data.bloodtype;
userConting.natureofAccount = data.data.natureofAccount;
userConting.careerPlanning = data.data.career_planning;
userConting.helpObtained = data.data.help_obtained;
})
.finally(() => {
rowLoading.value = false;

43
src/views/hr/archives/basicinformation/appraisalrecord.vue

@ -24,17 +24,25 @@ const props = defineProps({
},
},
});
const searchAry = reactive({
id:props.usercont.keystr,
page:1,
pagesize:10,
state:0
})
const addkpjlBoxPage = ref(false);
const editkpjlBoxPage = ref(false);
const totalVal = ref(0)
const tableLoading = ref(false);
const kpjlList = ref<kaopingjilu[]>([]);
const jcjlContList = ref<any[]>([]);
const kpjlInfo = ref<kaopingjilu>();
const getkpjlList = () => {
const getjcjlList = () => {
tableLoading.value = true;
getAppraisalrecordCont({ id: props.usercont.keystr })
searchAry.id = props.usercont.keystr;
getAppraisalrecordCont(searchAry)
.then((data) => {
kpjlList.value = data.data;
jcjlContList.value = data.data.list;
totalVal.value = data.data.total
})
.finally(() => {
tableLoading.value = false;
@ -46,8 +54,8 @@ const getkpjlList = () => {
watch(
() => props.tabsid,
() => {
if (props.tabsid == "3") {
getkpjlList();
if (props.tabsid == "11") {
getjcjlList();
}
}
);
@ -76,7 +84,7 @@ const delkpjlBox = (cont: kaopingjilu) => {
editAppraisalrecordContState({ id: toString(), state: 3, isdel: 1 }).then(
() => {
ElMessage.success("删除成功");
getkpjlList();
getjcjlList();
}
);
});
@ -86,22 +94,22 @@ const delkpjlBox = (cont: kaopingjilu) => {
<AddAppraisalrecord
v-model:addisshow="addkpjlBoxPage"
:keyval="props.usercont.keystr"
@restdata="getkpjlList"
@restdata="getjcjlList"
/>
<EditAppraisalrecord
v-model:editisshow="editkpjlBoxPage"
:keyval="props.usercont.keystr"
:datacont="kpjlInfo"
@restdata="getkpjlList"
@restdata="getjcjlList"
/>
<el-table
v-loading="tableLoading"
highlight-current-row
:data="kpjlList"
:data="jcjlContList"
border
:header-cell-style="{ background: '#F5F7FA' }"
>
<el-table-column label="考核年度" prop="year" />
<el-table-column label="考核年度" prop="years" />
<el-table-column label="考核等级" prop="level" />
<el-table-column fixed="right" align="right" width="130">
<template #header>
@ -134,6 +142,15 @@ const delkpjlBox = (cont: kaopingjilu) => {
</template>
</el-table-column>
</el-table>
<div class="pageCalss">
<el-pagination background layout="prev, pager, next" :total="totalVal" />
</div>
</template>
<style></style>
<style>
.pageCalss{
margin-top:15px;
text-align: center;
width:100%;
}
</style>

24
src/views/hr/archives/basicinformation/certificates.vue

@ -29,7 +29,13 @@ const props = defineProps({
},
},
});
const searchAry = reactive({
id:props.usercont.keystr,
page:1,
pagesize:10,
state:0,
types:4
})
const addzsxxBoxPage = ref(false);
const editzsxxBoxPage = ref(false);
const tableLoading = ref(false);
@ -37,9 +43,10 @@ const zsxxList = ref<zhengshuxinxi[]>([]);
const zsxxInfo = ref<zhengshuxinxi>();
const getzsxxList = () => {
tableLoading.value = true;
getCertificatesCont({ id: props.usercont.keystr })
getCertificatesCont(searchAry)
.then((data) => {
zsxxList.value = data.data;
zsxxList.value = data.data.list;
totalVal.value = data.data.total
})
.finally(() => {
tableLoading.value = false;
@ -51,7 +58,8 @@ const getzsxxList = () => {
watch(
() => props.tabsid,
() => {
if (props.tabsid == "4") {
if (props.tabsid == "15") {
searchAry.id=props.usercont.keystr
getzsxxList();
}
}
@ -171,6 +179,9 @@ const delzsxxBox = (cont: zhengshuxinxi) => {
<el-button type="primary" @click="addzsxxBox"><i-ep-plus />新增证书信息</el-button>
</el-col>
</el-row>
<div class="pageCalss">
<el-pagination background layout="prev, pager, next" :total="totalVal" />
</div>
</template>
<style lang="scss" scoped>
.colBox{
@ -180,4 +191,9 @@ const delzsxxBox = (cont: zhengshuxinxi) => {
margin-top:25px;
text-align:right
}
.pageCalss{
margin-top:15px;
text-align: center;
width:100%;
}
</style>

2
src/views/hr/archives/basicinformation/charactercolor.vue

@ -127,7 +127,7 @@ watch(
}),
async (newValues) => {
const { usercont, tabsid } = newValues;
// tabsid'2'usercont.number
// tabsid'2'usercont.number props.tabsid
if (tabsid === '2' && usercont.number) {
error.value = null;
await nextTick();

80
src/views/hr/archives/basicinformation/employmentrelations.vue

@ -31,7 +31,7 @@ const props = defineProps({
const addyggxBoxPage = ref(false);
const edityggxBoxPage = ref(false);
const tableLoading = ref(false);
const yggxList = ref<yonggongguanxi[]>([]);
const yggxList = ref([]);
const yggxInfo = ref<yonggongguanxi>();
const getyggxList = () => {
tableLoading.value = true;
@ -49,7 +49,7 @@ const getyggxList = () => {
watch(
() => props.tabsid,
() => {
if (props.tabsid == "4") {
if (props.tabsid == "13") {
getyggxList();
}
}
@ -95,32 +95,58 @@ const delyggxBox = (cont: yonggongguanxi) => {
:datacont="yggxInfo"
@restdata="getyggxList"
/>
<el-table
v-loading="tableLoading"
highlight-current-row
:data="yggxList" border
:header-cell-style="{ background: '#F5F7FA' }">
<el-table-column label="入职渠道" prop="entrychannel" align="center"/>
<el-table-column label="参加工作日期" prop="startdate" align="center"/>
<el-table-column label="社会工龄(年)" prop="seniority" align="center"/>
<el-table-column label="加入集团日期" prop="joindate" align="center" />
<el-table-column label="集团工龄(年)" prop="cliqueseniority" align="center" />
<el-table-column fixed="right" align="right" >
<template #header>
<el-button type="primary" link size="small" @click.stop="addyggxBox(props.usercont.keystr)">
<i-ep-plus /> 新增
</el-button>
<el-descriptions
class="margin-top"
:column="3"
:size="size"
border
>
<template #extra>
<el-button type="primary">编辑</el-button>
</template>
<el-descriptions-item>
<template #label>
<div class="cell-item">入职渠道</div>
</template>
<template #default="scope">
<el-button type="primary" link size="small" @click.stop="edityggxBox(scope.row)">
<i-ep-edit />编辑
</el-button>
<el-button type="primary" link size="small" @click.stop="delyggxBox(scope.row)">
<i-ep-delete />删除
</el-button>
{{yggxList.channel}}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
<div class="cell-item">参加工作日期</div>
</template>
</el-table-column>
</el-table>
{{yggxList.jobstartdate}}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
<div class="cell-item">社会工龄</div>
</template>
{{yggxList.shehuiGongli}}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
<div class="cell-item">加入集团日期</div>
</template>
{{yggxList.entrydate}}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
<div class="cell-item">集团工龄</div>
</template>
{{yggxList.jiTuanGongli}}
</el-descriptions-item>
</el-descriptions>
</template>
<style lang="scss" scoped></style>
<style scoped>
.el-descriptions {
margin-top: 20px;
}
.cell-item {
display: flex;
align-items: center;
}
.margin-top {
margin-top: 20px;
}
</style>

28
src/views/hr/archives/basicinformation/jobtitle.vue

@ -28,16 +28,18 @@ const props = defineProps({
},
},
});
const totalVal = ref(0)
const addzcxxBoxPage = ref(false);
const editzcxxBoxPage = ref(false);
const tableLoading = ref(false);
const zcxxList = ref<zhichengxinxi[]>([]);
const zcxxList = ref<any[]>([]);
const zcxxInfo = ref<zhichengxinxi>();
const getzcxxList = () => {
tableLoading.value = true;
getJobtitleCont({ id: props.usercont.keystr })
.then((data) => {
zcxxList.value = data.data;
zcxxList.value = data.data.list;
totalVal.value = data.data.total
})
.finally(() => {
tableLoading.value = false;
@ -49,7 +51,7 @@ const getzcxxList = () => {
watch(
() => props.tabsid,
() => {
if (props.tabsid == "4") {
if (props.tabsid == "14") {
getzcxxList();
}
}
@ -100,11 +102,11 @@ const delzcxxBox = (cont: zhichengxinxi) => {
highlight-current-row
:data="zcxxList" border
:header-cell-style="{ background: '#F5F7FA' }">
<el-table-column label="职称级别" prop="level" align="center"/>
<el-table-column label="职称级别" prop="types" align="center"/>
<el-table-column label="职称系列" prop="series" align="center"/>
<el-table-column label="职称专业" prop="profession" align="center" />
<el-table-column label="资格证书编号" prop="serialnumber" align="center" />
<el-table-column label="生效时间" prop="effectivetime" align="center" />
<el-table-column label="职称专业" prop="speciality" align="center" />
<el-table-column label="资格证书编号" prop="number" align="center" />
<el-table-column label="生效时间" prop="timeDataStr" align="center" />
<el-table-column fixed="right" align="right" >
<template #header>
<el-button type="primary" link size="small" @click.stop="addzcxxBox(props.usercont.keystr)">
@ -121,6 +123,14 @@ const delzcxxBox = (cont: zhichengxinxi) => {
</template>
</el-table-column>
</el-table>
<div class="pageCalss">
<el-pagination background layout="prev, pager, next" :total="totalVal" />
</div>
</template>
<style lang="scss" scoped></style>
<style lang="scss" scoped>
.pageCalss{
margin-top:15px;
text-align: center;
width:100%;
}
</style>

45
src/views/hr/archives/basicinformation/rewardsandpunishments.vue

@ -28,15 +28,27 @@ const props = defineProps({
});
const addJcjlBoxPage = ref(false);
const editJcjlBoxPage = ref(false);
const searchAry = reactive({
id:props.usercont.keystr,
page:1,
pagesize:10,
state:0
})
const totalVal = ref(0)
const tableLoading = ref(false);
const jcjlList = ref<jiangchengjilu[]>([]);
const jcjlList = ref<any[]>([]);
const jcjlInfo = ref<jiangchengjilu>();
const getjcjlList = () => {
const getRewPunList = () => {
tableLoading.value = true;
getRewardsAndPunishmentsCont({ id: props.usercont.keystr })
console.log("奖惩记录",props.usercont)
searchAry.id = props.usercont.keystr;
getRewardsAndPunishmentsCont(searchAry)
.then((data) => {
jcjlList.value = data.data;
console.log("奖惩记录",data)
jcjlList.value = data.data.list;
totalVal.value = data.data.total
})
.finally(() => {
tableLoading.value = false;
@ -48,8 +60,8 @@ const getjcjlList = () => {
watch(
() => props.tabsid,
() => {
if (props.tabsid == "6") {
getjcjlList();
if (props.tabsid == "10") {
getRewPunList();
}
}
);
@ -105,11 +117,11 @@ const delJcjlBox = (cont: jiangchengjilu) => {
border
:header-cell-style="{ background: '#F5F7FA' }"
>
<el-table-column label="奖惩级别" prop="level" />
<el-table-column label="奖惩类型" prop="type" />
<el-table-column label="奖惩内容" prop="content" />
<el-table-column label="奖惩时间" prop="time" />
<el-table-column label="奖惩单位" prop="company" />
<el-table-column label="奖惩级别" prop="levelName" />
<el-table-column label="奖惩类型" prop="rewPunClassName" />
<el-table-column label="奖惩内容" prop="title" />
<el-table-column label="奖惩时间(年)" prop="years" />
<el-table-column label="奖惩单位" prop="issuingUnit" />
<el-table-column fixed="right" align="right">
<template #header>
<el-button
@ -141,5 +153,14 @@ const delJcjlBox = (cont: jiangchengjilu) => {
</template>
</el-table-column>
</el-table>
<div class="pageCalss">
<el-pagination background layout="prev, pager, next" :total="totalVal" />
</div>
</template>
<style></style>
<style>
.pageCalss{
margin-top:15px;
text-align: center;
width:100%;
}
</style>

56
src/views/hr/archives/basicinformation/talentinventory.vue

@ -24,30 +24,37 @@ const props = defineProps({
},
},
});
const editrcpdBoxPage = ref(false);
const addrcpdBoxPage = ref(false);
const peopd = reactive([{
zy:props.usercont.careerPlanning,
bz:props.usercont.helpObtained
}])
// const editrcpdBoxPage = ref(false);
// const addrcpdBoxPage = ref(false);
const tableLoading = ref(false);
const rcpdList = ref<rencaipandian[]>([]);
const rcpdInfo = ref<rencaipandian>();
const getrcpdList = () => {
tableLoading.value = true;
getTalentinventoryCont({ id: props.usercont.keystr })
.then((data) => {
rcpdList.value = data.data;
})
.finally(() => {
tableLoading.value = false;
});
};
// const tableLoading = ref(false);
// const rcpdList = ref<rencaipandian[]>([]);
// const rcpdInfo = ref<rencaipandian>();
// const getrcpdList = () => {
// tableLoading.value = true;
// getTalentinventoryCont({ id: props.usercont.keystr })
// .then((data) => {
// rcpdList.value = data.data;
// })
// .finally(() => {
// tableLoading.value = false;
// });
// };
/**
* 监听数据
*/
watch(
() => props.tabsid,
() => {
if (props.tabsid == "3") {
getrcpdList();
if (props.tabsid == "12") {
// getrcpdList();
// console.log("西",props.usercont)
peopd.zy=props.usercont.careerPlanning
peopd.bz=props.usercont.helpObtained
}
}
);
@ -97,22 +104,15 @@ const delrcpdBox = (cont: rencaipandian) => {
<el-table
v-loading="tableLoading"
highlight-current-row
:data="rcpdList"
:data="peopd"
border
:header-cell-style="{ background: '#F5F7FA' }"
>
<el-table-column label="职业生涯规划" prop="career" />
<el-table-column label="期望从组织获得的帮助" prop="expecthelp" />
<el-table-column label="职业生涯规划" prop="zy" />
<el-table-column label="期望从组织获得的帮助" prop="bz" />
<el-table-column fixed="right" align="right" width="130">
<template #header>
<el-button
type="primary"
link
size="small"
@click.stop="addrcpdBox(props.usercont.keystr)"
>
<i-ep-plus /> 新增
</el-button>
操作
</template>
<template #default="scope">
<el-button

44
src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue

@ -205,7 +205,7 @@ const dialogCancel = () => {
@ 功能: 表单编辑功能按钮回调事件
*/
const buttonCallbackEvent = (type: string) => {
console.log("表单编辑功能按钮回调事件", type)
// console.log("", type)
switch (type) {
case 'del': //
state.value.formData.list = []
@ -224,7 +224,7 @@ const buttonCallbackEvent = (type: string) => {
)
state.value.formDataPreview = stringToObj(stringPreview)
state.value.formDataPreview.form.name = `Preview${formName}` //
// console.log("",state.value.formDataPreview);
console.log("预览数据",state.value.formDataPreview);
state.value.previewVisible = true
break
case 'json': //
@ -260,21 +260,21 @@ const gainTableForm = () => {
.then((res:any) => {
if(res.code == 0){
const result = res.data
console.log("初始设计搜索时--1--->",result)
// console.log("--1--->",result)
formFieldAry.value = result.formField
// res.data=''
if (result.mastesform) {
state.value.formData = stringToObj(result.mastesform)
}
console.log("初始设计搜索时",state.value.formData)
// console.log("",state.value.formData)
if(result.mastesformjson){
let kjdkjksd = string2json(result.mastesformjson)
console.log("初始设计搜索时-begin-->",state.value.formData.purview)
// console.log("-begin-->",state.value.formData.purview)
state.value.formData.purview=kjdkjksd.purview
console.log("初始设计搜索时--->",kjdkjksd)
// console.log("--->",kjdkjksd)
}
state.value.formData.config.groupKey = result.groupKey
console.log("初始设计搜索时--end->",state.value.formData)
// console.log("--end->",state.value.formData)
state.value.formDict = string2json(result.dict)
//
state.value.formOtherData.source = result.source
@ -314,7 +314,7 @@ const gainTableForm = () => {
})
})
.catch((res: any) => {
// console.log(res)
console.log(res)
ElMessage.error(res.msg || '加载异常')
state.value.loading = false
})
@ -332,7 +332,7 @@ onMounted(() => {
@ 功能: 根据启用版本进行加载页面
*/
const versionUpdateForm = (val:string) => {
// console.log("-------111------->",val)
console.log("加载异常-------111------->",val)
versionId.value = val
gainTableForm()
// getInitData()
@ -343,7 +343,7 @@ const versionUpdateForm = (val:string) => {
@ 功能: 关闭预览
*/
const closePreviewPage = (val:boolean) => {
// console.log("",val)
console.log("关闭预览",val)
state.value.previewVisible = val
}
/**
@ -365,17 +365,17 @@ const saveAppFormData = () => {
appSignCode:props.formconfigcont.signCode
}
state.value.loading = true
console.log("写入自建应用App表单",sendData)
// console.log("App",sendData)
createAppForm(sendData)
.then((data:any) => {
state.value.loading = false
console.log("写入自建应用App表单--->",data)
// console.log("App--->",data)
// appPageKey.value = data.data.customerFormCont.id
// appPageKey.set(data.data.customerFormCont.id.toString())
emits('update:formVersion', data.data.formVersion.id.toString())
emits('update:appPageKey', data.data.customerFormCont.id.toString())
console.log("写入自建应用App表单-11111-->",data.data.customerFormCont.id)
console.log("写入自建应用App表单-2222-->",props.appPageKey)
// console.log("App-11111-->",data.data.customerFormCont.id)
// console.log("App-2222-->",props.appPageKey)
// emits('update:appPageKey', data.data.customerFormCont.id.toString())
gainTableForm()
})
@ -403,11 +403,11 @@ const editAppFormTable = () => {
menuId:props.menuId,
}
state.value.loading = true
console.log("编辑App自定义表单",sendData)
// console.log("App",sendData)
editAppPageInfo(sendData)
.then((data:any) => {
state.value.loading = false
console.log("编辑App自定义表单--->",data)
// console.log("App--->",data)
emits('update:formVersion', versionId.value.toString())
gainTableForm()
})
@ -437,7 +437,7 @@ const saveOtherVersionIng = () =>{
saveOtherVersion(sendData)
.then((data:any) => {
state.value.loading = false
console.log("保存为其他版本--->",data)
// console.log("--->",data)
emits('update:formVersion', data.data.version.toString())
gainTableForm()
})
@ -460,21 +460,21 @@ const versionPreviewPage = (val:string) => {
.then((res:any) => {
if(res.code == 0){
const result = res.data
// console.log("--1--->",result)
console.log("初始设计搜索时--1--->",result)
formFieldAry.value = result.formField
// res.data=''
if (result.mastesform) {
state.value.formData = stringToObj(result.mastesform)
}
// console.log("",state.value.formData)
console.log("初始设计搜索时",state.value.formData)
if(result.mastesformjson){
let kjdkjksd = string2json(result.mastesformjson)
// console.log("-begin-->",state.value.formData.purview)
console.log("初始设计搜索时-begin-->",state.value.formData.purview)
state.value.formData.purview=kjdkjksd.purview
// console.log("--->",kjdkjksd)
console.log("初始设计搜索时--->",kjdkjksd)
}
state.value.formData.config.groupKey = result.groupKey
// console.log("--end->",state.value.formData)
console.log("初始设计搜索时--end->",state.value.formData)
state.value.formDict = string2json(result.dict)
//
state.value.formOtherData.source = result.source

Loading…
Cancel
Save