Merge branch 'jzl'

precision-effect-web/src/api/account/account.js

+/*
+ * @Author: 纪泽龙 jizelong@qq.com
+ * @Date: 2023-06-12 10:49:16
+ * @LastEditors: 纪泽龙 jizelong@qq.com
+ * @LastEditTime: 2023-06-13 16:19:48
+ * @FilePath: /precision-effect-web/src/api/account/account.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import request from '@/utils/request'
 
 // 查询账户列表
@@ -9,6 +17,15 @@ export function listAccount(query) {
   })
 }
 
+
+// 应收应付金额列表
+export function getIncomeOrPayableList (query) {
+  return request({
+    url: '/trade/project/getIncomeOrPayableList',
+    method: 'get',
+    params: query
+  })
+}
 // 查询账户详细
 export function getAccount(accountId) {
   return request({

precision-effect-web/src/assets/styles/zehong.scss

@@ -324,3 +324,6 @@
 .flex{
 	display: flex;
 }
+.cup{
+	cursor: pointer;
+}
\ No newline at end of file

precision-effect-web/src/views/account/component/MoneyTable.vue

+<!--
+ * @Author: 纪泽龙 jizelong@qq.com
+ * @Date: 2023-06-13 15:40:04
+ * @LastEditors: 纪泽龙 jizelong@qq.com
+ * @LastEditTime: 2023-06-13 17:18:43
+ * @FilePath: /precision-effect-web/src/views/account/component/table.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div>
+    <!-- 交易项目、卖方、申请人、买方、买方经办人、应付/应收金额 -->
+    <el-table :data="tableData" v-loading="moneyLoading">
+      <el-table-column
+        label="交易项目"
+        align="center"
+        prop="a"
+        :formatter="formatter"
+      />
+      <el-table-column label="卖方" align="center" prop="tradeTransactorName" />
+      <el-table-column label="申请人" align="center" prop="applyName" />
+      <el-table-column label="买方" align="center" prop="applyDeptName" />
+      <el-table-column label="买方经办人" align="center" prop="tradeDeptName" />
+      <template v-if="or === 'income'">
+        <el-table-column
+          label="应收金额"
+          align="center"
+          prop="pendingPayment"
+        />
+      </template>
+      <template v-else>
+        <el-table-column
+          label="应付金额"
+          align="center"
+          prop="pendingPayment"
+        />
+      </template>
+    </el-table>
+
+    <pagination
+      v-show="tableData.length > 0"
+      :total="total"
+      :page.sync="queryAccountDetailParams.pageNum"
+      :limit.sync="queryAccountDetailParams.pageSize"
+      @pagination="getOperateList"
+    />
+  </div>
+</template>
+
+<script>
+export default {
+  name: "",
+  props: {
+    moneyLoading: {
+      type: Boolean,
+    },
+    tableData: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    or: {
+      type: String,
+      default: "tableOr",
+    },
+    total: {
+      tyle: Number,
+    },
+    deptId: {
+      tyle: Number,
+    },
+  },
+  data() {
+    return {
+      queryAccountDetailParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+    };
+  },
+  methods: {
+    getOperateList() {
+      this.$parent.getIncomeOrPayableList(
+        {
+          ...queryAccountDetailParams,
+          deptId: this.deptId,
+        },
+        or
+      );
+    },
+    formatter(row, column, cellValue, index) {
+      return cellValue ? cellValue : "-";
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>