diff --git a/src/views/ItemEntryTemplate/index.vue b/src/views/ItemEntryTemplate/index.vue
index 5110020..5347e2a 100644
--- a/src/views/ItemEntryTemplate/index.vue
+++ b/src/views/ItemEntryTemplate/index.vue
@@ -30,24 +30,24 @@
         </div>
       </template>
     </div>
-    <div class="right">
+    <div class="right" v-loading="tableLoading">
       <div class="topBox" style="margin-bottom: 10px">
         <div class="searchBox">
           <div style="margin-left: 10px;display: flex;align-items: center">
             账簿：
             <el-select
-                class="w-100"
-                v-model="pkglbook"
-                filterable
-                :clearable="true"
-                placeholder="请选择"
-                @change="changepkglbookHandle"
+              class="w-100"
+              v-model="pkglbook"
+              filterable
+              :clearable="true"
+              placeholder="请选择"
+              @change="changepkglbookHandle"
             >
               <el-option
-                  v-for="(el, index) in pkglbookOptions"
-                  :key="el.value"
-                  :label="el.label"
-                  :value="el.value"
+                v-for="(el, index) in pkglbookOptions"
+                :key="el.value"
+                :label="el.label"
+                :value="el.value"
               >
               </el-option>
             </el-select>
@@ -55,18 +55,18 @@
           <div style="margin-left: 10px;display: flex;align-items: center">
             凭证类别：
             <el-select
-                class="w-100"
-                v-model="voucher"
-                filterable
-                :clearable="true"
-                placeholder="请选择"
-                @change="voucherChangeHandle"
+              class="w-100"
+              v-model="voucher"
+              filterable
+              :clearable="true"
+              placeholder="请选择"
+              @change="voucherChangeHandle"
             >
               <el-option
-                  v-for="(el, index) in voucherOptions"
-                  :key="el.value"
-                  :label="el.label"
-                  :value="el.value"
+                v-for="(el, index) in voucherOptions"
+                :key="el.value"
+                :label="el.label"
+                :value="el.value"
               >
               </el-option>
             </el-select>
@@ -76,41 +76,41 @@
           <!--      查看状态     -->
           <template v-if="!editFlag">
             <el-button
-                size="small"
-                icon="el-icon-edit"
-                @click="editOperate"
-                type="primary"
+              size="small"
+              icon="el-icon-edit"
+              @click="editOperate"
+              type="primary"
             >编辑
             </el-button>
           </template>
           <!--          编辑状态 -->
           <template v-else>
             <el-button
-                size="small"
-                icon="el-icon-plus"
-                @click="Operate"
-                type="primary"
+              size="small"
+              icon="el-icon-plus"
+              @click="Operate"
+              type="primary"
             >新增
             </el-button>
             <el-button
-                size="small"
-                icon="el-icon-circle-close"
-                @click="closeOperate"
-                type="primary"
+              size="small"
+              icon="el-icon-circle-close"
+              @click="closeOperate"
+              type="primary"
             >关闭
             </el-button>
             <el-button
-                size="small"
-                icon="el-icon-check"
-                @click="saveOperate"
-                type="primary"
+              size="small"
+              icon="el-icon-check"
+              @click="saveOperate"
+              type="primary"
             >保存
             </el-button>
             <el-button
-                size="small"
-                icon="el-icon-delete"
-                @click="delOperate"
-                type="primary"
+              size="small"
+              icon="el-icon-delete"
+              @click="delOperate"
+              type="primary"
             >删除
             </el-button>
           </template>
@@ -129,18 +129,18 @@
           <template #subjectClassificationName="{row}">
             <div v-if="editFlag">
               <el-select
-                  class="w-100"
-                  v-model="row.row.subjectClassificationId"
-                  filterable
-                  :clearable="true"
-                  placeholder="请选择"
-                  @change="(val)=>{subClassOptionsChangeHandle(val,row.row)}"
+                class="w-100"
+                v-model="row.row.subjectClassificationId"
+                filterable
+                :clearable="true"
+                placeholder="请选择"
+                @change="(val)=>{subClassOptionsChangeHandle(val,row.row)}"
               >
                 <el-option
