Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/views/market/spot_trade/components/post_buying/index.vue

@@ -104,7 +104,7 @@ import Drawer from '@/common/components/drawer/index.vue';
 import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
 import { hdWROrder, wRListingCancelOrder } from '@/services/proto/warehousetrade';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { HdWROrderReq } from '@/services/proto/warehousetrade/interface';
+import {HdWROrderReq, WRGoodsInfo} from '@/services/proto/warehousetrade/interface';
 import { getAccountTypeList, getInTaAccount, getUserId } from '@/services/bus/account';
 import { v4 as uuidv4 } from 'uuid';
 import moment from 'moment';
@@ -142,6 +142,15 @@ export default defineComponent({
             if (marketInfo) {
                 validateAction<FormParam>(formRef, formState).then((res) => {
                     // 只有有仓单的有求购  无仓单不能求购
+
+                    const wrGoodsInfo: WRGoodsInfo = {
+                        GoodsID: props.selectedRow.goodsid, // uint32 配置商品ID
+                        GoodsCode: props.selectedRow.goodscode, // string 配置商品代码
+                        PriceFactor: 1, // double 商品价格系数
+                        PriceMove: 0, // double 商品升贴水值
+                        WeightRatio: 1, // double 商品重量系数
+                    };
+
                     const param = {
                         AccountID: res.accountid, // 默认内部资金账号第一个
                         ClientSerialNo: uuidv4(), // 客户端流水号
@@ -177,7 +186,7 @@ export default defineComponent({
                         Attachment2: '', // 附件2
                         Remark: '222', // 备注
                         ApplyID: 0, // 申请ID
-                        WRTradeGoods: [],
+                        WRTradeGoods: isFixed()?[] : [wrGoodsInfo],
                         CanPart: 1, // 是否允许部份摘牌0:不允许;1:允许
                         WRStandardID: props.selectedRow.wrstandardid,
                         HasWr: 1, // 无仓单挂牌  是否有无仓单

src/views/order/funding_information/components/funding_information_funding_log/index.vue

@@ -32,6 +32,9 @@ import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrad
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+import {queryAmountLog} from "@/services/go/TaAccount";
+import {QueryAmountLogReq} from "@/services/go/TaAccount/interface";
+import {getSelectedAccountId} from "@/services/bus/account";
 export default defineComponent({
     name: enumOrderComponents.funding_information_funding_log,
     components: {
@@ -42,15 +45,16 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
         // 获取列表数据
         const queryTableAction = () => {
-            const param: QueryPerformancePlanReq = {
-                buyorsell: 0,
+            const param: QueryAmountLogReq = {
+                accountID: getSelectedAccountId().toString(),
             };
-            queryTable(QueryPerformancePlan, param);
+
+            queryTable(queryAmountLog, param);
         };
         // 表格通用逻辑
         const param: ComposeOrderTableParam = {
             queryFn: queryTableAction,
-            tableName: 'table_pcweb_spot_trade_bottom_performance_info_buy',
+            tableName: 'table_pcweb_spot_trade_bottom_funding_info_log',
             recordList: getRecordItemTab(),
         };
         return {

src/views/order/funding_information/components/funding_information_funding_summary/index.vue

@@ -1,20 +1,70 @@
 <template>
   <!-- 资金汇总 -->
-  <section class="funding_information_funding_summary">
-    资金汇总
-  </section>
+    <section>
+        <a-table :columns="columns"
+                 class="srcollYTable"
+                 :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
+                 :pagination="false"
+                 :loading="loading"
+                 :expandedRowKeys="expandedRowKeys"
+                 :customRow="Rowclick"
+                 rowKey="key"
+                 :data-source="tableList">
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList :btnList="btnList"
+                         :record="record"
+                         @click="openComponent" />
+            </template>
+        </a-table>
+        <component :is="componentId"
+                   v-if="componentId"
+                   :selectedRow="selectedRow"
+                   @cancel="closeComponent"></component>
+    </section>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-export default defineComponent({
-    name: enumOrderComponents.funding_information_funding_summary,
-    components: {},
-    setup() {
-        return {};
-    },
-});
+    import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
+    import { queryTableList, BtnList, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
+    import { QueryPerformancePlan, queryWrTradeDetail } from '@/services/go/wrtrade';
+    import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+    import { getRecordItemTab } from '@/common/setup/order/orderData';
+    import { handleComposeOrderTable } from '@/common/setup/table/compose';
+    import { ComposeOrderTableParam } from '@/common/setup/table/interface';
+    import {getTaAccounts, queryAmountLog} from "@/services/go/TaAccount";
+    import {GetTaAccountsReq, QueryAmountLogReq} from "@/services/go/TaAccount/interface";
+    import {getSelectedAccountId} from "@/services/bus/account";
+    import {getLongTypeLoginID} from "@/services/bus/login";
+    import * as Long from "long";
+    export default defineComponent({
+        name: enumOrderComponents.funding_information_funding_summary,
+        components: {
+            BtnList,
+        },
+        setup() {
+            // 表格列表数据
+            const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+            // 获取列表数据
+            const queryTableAction = () => {
+                const param: GetTaAccountsReq = {
+                    loginID: Number(getLongTypeLoginID()),
+                };
+                queryTable(getTaAccounts, param);
+            };
+            // 表格通用逻辑
+            const param: ComposeOrderTableParam = {
+                queryFn: queryTableAction,
+                tableName: 'table_pcweb_spot_trade_bottom_funding_info_summary',
+                recordList: getRecordItemTab(),
+            };
+            return {
+                ...handleComposeOrderTable<WrPerformancePlan>(param),
+                loading,
+                tableList,
+            };
+        },
+    });
 </script>
 
 <style lang="less">