资金日记账

src/api/pages/report/detail-report.js

@@ -27,6 +27,8 @@ export default {
     getSupAccount:'get_sup_account',
     // 供应商往来余额表明细
     getSupAccountItem:'get_sup_account_item',
+    // 资金日记账
+    getFundReport:'get_fund_report',
   }
 }
 

src/view/fin/fund-report/index.vue

@@ -0,0 +1,89 @@
+<template>
+  <div class="main-div">
+    <BaseIndexButtonGroup id="BaseIndexButtonGroup">
+      <template #left>
+        <BaseIndexButton ref="search" name="search"></BaseIndexButton>
+        <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
+      </template>
+    </BaseIndexButtonGroup>
+
+    <!--  查询条件区域  -->
+    <div id="search-cond-div" ref="search-cond-div" style="margin-top: 1px;padding: 0">
+      <SearchCond ref="searchCond" v-model="searchCond"
+                  @collapse-change="collapseChange" :setFlag="false"
+                  :searchContent="searchContent"></SearchCond>
+    </div>
+    <!--  表格部分  -->
+    <div slot="top" style="margin-left: 5px;">
+      <!--  表格部分  -->
+      <DkTable :data="tableData"
+               :page-flag="false"
+               :page-total-flag="false"
+               :height="tableHeight"
+               primaryKey="itemId"
+               :pageFlag="true"
+               @pageChange="pageSizeChange"
+               :page-total="pageInfo.total"
+               :current-page="pageInfo.currentPage"
+               ref="table-select"
+               :showCheckboxHeader="false"
+               :choose-flag="false">
+        <DkTableColumn field="macname"></DkTableColumn>
+        <DkTableColumn field="accdate"/>
+        <DkTableColumn field="amtinflow" data-type="number"/>
+        <DkTableColumn field="balance" data-type="number"></DkTableColumn>
+      </DkTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import {indexMixin} from "@/mixins";
+
+export default {
+  name: 'supplier-account-report',
+  mixins: [indexMixin],
+  data() {
+    let self = this
+    return {
+      detailFlag:false,
+      itemData:[],
+      // 模式切换值
+      tabsModel: 'totalOrder',
+      tabsOptions: [{label: self.$t('totalOrder'), name: 'totalOrder'}, //总单
+        {label: self.$t('details'), name: 'details'}, //明细
+      ],
+      searchContent: [
+        {
+          itemCode: '账务日期-时间',
+          itemName: 'accDate',
+          valueFormat: {
+            code: 'accDate',
+            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
+          },
+          valueKind: 'DATE_RANGE'
+        },
+      ],
+    }
+  },
+  methods: {
+    /**
+     * @desc   : 查询数据
+     * @author : 常皓宁
+     * @date   : 2024/4/25 13:09
+     */
+    getData(params) {
+      params.cpId = this.$store.state.user.cpId
+      return this.excute(this.$service.detailReportService, this.$service.detailReportService.getFundReport, params)
+    },
+  },
+  created() {
+    this.primaryKey = 'itemId'  // 设置主键Id
+    this.routeObjName = 'detailReport'  // 设置路由名称
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/view/mst/basic-data/index.vue

@@ -61,9 +61,10 @@
                  :data="saleChannelTableData"
                  :pageFlag="true"
                  :page-total="pageInfo.total" :current-page="pageInfo.currentPage" :choose-flag="false"
-                 :height="this.tableHeight" primaryKey="seriesId" @pageChange="pageSizeChange">
+                 :height="this.tableHeight" primaryKey="channelId" @pageChange="pageSizeChange">
           <DkTableColumn field="channelCode"></DkTableColumn>
           <DkTableColumn field="channelName"></DkTableColumn>
+          <DkTableColumn field="flgDefault" type="switch"></DkTableColumn>
           <DkTableColumn field="flgValid" type="switch"></DkTableColumn>
           <DkTableColumn field="remarks"></DkTableColumn>
         </DkTable>
@@ -109,7 +110,7 @@
           <InputPop v-model="formData.contactPhone"/>
         </DkFormItem>
         <!-- 默认仓库（仓库特有）-->
-        <DkFormItem v-if="kindCode === this.$config.kindCode.basicWarehouse" prop="flgDefault">
+        <DkFormItem v-if="kindCode === this.$config.kindCode.basicWarehouse || kindCode === this.$config.kindCode.basicChannel" prop="flgDefault">
           <DkSwitch prop="flgDefault" v-model="formData.flgDefault"
                     ref="flgDefault"></DkSwitch>
         </DkFormItem>
@@ -270,6 +271,7 @@ export default {
           this.formData.kindName = row.kindName
           this.formData.id = rows[0].channelId
           this.formData.name = rows[0].channelName
+          this.formData.flgDefault = rows[0].flgDefault
           this.formData.remarks = rows[0].remarks
         }
         //数据字典
@@ -315,6 +317,7 @@ export default {
         params = {
           channelId: this.formData.id,
           channelName: this.formData.name,
+          flgDefault: this.formData.flgDefault,
         }
         serviceName = this.$service.saleChannelService
         if (this.modalParams.button === this.$config.formMode.add) {