-                    v-for="(el, index) in subClassOptions"
-                    :key="el.value"
-                    :label="el.label"
-                    :value="el.value"
+                  v-for="(el, index) in subClassOptions"
+                  :key="el.value"
+                  :label="el.label"
+                  :value="el.value"
                 >
                 </el-option>
               </el-select>
@@ -261,7 +261,7 @@
                 <p :style="{ color: row.row.abstractRes ? '#000' : '#c0c4cc' }" class="showText"
                 >{{
                     row.row.abstractRes ? row.row.abstractRes :
-                        '请点击选择'
+                      '请点击选择'
                   }}
                 </p>
                 <i class="el-icon-more "
@@ -276,17 +276,17 @@
           <template #pkCashflow="{row}">
             <div v-if="editFlag">
               <el-select
-                  class="w-100"
-                  v-model="row.row.pkCashflow"
-                  filterable
-                  :clearable="true"
-                  placeholder="请选择"
+                class="w-100"
+                v-model="row.row.pkCashflow"
+                filterable
+                :clearable="true"
+                placeholder="请选择"
               >
                 <el-option
-                    v-for="(el, index) in queryCashOptions"
-                    :key="el.value"
-                    :label="el.label"
-                    :value="el.value"
+                  v-for="(el, index) in queryCashOptions"
+                  :key="el.value"
+                  :label="el.label"
+                  :value="el.value"
                 >
                 </el-option>
               </el-select>
@@ -331,7 +331,7 @@
                    @click="elDialogClick(row, index, indexRow)"
                 >{{
                     row.mdmName ? row.mdmName :
-                        '请点击选择'
+                      '请点击选择'
                   }}
                 </p>
                 <i class="el-icon-more "
@@ -344,12 +344,12 @@
               </div>
               <div v-else>
                 <el-cascader
-                    v-model="row.fieldArr"
-                    :options="propertyTree"
-                    :props="{ children: 'sublistMdmModuleDbFileds',
+                  v-model="row.fieldArr"
+                  :options="propertyTree"
+                  :props="{ children: 'sublistMdmModuleDbFileds',
                 label: 'chName',
                 value: 'id', }"
-                    @change="(val)=>{fieldIdChangeHandle(val,row)}"
+                  @change="(val)=>{fieldIdChangeHandle(val,row)}"
                 ></el-cascader>
               </div>
             </template>
@@ -374,38 +374,38 @@
     </div>
     <!--    新增-->
     <base-right-dialog
-        @handleClose="examineOperateDialog = false"
-        @handleConfirmClick="handleConfirmClick"
-        :dialogVisible="examineOperateDialog"
-        size="900px"
-        :appendBody="true"
-        :loading="true"
-        :footerShow="true"
-        :submitShow="true"
-        :title="dialogTitle +'事项分录模版'"
-        submitTitle="保存"
+      @handleClose="examineOperateDialog = false"
+      @handleConfirmClick="handleConfirmClick"
+      :dialogVisible="examineOperateDialog"
+      size="900px"
+      :appendBody="true"
+      :loading="true"
+      :footerShow="true"
+      :submitShow="true"
+      :title="dialogTitle +'事项分录模版'"
+      submitTitle="保存"
     >
       <div class="rightDialogClass_main" style="background-color: #fff;" v-if="examineOperateDialog">
         <div class="form">
           <base-form
-              ref="basicFormRefsName"
-              :formRow="basicFormForm"
-              :isFunBtn="false"
-              :spanWidth="'100px'"
-              justifyContent="flex-end"
-              :rules="basicFormRulers"
-              @onSelect="onSelect"
-              :view-status="statusView"
-              @elDialogClick="elDialogClick"
-              @cascaderChange="AddCascaderChange"
+            ref="basicFormRefsName"
+            :formRow="basicFormForm"
+            :isFunBtn="false"
+            :spanWidth="'100px'"
+            justifyContent="flex-end"
+            :rules="basicFormRulers"
+            @onSelect="onSelect"
+            :view-status="statusView"
+            @elDialogClick="elDialogClick"
+            @cascaderChange="AddCascaderChange"
 
           >
           </base-form>
         </div>
         <div class="table">
           <div
