huangbin 4 vuotta sitten
vanhempi
commit
965d8d18a7

+ 1 - 0
src/services/go/wrtrade/interface.ts

@@ -40,6 +40,7 @@ export interface WrOrderQuote {
     wrstandardcode: string;//商品代码
     wrstandardid: number;//商品id
     wrstandardname: string;//商品名称
+    deliverymonth: string;//交收月
 }
 
 /**

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

@@ -19,12 +19,12 @@
            :key="index + 11"
            @click="choose(item)">
         <a-row class="firstRow">
-          <a-col :span="7">{{item.productname}}</a-col>
+          <a-col :span="7">{{item.username}}</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="7">{{item.productname}}</a-col>
           <a-col :span="10">
             <a-row class="middle">
               <a-col :span="7">{{item.financingdays}}天</a-col>

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

@@ -96,6 +96,7 @@
                :selectedRow="selectedRow"
                :goodsPrice="getGoodsPrice()"
                :enumName="enumName"
+               :time="time"
                @cancel="closeComponent"></component>
   </div>
 </template>
@@ -147,7 +148,7 @@ export default defineComponent({
         [ModalEnum.spot_trade_warehouse_post_buying]: defineAsyncComponent(() => import('../post_buying/index.vue')),
     },
     setup(props, context) {
-        const time = ref<Moment>(moment()); // string 交收月
+        const time = ref<Moment>(moment(props.selectedRow.deliverymonth)); // string 交收月
         const loading = ref<boolean>(false);
         const { visible, cancel } = _closeModal(context);
         //

+ 6 - 1
src/views/market/spot_trade/components/post_buying/index.vue

@@ -140,7 +140,7 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 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';
+import moment, { Moment } from 'moment';
 import { getMarketRunByTradeMode } from '@/services/bus/market';
 import { WrOrderQuote } from '@/services/go/wrtrade/interface';
 import { handleForm } from './setup';
@@ -163,12 +163,17 @@ export default defineComponent({
             default: '',
             type: String as PropType<EnumRouterName>,
         },
+        time: {
+            type: Object as PropType<Moment>,
+            default: moment(),
+        },
     },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
         const loading = ref<boolean>(false);
         const accountList = getAccountTypeList([2]);
         const { rules, formState, formRef } = handleForm();
+        formState.DeliveryMonth = props.time;
         function submit() {
             const marketInfo = getMarketRunByTradeMode(17);
             if (marketInfo) {