Merge branch 'qin_v10_master'

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

@@ -132,13 +132,13 @@ function editXueLiBox(cont:innerWorkCont){
 						<template #label>
                             <el-text><svg-icon icon-class="sj" class="svg_box"></svg-icon> 调动类型</el-text>
                         </template>
-                        {{ item.changetypename }}
+                        {{ item.bdlx }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 						<template #label>
-                            <el-text><svg-icon icon-class="dutiescont" class="svg_box"></svg-icon> 岗位</el-text>
+                            <el-text><svg-icon icon-class="dutiescont" class="svg_box"></svg-icon> 变动原因</el-text>
                         </template>
-                        {{ item.postname }}
+                        {{ item.changeReason }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 						<template #label>
@@ -150,20 +150,45 @@ function editXueLiBox(cont:innerWorkCont){
 						<template #label>
                             <el-text><svg-icon icon-class="jianzhi" class="svg_box"></svg-icon> 职位</el-text>
                         </template>
-                        {{ item.postname }}
+                        {{ item.zhiwei }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 						<template #label>
+                            <el-text><svg-icon icon-class="jianzhi" class="svg_box"></svg-icon> 职等</el-text>
+                        </template>
+                        {{ item.dengji }}
+                </el-descriptions-item>
+				<el-descriptions-item>
+						<template #label>
+                            <el-text><svg-icon icon-class="jianzhi" class="svg_box"></svg-icon> 上级职位</el-text>
+                        </template>
+                        {{ item.superiorpostname }}
+                </el-descriptions-item>
+				<el-descriptions-item>
+						<template #label>
+                            <el-text><svg-icon icon-class="jianzhi" class="svg_box"></svg-icon> 上级姓名</el-text>
+                        </template>
+                        {{ item.superiormanname }}
+                </el-descriptions-item>
+				<el-descriptions-item>
+						<template #label>
+                            <el-text><svg-icon icon-class="jianzhi" class="svg_box"></svg-icon> 下属人数</el-text>
+                        </template>
+						<el-text v-if="item.subordinatescount!=0">{{item.subordinatescount}}</el-text>
+                </el-descriptions-item>
+				<el-descriptions-item :span="2">
+						<template #label>
                             <el-text><svg-icon icon-class="iconfont-jixieqimo" class="svg_box"></svg-icon> 职务性质</el-text>
                         </template>
 						<el-text v-if="item.assigntype == 1">主职</el-text>
                         <el-text v-if="item.assigntype != 1">兼职</el-text>
                 </el-descriptions-item>
-				<el-descriptions-item :span="2">
+				<el-descriptions-item :span="3">
 						<template #label>
                             <el-text><svg-icon icon-class="tree" class="svg_box"></svg-icon> 行政组织</el-text>
                         </template>
-                        {{ item.allorgname }}
+						<el-text v-if="item.gsmc">{{item.gsmc}}</el-text><el-text v-if="item.yjbm">/{{item.yjbm}}</el-text><el-text v-if="item.ejbm">/{{item.ejbm}}</el-text><el-text v-if="item.gongduan">/{{item.gongduan}}</el-text>
+						
                 </el-descriptions-item>
 			</el-descriptions>
 		</el-col>

src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue

@@ -770,6 +770,10 @@ const dialogOpen = (obj: any, params: any = {}) => {
 				</div>
 			</el-tab-pane>
 			<el-tab-pane label="列表设置" :name="2">
+				<el-divider content-position="left">开启视图</el-divider>
+				<div class="demo-collapse">
+				111
+				</div>
 				<el-divider content-position="left">功能按钮</el-divider>
 				<div class="form_tabs">
 					<el-table ref="tableAttrBut" :data="tableButtonList" border  style="width: 100%" @selection-change="tableAttrButClick">