-              style="display: flex;justify-content: flex-end;cursor:pointer;margin: 10px 0;font-size: 14px;color: #4876ed; "
-              @click="addData"
+            style="display: flex;justify-content: flex-end;cursor:pointer;margin: 10px 0;font-size: 14px;color: #4876ed; "
+            @click="addData"
           >添加
           </div>
           <base-table ref="customtable" :showIndex="false" :slotrow="false"
@@ -417,7 +417,7 @@
                    @click="elDialogClick(row, index, indexRow)"
                 >{{
                     row.mdmName ? row.mdmName :
-                        '请点击选择'
+                      '请点击选择'
                   }}
                 </p>
                 <i class="el-icon-more "
@@ -427,12 +427,12 @@
             <template #fieldId="{row}">
               <div>
                 <el-cascader
-                    v-model="row.fieldArr"
-                    :options="propertyTree"
-                    :props="{ children: 'sublistMdmModuleDbFileds',
+                  v-model="row.fieldArr"
+                  :options="propertyTree"
+                  :props="{ children: 'sublistMdmModuleDbFileds',
                 label: 'chName',
                 value: 'id', }"
-                    @change="(val)=>{fieldIdChangeHandle(val,row)}"
+                  @change="(val)=>{fieldIdChangeHandle(val,row)}"
                 ></el-cascader>
               </div>
             </template>
@@ -454,23 +454,23 @@
     </base-right-dialog>
     <!--    公式编辑器-->
     <base-dialog
-        :dialogVisible.sync="passwordDialogShow"
-        :closeModal="false"
-        :footerShow="true"
-        title="公式编辑器"
-        width="700px"
-        top="20vh"
-        @handleConfirmClick="passwordChangeHandle"
+      :dialogVisible.sync="passwordDialogShow"
+      :closeModal="false"
+      :footerShow="true"
+      title="公式编辑器"
+      width="700px"
+      top="20vh"
+      @handleConfirmClick="passwordChangeHandle"
     >
       <div class="rightDialogClass_main" style="background-color: #fff;" v-if="passwordDialogShow">
         <div class="addDialog">
           <div class="left">
             <el-input
-                type="textarea"
-                :rows="23"
-                placeholder="请输入内容"
-                resize="none"
-                v-model="textarea"
+              type="textarea"
+              :rows="23"
+              placeholder="请输入内容"
+              resize="none"
+              v-model="textarea"
             >
             </el-input>
             <div class="btn" style="margin-top: 5px;display: flex;justify-content: flex-end">
@@ -505,14 +505,14 @@
                 <template v-else>
                   <div style="margin-top: 10px">
                     <base-form
-                        ref="fixedValueFormRefsName"
-                        :formRow="fixedValueForm"
-                        :isFunBtn="false"
-                        :spanWidth="'70px'"
-                        justifyContent="flex-end"
-                        @onSelect="fixedValueOnSelect"
-                        @elDialogClick="fixedValuelDialogClick(false)"
-                        @cascaderChange="cascaderChange"
+                      ref="fixedValueFormRefsName"
+                      :formRow="fixedValueForm"
+                      :isFunBtn="false"
+                      :spanWidth="'70px'"
+                      justifyContent="flex-end"
+                      @onSelect="fixedValueOnSelect"
+                      @elDialogClick="fixedValuelDialogClick(false)"
+                      @cascaderChange="cascaderChange"
                     >
                     </base-form>
                   </div>
@@ -526,13 +526,13 @@
     </base-dialog>
     <!--    选择映射档案-->
     <base-dialog
-        :dialogVisible.sync="masterDialog"
-        :closeModal="false"
-        :footerShow="true"
-        title="选择映射档案"
-        width="80%"
-        top="10vh"
-        @handleConfirmClick="masterPickDialog"
+      :dialogVisible.sync="masterDialog"
+      :closeModal="false"
+      :footerShow="true"
+      title="选择映射档案"
+      width="80%"
+      top="10vh"
+      @handleConfirmClick="masterPickDialog"
     >
       <div class="rightDialogClass_main" style="background-color: #fff;" v-if="masterDialog">
         <baseChoice ref="baseChoice" @getTableList="getTableList" placeholder="基础数据名称"
