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

src/views/order/financing_manager/components/financing_manager_apply_order/index.vue

@@ -34,8 +34,8 @@
       </template>
 
       <!-- 结算方式 1:按日结息 3:按月结息-->
-      <template #interestsettlemode="{ record }">
-        <a>{{ getInterestSettleModeName(record.interestsettlemode) }}</a>
+      <template #interestsettlemode="{ text }">
+        <a>{{ getInterestSettleModeName(text) }}</a>
       </template>
       <!-- 费用 -->
       <template #interestsettlevalue="{ record }">

src/views/order/spot_warran/components/spot_warrant_deal/components/spot_warrant_deal_detail/index.vue

@@ -0,0 +1,105 @@
+<template>
+  <Drawer :title="'详情'"
+          :placement="'right'"
+          class="delistingBottom"
+          :visible="visible"
+          @cancel="cancel">
+    <div>
+      <a-row :gutter="24"
+             type="flex"
+             justify="center">
+        <a-col :span="24"
+               class="fixedBtns">
+          <a-form-item class="btnCenter">
+            <a-button class="cancelBtn"
+                      @click="cancel">取消</a-button>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </div>
+  </Drawer>
+</template>
+
+<script lang="ts">
+import { BtnListType } from '@/common/components/btnList/interface';
+import Drawer from '@/common/components/drawer/index.vue';
+import { getBarmaginApplyStatus } from '@/common/constants/enumsName';
+import { BtnList, ModalEnum, queryTableList } from '@/common/export/commonTable';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { _closeModal } from '@/common/setup/modal/modal';
+import { getTableEvent } from '@/common/setup/table';
+import { expandIcon } from '@/common/setup/table/clolumn';
+import { queryQueryWrTradeBargainApply } from '@/services/go/wrtrade';
+import { QueryWrTradeBargainApplyQsp, QueryWrTradeBargainApplyReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
+import { wrBargainBack, wrBargainNoAgree } from '@/services/proto/WrBargain';
+import { WrBargainBackReq, WrBargainNoAgreeReq } from '@/services/proto/WrBargain/interface';
+import Long from 'long';
+import { defineComponent, PropType, ref } from 'vue';
+
+export default defineComponent({
+    name: ModalEnum.spot_warrant_bargain_detail,
+    components: { Drawer, BtnList },
+    emits: ['cancel', 'update'],
+    props: {
+        selectedRow: {
+            type: Object as PropType<QueryWrTradeBargainApplyQsp | WrOrderDetail>,
+            default: {},
+        },
+        isMy: {
+            type: Boolean,
+            default: true,
+        },
+    },
+    setup(props, context) {
+        const { visible, cancel } = _closeModal(context);
+
+        return {
+            visible,
+            cancel,
+        };
+    },
+});
+</script>
+
+<style lang="less" scoped>
+.listed {
+    width: 100%;
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    overflow: hidden;
+    .ant-form {
+        height: 100%;
+        .formBar {
+            height: 100%;
+            max-height: 100%;
+        }
+    }
+    .condition {
+        width: 100%;
+        height: 48px;
+        padding: 10px 16px;
+        border-bottom: 1px solid @m-black6;
+        .inlineflex;
+        .conditionBtn {
+            align-self: center;
+            align-items: center;
+            border: 0;
+            min-width: 80px;
+            height: 28px;
+            line-height: 28px;
+            background: @m-black7;
+            .rounded-corners(3px);
+            font-size: 14px;
+            color: @m-blue0;
+            &:hover {
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
+            }
+        }
+        .conditionBtn + .conditionBtn {
+            margin-left: 10px;
+        }
+    }
+}
+</style>;

src/views/order/spot_warran/components/spot_warrant_deal/index.vue

@@ -1,46 +1,40 @@
 <template>
-    <!-- 成交 -->
-    <section>
-        <a-table
-            :columns="columns"
-            class="srcollYTable expandLeftTable"
-            :scroll="{ x: '100%', y: '190px' }"
-            :pagination="false"
-            :loading="loading"
-            :expandedRowKeys="expandedRowKeys"
-            :customRow="Rowclick"
-            :expandIcon="expandIcon"
-            :expandIconAsCell="false"
-            rowKey="key"
-            :data-source="tableList"
-        >
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <BtnList
-                    :btnList="btnList"
-                    :record="record"
-                    class="btn-list-sticky"
-                    @click="openComponent"
-                />
-            </template>
+  <!-- 成交 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable expandLeftTable"
+             :scroll="{ x: '100%', y: '190px' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             :expandIcon="expandIcon"
+             :expandIconAsCell="false"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <BtnList :btnList="btnList"
+                 :record="record"
+                 class="btn-list-sticky"
+                 @click="openComponent" />
+      </template>
 
-            <!-- 成交金额 -->
-            <template #amount="{ record }">
-                <a>{{ record.tradeqty * record.tradeprice }}</a>
-            </template>
+      <!-- 成交金额 -->
+      <template #amount="{ record }">
+        <a>{{ record.tradeqty * record.tradeprice }}</a>
+      </template>
 
-            <!-- 挂牌类型 -->
-            <template #wrtradetype="{ record }">
-                <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
-            </template>
-        </a-table>
-        <component
-            :is="componentId"
-            v-if="componentId"
-            :selectedRow="selectedRow"
-            @cancel="closeComponent"
-        ></component>
-    </section>
+      <!-- 挂牌类型 -->
+      <template #wrtradetype="{ record }">
+        <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+      </template>
+    </a-table>
+    <component :is="componentId"
+               v-if="componentId"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
+  </section>
 </template>
 
 <script lang="ts">
@@ -58,6 +52,7 @@ export default defineComponent({
     name: enumOrderComponents.spot_warrant_deal,
     components: {
         BtnList,
+        spot_warrant_deal_detail: defineAsyncComponent(() => import('./components/spot_warrant_deal_detail/index.vue')),
     },
     setup() {
         // 表格列表数据