修改历史记录展示页面

src/api/taskapi/management.ts

@@ -96,7 +96,8 @@ export function softDeletion(data: any):any{
 //获取修改记录
 export function gainEditDataLog(data: any):any{
 	return request({
-		url: '/systemapi/task_management/gainEditDataLog',
+		// url: '/systemapi/task_management/gainEditDataLog',
+		url: '/systemapi/task_management/gainEditDataNewLog',
 		method: 'post',
 		data: data
 	});

src/components/DesignForm/tableListPage/formPageCont.vue

@@ -137,7 +137,7 @@ const getCustomrrFormInfo = () => {
 			gainEditDataLog({id:props.pageInfo.masters_key})
 			.then(({data})=>{
 				// console.log("获取修改记录-1111-->",data)
-				pageLog.value = data.logAry
+				pageLog.value = data
 			});
 		})
 }
@@ -273,13 +273,13 @@ const jsuanKuandu = () => {
 						:after-submit="afterSubmit"
 						:submit-edit="submitEdit"
 					/>
-					<el-divider  v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
+					<el-divider  v-if="pageLog&&pageLog.length > 0" content-position="left">历史3记录</el-divider>
 					<el-timeline style="width: 100%">
 						<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人：'+item.creater" placement="top">
 							<el-card>
 								<el-descriptions  border>
-									<el-descriptions-item v-for="(mastItem,mastIndex) in item.masterdata" :key="mastIndex" :label="mastIndex">
+									<el-descriptions-item v-for="(mastItem,mastIndex) in item.masterdata" :key="mastItem.label" :label="mastItem.label">
-										{{mastItem}}
+										{{mastItem.label}}
 									</el-descriptions-item>
 								</el-descriptions>
 								<el-tabs v-if="item.sunList" type="border-card" style="margin-top:20px;">
@@ -337,24 +337,40 @@ const jsuanKuandu = () => {
 				:send-draft-submit= "sendDraftSubmit"
 				:submit-edit="submitEdit"
 			/>
-			<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
+			<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史3记录</el-divider>
 			<el-timeline style="width: 100%">
 				<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人：'+item.creater" placement="top">
 					<el-card >
-						<el-descriptions  border>
+						<el-tabs>
-							<el-descriptions-item v-for="(mastItem,mastIndex) in item.masterdata" :key="mastIndex" label-align="right">
+							<el-tab-pane label="主要信息">
-								<template #label>
+								<el-descriptions  border :column="1">
-									<div style="width: 100px;">
+									<el-descriptions-item v-for="(mastItem,mastIndex) in item.masterdata" :key="mastIndex" label-align="right"  width="150px" >
-										{{mastIndex}}
+										<template #label>
-									</div>
+											<div style="width: 100px;">
-								</template>
+												{{mastItem.label}}
-								{{mastItem}}
+											</div>
-							</el-descriptions-item>
+										</template>
-						</el-descriptions>
+										{{mastItem.types}}--->{{mastItem.auxiliary}}<br>
-						<el-tabs v-if="item.sunList" type="border-card" style="margin-top:20px;">
+										
-							<el-tab-pane v-for="(sonItem,sonIndex) in item.sunList" :label="sonIndex" :key="sonIndex">
+										
+										<div v-if="mastItem.types=='lowcodeImage'">
+											<el-image style="width: 100px; height: 100px" :src="mastItem.value" fit="cover" />
+										</div>
+										<div v-else v-html="mastItem.value"></div>
+									</el-descriptions-item>
+								</el-descriptions>
+							</el-tab-pane>
+						</el-tabs>
+						<el-tabs v-if="item.sunData" type="border-card" style="margin-top:20px;">
+							<el-tab-pane v-for="(sonItem,sonIndex) in item.sunData" :label="sonIndex" :key="sonIndex">
 								<el-descriptions v-for="(sonVal,sonIndex) in sonItem" :key="sonIndex" border>
-									<el-descriptions-item v-for="(sonCentor,sonKey) in sonVal" :key="sonKey" :label="sonKey">	{{sonCentor}}
+									<el-descriptions-item v-for="(sonCentor,sonKey) in sonVal" :key="sonKey" width="150px" >	
+										<template #label>
+											<div style="width: 100px;">
+												{{sonCentor.label}}
+											</div>
+										</template>
+										{{sonCentor.value}}
 									</el-descriptions-item>
 								</el-descriptions>
 							</el-tab-pane>

src/components/DesignForm/tableListPage/formPageContApp.vue

@@ -131,7 +131,7 @@ const getCustomrrFormInfo = () => {
 			gainEditDataLog({id:props.pageInfo.mastersKeyStr})
 			.then(({data})=>{
 				// console.log("获取修改记录-1111-->",data)
-				pageLog.value = data.logAry
+				pageLog.value = data
 			});
 		})
 }
@@ -259,7 +259,7 @@ const submitEdit = (type: string,val?:any) => {
 							:submit-edit="submitEdit"
 						/>
 						
-					<el-divider  v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
+					<el-divider  v-if="pageLog&&pageLog.length > 0" content-position="left">历史1记录</el-divider>
 					<el-timeline style="width: 100%">
 						<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人：'+item.creater" placement="top">
 							<el-card>

src/views/sysworkflow/lowcodepage/appCardPage.vue

@@ -284,8 +284,8 @@ const lookFormList = (val:any) => {
 			lookPageIsShow.value = true
 			state.formId = val.idStr
 			let stateData = string2json(val.listjson)
-			console.log(val.listjson)
+			// console.log(val.listjson)
-			console.log("查看表单列表---->",stateData)
+			// console.log("查看表单列表---->",stateData)
 			//let holeControlAndConfigStateData = string2json(data.data.appForm.mastesformjson)
 			if(stateData.tableData.columns&&stateData.tableData.columns.length>0){
 				for(let i = 0;i<stateData.tableData.columns.length;i++){

src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue

@@ -119,7 +119,7 @@ const gainFormData = () =>{
 						gainEditDataLog({id:props.flowLogInfo.mastersKeyStr})
 						.then(({data})=>{
 							// console.log("获取修改记录-1111-->",data)
-							pageLog.value = data.logAry
+							pageLog.value = data
 						});
 					})
 	// haveCustomerFormVersion({id:props.flowLogInfo.version_id.toString()})
@@ -166,7 +166,7 @@ const gainFormData = () =>{
 							:save-edit-form-info="saveEditFormInfo"
 							:send-draft-submit= "sendDraftSubmit"
 						/>
-						<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
+						<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史2记录</el-divider>
 						<el-timeline>
 							<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人：'+item.creater" placement="top">
 								<el-card>