@@ -542,13 +542,13 @@
       </div>
     </base-dialog>
     <base-dialog
-        :dialogVisible.sync="billDialog"
-        :closeModal="false"
-        :footerShow="true"
-        title="选择单据项目"
-        width="400px"
-        top="10vh"
-        @handleConfirmClick="billClickHandle"
+      :dialogVisible.sync="billDialog"
+      :closeModal="false"
+      :footerShow="true"
+      title="选择单据项目"
+      width="400px"
+      top="10vh"
+      @handleConfirmClick="billClickHandle"
     >
       <div class="rightDialogClass_main" style="background-color: #fff;" v-if="billDialog">
         <div class="showList" style="height: 60vh;overflow: auto">
@@ -1001,6 +1001,7 @@ export default {
         }
       ],
       tableData: [],
+      tableLoading:false,
       dialogTitle: '新增',
       examineOperateDialog: false,
       statusView: false,
@@ -1055,7 +1056,7 @@ export default {
       obj.dBbSumFieArr = item.dBbSumField ? this.searchIDHandle(item.dBbSumField, this.propertyTree, row) : []
       if (obj.assistEntityList) {
         obj.assistEntityList.forEach(ele => {
-          ele.fieldId = this.searchIDHandle(ele.fieldId, this.propertyTree, row)
+          ele.fieldArr = this.searchIDHandle(ele.fieldId, this.propertyTree, row)
         })
       }
     },
@@ -1139,8 +1140,8 @@ export default {
       })
       console.log(this.tableData, 'this.tableData')
       const res = await confTempSaveAPI(this.tableData)
-      this.$vmNews("保存成功",'success')
-      this.editFlag=false
+      this.$vmNews('保存成功', 'success')
+      this.editFlag = false
       this.getTableData()
     },
     //关闭方法
