From a5270cb1cf9a0a4cbe3ad2ecfbe6cb4e51c2e9b5 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 21 Aug 2024 16:58:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95-=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E5=85=85=E8=A7=84=E5=88=99-v0.331?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlPropertiNew.vue | 12 +++++++++++-
 .../associatedforms/associatedFormsChildFillRole.vue |  4 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index c724c7b..2b75286 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -2580,6 +2580,16 @@ watch(associatedFormsDataRangeDialogFlag, (val) => {
         }, 200);
     }
 })
+//关联表单数据填充规则根据已选择子表的数目和id将已选择的子表置为不可选择
+watch(() => controlData.value.control?.fillRoles?.child?.length, (newValue, oldValue) => {
+    /* if (newValue!== oldValue) {
+        console.log('变量值发生变化：', newValue);
+    } */
+    console.log(asfasfChildTableList.value)
+    console.log(controlData.value.control?.fillRoles?.child)
+});
+
+
 
 //确定回调
 function handleDetermine(){
@@ -4544,7 +4554,7 @@ const radioChangeSet = (val:any) => {
 
 
     <!-- 数据填充规则弹窗 -->
-    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 300px;max-height:900px"  width="50%"  >
+    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 300px;max-height:900px"  width="80%"  >
 		<template v-if="controlData.type=='associatedForms'">
             <el-button  style="font-size: large;margin-top: 10px;margin-bottom: 15px;"   type="primary" link append-to-body="true" modal="true" @click="addFillRole">十 主表填充规则</el-button>
             <div style="max-height:230px;border:1px solid white;overflow-y:auto;">
diff --git a/src/widget/associatedforms/associatedFormsChildFillRole.vue b/src/widget/associatedforms/associatedFormsChildFillRole.vue
index 6c2eca8..780f709 100644
--- a/src/widget/associatedforms/associatedFormsChildFillRole.vue
+++ b/src/widget/associatedforms/associatedFormsChildFillRole.vue
@@ -236,9 +236,11 @@ function selectedChildTableChanged() {
   console.log(childTableList1.value)
   for(let i = 0;i<childTableList1.value[0].children.length;i++){
     if(childTableList1.value[0].children[i].id==selectedChildTable1.value){
-      childTableList1.value[0].children[i].disable = true
+      //alert(1)
+      childTableList1.value[0].children[i].disabled = true
     }
   }
+  console.log(childTableList1)
   emit('update:childTableList', childTableList1)
 }