From fc6f7684e32a744e4b83417b645a857f8cac1e91 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 27 Jun 2024 15:15:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=97=E6=AE=B5=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=BA=E9=80=89=E9=A1=B9v1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue |  2 +-
 .../DesignForm/formControlPropertiNew.vue     |  2 +-
 .../sysworkflow/lowcodepage/appFormList.vue   | 25 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 3bce238e4..59f5eef4d 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -4002,7 +4002,7 @@ const disabledIstrue = (val:string) => {
 
             
             
-            <template v-if="controlData.type=='radio'||controlData.type=='select'">
+            <template v-if="(controlData.type=='radio'||controlData.type=='select')&&controlData.config.optionsType==0">
                 
                 <el-table  
                 :data="controlData.options" stripe  border style="width: 100%;min-height:50px;max-height:500px;overflow-y:auto" 
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index ebe5bfa2b..107ac521f 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -4032,7 +4032,7 @@ const disabledIstrue = (val:string) => {
 
             
             
-            <template v-if="controlData.type=='radio'||controlData.type=='select'">
+            <template v-if="(controlData.type=='radio'||controlData.type=='select')&&controlData.config.optionsType==0">
                 
                 <el-table  
                 :data="controlData.options" stripe  border style="width: 100%;min-height:50px;max-height:500px;overflow-y:auto" 
diff --git a/src/views/sysworkflow/lowcodepage/appFormList.vue b/src/views/sysworkflow/lowcodepage/appFormList.vue
index 2463eb6aa..be400f2b5 100644
--- a/src/views/sysworkflow/lowcodepage/appFormList.vue
+++ b/src/views/sysworkflow/lowcodepage/appFormList.vue
@@ -5,7 +5,7 @@
 -->
 <script lang='ts' setup>
 import { customerFormCont } from "@/api/DesignForm/type";
-import { getCustomerFormList,editProductionFormStatus,appJwtPower } from '@/api/DesignForm/requestapi'
+import { getCustomerFormList,editProductionFormStatus,appJwtPower,getFieldRecord } from '@/api/DesignForm/requestapi'
 import {Delete,Edit,View,MoreFilled} from '@element-plus/icons-vue'
 import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
 import { useUserStore } from "@/store/modules/user";
@@ -175,6 +175,29 @@ const lookFormList = (val:any) => {
 	let stateData = string2json(val.listjson)
 			console.log(val.listjson)
 			console.log("查看表单列表---->",stateData)
+
+			if(stateData.tableData.columns.length>0){
+				for(let i = 0;i<stateData.tableData.columns.length;i++){
+					if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){
+						console.log(stateData.tableData.columns[i])
+						let paramx:string = ""+stateData.tableData.columns[i].control.optionsValue3Field
+						/*
+							在这里请求后台获取字段
+						*/
+						getFieldRecord(paramx).then(({ data }) => {
+							stateData.tableData.columns[i].options = data
+							if(stateData.searchData.length>0){
+								for(let j = 0;j<stateData.searchData.length;j++){
+									console.log(stateData.searchData[j])
+									if(stateData.searchData[j].id==stateData.tableData.columns[i].id){
+										stateData.searchData[j].options = data
+									}
+								}
+							}
+						})
+					}
+				}
+			}
 			state.tableData = stateData.tableData
 			state.searchData = stateData.searchData
 			state.loading = stateData.loading