会计事项平台更新

src/views/businessVoucher/index.vue

@@ -96,16 +96,19 @@
         </div>
       </div>
       <div class="leftTitle" style="display: flex;align-items: center;justify-content: space-between">
-        <div>分录信息</div>
+        <div>{{ billTypeClickName }}</div>
       </div>
       <div class="table">
         <base-table ref="customtable" :showIndex="false" :slotrow="false" :showSelect="true"
-                    tableHeight="calc(50vh - 110px)" :tableData="tableData" :tableColumn="tableColumn"
+                     :tableData="tableData" :tableColumn="tableColumn"
                     @radioChange="radioChange" id="printMe" @onSelectionChange="onSelectionChange"
         >
           <template #billStatus="{row}">
             <div>{{ row.billStatus === 'Y' ? '已生成' : '未生成' }}</div>
           </template>
+          <template #billstatus="{row}">
+            <div>{{ row.billstatus === 'Y' ? '已生成' : '未生成' }}</div>
+          </template>
           <template #operation="{row}">
             <div @click="generateHandle(row)" style="cursor: pointer;color: #4876ed">
               {{ row.billStatus === 'Y' ? '查看' : '生成' }}
@@ -115,7 +118,8 @@
         <base-page :pageModel.sync="pageModel" @onPageChange="pageChange"></base-page>
       </div>
       <!--      辅助核算-->
-      <template v-if="this.selected.length">
+      <template>
+        <div>分录信息</div>
         <div class="table">
           <base-table ref="assistTable" :showIndex="false" :slotrow="false"
                       tableHeight="calc(50vh - 110px)" :tableData="assistTableData"
@@ -653,7 +657,7 @@ export default {
         type: 'warning'
       }).then(async() => {
         let flag = this.checkBoxList.some((item, index) => {
-          if (item.billStatus !== 'Y') {
+          if (item.billstatus !== 'Y') {
             this.$vmNews('未生成的单据不能收回')
             return true
           }
@@ -680,10 +684,10 @@ export default {
     coreDataOpenDialog() {
       if (this.checkBoxList.length === 0) {
         this.$vmNews('请选择单据')
-        return
+        returnt
       }
       let flag = this.checkBoxList.some((item, index) => {
-        if (item.billStatus == 'Y') {
+        if (item.billStatus == 'Y' || item.billstatus == 'Y') {
           this.$vmNews('已生成的单据不能生成')
           return true
         }
@@ -693,10 +697,20 @@ export default {
       }
       this.$refs.datePickDialog.openDialog()
     },
-    billTypeListChangeHandle() {
+    billTypeListChangeHandle(val, obj) {
+      console.log(val, obj, '?')
       if (this.searchObjTable.billTypeClickID) {
         console.log(this.searchObjTable.billTypeClickID, '?')
         this.billTypeClickID = this.searchObjTable.billTypeClickID[this.searchObjTable.billTypeClickID.length - 1]
+        let obj = this.billTypeList.find(item => {
+          return item.mdmModuleEntity.some(ele => {
+            if (ele.id == this.billTypeClickID) {
+              this.billTypeClickName = ele.name
+            }
+            return ele.id == this.billTypeClickID
+          })
+        })
+        console.log(obj, '?')
       }
     },
     onSelectionChange(val) {
@@ -704,7 +718,7 @@ export default {
     },
     //生成方法
     async generateHandle(row) {
-      if (row.billStatus == 'Y') {
+      if (row.billStatus == 'Y' || row.billstatus == 'Y') {
         this.$refs.customFormDialog.openDialog(row)
       } else {
         this.coreData(row)
@@ -1449,7 +1463,7 @@ export default {
         if (res.status == 200) {
           this.$vmNews('保存成功', 'success')
           this.examineOperateDialog = false
-          this.resetTable()
+          this.resetTable(true)
         }
       }
 
@@ -1460,7 +1474,7 @@ export default {
       // this.pageModel.limit = model.limit
       this.getTableData()
     },
-    async getTableData() {
+    async getTableData(flag = false) {
       this.assistTableData = []
       if (!this.billTypeClickID) return
       const res2 = await queryBillFiledsAPI({
@@ -1490,14 +1504,19 @@ export default {
         this.$refs.customtable.clearSelect()
         this.selected = []
         this.checkBoxList = []
+        if (flag && this.tableData.length) {
+          this.radioChange(flag)
+        }
       })
 
     },
-    resetTable() {
+    resetTable(flag = false) {
       this.tableData = []
       this.pageModel.page = 1
       this.selected = []
-      this.getTableData()
+      let obj = this.checkBoxList[0]
+      this.checkBoxList = []
+      this.getTableData(obj)
     },
     // 点击某条数据
     async radioChange(val) {
@@ -2120,6 +2139,6 @@ export default {
 }
 
 ::v-deep .el-table__body-wrapper {
-  height: calc(50vh - 210px) !important;
+  height: calc(50vh - 180px) !important;
 }
 </style>

src/views/relevance/index.vue

@@ -274,7 +274,7 @@ export default {
         },
         {
           label: '映射档案',
-          prop: ''
+          prop: 'mappingFileName'
         },
         {
           label: '备注',

vue.config.js

@@ -41,7 +41,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://hzya.ufyct.com:9067/`,
         // target: `http://127.0.0.1:9081/`,
-        target: `http://192.168.2.189:10086`,//一凡
+        target: `http://192.168.2.189:10087`,//一凡
         // target: `http://8.136.10.42:10086`,//一凡
         // target: `http://192.168.2.78:8080`,
         // target: `http://b8bc6e8e.natappfree.cc`,