@@ -1311,9 +1312,9 @@ export default {
     },
     //找id
     searchIDHandle(val, options, row = {}) {
+      console.log(val,options,row,'看看内部')
       let valPath = ''
       let obj = null
-
       function getValuePath(el, data, path = []) {
         for (let i = 0; i < data.length; i++) {
           const item = data[i]
@@ -1333,7 +1334,6 @@ export default {
         }
         return null
       }
-
       const targetValue = Array.isArray(val) ? val[val.length - 1] : val
       const valuePath = getValuePath(targetValue, options)
       valPath = valuePath ? valuePath : []
@@ -1418,6 +1418,7 @@ export default {
     },
     //新增弹窗所有下啦获取
     async addGetSelectHandle() {
+      this.tableLoading = true
       //会计科目
       const res = await subjectClassificationqueryAllAPI({
         aeConfModuleId: this.clickFatherObj.data.aeConfModuleId,
@@ -1450,6 +1451,7 @@ export default {
         item.chName = item.remark
       })
       this.propertyTree = res4.attribute
+      this.tableLoading = false
     },
     //凭证类别修改方法
     voucherChangeHandle(val) {
@@ -1700,10 +1702,10 @@ export default {
       if (this.dialogTitle === '编辑') {
         this.openLoading()
         const res = await tempupdateAPI(
-            {
-              ...this.$refs.basicFormRefsName.ruleForm,
-              assistEntityList: this.addTableData
-            }
+          {
+            ...this.$refs.basicFormRefsName.ruleForm,
+            assistEntityList: this.addTableData
+          }
         )
         if (res.status == 200) {
           this.$vmNews('保存成功', 'success')
@@ -1713,10 +1715,10 @@ export default {
       } else {
         this.openLoading()
         const res = await confTempSaveAPI(
-            {
-              ...this.$refs.basicFormRefsName.ruleForm,
-              assistEntityList: this.addTableData
-            }
+          {
+            ...this.$refs.basicFormRefsName.ruleForm,
+            assistEntityList: this.addTableData
+          }
         )
         if (res.status == 200) {
           this.$vmNews('保存成功', 'success')
@@ -1761,7 +1763,20 @@ export default {
       this.selected = []
       this.selected.push(val)
       console.log(val.assistEntityList, '?val.assistEntityList')
+      let row = {
+        props: {
+          children: 'sublistMdmModuleDbFileds',
+          label: 'chName',
+          value: 'id'
+        }
+      }
+      val.assistEntityList.forEach(item => {
+        console.log(item.fieldId,'item.fieldId')
+        item.fieldArr = item.fieldId ? this.searchIDHandle(item.fieldId, this.propertyTree, row) : []
+        console.log(item.fieldArr,'?fieldArr',item,this.propertyTree)
+      })
       this.assistTableData = val.assistEntityList ? val.assistEntityList : []
+
     },
     // 删除
     delOperate() {
@@ -1774,13 +1789,16 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(async() => {
-        const res = await tempdeleteAPI({
-          id: this.selected[0].id
-        })
-        if (res.status == 200) {
-          this.$vmNews('删除成功', 'success')
-          this.resetTable()
+        if (this.selected[0].id) {
+          const res = await tempdeleteAPI({
+            id: this.selected[0].id
+          })
+          if (res.status == 200) {
+            this.$vmNews('删除成功', 'success')
+          }
         }
+        this.tableData.splice(this.selected[0].index, 1)
+
       })
     },
     // 编辑
@@ -1797,11 +1815,11 @@ export default {
         this.$vmNews('请选择凭证')
         return
       }
+      await this.addGetSelectHandle()
       this.tableData.forEach(item => {
         this.transitionRowHandle(item)
       })
       this.editFlag = true
-      await this.addGetSelectHandle()
       return
       if (!this.selected.length) {
         this.$vmNews('请至少选择一条数据')
diff --git a/src/views/classifyDefinition/index.vue b/src/views/classifyDefinition/index.vue
index 82c74dc..d3b704c 100644
--- a/src/views/classifyDefinition/index.vue
+++ b/src/views/classifyDefinition/index.vue
@@ -838,7 +838,7 @@ export default {
         this.getAddOptions()
         this.$refs.basicFormRefsName.ruleForm = {
           ...this.selected[0],
-          factornamesArr: this.selected[0].factornames.split(',')
+          factornamesArr: this.selected[0].factornames ? this.selected[0].factornames.split(',') : []
         }
       })
     },
diff --git a/src/views/masterDataOptions/dataOrigin/index.vue b/src/views/masterDataOptions/dataOrigin/index.vue
index 65f9592..60ae95b 100644
--- a/src/views/masterDataOptions/dataOrigin/index.vue
+++ b/src/views/masterDataOptions/dataOrigin/index.vue
@@ -24,7 +24,7 @@
             :tabLoading="mainTabLoading"
             :tableColumn="mainTableColumn"
             :border="false"
-            tableMaxHeight="600"
+            tableHeight="calc(100vh - 280px)"
             :highlightCurrent="true"
             @radioChange="mainOnClick"
         >
@@ -63,7 +63,7 @@
             :tabLoading="activedTabLoading"
             :tableColumn="activedTableColumn"
             :border="false"
-            tableMaxHeight="650"
+            tableHeight="calc(100vh - 200px)"
             :highlightCurrent="true"
             @radioChange="activedOnClick"
             @onFunc="activedOnFunc"
diff --git a/src/views/relevance/index.vue b/src/views/relevance/index.vue
index 576ac40..cb4b31a 100644
--- a/src/views/relevance/index.vue
+++ b/src/views/relevance/index.vue
@@ -678,12 +678,13 @@ export default {
       this.resetTable()
     },
     billTreeClick(item, row) {
-      console.log(row, '?')
+
+      console.log(row, '?',item)
       if (item.fatherRow) {
         return
       }
       this.billTreeActive = item
-      this.billTreeActiveFather = row
+      this.billTreeActiveFather = row.parent.data
     },
     //头部按钮统一调用方法
     clickSave(item) {