Merge remote-tracking branch 'origin/master'

src/assets/styles/mixin.less

@@ -256,6 +256,18 @@
         line-height: 26px;
     }
 }
+// 左边菜单展开后 表格展开行操作按钮显示在最右侧
+.expandLeftTable {
+    .ant-table {
+        .ant-table-content {
+            .ant-table-tbody {
+                .ant-table-expanded-row {
+                    width: calc(100vw - 180px);
+                }
+            }
+        }
+    }
+}
 
 // 上面表格样式
 .topTable {
@@ -1641,7 +1653,6 @@ input:-internal-autofill-selected {
     // }
 }
 .topTableHeight40 {
-    position: relative;
     height: calc(100% - 40px);
 }
 

src/assets/styles/variables.less

@@ -76,6 +76,7 @@
 @m-blue18: #1b3356;
 @m-blue19: #102442;
 @m-blue20: #122d55;
+@m-blue21: #102e45;
 @body-bg: #e9eef3;
 @m-white0: #ffffff;
 @m-white0-hover: rgba(@m-white0, .8);

src/common/components/drawer/index.vue

@@ -1,26 +1,25 @@
 <template>
-    <a-drawer
-        :placement="placement"
-        :closable="false"
-        :visible="visible"
-        :destroyOnClose="true"
-        class="bottomListed"
-        height="406px"
-    >
-        <!-- 摘牌是top  挂牌是bottom 期货交易是tradeDialog -->
-        <div class="collapse" @click="cancel">
-            <DoubleRightOutlined />
-        </div>
-        <div class="collapseCont">
-            <div class="title">{{ title }}</div>
-            <div class="content highContent">
-                <!-- <Listed></Listed> -->
-                <!-- <Delisting></Delisting> -->
-                <slot></slot>
-                <!-- <Trade></Trade> -->
-            </div>
-        </div>
-    </a-drawer>
+  <a-drawer :placement="placement"
+            :closable="false"
+            :visible="visible"
+            :destroyOnClose="true"
+            class="bottomListed"
+            height="406px">
+    <!-- 摘牌是top  挂牌是bottom 期货交易是tradeDialog -->
+    <div class="collapse"
+         @click="cancel">
+      <DoubleRightOutlined />
+    </div>
+    <div class="collapseCont">
+      <div class="title">{{ title }}</div>
+      <div class="content highContent">
+        <!-- <Listed></Listed> -->
+        <!-- <Delisting></Delisting> -->
+        <slot></slot>
+        <!-- <Trade></Trade> -->
+      </div>
+    </div>
+  </a-drawer>
 </template>
 
 <script lang="ts">
@@ -34,7 +33,7 @@ import { DoubleRightOutlined } from '@ant-design/icons-vue';
 
 export default defineComponent({
     name: 'drawer',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         modalName: {
             default: 'drawer',
@@ -166,7 +165,7 @@ export default defineComponent({
                             overflow-y: auto;
                             overflow-x: hidden;
                             background: @m-grey11;
-                            border: 8px solid @m-blue5;
+                            border: 8px solid @m-blue21;
                             border-top: 0;
                         }
                         .highContent {

src/common/constants/enumsName.ts

@@ -3,8 +3,8 @@ import * as EnumType from './enumCommon';
 
 /**
  * 获取证件类型枚举名称
- * @param enumdicid 
- * @returns 
+ * @param enumdicid
+ * @returns
  */
 export function getCardTypeEnumItemName(enumdicid: number): string {
     return getItemEnumName('certificatetype', enumdicid)
@@ -364,7 +364,7 @@ export function getContractName(type: number): string {
     return result
 }
 
-export function getFinancingStatus(status: number, price: String) : String{
+export function getFinancingStatus(status: number, price: String): String {
     let result = "--";
     switch (status) {
         case 1:
@@ -487,8 +487,8 @@ export function getWeekName(type: string): string {
 
 /**
  * 获取对应协议枚举对应名
- * @param type 
- * @returns 
+ * @param type
+ * @returns
  */
 export function getAgreementTypeName(type: EnumType.AgreementType): string {
     let result = '--'
@@ -562,7 +562,7 @@ export function getChangeLogType(changelogtype: number) {
 
 //仓单委托状态
 // 委托状态 - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:已成 8:成交失败 9:委托拒绝 10:挂牌部分成交 11:仓单生成失败 12:首付扣款失败 13:履约失败 14:撤单解冻贷款失败 15:部成部撤
-export function getWrTradeOrderStatusName(type: number){
+export function getWrTradeOrderStatusName(type: number) {
     let result = '--'
     switch (type) {
         case 1:
@@ -619,15 +619,15 @@ export function getWrTradeOrderStatusName(type: number){
  * @param buyOrSell 买卖 - 0:买 1:卖(挂牌类型 买为采购 卖为销售)
  * @param wrTradeType 1:挂牌 2:摘牌
  */
-export function getWrOrderTypeName(buyOrSell: number, wrTradeType: number){
+export function getWrOrderTypeName(buyOrSell: number, wrTradeType: number) {
     let result = '--'
-    if(buyOrSell === 0 && wrTradeType === 1){
+    if (buyOrSell === 0 && wrTradeType === 1) {
         result = "买入"
-    }else if(buyOrSell === 1 && wrTradeType === 1){
+    } else if (buyOrSell === 1 && wrTradeType === 1) {
         result = "卖出"
-    }else if(buyOrSell === 0 && wrTradeType === 2){
+    } else if (buyOrSell === 0 && wrTradeType === 2) {
         result = "买入"
-    }else if(buyOrSell === 1 && wrTradeType === 2){
+    } else if (buyOrSell === 1 && wrTradeType === 2) {
         result = "卖出"
     }
     return result
@@ -730,7 +730,7 @@ export function getPerformanceStatusName(type: number) {
 /**
  * 付款方式 - 1:冻结 2:扣款
  */
-export function getPaymentTypeName(type: number){
+export function getPaymentTypeName(type: number) {
     let result = '--'
     switch (type) {
         case 1:
@@ -754,7 +754,7 @@ export function getPaymentTypeName(type: number){
  * 904:商城收款 1001:期权冻结 1002:期权解冻 1003:期权权力金 1004:期权手续费冻结 1005:期权手续费解冻 1006:期权手续费 1007:期权盈亏 1101:营销扣款 1102:营销收款
  * @param type
  */
-export function getOperateTypeName(type: number){
+export function getOperateTypeName(type: number) {
     let result = '--'
     switch (type) {
         case 101:

src/common/methods/request/resultInfo.ts

@@ -47,11 +47,12 @@ export async function controlLoading(fn: Function, loading: Ref<boolean>, param?
     console.log('请求接口参数: ', param);
     loading.value = true;
     try {
-        return await param ? fn(param) : fn()
+        const result = await param ? fn(param) : fn()
+        loading.value = false;
+        return result;
     } catch (err) {
-        Promise.resolve(err)
-    } finally {
         loading.value = false;
+        Promise.resolve(err)
     }
 }
 

src/common/setup/modal/modal.ts

@@ -53,7 +53,9 @@ export function openModal(modelName: keyof ModalName, data?: any) {
 
 export type { ModalName };
 
-export function _closeModal(context: SetupContext<'cancel'[]>) {
+type emitFn = 'cancel' | 'update'
+
+export function _closeModal(context: SetupContext<emitFn[]>) {
     const visible = ref<boolean>(true);
     /**
      * 关闭弹窗

src/layout/components/main.vue

@@ -46,6 +46,7 @@ export default defineComponent({
 <style lang="less">
 .exposure {
     height: 100%;
+    position: relative;
 }
 .noBorderBottom {
     border-bottom: none;

src/layout/components/top.vue

@@ -12,7 +12,7 @@
         <Menu @chooseMenu="chooseMenu"
               :collapsed="collapsed" />
       </a-layout-sider>
-      <a-layout-content :style="{ background: '#0E0E0F', flex: 1 }">
+      <a-layout-content :style="{ background: '#0E0E0F', flex: 1, }">
         <!-- <Drawer :title="'挂牌'" :visible="visible"></Drawer> -->
         <!-- <Main /> -->
         <router-view />

src/views/business/plan/components/add/index.vue

@@ -162,7 +162,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'add-custom',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
         const loading = ref<boolean>(false);
@@ -195,8 +195,8 @@ export default defineComponent({
                     AreaUserID: userid,
                     Remark: param.Remark,
                 };
-                if ( param.ConvertFactor) reqParam.ConvertFactor = param.ConvertFactor
-                if ( param.Tradeuserid) reqParam.Tradeuserid = param.Tradeuserid
+                if (param.ConvertFactor) reqParam.ConvertFactor = param.ConvertFactor;
+                if (param.Tradeuserid) reqParam.Tradeuserid = param.Tradeuserid;
                 requestResultLoadingAndInfo(hedgePlanReq, reqParam, loading, OperateType === 1 ? ['保存草稿成功', '保存草稿失败:'] : ['提交申请成功', '提交申请失败:']).then(() => {
                     cancel(true);
                 });

src/views/business/plan/components/audit/index.vue

@@ -109,7 +109,7 @@ import { getLongTypeLoginID } from '@/services/bus/login';
 import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'plan_audit_audit',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3HedgePlan>,

src/views/business/plan/components/cancel/index.vue

@@ -101,7 +101,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'plan_audit_cancel',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3HedgePlan>,

src/views/business/plan/components/delete/index.vue

@@ -126,7 +126,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'plan_uncommitted_delete',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3HedgePlan>,

src/views/business/plan/components/detail/index.vue

@@ -118,7 +118,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'plan-detail',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3HedgePlan>,

src/views/business/plan/components/modify/index.vue

@@ -164,7 +164,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'plan_uncommitted_modify',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3HedgePlan>,

src/views/business/purchase/components/detail/index.vue

@@ -104,7 +104,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'purchase_pending-detail',
     components: {},
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3SellBuyContract>,

src/views/business/purchase/components/funds/index.vue

@@ -176,7 +176,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'purchase_pending_funds',
     components: {},
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3SellBuyContract>,

src/views/business/purchase/components/invoice/index.vue

@@ -144,7 +144,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'purchase_pending_invoice',
     components: {},
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3SellBuyContract>,

src/views/business/purchase/components/settlement/index.vue

@@ -321,7 +321,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'purchase_pending_settlement',
     components: {},
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3SellBuyContract>,

src/views/business/purchase/components/someprice/index.vue

@@ -165,7 +165,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'purchase_pending_someprice',
     components: {},
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3SellBuyContract>,

src/views/business/purchase/components/storage/index.vue

@@ -149,7 +149,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'purchase_pending_storage',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     components: {},
     props: {
         selectedRow: {

src/views/business/sell/components/detail/index.vue

@@ -102,7 +102,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'sell-detail',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     components: {},
     props: {
         selectedRow: {

src/views/business/sell/components/funds/index.vue

@@ -176,7 +176,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'sell_pending_funds',
     components: {},
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3SellBuyContract>,

src/views/business/sell/components/invoice/index.vue

@@ -143,7 +143,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'sell_pending_invoice',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3SellBuyContract>,

src/views/business/sell/components/settlement/index.vue

@@ -318,7 +318,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'sell_pending_settlement',
     components: {},
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3SellBuyContract>,

src/views/business/sell/components/someprice/index.vue

@@ -165,7 +165,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'sell_pending_someprice',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3SellBuyContract>,

src/views/business/sell/components/storage/index.vue

@@ -153,7 +153,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'sell_pending_storage',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3SellBuyContract>,

src/views/information/account_info/compoments/add-business/index.vue

@@ -88,7 +88,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'add-business-info',
     components: {},
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         roleid: {
             default: 0,

src/views/information/account_info/compoments/cancel-business/index.vue

@@ -36,7 +36,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'account_info_business_btn_cancel',
     components: { Detail },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             default: {},

src/views/information/account_info/compoments/detail-business/index.vue

@@ -27,7 +27,7 @@ export default defineComponent({
     components: {
         Detail,
     },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<ErmcpLoginUser>,

src/views/information/account_info/compoments/locked-business/index.vue

@@ -30,7 +30,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'account_info_business_btn_locked',
     components: { Detail },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             default: {},

src/views/information/account_info/compoments/modify-business/index.vue

@@ -81,7 +81,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'account_info_business_btn_modify',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     components: {},
     props: {
         selectedRow: {

src/views/information/account_info/compoments/reset-business/index.vue

@@ -65,7 +65,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'account_info_business_btn_reset',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             default: {},

src/views/information/account_info/compoments/unlocked-business/index.vue

@@ -30,7 +30,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'account_info_business_btn_unlocked',
     components: { Detail },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             default: {},

src/views/information/spot-contract/components/add/index.vue

@@ -440,7 +440,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'add-spot-contract',
     components: { UploadImg },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3ContractRsp>,

src/views/information/spot-contract/components/cancel/index.vue

@@ -35,7 +35,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'spot-contract-detail',
     components: { InfoDetail },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3ContractRsp>,

src/views/information/spot-contract/components/check/index.vue

@@ -132,7 +132,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'spot-contract-detail',
     components: { Detail },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3ContractRsp>,

src/views/information/spot-contract/components/delete/index.vue

@@ -35,7 +35,7 @@ export default defineComponent({
     components: {
         InfoDetail,
     },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3ContractRsp>,

src/views/information/spot-contract/components/detail/index.vue

@@ -53,14 +53,14 @@
           <a>{{ InOutTypeName(text) }}</a>
         </template>
 
-                <!-- 款项类型 -->
-                <template #kxtype="{ text }">
-                    <a>{{ kxtypeName(text) }}</a>
-                </template>
+        <!-- 款项类型 -->
+        <template #kxtype="{ text }">
+          <a>{{ kxtypeName(text) }}</a>
+        </template>
 
-            </a-table>
-        </div>
-    </a-modal>
+      </a-table>
+    </div>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -83,7 +83,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: 'spot-contract-detail',
     components: { InfoDetail },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3ContractRsp>,

src/views/information/spot-contract/components/finish/index.vue

@@ -33,7 +33,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'spot-contract-finish',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     components: { InfoDetail },
     props: {
         selectedRow: {

src/views/information/spot-contract/components/modify/index.vue

@@ -431,7 +431,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: 'spot_contract_btn_modify',
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<Ermcp3ContractRsp>,

src/views/market/spot_trade/components/buy-sell-market/components/buy/index.vue

@@ -1,30 +1,28 @@
 <template>
-    <!-- 买大厅 -->
-    <a-table
-        :columns="columns"
-        class="buyHallTable"
-        :scroll="{ x: '100%', y: 'calc(100vh- 510px)' }"
-        :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"
-        :buyOrSell="BuyOrSell.buy"
-        :enumName="enumName"
-        :parantSelectedRow="parantSelectedRow"
-        @cancel="closeComponent"
-    ></component>
+  <!-- 买大厅 -->
+  <a-table :columns="columns"
+           class="buyHallTable"
+           :scroll="{ x: '100%', y: 'calc(100vh- 510px)' }"
+           :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"
+             :buyOrSell="BuyOrSell.buy"
+             :enumName="enumName"
+             :parantSelectedRow="parantSelectedRow"
+             @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
@@ -58,7 +56,6 @@ export default defineComponent({
     components: {
         BtnList,
         [ModalEnum.spot_trade_warehouse_delisting]: defineAsyncComponent(() => import('../delisting/index.vue')),
-        [ModalEnum.spot_trade_warehouse_financing_delisting]: defineAsyncComponent(() => import('../financing_delisting/index.vue')),
     },
     setup(props, context) {
         // 表格列表数据

src/views/market/spot_trade/components/buy-sell-market/components/delisting/index.vue

@@ -113,6 +113,8 @@
             <a-col :span="24">
               <a-form-item class="tc">
                 <a-button class="listedBtn"
+                          :loading="loading"
+                          :disabled="loading"
                           @click="submit">{{isBuy() ? '卖出' : '买入'}}</a-button>
                 <a-button class="ml10 cancelBtn"
                           @click="cancel">取消</a-button>
@@ -146,7 +148,7 @@ import { EnumRouterName } from '@/common/constants/enumRouterName';
 export default defineComponent({
     name: ModalEnum.spot_trade_warehouse_financing_delisting,
     components: { Drawer, PlusOutlined, MinusOutlined },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         enumName: {
             default: '',
@@ -220,6 +222,7 @@ export default defineComponent({
             cancel,
             accountList,
             wrHoldList,
+            loading,
             submit,
             isSale,
             isBuy,

src/views/market/spot_trade/components/buy-sell-market/components/financing_delisting/components/choose-finance/index.vue

@@ -1,98 +1,100 @@
 <template>
-    <!-- 仓单贸易&仓单预售 融资-->
+  <!-- 仓单贸易&仓单预售 融资-->
 
-    <Drawer
-        :title="'选择融资方案'"
-        :placement="'top'"
-        :visible="visible"
-        width="486px"
-        height="479px"
-        @cancel="update"
-        class="top financing"
-    >
-        <div class="financingCont">
-            <a-row class="f-t">
-                <a-col :span="7">融出方/名称</a-col>
-                <a-col :span="10">天数/保证金/利息</a-col>
-                <a-col :span="7">结息/起息天数</a-col>
+  <Drawer :title="'选择融资方案'"
+          :placement="'top'"
+          :visible="visible"
+          width="486px"
+          height="580px"
+          @cancel="update"
+          class="top financing">
+    <div class="financingCont">
+      <a-row class="f-t">
+        <a-col :span="7">融出方/名称</a-col>
+        <a-col :span="10">天数/保证金/利息</a-col>
+        <a-col :span="7">结息/起息天数</a-col>
+      </a-row>
+      <div class="contBar"
+           v-for="(item, index) in list"
+           :key="index + 11"
+           @click="choose(item)">
+        <a-row class="firstRow">
+          <a-col :span="7">{{item.productname}}</a-col>
+          <a-col :span="17"
+                 v-if="item.isautoloan">放款快</a-col>
+        </a-row>
+        <a-row class="secondRow">
+          <a-col :span="7">{{item.username}}</a-col>
+          <a-col :span="10">
+            <a-row class="middle">
+              <a-col :span="7">{{item.financingdays}}天</a-col>
+              <a-col :span="10">{{item.marginratio * 100}}%</a-col>
+              <a-col :span="7">{{item.interestrate * 100}}%</a-col>
             </a-row>
-            <div class="contBar">
-                <a-row class="firstRow">
-                    <a-col :span="7">铜供应链金融</a-col>
-                    <a-col :span="17">放款快</a-col>
-                </a-row>
-                <a-row class="secondRow">
-                    <a-col :span="7">铜杆帮你采</a-col>
-                    <a-col :span="10">
-                        <a-row class="middle">
-                            <a-col :span="7">30天</a-col>
-                            <a-col :span="10">30%</a-col>
-                            <a-col :span="7">11%</a-col>
-                        </a-row>
-                    </a-col>
-                    <a-col :span="7">
-                        <div class="settle">
-                            <div>日结</div>
-                            <div>1天起息</div>
-                        </div>
-                    </a-col>
-                </a-row>
+          </a-col>
+          <a-col :span="7">
+            <div class="settle">
+              <div>{{item.interestsettlemode === 1 ? '日' : '月'}}结</div>
+              <div>{{item.interestminlen}}天起息</div>
             </div>
-            <div class="contBar">
-                <a-row class="firstRow">
-                    <a-col :span="7">铜供应链金融</a-col>
-                    <a-col :span="17">放款快</a-col>
-                </a-row>
-                <a-row class="secondRow">
-                    <a-col :span="7">铜杆帮你采</a-col>
-                    <a-col :span="10">
-                        <a-row class="middle">
-                            <a-col :span="7">30天</a-col>
-                            <a-col :span="10">30%</a-col>
-                            <a-col :span="7">11%</a-col>
-                        </a-row>
-                    </a-col>
-                    <a-col :span="7">
-                        <div class="settle">
-                            <div>日结</div>
-                            <div>1天起息</div>
-                        </div>
-                    </a-col>
-                </a-row>
+          </a-col>
+        </a-row>
+      </div>
+      <!-- <div class="contBar">
+        <a-row class="firstRow">
+          <a-col :span="7">铜供应链金融</a-col>
+          <a-col :span="17">放款快</a-col>
+        </a-row>
+        <a-row class="secondRow">
+          <a-col :span="7">铜杆帮你采</a-col>
+          <a-col :span="10">
+            <a-row class="middle">
+              <a-col :span="7">30天</a-col>
+              <a-col :span="10">30%</a-col>
+              <a-col :span="7">11%</a-col>
+            </a-row>
+          </a-col>
+          <a-col :span="7">
+            <div class="settle">
+              <div>日结</div>
+              <div>1天起息</div>
             </div>
-            <div class="contBar">
-                <a-row class="firstRow">
-                    <a-col :span="7">铜供应链金融</a-col>
-                    <a-col :span="17">放款快</a-col>
-                </a-row>
-                <a-row class="secondRow">
-                    <a-col :span="7">铜杆帮你采</a-col>
-                    <a-col :span="10">
-                        <a-row class="middle">
-                            <a-col :span="7">30天</a-col>
-                            <a-col :span="10">30%</a-col>
-                            <a-col :span="7">11%</a-col>
-                        </a-row>
-                    </a-col>
-                    <a-col :span="7">
-                        <div class="settle">
-                            <div>日结</div>
-                            <div>1天起息</div>
-                        </div>
-                    </a-col>
-                </a-row>
+          </a-col>
+        </a-row>
+      </div>
+      <div class="contBar">
+        <a-row class="firstRow">
+          <a-col :span="7">铜供应链金融</a-col>
+          <a-col :span="17">放款快</a-col>
+        </a-row>
+        <a-row class="secondRow">
+          <a-col :span="7">铜杆帮你采</a-col>
+          <a-col :span="10">
+            <a-row class="middle">
+              <a-col :span="7">30天</a-col>
+              <a-col :span="10">30%</a-col>
+              <a-col :span="7">11%</a-col>
+            </a-row>
+          </a-col>
+          <a-col :span="7">
+            <div class="settle">
+              <div>日结</div>
+              <div>1天起息</div>
             </div>
-        </div>
-    </Drawer>
+          </a-col>
+        </a-row>
+      </div> -->
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">
 import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
-import { WrOrderQuote, WrOrderQuoteDetail } from '@/services/go/wrtrade/interface';
+import { WrFAProductDetail, WrOrderQuote, WrOrderQuoteDetail } from '@/services/go/wrtrade/interface';
 import { getAccountTypeList, getSelectedAccountId, getUserId } from '@/services/bus/account';
-import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { HdWRDealOrder } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';
 import moment from 'moment';
@@ -101,34 +103,40 @@ import { HdWRDealOrderReq } from '@/services/proto/warehousetrade/interface';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { validateAction } from '@/common/setup/form';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { queryFaProductDetail } from '@/services/go/wrtrade';
 export default defineComponent({
     name: ModalEnum.spot_trade_warehouse_delisting,
     components: { Drawer, PlusOutlined, MinusOutlined },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
-        enumName: {
-            default: '',
-            type: String as PropType<EnumRouterName>,
-        },
         selectedRow: {
             type: Object as PropType<WrOrderQuoteDetail>,
             default: {},
         },
-        parantSelectedRow: {
-            type: Object as PropType<WrOrderQuote>,
-            default: {},
-        },
     },
 
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
+        const list = ref<WrFAProductDetail[]>([]);
+        const loading = ref<boolean>(false);
+        queryResultLoadingAndInfo(queryFaProductDetail, loading, { wrfactortypeid: props.selectedRow.wrtradeorderid }).then((res) => {
+            list.value = res;
+        });
+        queryFaProductDetail;
         function update() {
             cancel();
             context.emit('cancel');
         }
+        function choose(item: WrFAProductDetail) {
+            cancel();
+            context.emit('update', item);
+        }
         return {
             visible,
             update,
+            choose,
+            loading,
+            list,
         };
     },
 });

src/views/market/spot_trade/components/buy-sell-market/components/financing_delisting/index.vue

@@ -87,11 +87,11 @@
             <a-col :span="24"
                    class="mt-10">
               <a-form-item label="融资方案"
+                           @click="openComponent({code: 'ChooseFinance'})"
                            name="case">
                 <div class="way">
-                  <div class="left">铜供应链金融-铜杆帮你采-30天-10%-11%-按日结息-1天起息</div>
-                  <div class="right"
-                       @click="showAction">
+                  <div class="left">{{formState.case}}</div>
+                  <div class="right">
                     <svg class="icon svg-icon"
                          aria-hidden="true">
                       <use xlink:href="#icon-fangan" />
@@ -126,33 +126,32 @@
       </div>
     </div>
   </Drawer>
-  <ChooseFinance v-if="show"
-                 @cancel="showAction" />
+  <!-- <ChooseFinance v-if="show"
+                 @cancel="showAction" /> -->
+  <component :is="componentId"
+             v-if="componentId"
+             :selectedRow="selectedRow"
+             @update="choose"
+             @cancel="closeComponent">
+  </component>
 </template>
 
 <script lang="ts">
-import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
-import { defineComponent, PropType, ref } from 'vue';
+import { defineAsyncComponent, defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
 import { WrOrderQuote, WrOrderQuoteDetail } from '@/services/go/wrtrade/interface';
-import { getAccountTypeList, getSelectedAccountId, getUserId } from '@/services/bus/account';
-import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { HdWRDealOrder } from '@/services/proto/warehousetrade';
-import { v4 as uuidv4 } from 'uuid';
-import moment from 'moment';
+import { getAccountTypeList } from '@/services/bus/account';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
-import { HdWRDealOrderReq } from '@/services/proto/warehousetrade/interface';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { handleForm, handleIs, handleSpotWarrant } from './setup';
-import { validateAction } from '@/common/setup/form';
-import { ListingForm } from './interface';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import ChooseFinance from './components/choose-finance/index.vue';
+import { handleModalComponent } from '@/common/setup/asyncComponent';
+import { WrFAProductDetail } from '@/services/go/wrtrade/interface';
 export default defineComponent({
     name: ModalEnum.spot_trade_warehouse_delisting,
-    components: { Drawer, PlusOutlined, MinusOutlined, ChooseFinance },
-    emits: ['cancel'],
+    components: { Drawer, ChooseFinance: defineAsyncComponent(() => import('./components/choose-finance/index.vue')) },
+    emits: ['cancel', 'update'],
     props: {
         enumName: {
             default: '',
@@ -182,11 +181,15 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         const { isSale, isBuy, isFloat } = handleIs(props.enumName, props.buyOrSell);
         const { wrHoldList } = handleSpotWarrant(props.enumName, props.buyOrSell, props.parantSelectedRow, loading);
+        const { componentId, closeComponent, openComponent } = handleModalComponent(() => {}, ref({}));
 
         const show = ref<boolean>(false);
         function showAction() {
             show.value = !show.value;
         }
+        function choose(item: WrFAProductDetail) {
+            formState.case = `${item.productname}-${item.username}-${item.financingdays}天-${item.marginratio * 100}%-${item.interestrate * 100}%-${item.interestsettlemode === 1 ? '按日结息' : '按月结息'}-${item.interestminlen}天起息`;
+        }
         function submit() {
             // validateAction<ListingForm>(formRef, formState).then((res) => {
             //     // 首先确定  这是仓单贸易的有仓单挂摘牌 HasWr = 1
@@ -227,6 +230,7 @@ export default defineComponent({
         return {
             visible,
             cancel,
+            choose,
             accountList,
             wrHoldList,
             submit,
@@ -238,6 +242,9 @@ export default defineComponent({
             formRef,
             show,
             showAction,
+            componentId,
+            closeComponent,
+            openComponent,
         };
     },
 });

src/views/market/spot_trade/components/buy-sell-market/components/financing_delisting/interface.ts

@@ -3,6 +3,7 @@ export interface ListingForm {
     num: number,
     LadingBillId: string,
     case: string,
+    caseId: string,
 }
 
 export interface Wrhold {

src/views/market/spot_trade/components/buy-sell-market/components/financing_delisting/setup.ts

@@ -12,7 +12,8 @@ export function handleForm(data: WrOrderQuoteDetail) {
         accountid: undefined,
         num: 0,
         LadingBillId: '',
-        case: ''
+        case: '',
+        caseId: ''
     })
     const rules = {
         accountid: [{ required: true, message: '请选择交易账户' }],

src/views/market/spot_trade/components/buy-sell-market/components/sell/index.vue

@@ -1,31 +1,29 @@
 <template>
-    <!-- 卖大厅 -->
+  <!-- 卖大厅 -->
 
-    <a-table
-        :columns="columns"
-        class="sellHallTable"
-        :scroll="{ x: '100%', y: 'calc(100vh - 510px)' }"
-        :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"
-        :enumName="enumName"
-        :buyOrSell="BuyOrSell.sell"
-        :parantSelectedRow="parantSelectedRow"
-        @cancel="closeComponent"
-    ></component>
+  <a-table :columns="columns"
+           class="sellHallTable"
+           :scroll="{ x: '100%', y: 'calc(100vh - 510px)' }"
+           :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"
+             :enumName="enumName"
+             :buyOrSell="BuyOrSell.sell"
+             :parantSelectedRow="parantSelectedRow"
+             @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
@@ -59,6 +57,7 @@ export default defineComponent({
     components: {
         BtnList,
         [ModalEnum.spot_trade_warehouse_delisting]: defineAsyncComponent(() => import('../delisting/index.vue')),
+        [ModalEnum.spot_trade_warehouse_financing_delisting]: defineAsyncComponent(() => import('../financing_delisting/index.vue')),
     },
     setup(props, context) {
         // 表格列表数据

src/views/market/spot_trade/components/buy-sell-market/index.vue

@@ -106,7 +106,7 @@ import { getQuoteDayInfoByCode } from '@/services/bus/goods';
 import TimerUtils from '@/utils/timer/timerUtil';
 
 export default defineComponent({
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     name: 'buy-sell-market',
     props: {
         selectedRow: {

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

@@ -1,68 +1,72 @@
 <template>
-    <!-- 买卖大厅详情 -->
-    <Drawer :title="'详情'" :placement="'top'" :visible="visible" class="top" @cancel="cancel">
-        <div class="detailCont">
-            <div class="rows">
-                <div class="row">
-                    <div class="left">品种</div>
-                    <div class="right">螺纹钢</div>
-                </div>
-                <div class="row">
-                    <div class="left">品类</div>
-                    <div class="right">直径12mm</div>
-                </div>
-                <div class="row">
-                    <div class="left">品牌</div>
-                    <div class="right">江铜</div>
-                </div>
-                <div class="row">
-                    <div class="left">仓库</div>
-                    <div class="right">华南仓库</div>
-                </div>
-                <div class="row">
-                    <div class="left">产地</div>
-                    <div class="right">云南</div>
-                </div>
-                <div class="row">
-                    <div class="left">含铜量</div>
-                    <div class="right">99%</div>
-                </div>
+  <!-- 买卖大厅详情 -->
+  <Drawer :title="'详情'"
+          :placement="'top'"
+          :visible="visible"
+          class="top"
+          @cancel="cancel">
+    <div class="detailCont">
+      <div class="rows">
+        <div class="row">
+          <div class="left">品种</div>
+          <div class="right">螺纹钢</div>
+        </div>
+        <div class="row">
+          <div class="left">品类</div>
+          <div class="right">直径12mm</div>
+        </div>
+        <div class="row">
+          <div class="left">品牌</div>
+          <div class="right">江铜</div>
+        </div>
+        <div class="row">
+          <div class="left">仓库</div>
+          <div class="right">华南仓库</div>
+        </div>
+        <div class="row">
+          <div class="left">产地</div>
+          <div class="right">云南</div>
+        </div>
+        <div class="row">
+          <div class="left">含铜量</div>
+          <div class="right">99%</div>
+        </div>
+      </div>
+      <div class="ruleTitle">履约规则：</div>
+      <div class="rulesCont">
+        <a-row>
+          <a-col :span="12">
+            <div class="line">
+              <div class="no">1</div>
+              <div class="name">买方30%货款</div>
+              <div class="time">T+30</div>
             </div>
-            <div class="ruleTitle">履约规则：</div>
-            <div class="rulesCont">
-                <a-row>
-                    <a-col :span="12">
-                        <div class="line">
-                            <div class="no">1</div>
-                            <div class="name">买方30%货款</div>
-                            <div class="time">T+30</div>
-                        </div>
-                    </a-col>
-                    <a-col :span="12">
-                        <div class="line">
-                            <div class="no">2</div>
-                            <div class="name">卖方发货</div>
-                            <div class="time">T+3</div>
-                        </div>
-                    </a-col>
-                    <a-col :span="12">
-                        <div class="line">
-                            <div class="no">3</div>
-                            <div class="name">买方70%货款</div>
-                            <div class="time">T+10</div>
-                        </div>
-                    </a-col>
-                    <a-col :span="12">
-                        <div class="line">
-                            <div class="no">4</div>
-                            <div class="name">卖方开票</div>
-                            <div class="time">T+1</div>
-                        </div>
-                    </a-col>
-                </a-row>
+          </a-col>
+          <a-col :span="12">
+            <div class="line">
+              <div class="no">2</div>
+              <div class="name">卖方发货</div>
+              <div class="time">T+3</div>
             </div>
-        </div>
-    </Drawer>
+          </a-col>
+          <a-col :span="12">
+            <div class="line">
+              <div class="no">3</div>
+              <div class="name">买方70%货款</div>
+              <div class="time">T+10</div>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="line">
+              <div class="no">4</div>
+              <div class="name">卖方开票</div>
+              <div class="time">T+1</div>
+            </div>
+          </a-col>
+        </a-row>
+      </div>
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">
@@ -81,7 +85,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 export default defineComponent({
     name: ModalEnum.spot_trade_warehouse_delisting,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrPosition>,

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

@@ -116,7 +116,7 @@ import { FormParam } from './interface';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 
 export default defineComponent({
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     name: ModalEnum.spot_trade_warehouse_post_buying,
     components: { Des, Drawer, PlusOutlined, MinusOutlined },
     props: {

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_floating_price/index.vue

@@ -1,39 +1,33 @@
 <template>
-    <!-- 仓单预售 浮动价预售-->
-    <div class="topTableHeight">
-        <a-table
-            :columns="columns"
-            class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
-            :pagination="false"
-            :loading="loading"
-            :expandedRowKeys="expandedRowKeys"
-            :customRow="Rowclick"
-            rowKey="key"
-            :data-source="tableList"
-        ></a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="firstBtn"></contextMenu>
-        <component
-            :is="componentId"
-            v-if="componentId"
-            :enumName="name"
-            :selectedRow="selectedRow"
-            @cancel="closeComponent"
-        ></component>
-    </div>
+  <!-- 仓单预售 浮动价预售-->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList"></a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu"
+                 @cancel="closeContext"
+                 :list="firstBtn"></contextMenu>
+    <component :is="componentId"
+               v-if="componentId"
+               :enumName="name"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, ComposeTableParam } from '@/common/export/commonTable';
+import { queryTableList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, ComposeTableParam } from '@/common/export/commonTable';
 import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
 import { queryOrderQuote } from '@/services/go/wrtrade';
 import { handleComposeTable } from '@/views/market/spot_trade/setup';
-import { subscribeInfoType } from '@/services/socket/quota/interface';
-import { v4 as uuidv4 } from 'uuid';
-import { addSubscribeQuotation } from '@/services/socket/quota';
-import { onMounted } from 'vue';
 
 export default defineComponent({
     name: EnumRouterName.warehouse_pre_sale_floating_price,
@@ -46,13 +40,13 @@ export default defineComponent({
     setup() {
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderQuote>();
-        let uuid = uuidv4();
         // 获取列表数据
         const queryTableAction = () => {
             const param: QueryOrderQuoteReq = {
                 wrpricetype: 2,
                 haswr: 0,
             };
+            queryTable(queryOrderQuote, param);
         };
 
         // 表格通用逻辑

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_price/index.vue

@@ -1,32 +1,30 @@
 <template>
-    <!-- 仓单预售 一口价预售-->
-    <div class="topTableHeight">
-        <a-table
-            :columns="columns"
-            class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
-            :pagination="false"
-            :loading="loading"
-            :expandedRowKeys="expandedRowKeys"
-            :customRow="Rowclick"
-            rowKey="key"
-            :data-source="tableList"
-        ></a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="firstBtn"></contextMenu>
-        <component
-            :is="componentId"
-            v-if="componentId"
-            :enumName="name"
-            :selectedRow="selectedRow"
-            @cancel="closeComponent"
-        ></component>
-    </div>
+  <!-- 仓单预售 一口价预售-->
+  <div class="topTableHeight">
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: 'calc(100vh - 479px)' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList"></a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu"
+                 @cancel="closeContext"
+                 :list="firstBtn"></contextMenu>
+    <component :is="componentId"
+               v-if="componentId"
+               :enumName="name"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, ComposeTableParam } from '@/common/export/commonTable';
+import { queryTableList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, ComposeTableParam } from '@/common/export/commonTable';
 import { QueryOrderQuoteReq, WrOrderQuote } from '@/services/go/wrtrade/interface';
 import { queryOrderQuote } from '@/services/go/wrtrade';
 import { handleComposeTable } from '@/views/market/spot_trade/setup';

src/views/order/performance_information/components/performance_information_buy_performance/components/breach_contract/index.vue

@@ -30,7 +30,7 @@ import { WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
 export default defineComponent({
     name: ModalEnum.performance_information_buy_performance_breach_contract,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrPosition>,

src/views/order/performance_information/components/performance_information_buy_performance/components/detail/index.vue

@@ -30,7 +30,7 @@ import { WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
 export default defineComponent({
     name: ModalEnum.performance_information_buy_performance_detail,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrPosition>,

src/views/order/performance_information/components/performance_information_buy_performance/components/extension/index.vue

@@ -30,7 +30,7 @@ import { WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
 export default defineComponent({
     name: ModalEnum.performance_information_buy_performance_extension,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrPosition>,

src/views/order/performance_information/components/performance_information_buy_performance/components/pay/index.vue

@@ -30,7 +30,7 @@ import { WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
 export default defineComponent({
     name: ModalEnum.performance_information_buy_performance_pay,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrPosition>,

src/views/order/performance_information/components/performance_information_sell_performance/components/breach_contract/index.vue

@@ -30,7 +30,7 @@ import { WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
 export default defineComponent({
     name: ModalEnum.performance_information_sell_performance_breach_contract,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrPosition>,

src/views/order/performance_information/components/performance_information_sell_performance/components/detail/index.vue

@@ -30,7 +30,7 @@ import { WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
 export default defineComponent({
     name: ModalEnum.performance_information_sell_performance_detail,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrPosition>,

src/views/order/performance_information/components/performance_information_sell_performance/components/extension/index.vue

@@ -30,7 +30,7 @@ import { WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
 export default defineComponent({
     name: ModalEnum.performance_information_sell_performance_extension,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrPosition>,

src/views/order/performance_information/components/performance_information_sell_performance/components/pay/index.vue

@@ -30,7 +30,7 @@ import { WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
 export default defineComponent({
     name: ModalEnum.performance_information_sell_performance_pay,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrPosition>,

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/components/listed/index.vue

@@ -136,6 +136,8 @@
             <a-col :span="24">
               <a-form-item class="tc">
                 <a-button class="listedBtn"
+                          :loading="loading"
+                          :disabled="loading"
                           @click="submit">卖出</a-button>
                 <a-button class="ml10 cancelBtn"
                           @click="cancel">取消</a-button>
@@ -173,7 +175,7 @@ import Bus from '@/utils/eventBus';
 export default defineComponent({
     name: ModalEnum.spot_warrant_spot_details_listed,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrPosition>,
@@ -253,6 +255,7 @@ export default defineComponent({
             submit,
             visible,
             cancel,
+            loading,
             rules,
             formState,
             formRef,

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_pending_order/components/cancle/index.vue

@@ -22,7 +22,7 @@ import { Modal } from 'ant-design-vue';
 export default defineComponent({
     name: ModalEnum.pre_sale_warehouse_receipt_pending_order_cancel_order,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrOrderDetail>,

src/views/order/spot_warran/components/spot_warrant_pending_order/components/cancle/index.vue

@@ -1,6 +1,6 @@
 <template>
-    <!-- 现货仓单 现货明细 撤单 -->
-    <div></div>
+  <!-- 现货仓单 现货明细 撤单 -->
+  <div></div>
 </template>
 
 <script lang="ts">
@@ -22,7 +22,7 @@ import { Modal } from 'ant-design-vue';
 export default defineComponent({
     name: ModalEnum.spot_warrant_pending_order_cancel_order,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrOrderDetail>,

src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/index.vue

@@ -123,6 +123,8 @@
             <a-col :span="24">
               <a-form-item class="tc">
                 <a-button class="listedBtn"
+                          :loading="loading"
+                          :disabled="loading"
                           @click="submit">卖出</a-button>
                 <a-button class="ml10 cancelBtn"
                           @click="cancel">取消</a-button>
@@ -161,7 +163,7 @@ import Bus from '@/utils/eventBus/index';
 export default defineComponent({
     name: ModalEnum.spot_warrant_spot_details_listed,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrHoldLB>,
@@ -245,6 +247,7 @@ export default defineComponent({
             submit,
             visible,
             cancel,
+            loading,
             rules,
             formState,
             formRef,

src/views/order/spot_warran/components/spot_warrant_spot_details/components/pick_up/index.vue

@@ -85,6 +85,8 @@
             <a-col :span="24">
               <a-form-item class="tc">
                 <a-button class="listedBtn"
+                          :loading="loading"
+                          :disabled="loading"
                           @click="submit">提货</a-button>
                 <a-button class="ml10 cancelBtn"
                           @click="cancel">取消</a-button>
@@ -105,7 +107,7 @@ import { getSelectedAccountId, getUserId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { wROutApply } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';
-import moment, {Moment} from 'moment';
+import moment, { Moment } from 'moment';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { WROutInDetail } from '@/services/proto/warehousetrade/interface';
@@ -119,7 +121,7 @@ import { FormParam } from './interface';
 export default defineComponent({
     name: ModalEnum.spot_warrant_spot_details_pick_up,
     components: { Drawer },
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     props: {
         selectedRow: {
             type: Object as PropType<WrHoldLB>,
@@ -163,6 +165,7 @@ export default defineComponent({
             visible,
             cancel,
             submit,
+            loading,
             rules,
             formState,
             formRef,

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

@@ -3,7 +3,7 @@
     <section>
         <a-table
             :columns="columns"
-            class="srcollYTable"
+            class="srcollYTable expandLeftTable"
             :scroll="{ x: '100%', y: '227px' }"
             :pagination="false"
             :loading="loading"

src/views/platinum/platinum_agreement/compoments/add/index.vue

@@ -90,7 +90,7 @@ import { handleArgreementType } from '@/views/platinum/platinum_agreement/setup'
 import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     name: 'add-custom',
     components: {},
     setup(props, context) {

src/views/platinum/platinum_agreement/compoments/delete/index.vue

@@ -74,7 +74,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 import { handleAgreementLog } from '@/views/platinum/platinum_agreement/compoments/setup';
 
 export default defineComponent({
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     name: 'detail',
     components: { Des },
     props: {

src/views/platinum/platinum_agreement/compoments/detail/index.vue

@@ -65,7 +65,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 import { handleAgreementLog } from '../setup';
 
 export default defineComponent({
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     name: 'custom-detail',
     components: { Des },
     props: {

src/views/platinum/platinum_agreement/compoments/modify/index.vue

@@ -76,7 +76,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 
 export default defineComponent({
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     name: ModalEnum.platinum_agreement_modify,
     components: {},
     props: {

src/views/platinum/platinum_agreement/compoments/resume/index.vue

@@ -73,7 +73,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 import { handleAgreementLog } from '../setup';
 
 export default defineComponent({
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     name: 'custom-detail',
     components: { Des },
     props: {

src/views/platinum/platinum_agreement/compoments/stop/index.vue

@@ -73,7 +73,7 @@ import { _closeModal } from '@/common/setup/modal/modal';
 import { handleAgreementLog } from '../setup';
 
 export default defineComponent({
-    emits: ['cancel'],
+    emits: ['cancel', 'update'],
     name: 'custom-detail',
     components: { Des },
     props: {