关联表单-数据填充规则-v0.276

src/widget/associatedforms/associatedFormsChildFillRole.vue

@@ -1,44 +1,30 @@
 <!-- eslint-disable vue/no-v-html -->
 <template>
-
   <div
     style="background-color: #F0F0F0;padding: 12px;border-radius: 5px;padding-left:45px;margin-bottom:20px;margin-right:11px;min-height: 65px;padding-top: 16px;color: black;">
     <el-button 
       :icon="Close" size="small" circle type="info" plain
       style="float: right;margin-top: -22px;margin-right: -22px" @click="delRole" />
-
     <el-tree-select 
       v-model="selectedChildTable1" style="width: 290px;margin-bottom: -1px" :data="childTableList"
       placeholder="请选择关联表单子表" check-strictly :render-after-expand="false" filterable
       @change="selectedChildTableChanged" />
-    
-
-      <el-popover
-                    
-					placement="top-end"
-					title=""
-					:width="200"
-					trigger="hover"
-					content="若【设置筛选条件】，则仅填充满足筛选条件的子表数据"
-				>
+    <el-popover placement="top-end" title="" :width="200" trigger="hover" content="若【设置筛选条件】，则仅填充满足筛选条件的子表数据">
       <template #reference>
         <el-button 
           v-if="selectedChildTable1 !== '' && filterCondition1.conditionHtml === ''"
-              style="padding-top: 8px; width: 290px;margin-left: 85px;height: 30px;" type="primary" plain append-to-body="true"
-              modal="true" @click="filterConditionDialogFlag = true">设置筛选条件（选填）</el-button>
+          style="padding-top: 8px; width: 290px;margin-left: 85px;height: 30px;" type="primary" plain
+          append-to-body="true" modal="true" @click="filterConditionDialogFlag = true">设置筛选条件（选填）</el-button>
       </template>
     </el-popover>
-
-    
-
-
-
     <div 
       v-if="selectedChildTable1 !== '' && filterCondition1.conditionHtml !== ''"
       style="padding-top: 5px; width: auto;margin-left: 85px;height: 30px;cursor: pointer;display: inline-block;margin-top: 3px;"
       @click="filterConditionDialogHandle" v-html="filterCondition1.conditionHtml"></div>
     <el-divider v-if="selectedChildTable1 !== ''" />
-    <div v-if="selectedChildTable1 !== ''" style="background-color: #F0F0F0;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;padding-bottom: 1px;margin-right: 10px;"><!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
+    <div 
+      v-if="selectedChildTable1 !== ''"
+      style="background-color: #F0F0F0;padding: 12px;border-radius: 10px;padding-left:45px;margin-bottom:20px;padding-bottom: 1px;margin-right: 10px;"><!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
       <template v-for="(item, index) in childRoles" :key="childRoles[index].id">
         {{ item }}
         <!-- <AssociatedFormsFillRole 
@@ -55,38 +41,29 @@
   </div>
 
 
-  <el-dialog v-model="filterConditionDialogFlag" style="margin-top:70px ;min-height: 500px" width="50%" :show-close="false" title="筛选条件" append-to-body>
-    
+  <el-dialog 
+    v-model="filterConditionDialogFlag" style="margin-top:70px ;min-height: 500px" width="50%"
+    :show-close="false" title="筛选条件" append-to-body>
     <div class="common-layout">
       <el-container>
         <el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
           <el-tree 
             ref="fieldTreeRef" node-key="id" empty-text="选择关联的表单后展示" :data="asfasfFieldTree"
             :props="treeDefaultProps" :filter-node-method="filterNode"
-              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"  @node-contextmenu="handleFieldTreeContextmenuRange" />
-            <!--  <el-input 
-              v-show="fieldTreeSearchFlag" v-model="fieldTreeFilterText" style="width:98%;margin: 3px;"
-              placeholder="搜索字段" class="filter-tree" /> --> 
+            style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+            @node-contextmenu="handleFieldTreeContextmenuRange" />
           <el-tree 
             ref="fieldTreeRef" node-key="id" empty-text="请先保存当前表单" :data="associatedFormsCurrentFormFieldTree"
             :props="treeDefaultProps" :filter-node-method="filterNode"
-              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;" @node-contextmenu="handleFieldTreeContextmenuRange" />
-            <!-- <el-input 
-              v-show="orgTreeSearchFlag" v-model="orgTreeFilterText" style="width:98%;margin: 3px;"
-              placeholder="搜索字段" class="filter-tree" /> -->
+            style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+            @node-contextmenu="handleFieldTreeContextmenuRange" />
           <el-tree 
             ref="orgTreeRef" style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
             :data="orgAndManTree" :props="treeDefaultProps" :filter-node-method="filterNode"
-              
             @node-contextmenu="handleOrgTreeContextmenuRange" />
-              
-            <!--<el-input 
-              v-show="roleTreeSearchFlag" v-model="roleTreeFilterText" style="width:98%;margin: 3px;"
-              placeholder="搜索字段" class="filter-tree" />-->
           <el-tree 
             ref="roleTreeRef" style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
             :data="roleTree" :props="treeDefaultProps" :filter-node-method="filterNode"
-              
             @node-contextmenu="handleRoleTreeContextmenuRange" />
         </el-aside>
         <el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
@@ -95,12 +72,9 @@
             仅可选择符合以下条件的数据</div>
           <div id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px;">
             <AssociatedFormsTinyaceFillRoleFilterCondition 
-                ref="tinymceRef" 
-                :aft-text="filterCondition1.conditionHtml"
-                :aft-text-copy="filterCondition1.conditionHtmlCopy" 
-                @text-change="aftTextChangedRange" @gongshi-change="aftGongshiChangedRange"
-                ></AssociatedFormsTinyaceFillRoleFilterCondition>
-              
+              ref="tinymceRef" :aft-text="filterCondition1.conditionHtml"
+              :aft-text-copy="filterCondition1.conditionHtmlCopy" @text-change="aftTextChangedRange"
+              @gongshi-change="aftGongshiChangedRange"></AssociatedFormsTinyaceFillRoleFilterCondition>
           </div>
           <div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px;">
             <ul>
@@ -121,7 +95,6 @@
 
     <template #footer>
       <div class="dialog-footer">
-        <!-- <el-button @click="asfhTextCancelRange">取消</el-button> -->
         <el-button type="primary" @click="filterConditionDialogHandle">
           确定
         </el-button>