huangbin 4 năm trước cách đây
mục cha
commit
7a8e4b9114

+ 7 - 8
src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_bargain/index.vue

@@ -55,19 +55,18 @@
 
 <script lang="ts">
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
-import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
-import { queryQueryWrTradeBargainApply, queryWrOrderDetail } from '@/services/go/wrtrade';
-import { QueryWrOrderDetailReq, QueryWrTradeBargainApplyQsp, QueryWrTradeBargainApplyReq, WrOrderDetail } from '@/services/go/wrtrade/interface';
+import { getBarmaginApplyStatus, getWrOrderTypeName, getWrTradeOrderStatusName } from '@/common/constants/enumsName';
+import { BtnList, defineAsyncComponent, defineComponent, queryTableList } from '@/common/export/commonTable';
+import { formatTime } from '@/common/methods';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
+import { expandIcon } from '@/common/setup/table/clolumn';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-import { getWrOrderTypeName, getWrTradeOrderStatusName, getBarmaginApplyStatus } from '@/common/constants/enumsName';
-import { BtnListType } from '@/common/components/btnList/interface';
-import { expandIcon } from '@/common/setup/table/clolumn';
-import { getSpotWarrantBargainColumns } from './setup';
-import { formatTime } from '@/common/methods';
 import { getUserId } from '@/services/bus/account';
+import { queryQueryWrTradeBargainApply } from '@/services/go/wrtrade';
+import { QueryWrTradeBargainApplyQsp, QueryWrTradeBargainApplyReq } from '@/services/go/wrtrade/interface';
 import Bus from '@/utils/eventBus';
+import { getSpotWarrantBargainColumns } from './setup';
 
 export default defineComponent({
     name: enumOrderComponents.pre_sale_warehouse_receipt_bargain,

+ 1 - 0
src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_bargain/setup.ts

@@ -10,6 +10,7 @@ export function getSpotWarrantBargainColumns() {
         { title: '数量', key: 'orderqty', align: 'center', width: 120 },
         // { title: '整单', key: 'canpart', align: 'center', width: 80 },
         { title: '挂牌有效期', key: 'validtime', align: 'center', width: 120 },
+        { title: '交收月', key: 'deliverymonth', align: 'center', width: 120 },
         { title: '履约保证金', key: 'marginvalue', align: 'center', width: 120 },
         { title: '履约方式', key: 'templatename', align: 'center', width: 160 },
         { title: '最新议价价格', key: 'applyprice', align: 'center', width: 120 },