会计事项平台更新

src/views/ItemEntryTemplate/index.vue

@@ -30,7 +30,7 @@
         </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">
@@ -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,7 +1140,7 @@ export default {
       })
       console.log(this.tableData, 'this.tableData')
       const res = await confTempSaveAPI(this.tableData)
-      this.$vmNews("保存成功",'success')
+      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) {
@@ -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() => {
+        if (this.selected[0].id) {
           const res = await tempdeleteAPI({
             id: this.selected[0].id
           })
           if (res.status == 200) {
             this.$vmNews('删除成功', 'success')
-          this.resetTable()
           }
+        }
+        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('请至少选择一条数据')

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(',') : []
         }
       })
     },

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"

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) {