From 6d9769f7ea8d4c2f710de154498ddd27e0f4c440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 8 Oct 2023 02:16:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdp-ui-ext/mdp-expand/FormData.vue        | 36 +++----------------
 src/views/mdp/form/formField/Field.vue        |  4 +--
 src/views/mdp/form/formField/Index.vue        |  8 +++--
 3 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/src/components/mdp-ui-ext/mdp-expand/FormData.vue b/src/components/mdp-ui-ext/mdp-expand/FormData.vue
index 023ef3f..c69be77 100644
--- a/src/components/mdp-ui-ext/mdp-expand/FormData.vue
+++ b/src/components/mdp-ui-ext/mdp-expand/FormData.vue
@@ -48,6 +48,8 @@
 <script> 
 	import { mapGetters } from 'vuex'  
 	import MdpFormDataItem from './FormDataItem.vue'
+	
+import treeTool from '@/components/mdp-ui/js/treeTool.js'
 	/**
 	 * 表单数据填单
 	 */
@@ -156,37 +158,7 @@
 							} 
 							if(!params.deptName){
 								params.deptName=this.userInfo.deptName
-							} 
-							var bizKeys=[];
-							if(this.formFields!=null && this.formFields.length>0){
-								var isBizKey=this.formFields[0].isBizKey;
-								if(isBizKey && isBizKey.length==3){
-									if(isBizKey.charAt(0)=="1"){
-										 bizKeys.push(params.cuserid);
-									} 
-									if(isBizKey.charAt(1)=="1"){
-										 bizKeys.push(params.deptid);
-									} 
-								}
-							}
- 							this.formFields.forEach(item=>{ 
-								if(item.isBizKey.charAt(2)=="1"){
-									bizKeys.push(params[item.fieldIdCamel]);
-								}
-								if(params[item.fieldIdCamel]!=this.editForm[item.fieldIdCamel]){
-									params.changeData=true;
-								}
-							
-							});
-							if(bizKeys.length==0){
-								if(params.id){
-									bizKeys.push(params.id);
-								}
-								
-							}
-							if(bizKeys.length>0){
-								params.bizKey=bizKeys.join(","); 
-							}
+							}   
 							this.$emit('input',params)
 							this.$emit('submit',params);//  @submit="afterAddSubmit"  
 					}
@@ -214,7 +186,7 @@
  					}   
 					this.initFieldQx(item) 
 				});
-				this.fields=this.formFields
+				this.fields=treeTool.translateDataToTree(this.formFields,'pid','id') 
 				this.$nextTick(()=>{
 					this.$refs['editForm'].clearValidate();
 				}) 
diff --git a/src/views/mdp/form/formField/Field.vue b/src/views/mdp/form/formField/Field.vue
index 4c7a76f..5ec9369 100644
--- a/src/views/mdp/form/formField/Field.vue
+++ b/src/views/mdp/form/formField/Field.vue
@@ -14,7 +14,7 @@
 		</el-row>  
 		<el-card v-else-if="field.extType=='card'" :gutter="gutter"> 
 			<div slot="header" class="clearfix">
-				<span>{{ field.title }}</span> 
+				<span>{{ field.title }}</span>
 			</div>    
 			<template v-if="sample==true">
 				<el-row :gutter="gutter"> 
@@ -222,7 +222,7 @@
 			value:{
 				deep:true,
 				immediate:true,
-				handler:function(){
+				handler:function(){ 
 					this.field=this.value
 					if(this.field.extType=='tabs'){
 						if(this.field.gname){
diff --git a/src/views/mdp/form/formField/Index.vue b/src/views/mdp/form/formField/Index.vue
index 3756864..ddff385 100644
--- a/src/views/mdp/form/formField/Index.vue
+++ b/src/views/mdp/form/formField/Index.vue
@@ -30,7 +30,7 @@
 				  </el-form-item>
 				  <el-row>
 					<draggable id="sf"  class="dragArea min-height" v-model="selectedFields" :options="{group:{ name:'g1'}, animation:150}" @add="onAdd"  :no-transition-on-drag="true" @start="drag=true" @end="drag=false">
-	
+
 							<el-col v-for="(item,index) in selectedFields" @click.ctrl.native="doChildDelete(item,index,selectedFields)" :key="index" :span="calcSpan(item)">
  								<mdp-field @bkey-change="onBkeyChange" :find-not-in-child="findNotInChild" :has-child="hasChild"  :gutter="0" :span="24" :value="item" @change="(v)=>Object.assign(item,v)"></mdp-field> 
 							</el-col> 
@@ -181,6 +181,7 @@ export default {
 		},
 		'visible':function(visible) { 
 		if(visible==true){ 
+			debugger
 			this.selectedFields=treeTool.translateDataToTree(this.formFields,'pid','id') 
 			this.setPrimaryKeys();
 			this.$nextTick(()=>{
@@ -350,6 +351,7 @@ export default {
 		onTplStart(evt){ 
 		},
 		onAdd(evt){   
+			debugger
 			let item=this.selectedFields[evt.newIndex];  
 			var item2=JSON.parse(JSON.stringify(item)) 
 			item.isNewAdd=true
@@ -602,7 +604,7 @@ export default {
 			children.forEach(k=>{
 				if(k.children && k.children.length>0){
 					var childs=k.children
-					delete k.children
+					childs.forEach(c=>c.pid=k.id)
 					list.push(k)
 					this.getMyFieldList(list,childs)
 				}else{
@@ -626,7 +628,7 @@ export default {
 		draggable, MdpField
 	},
 	mounted() {
-		
+		debugger;
 		this.myFormDef=this.formDef
 		if(this.formFields){
 			this.selectedFields=treeTool.translateDataToTree(this.formFields,'pid','id')