update

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/buy/index.vue

@@ -2,7 +2,7 @@
   <!-- 仓单贸易 贸易圈挂牌 卖-->
   <div>
     <a-table :columns="columns"
-             :class="['srcollYTable', isBottom ? 'condSecondTabTableHalfTop' : 'condSecondTabTableHalfTopNoBottom', 'halfBottom', tableList.length ? 'noPlaceHolder' : 'hasPlaceHolder']"
+             :class="['srcollYTable', isBottom ? 'condSecondTabTableHalfTop' : 'condSecondTabTableHalfTopNoBottom', 'halfBottom',  tableList.length ? 'noPlaceHolder' : 'hasPlaceHolder']"
              :scroll="{ x: '100%', y: isBottom ? 'calc((100vh- 443px)/2 - 14px)' : 'calc((100vh - 196px)/2 - 16px)' }"
              :pagination="false"
              :loading="loading"
@@ -10,12 +10,12 @@
              :customRow="Rowclick"
              rowKey="key"
              :data-source="tableList">
-      <template #marginvalue="{ text }">
-        <span>{{ (text * 100).toFixed(2) + '%'}}</span>
-      </template>
       <template #index="{ index }">
         <span>{{ index + 1 }}</span>
       </template>
+      <template #marginvalue="{ text }">
+        <span>{{ (text * 100).toFixed(2) + '%'}}</span>
+      </template>
       <!-- 议价 -->
       <template #canbargain="{ text }">
         <span>{{ text ? '是' : '否' }}</span>

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/delisting/index.vue

@@ -50,8 +50,6 @@
                                 :min="0"
                                 v-model:value="formState.price"
                             />
-                            <MinusOutlined />
-                            <PlusOutlined />
                         </a-form-item>
                     </a-col>
                     <a-col :span="24" v-else>
@@ -301,7 +299,7 @@ export default defineComponent({
                         WRFactorTypeId: Long.fromString(props.selectedRow.wrfactortypeid), // uint64 仓单要素ID(wrholdlb的WRFactorTypeId字段),卖的时候填写
                         TradeDate: moment().format('YYYYMMDD'), // string 交易日
                         DeliveryMonth: '', // string 交收月
-                        HasWr: 0, // uint32 是否有仓单-0:没有仓单 1:有仓单
+                        HasWr: 1, // uint32 是否有仓单-0:没有仓单 1:有仓单
                         IsFinancing: 0, // uint32 是否融资购买(买摘牌时有效)-0:否 1:是
                         ProductDetailID: res.caseId, // uint64 金融机构产品组合ID(融资购买时有效)
                     };

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/post-buying/index.vue

@@ -83,11 +83,20 @@
               </a-form-item>
             </a-col>
             <a-col :span="24">
+              <a-form-item label="交收月"
+                           name="DeliveryMonth">
+                <a-month-picker style="width: 140px"
+                                v-model:value="formState.DeliveryMonth"
+                                :allowClear="'false'"
+                                class="commonDatePicker dialogDatePicker" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
               <a-form-item label="挂牌有效期"
-                           name="DeliveryMonth"
+                           name="vidaliteTime"
                            class="inputIconBox">
                 <a-date-picker style="width: 260px"
-                               v-model:value="formState.DeliveryMonth"
+                               v-model:value="formState.vidaliteTime"
                                :allowClear="false"
                                class="commonDatePicker dialogDatePicker" />
               </a-form-item>
@@ -308,6 +317,10 @@ export default defineComponent({
         const { visible, cancel } = _closeModal(context);
         // 表单
         const { rules, formState, formRef } = handleForm();
+        const momth = props.selectedRow.deliverymonth;
+        if (momth) {
+            formState.DeliveryMonth = moment(momth);
+        }
         // 选择朋友
         const { friendCheck, showFriend, chooseFriend, openFriend, getFriendLength, limiteFriends } = useFriends(formState);
         // 履约模板
@@ -368,8 +381,8 @@ export default defineComponent({
                         WRTradeGoods: [],
                         CanPart: numCheck.value ? 0 : 1, // 是否允许部份摘牌0:不允许;1:允许
                         WRStandardID: props.selectedRow.wrstandardid,
-                        HasWr: 1, // 无仓单挂牌  是否有无仓单
-                        DeliveryMonth: '',
+                        HasWr: 0, // 无仓单挂牌  是否有无仓单
+                        DeliveryMonth: moment(formState.DeliveryMonth).format('YYYY-MM-DD HH:mm:ss'),
                         DelistMinQty: numCheck.value ? formState.delistingQty : 0, // 起摘数量
                         MarginFlag: 1, // 挂牌是否指定保证金 0:否 1:是
                         MarginAlgorithm: 1, // 指定保证金方式 1:比率 2:固定

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/post-buying/setup.ts

@@ -38,6 +38,8 @@ export function handleForm() {
             { validator: validateMargin, trigger: 'blur', type: 'number' }
         ],
         accountid: [{ required: true, message: '请输入交易账号' }],
+        vidaliteTime: [{ required: true, message: '请选择挂牌有效期' }],
+        DeliveryMonth: [{ required: true, message: '请选择交收月' }],
     }
     return { rules, formState, formRef }
 }

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/sell/index.vue

@@ -2,7 +2,7 @@
   <!-- 仓单贸易 贸易圈挂牌 买-->
   <div>
     <a-table :columns="columns"
-             :class="['srcollYTable', isBottom ? 'condSecondTabTableHalfTop' : 'condSecondTabTableHalfTopNoBottom', tableList.length ? 'noPlaceHolder' : 'hasPlaceHolder']"
+             :class="['srcollYTable', isBottom ? 'condSecondTabTableHalfTop' : 'condSecondTabTableHalfTopNoBottom',  tableList.length ? 'noPlaceHolder' : 'hasPlaceHolder']"
              :scroll="{ x: '100%', y: isBottom ? 'calc((100vh- 443px)/2 - 14px)' : 'calc((100vh - 196px)/2 - 16px)' }"
              :pagination="false"
              :loading="loading"

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/post-buying/index.vue

@@ -84,10 +84,10 @@
             </a-col>
             <a-col :span="24">
               <a-form-item label="挂牌有效期"
-                           name="DeliveryMonth"
+                           name="vidaliteTime"
                            class="inputIconBox">
                 <a-date-picker style="width: 260px"
-                               v-model:value="formState.DeliveryMonth"
+                               v-model:value="formState.vidaliteTime"
                                :allowClear="false"
                                class="commonDatePicker dialogDatePicker" />
               </a-form-item>

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/post-buying/setup.ts

@@ -38,6 +38,7 @@ export function handleForm() {
             { validator: validateMargin, trigger: 'blur', type: 'number' }
         ],
         accountid: [{ required: true, message: '请输入交易账号' }],
+        vidaliteTime: [{ required: true, message: '请选择挂牌有效期' }],
     }
     return { rules, formState, formRef }
 }