Merge branch 'qin_v5'

src/components/DesignForm/assembly/index.ts

@@ -267,7 +267,7 @@ export default [
 				}
 			},
 			{
-				type: 'organization',
+				type: 'organization', 
 				label: '联系地址',
 				unitName: '联系地址',
 				icon: 'marker',

src/components/DesignForm/formControlAttres.vue

@@ -592,7 +592,7 @@ const attrList = computed(() => {
           vShow: ['upload']
         },
         {
-          label: 'direction',
+          label: '分割线方向',
           type: 'select',
           dict: { horizontal: 'horizontal', vertical: 'vertical' },
           placeholder: '分割线方向，默认horizontal',
@@ -601,14 +601,14 @@ const attrList = computed(() => {
           vShow: ['divider']
         },
         {
-          label: 'border-style',
+          label: '分隔符样式',
           placeholder: '分隔符样式，默认solid',
           value: control.borderStyle,
           path: 'control.borderStyle',
           vShow: ['divider']
         },
         {
-          label: 'content-position',
+          label: '文字方位',
           type: 'select',
           dict: { left: 'left', right: 'right', center: 'center' },
           value: control.contentPosition,

src/components/DesignForm/formControlPropertiNew.vue

@@ -908,7 +908,7 @@ const attrList = computed(() => {
                     vShow: ['upload']
                 },
                 {
-                    label: 'direction',
+                    label: '分割线方向',
                     type: 'select',
                     dict: { horizontal: 'horizontal', vertical: 'vertical' },
                     placeholder: '分割线方向，默认horizontal',
@@ -917,14 +917,14 @@ const attrList = computed(() => {
                     vShow: ['divider']
                 },
                 {
-                    label: 'border-style',
+                    label: '分隔符样式',
                     placeholder: '分隔符样式，默认solid',
                     value: control.borderStyle,
                     path: 'control.borderStyle',
                     vShow: ['divider']
                 },
                 {
-                    label: 'content-position',
+                    label: '文字方位',
                     type: 'select',
                     dict: { left: 'left', right: 'right', center: 'center' },
                     value: control.contentPosition,

src/components/DesignForm/formControlProperties.vue

@@ -915,7 +915,7 @@ const attrList = computed(()=>{
                 vShow: ['upload']
             },
             {
-                label: 'direction',
+                label: '分割线方向',
                 type: 'select',
                 dict: { horizontal: 'horizontal', vertical: 'vertical' },
                 placeholder: '分割线方向，默认horizontal',
@@ -924,14 +924,14 @@ const attrList = computed(()=>{
                 vShow: ['divider']
             },
             {
-                label: 'border-style',
+                label: '分隔符样式',
                 placeholder: '分隔符样式，默认solid',
                 value: control.borderStyle,
                 path: 'control.borderStyle',
                 vShow: ['divider']
             },
             {
-                label: 'content-position',
+                label: '文字方位',
                 type: 'select',
                 dict: { left: 'left', right: 'right', center: 'center' },
                 value: control.contentPosition,

src/components/DesignForm/public/form/formGroup.vue

@@ -775,7 +775,7 @@ function optionsValue3Get1(data: any,fieldName: string){
 				</template>
 				<!--格栅布局-->
 				<template v-else-if="element.type === 'grid'">
-					<el-row class="form-row" :class="[element.className]">
+					<el-row class="form-row" :style="type === 5?'padding: 0 0 20px 0;':''" :class="[element.className]">
 						<el-col
 							class="form-col"
 							:class="{

src/components/DesignForm/public/form/formItem.vue

@@ -929,7 +929,7 @@ const uploadPic = (val:any) => {
 
 				
 				
-				<OrgCitys v-else-if="judgeIsShow(data.name) && data.type === 'organization' " :data="data" />
+	<OrgCitys v-else-if="judgeIsShow(data.name) && data.type === 'organization' " :data="data" />
 				<UrlLink v-else-if="judgeIsShow(data.name) && data.type === 'urllink' && type != 4" :data="data" />
 
 	

src/views/hr/archives/archivescont.vue

@@ -26,7 +26,7 @@ import Talentinventory from "@/views/hr/archives/basicinformation/talentinventor
 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 PersonalityTest from "@/views/hr/archives/basicinformation/personalityTest.vue";		//证书信息
+import PersonalityTest from "@/views/hr/archives/basicinformation/personalityTest.vue";		//就行人格
 
 
 const props = defineProps({

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

@@ -145,7 +145,7 @@ const delzsxxBox = (cont: zhengshuxinxi) => {
 						<template #label>
                             <el-text><el-icon><Tickets /></el-icon> 证书名称</el-text>
                         </template>
-                        {{ item.name }}
+                        {{ item.title }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 						<template #label>
@@ -157,19 +157,19 @@ const delzsxxBox = (cont: zhengshuxinxi) => {
 						<template #label>
                             <el-text><el-icon><OfficeBuilding /></el-icon> 发证单位</el-text>
                         </template>
-                        {{ item.issuingunit }}
+                        {{ item.issuingUnit }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 						<template #label>
                             <el-text><svg-icon icon-class="yunxing" class="svg_box"></svg-icon> 生效时间</el-text>
                         </template>
-                        {{ item.effectivetime }}
+                        {{ item.timeDataStr }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 						<template #label>
                             <el-text><svg-icon icon-class="stop" class="svg_box"></svg-icon> 截止时间</el-text>
                         </template>
-						{{ item.deadline }}
+						{{ item.endTimeStr }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 					<template #label>
@@ -181,7 +181,7 @@ const delzsxxBox = (cont: zhengshuxinxi) => {
 					<template #label>
                         <el-text><el-icon><QuestionFilled /></el-icon> 是否生效</el-text>
                      </template>
-                        {{ item.iseffective }}
+                        {{ item.validPeriod }}
                 </el-descriptions-item>
 			</el-descriptions>
 		</el-col>

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

@@ -38,7 +38,7 @@ const getzcxxList = () => {
 	tableLoading.value = true;
 	getJobtitleCont({ id: props.usercont.keystr })
 		.then((data) => {
-			zcxxList.value = data.data.list;
+			zcxxList.value = data.data;
 			totalVal.value = data.data.total
 		})
 		.finally(() => {
@@ -108,7 +108,8 @@ const delzcxxBox = (cont: zhichengxinxi) => {
 	<el-table 
 	v-loading="tableLoading" 
 	highlight-current-row 
-	:data="zcxxList" border
+	:data="zcxxList" 
+	border
 	:header-cell-style="{ background: '#F5F7FA' }">
 		<el-table-column label="职称级别" prop="types" align="center"/>
 		<el-table-column label="职称系列" prop="series" align="center"/>

src/views/hr/archives/basicinformation/personalityTest.vue

@@ -67,7 +67,7 @@ const isTestShouw = (val:number) => {
 	<div>
 		<CharacterColor v-if="isTestShouw(1)" :usercont="props.usercont" :tabsid="props.tabsid" />
 		<DiscTest v-if="isTestShouw(2)" :usercont="props.usercont" :tabsid="props.tabsid" />
-		<NinePage :usercont="props.usercont" :tabsid="props.tabsid" />
+		<NinePage v-if="isTestShouw(1)" :usercont="props.usercont" :tabsid="props.tabsid" />
 		<div  v-if="isTestShouw(3)" v-html="props.usercont.userTypes"></div>
 	</div>
 </template>