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

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

@@ -247,13 +247,16 @@ export default defineComponent({
                         WRStandardID: props.selectedRow.wrstandardid,
                         HasWr: isWR(), // 无仓单挂牌  是否有无仓单
                         DeliveryMonth: isWR() ? '' : moment(res.DeliveryMonth).format('YYYY-MM'),
-                        FactoryItems: props.selectedRow.wrResult != undefined ? props.selectedRow.wrResult.flatMap((it) => {
-                            return {
-                                DGFactoryItemTypeID: it.dgfactoryitemtypeid, // uint64 要素项类型ID
-                                DGFactoryItemID: it.dgfactoryitemid, // uint64 预约要素项类型值
-                                ItemTypeMode: 1, // uint32 要素项类型模式
-                            };
-                        }): [], // DGFactoryItems 要素类型明细集合(没有仓单要素ID填写)
+                        FactoryItems:
+                            props.selectedRow.wrResult != undefined
+                                ? props.selectedRow.wrResult.flatMap((it) => {
+                                      return {
+                                          DGFactoryItemTypeID: it.dgfactoryitemtypeid, // uint64 要素项类型ID
+                                          DGFactoryItemID: it.dgfactoryitemid, // uint64 预约要素项类型值
+                                          ItemTypeMode: 1, // uint32 要素项类型模式
+                                      };
+                                  })
+                                : [], // DGFactoryItems 要素类型明细集合(没有仓单要素ID填写)
                     };
                     requestResultLoadingAndInfo(hdWROrder, param, loading, ['求购成功', '求购失败:']).then(() => {
                         cancel(true);

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

@@ -22,23 +22,27 @@
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
-                            <a-form-item label="挂牌价格" name="FixedPrice">
+                            <a-form-item label="挂牌价格" name="FixedPrice" class="inputIconBox">
                                 <a-input-number
                                     class="commonInput"
                                     style="width: 260px"
                                     :min="0"
                                     v-model:value="formState.FixedPrice"
                                 />
+                                <MinusOutlined />
+                                <PlusOutlined />
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
-                            <a-form-item label="挂牌数量" name="OrderQty">
+                            <a-form-item label="挂牌数量" name="OrderQty" class="inputIconBox">
                                 <a-input-number
                                     class="commonInput"
                                     style="width: 260px"
                                     :min="0"
                                     v-model:value="formState.OrderQty"
                                 />
+                                <MinusOutlined />
+                                <PlusOutlined />
                                 <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
                             </a-form-item>
                         </a-col>
@@ -66,7 +70,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
-                            <a-form-item label="挂牌有效期" name="DeliveryMonth">
+                            <a-form-item label="挂牌有效期" name="DeliveryMonth" class="inputIconBox">
                                 <a-date-picker
                                     style="width: 260px"
                                     v-model:value="formState.DeliveryMonth"
@@ -77,13 +81,23 @@
                         </a-col>
 
                         <a-col :span="24" @click="openPermance">
-                            <a-form-item label="履约方式">
-                                <span class="white ml8">选择履约模板</span>
+                            <a-form-item label="履约方式" class="inputIconBox">
+                                <span class="clickBox">选择履约模板</span>
+                                <svg
+                                    class="icon svg-icon"
+                                    aria-hidden="true"
+                                    @click="openPermance"
+                                >
+                                    <use xlink:href="#icon-moban" />
+                                </svg>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24" @click="openFriend">
-                            <a-form-item label="指定朋友">
-                                <span class="white ml8">选择朋友</span>
+                            <a-form-item label="指定朋友" class="inputIconBox">
+                                <span class="clickBox">选择朋友</span>
+                                <svg class="icon svg-icon" aria-hidden="true" @click="openFriend">
+                                    <use xlink:href="#icon-pengyou1" />
+                                </svg>
                             </a-form-item>
                         </a-col>
                         <a-col :span="24">
@@ -302,16 +316,6 @@ export default defineComponent({
     }
 }
 
-.unit {
-    margin-left: 70px;
-    width: 260px;
-    .flex;
-    justify-content: space-between;
-    font-size: 14px;
-    color: @m-grey41;
-    height: 14px;
-    line-height: 14px;
-}
 .listedBtn {
     width: 120px;
     height: 30px;
@@ -340,63 +344,94 @@ export default defineComponent({
 .ant-form.dialogForm .ant-row.ant-form-item {
     margin-bottom: 14px;
 }
-.mt20 {
-    margin-top: 20px;
-}
-.mt-10 {
-    margin-top: -10px;
-}
 .ant-input-suffix {
     position: absolute;
     right: -25px;
 }
-.minusBtn,
-.plusBtn {
-    width: 15px;
-    height: 32px;
-    line-height: 32px;
-    font-size: 15px;
-    color: @m-blue15;
-    cursor: pointer;
-}
-.minusBtn {
-    position: absolute;
-    top: -6px;
-    left: 14px;
-    z-index: 1;
-}
-.plusBtn {
-    position: absolute;
-    top: -6px;
-    right: 14px;
-    z-index: 1;
+.ant-form.dialogForm .ant-row.ant-form-item .ant-form-item-label {
+    width: 80px;
 }
-.stepper {
-    padding-left: 30px;
-    padding-right: 30px;
-    text-align: center;
-    color: @m-yellow1;
-    font-size: 16px;
+.ant-form.dialogForm .ant-row.ant-form-item .ant-form-item-control-wrapper {
+    width: calc(100% - 80px);
 }
-.ant-slider.formSlider {
-    width: 260px !important;
-    margin-left: 70px;
-    .ant-slider-rail {
-        margin-right: 0;
-        padding-right: 0;
-        height: 3px !important;
-        border-radius: 2px !important;
-        background-color: @m-blue14;
-    }
-    .ant-slider-track {
-        height: 3px;
-        background-color: @m-blue0;
+.ant-form.dialogForm {
+    .ant-row.btnCenter.ant-form-item {
+        width: 100%;
+        .ant-col.ant-form-item-control-wrapper {
+            width: 100%;
+        }
     }
-    .ant-slider-step {
-        height: 3px;
+}
+.inputIconBox {
+    position: relative;
+    float: left;
+    width: 425px;
+    .ant-form-item-children {
+        width: 350px;
+        display: block;
+        .anticon {
+            width: 15px;
+            height: 32px;
+            line-height: 37px;
+            font-size: 15px;
+            color: @m-blue15;
+            cursor: pointer;
+        }
+        .anticon-minus {
+            position: absolute;
+            top: 0px;
+            left: 9px;
+            z-index: 1;
+        }
+        .anticon-plus {
+            position: absolute;
+            top: 0px;
+            right: 98px;
+            z-index: 1;
+        }
+        .anticon-calendar {
+            font-size: 20px;
+            position: absolute;
+            top: 5px;
+            right: 13px;
+            color: @m-blue15;
+        }
+        .commonInput {
+            input {
+                text-align: center;
+                color: @m-yellow6;
+            }
+        }
+        .ant-checkbox-wrapper {
+            margin-left: 10px;
+            color: @m-white14;
+            font-size: 14px;
+            .position(absolute, 0, auto, auto, 260px);
+            white-space: nowrap;
+            line-height: 32px;
+            height: 30px;
+        }
+        .svg-icon {
+            position: absolute;
+            top: 6px;
+            right: 98px;
+            color: @m-blue15 !important;
+            font-size: 20px;
+        }
     }
-    .ant-progress-text {
-        display: none;
+    .input-enumdicname {
+        right: 125px;
     }
 }
+.clickBox {
+    display: inline-block;
+    width: 260px;
+    text-indent: 8px;
+    border-radius: 4px;
+    line-height: 30px;
+    color: @m-grey66;
+    border: 1px solid var(--m-grey14);
+    cursor: pointer;
+    background: var(--m-grey21);
+}
 </style>

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

@@ -424,27 +424,6 @@ export default defineComponent({
         }
     }
 }
-// .minusBtn,
-// .plusBtn {
-//     width: 15px;
-//     height: 32px;
-//     line-height: 32px;
-//     font-size: 15px;
-//     color: @m-blue15;
-//     cursor: pointer;
-// }
-// .minusBtn {
-//     position: absolute;
-//     top: -6px;
-//     left: 14px;
-//     z-index: 1;
-// }
-// .plusBtn {
-//     position: absolute;
-//     top: -6px;
-//     right: 14px;
-//     z-index: 1;
-// }
 .inputIconBox {
     position: relative;
     float: left;