From 3c07e5b61ce4131c78c0204931c13a5e694bd7d2 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Fri, 26 Jul 2024 13:51:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/app/formPage.vue    |  2 +-
 src/components/DesignForm/app/index.vue       |  2 +-
 .../DesignForm/tableListPage/index.vue        |  2 +-
 .../workflow/drwer/promoterDrawer.vue         | 21 ++++++++-----
 .../lowcodepage/pageFlow/appTableFlow.vue     | 30 +++++++++----------
 5 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/components/DesignForm/app/formPage.vue b/src/components/DesignForm/app/formPage.vue
index 27b09c3..b901bc7 100644
--- a/src/components/DesignForm/app/formPage.vue
+++ b/src/components/DesignForm/app/formPage.vue
@@ -174,7 +174,7 @@ watch(()=>props.isWorkFlow,(val:number)=>{
 const getFlowInitSwps = () => {
 	gainRunFlowStart({id:props.flowkey})
 		.then(({data})=>{
-			// console.log("获取流程",data)
+			console.log("获取流程",data)
 			flowMap.value = data.flowList
 			nextStep.value = data.nextStep
 			currentProgress.value = data.Step
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index f39350b..acc1f2e 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -1028,7 +1028,7 @@ const judgeListTitle = (val:any,viewConfig:any) => {
 						:key="item.id || item.label"
 					>
 					
-						<el-table-column v-if="['-'].includes(item.fieldClass)" :type="item.type" :prop="item.field" :label="item.label" config="" width="60">
+						<el-table-column v-if="['-'].includes(item.fieldClass)" :type="item.type" :prop="item.field" :label="item.label" config="" width="60" fixed>
 							<template v-if="item.help" #header="scope">
 								{{ scope.column.label }}
 								<tooltip :content="item.help" />
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index f15b99f..2948f40 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -1018,7 +1018,7 @@ const judgeListTitle = (val:any,viewConfig:any) => {
 						:key="item.id || item.label"
 					>
 					
-						<el-table-column v-if="['-'].includes(item.fieldClass)" :type="item.type" :prop="item.field" :label="item.label" config="" width="60">
+						<el-table-column v-if="['-'].includes(item.fieldClass)" :type="item.type" :prop="item.field" :label="item.label" config="" width="60" fixed>
 							<template v-if="item.help" #header="scope">
 								{{ scope.column.label }}
 								<tooltip :content="item.help" />
diff --git a/src/components/workflow/drwer/promoterDrawer.vue b/src/components/workflow/drwer/promoterDrawer.vue
index c5828d0..023ed51 100644
--- a/src/components/workflow/drwer/promoterDrawer.vue
+++ b/src/components/workflow/drwer/promoterDrawer.vue
@@ -87,6 +87,7 @@ const savePromoter = () => {
         flag: true,
         id: flowPermission1.value.id
     })
+	// console.log(1);
 	let powerAry = [];
 	if(powerUnitAry.value.recUnitAry.masterUnitList && powerUnitAry.value.recUnitAry.masterUnitList.length > 0){
 
@@ -96,6 +97,7 @@ const savePromoter = () => {
 		})
 		
 	}
+	// console.log(2);
 	if(powerUnitAry.value.recUnitAry.sunUnitList && powerUnitAry.value.recUnitAry.sunUnitList.length > 0){
 		powerUnitAry.value.recUnitAry.sunUnitList.forEach((item:any)=>{
 			if(item.masterUnitList && item.masterUnitList.length > 0){
@@ -114,20 +116,20 @@ const savePromoter = () => {
 		let isNew = true
 		formData.value.purview.forEach((item:any)=>{
 			// console.log("正确---->",item.nodeKey)
-			if(item.nodeKey == "begin"){
+			if(item.nodeKey == props.nodeConfig.nodeNumber){
 				item.powerAry=powerAry
 				isNew = false
 			}
 		});
 		if(isNew){
 			formData.value.purview.push({
-			nodeKey: "begin",
+			nodeKey: props.nodeConfig.nodeNumber,
 			powerAry:powerAry
 		})
 		}
 	}else{
 		formData.value.purview = [{
-			nodeKey: "begin",
+			nodeKey: props.nodeConfig.nodeNumber,
 			powerAry:powerAry
 		}]
 	}
@@ -136,7 +138,12 @@ const savePromoter = () => {
 	// 	nodeKey: "begin",
 	// 	powerAry:powerAry
 	// }) {{props.formKey}}=>{{props.formVersion}}
-	
+	// console.log(4);
+	// console.log("formKey--->",props.formKey.toString());
+	// console.log("formVersion--->",props.formVersion.toString());
+	// console.log("value--->",formData.value);
+	console.log("purview--->",formData.value.purview);
+
 	let sendInfo: any  = {
 		formKey:props.formKey.toString(),
 		formVersion:props.formVersion.toString(),
@@ -239,8 +246,8 @@ const lookOpenOrClose = (val: boolean) => {
 */
 const oneLookSet = (val: any) => {
 	if(!val.isLook){
-		val.isEdit = val
-		isEditAll.value = val
+		val.isEdit = val.isLook
+		isEditAll.value = val.isLook
 	}
 	if(powerUnitAry.value.recUnitAry.masterUnitList){
 		let lookAll = 0
@@ -280,7 +287,7 @@ const oneEditSet = (val: any) => {
 <template>
 	<el-drawer v-model="visible" :append-to-body="true" title="发起人"  class="set_promoter" :show-close="false" :size="550" :before-close="closeDrawer"> 
 		<div class="demo-drawer__content">
-			
+			{{props.nodeConfig}}
             <div class="promoter_content drawer_content">
 				<el-tabs v-model="nodeSetUp" class="demo-tabs">
 					<el-tab-pane name="first">
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
index bb3f1fe..bf196c7 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
@@ -445,7 +445,7 @@ const initLoadData = () => {
 		// appFormTitle.value = props.pickAppMenu.label
 		gainAppPageInfo({id:props.pickAppMenu.id})
 		.then((data)=>{
-			// console.log("获取初始化表单数据",data)
+			console.log("获取初始化表单数据",data)
 			appInitData.value = data.data
 			// console.log("获取初始化表单数据---!",appInitData.value)
 			mastesformjson.value = data.data.appForm.mastesformjson
@@ -494,20 +494,20 @@ function optionsValue3Get3(data: any,fieldName: string){
 	<el-drawer  v-model="drawerOpenOrClose" v-loading="loadingData" :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="drawbox" class="drawerClass" >
 		<AppFormPage
 						
-						ref="formEl"
-						:number="props.pickAppMenu.id"
-						:isWorkFlow="isFlow"
-						:form-data="stateForm.formData"
-						:type="1"
-						:mastesformjson="mastesformjson"
-						:flowkey="appInitData.flowkey"
-						:groupid="appInitData.groupid"
-						:sign-code="appInitData.signCode"
-						:version-id="versionid"
-						:after-submit="afterSubmit"
-						add-url="addData"
-						@optionsValue3Get3="optionsValue3Get3"
-					/>
+			ref="formEl"
+			:number="props.pickAppMenu.id"
+			:isWorkFlow="isFlow"
+			:form-data="stateForm.formData"
+			:type="1"
+			:mastesformjson="mastesformjson"
+			:flowkey="appInitData.flowkey"
+			:groupid="appInitData.groupid"
+			:sign-code="appInitData.signCode"
+			:version-id="versionid"
+			:after-submit="afterSubmit"
+			add-url="addData"
+			@optionsValue3Get3="optionsValue3Get3"
+		/>
 	</el-drawer>
 	
 </template>