Merge branch 'qin_v4'

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

@@ -845,12 +845,19 @@ const pickUserVal = (val:any) => {
 	<BaiduMap v-if="judgeIsShow(data.name) &&data.type === 'baidumap' && type != 4" :data="data" />
 	<DigitPage v-else-if="judgeIsShow(data.name) &&data.type === 'digitpage' && type != 4" :data="data" />
 	<OrgCentent v-else-if="judgeIsShow(data.name) &&data.type === 'orgCentent'" :data="data" />
-	<LowcodeImage  v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeImage' " :data="data" :tablekey="props.tablekey" :form-table-set-up="props.alldata" >
+	<LowcodeImage  v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeImage' " :data="data" :tablekey="props.tablekey" :form-table-set-up="props.alldata" ></LowcodeImage>
-					
+	<!--拥有者-->
-				</LowcodeImage>
+	<OwnerPage v-else-if="judgeIsShow(data.name) && data.type === 'owner' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun"  />
+	<SerialNumber  v-else-if="judgeIsShow(data.name) && data.type === 'serialNumber' && type != 4" :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
+	<!--创建人-->
+	<FounderForm v-else-if="judgeIsShow(data.name) && data.type === 'founder' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
+	<!--创建时间-->
+	<FounderTime  v-else-if="judgeIsShow(data.name) && data.type === 'founderTime' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
+	<!--修改时间-->
+	<EditTime v-else-if="judgeIsShow(data.name) && data.type === 'editTime' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
 	<el-form-item
 		v-bind="data.item"
-		v-if="judgeIsShow(data.name) && data.type != 'baidumap' && data.type != 'digitpage' && data.type != 'orgCentent' && data.type != 'lowcodeImage'"
+		v-if="judgeIsShow(data.name) && data.type != 'owner' && data.type != 'baidumap' && data.type != 'digitpage' && data.type != 'orgCentent' && data.type != 'lowcodeImage' && data.type != 'serialNumber' && data.type != 'founder' && data.type != 'founderTime' && data.type != 'editTime'"
 		:disabled="judgeIsDisabled(data.name)"
 		:prop="tProp || data.name"
 		:class="config.className"
@@ -1070,14 +1077,8 @@ const pickUserVal = (val:any) => {
 				v-model="value"
 			/>
 			
-			<!--创建人-->
+				
-				<FounderForm v-else-if="data.type === 'founder' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
+				
-				<!--创建时间-->
-				<FounderTime  v-else-if="data.type === 'founderTime' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
-				<!--修改时间-->
-				<EditTime v-else-if="data.type === 'editTime' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
-				<!--拥有者-->
-				<OwnerPage v-else-if="data.type === 'owner' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun"  />
 				<!--所属部门-->
 				
 				
@@ -1092,7 +1093,7 @@ const pickUserVal = (val:any) => {
 				
 				<OrgCitys v-else-if="data.type === 'organization' " :data="data" />
 				<UrlLink v-else-if="data.type === 'urllink' && type != 4" :data="data" />
-				<SerialNumber  v-else-if="data.type === 'serialNumber' && type != 4" :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
+				
 			
 			<template v-if="data.type === 'tinymce'">
 				<!--  设计模式时拖动会出现异常，设计模式暂用图片代替-->