Merge branch 'qin_s5'

src/components/DesignForm/public/form/formItem.vue

@@ -1118,7 +1118,6 @@ const diGuiJilian = (val: any, options: any[]) => {
 
 </script>
 <template>
-
   <BaiduMap
     v-if="judgeIsShow(data.name) && data.type === 'baidumap' && type != 4"
     :data="data"

src/views/sysworkflow/lowcodepage/.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false

src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/attribute.vue

@@ -12,7 +12,7 @@ import { validateTextConfig, type ValidateTextTypes,scanTypes,transferDataSource
 import validateInt from "@/components/DesignForm/validateInt";
 import { CarsuselConfig, formStruct, PublicAtrr, VideoMsg } from "@/api/DesignForm/types";
 import { formatNumber } from "@/api/DesignForm/utils";
-import type { UploadInstance, UploadProps, UploadRawFile,ElTree } from "element-plus";
+import type { UploadInstance, UploadProps, UploadRawFile,ElTree,TableInstance } from "element-plus";
 import { ElMessage, genFileId } from "element-plus";
 import { getAssociatedFormsCurrentFieldTree, getAssociatedFormsOrgAndManTree, getCustomerFormList, getAsfasfFieldTree, getAsfasfFieldTreeOptionsValue3, getPersonByRoleId, getAllRole,getQrCodeImgInside, getAssociatedFormsRoleTree } from "@/api/javaRequest";
 import Draggable from "vuedraggable-es";
@@ -29,7 +29,6 @@ import { getAiagentList } from "@/api/doc/space";
 import { optionsInfo } from "@/api/DesignForm/type";
 const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API + "/api/upordown"; //上传地址
 import { v4 as uuidv4 } from "uuid";
-
 import { Delete,Plus } from "@element-plus/icons-vue";
 
 import AssociatedFormsTinyace from "@/widget/associatedforms/associatedFormsTinyace.vue";
@@ -123,6 +122,7 @@ const mathBoxShow = ref(false);
 //轮播图设置弹窗显示控制
 const dialogTableVisible = ref(false);
 //穿梭框设置弹窗显示控制
+const selectOrgConnectUserDialogFlag = ref(false)
 const transferDialogTableVisible = ref(false);
 const tabsData = ref<any>([])
 const activeTab = ref('')
@@ -150,7 +150,12 @@ const fieldTreeRef = ref<InstanceType<typeof ElTree>>();
 const orgTreeRef = ref<InstanceType<typeof ElTree>>();
 const roleTreeRef = ref<InstanceType<typeof ElTree>>();
 let resDataForGlxxszExceptself1: any[] = [];
+const associatedFormsChooseDialogFlag = ref(false);
+const currentAsfChangeCount = ref(0);
 const videoIndex = ref(0);
+
+
+
 watch(fieldTreeFilterText, (val) => {
     fieldTreeRef.value!.filter(val);
 });
@@ -160,7 +165,7 @@ watch(orgTreeFilterText, (val) => {
 watch(roleTreeFilterText, (val) => {
     roleTreeRef.value!.filter(val);
 });
-const treeRefcsk = ref<TreeInstance>();
+const treeRefcsk = ref<any>();
 const multipleSelection = ref<User[]>([])
 const defaultProps = {
   children: 'children',
@@ -192,16 +197,19 @@ interface User {
 }
 const componentKey = ref(0);
 const showImagePreview = ref(false);
+const showAssociatedFormsFillRole = ref(true);
 //关联表单
 const customerFormTree = ref<Tree[]>([]);
 const fieldTreeSearchFlag = ref(false);
 const roleTreeSearchFlag = ref(false);
 // 使用 ref 替代 computed，使其可写
-const zdtcszTableData = ref([])
+const zdtcszTableData = ref<any[]>([])
 const multipleTableRef = ref<TableInstance>() 
 // 定义treeSelectRef
 const treeSelectRef = ref();
 const unitFormList = ref<optionsInfo[]>([]);
+const asfs: any[] = [];
+const asfsExpectCurrent: any[] = [];
 /**
 @ 作者: 秦东
 @ 时间: 2026-02-25 11:36:09
@@ -2050,10 +2058,9 @@ const preFillDialogDetermine = () => {
 @ 时间: 2026-02-26 13:27:17
 @ 功能: 用户组织联动选择 showSelectOrgConnectUser  
 */
-
 const showSelectOrgConnectUser = () => {
     console.log("showSelectOrgConnectUser--------->",selectOrgConnectUserDialogFlag.value)
-  selectOrgConnectUserDialogFlag.value = true
+    selectOrgConnectUserDialogFlag.value = true
 }
 
 /**
@@ -3903,6 +3910,9 @@ const getCustomerFormTree = async () => {
     getCustomerFormList().then(({ data }) => {
             /* console.log(data.children)
             console.log(props.customerformid) */
+        console.log("获取表单------------------>",data)
+
+
             let datachildrenWithoutSelf = removeTreeNode(data.children, props.customerformid);
             let resData = ref<any>(datachildrenWithoutSelf);
             customerFormTree.value = [
@@ -3914,6 +3924,8 @@ const getCustomerFormTree = async () => {
                     children: [...resData.value],
                 },
             ];
+
+            console.log("获取表单-------customerFormTree----------->",customerFormTree.value[0].children)
         });
 }
 const handleDetermineAssociatedFormsChooseDialog = () => {
@@ -8056,7 +8068,7 @@ const updataBase = (val: any) => {
         title="选择关联表单"
         :show-close="false"
         style="margin-top: 70px"
-        width="50%"
+        width="70%"
     >
         <template v-if="controlData.type == 'associatedForms'">
             <div style="display: flex; margin-bottom: 2px; margin-top: 28px">
@@ -8064,7 +8076,7 @@ const updataBase = (val: any) => {
                 <el-tree-select
                     v-model="controlData.control.formid"
                     style="width: 390px"
-                    :data="customerFormTree[0].children"
+                    :data="customerFormTree?customerFormTree:[]"
                     check-strictly
                     :render-after-expand="false"
                     node-key="id"
@@ -8086,7 +8098,7 @@ const updataBase = (val: any) => {
         :close-on-click-modal="false"
         :show-close="false"
         style="margin-top: 70px; min-height: 500px"
-        width="50%"
+        width="80%"
     >
         <template v-if="controlData.type == 'associatedForms'">
             <div class="common-layout">
@@ -8191,7 +8203,7 @@ const updataBase = (val: any) => {
         :close-on-click-modal="false"
         :show-close="false"
         style="margin-top: 70px; min-height: 500px"
-        width="50%"
+        width="80%"
     >
         <template v-if="controlData.type == 'associatedForms'">
             <div class="common-layout">
@@ -8315,7 +8327,7 @@ const updataBase = (val: any) => {
         :close-on-click-modal="false"
         :show-close="false"
         style="margin-top: 70px; min-height: 300px; max-height: 900px"
-        width="60%"
+        width="90%"
     >
         <template v-if="controlData.type == 'associatedForms'">
             <el-button
@@ -8897,7 +8909,7 @@ const updataBase = (val: any) => {
                 <el-tree-select
                     v-model="controlData.control.optionsValue3Formid"
                     style="width: 390px"
-                    :data="customerFormTree[0].children?customerFormTree[0].children:[]"
+                    :data="customerFormTree"
                     check-strictly
                     :render-after-expand="false"
                     filterable

src/widget/associatedforms/associatedFormsChildFillRole.vue

@@ -46,7 +46,7 @@
 
 
   <el-dialog 
-    v-model="filterConditionDialogFlag" style="margin-top:70px ;min-height: 500px" width="50%"
+    v-model="filterConditionDialogFlag" style="margin-top:70px ;min-height: 500px" width="80%"
     :show-close="false" title="筛选条件" append-to-body>
     <div class="common-layout">
       <el-container>

src/widget/lowcodeimage/index.vue

@@ -5,18 +5,11 @@
 -->
 <template>
 	<div>
-    <el-form-item 
-        v-if="judgeIsShow(data.name)"
-		v-bind="data.item"
-		:prop="tProp || data.name"
-		:class="config.className"
-		:rules="itemRules as any"
-		:label="getLabel(data.item as FormItem)"
-    >
+    
 	
-        <el-input v-show="false" v-model="imgUrl" placeholder="请输入" :disabled="judgeIsEdit(data.name)"></el-input>
+    <el-input v-show="false" v-model="imgUrl" placeholder="请输入" :disabled="judgeIsEdit(data.name)"></el-input>
 		<LowcodeImage v-model:imgUrl="imgUrl" :data="props.data" :tablekey="props.tablekey" :form-table-set-up="props.formTableSetUp" @update-cont= "updateCont" ></LowcodeImage>
-    </el-form-item>
+  
 		
 	</div>
 </template>