theme color update

src/assets/styles/mixin.less

@@ -1176,13 +1176,13 @@
 
 .commonDatePicker.ant-calendar-picker {
     .ant-input {
-        background: @m-grey9;
+        background: @m-grey21;
         padding: 0 8px;
         height: 30px;
         line-height: 30px;
-        border: 0;
         color: @m-white1;
-
+        border: 1PX solid @m-grey14;
+        .rounded-corners(3px);
 
     }
     .ant-calendar-picker-icon {
@@ -1190,6 +1190,7 @@
     }
 
     .ant-calendar-picker-clear {
+        display: none;
         background: transparent;
         color: @m-grey1;
         svg {
@@ -1243,7 +1244,7 @@
                 border-bottom-color: @m-grey23;
                 .ant-calendar-input {
                     background: transparent;
-                    border: 1px solid @m-grey1;
+                    border: 1px solid @m-grey42;
                     color: @m-white0;
                     &::placeholder {
                         color: @m-grey1;
@@ -1253,7 +1254,7 @@
             .ant-calendar-date-panel {
                 // .ant-calendar-range-part {
                     .ant-calendar-header {
-                        border-color: @m-grey1;
+                        border-color: @m-grey42;
                         .ant-calendar-prev-year-btn,.ant-calendar-prev-month-btn {
                             color: @m-grey1;
                             &::before,&::after {
@@ -1266,14 +1267,14 @@
                     }
 
                     .ant-calendar-body {
-                        border-top-color: @m-grey1;
+                        border-top-color: @m-grey42;
                         .ant-calendar-column-header-inner {
                             color: @m-grey1;
                         }
                         .ant-calendar-cell {
                             .ant-calendar-date {
                                 background: transparent;
-                                color: @m-white0;
+                                color: @m-white6;
                             }
                             &:hover {
                                 .ant-calendar-date {
@@ -1313,7 +1314,7 @@
 
         }
         .ant-calendar-footer {
-            border-top-color: @m-grey1;
+            border-top-color: @m-grey42;
             .ant-calendar-time-picker-btn {
                 color: @m-grey1;
             }

src/assets/styles/theme.css

@@ -42,6 +42,7 @@
     --m-grey40: #405066;
     --m-grey40-hover: rgba(64, 80, 102, .8);
     --m-grey41: #7A8A94;
+    --m-grey42: #7A8A94;
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -197,6 +198,7 @@
     --m-grey40: #405066;
     --m-grey40-hover: rgba(64, 80, 102, .8);
     --m-grey41: #7A8A94;
+    --m-grey42: #7A8A94;
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -350,6 +352,7 @@
     --m-grey40: #5179E2;
     --m-grey40-hover: rgba(81, 121, 226, .8);
     --m-grey41: #ACBBC5;
+    --m-grey42: #b4cedd;
 
     --m-black0: #F8FBFF;
     --m-black1: #ECF2F5;

src/assets/styles/variables.less

@@ -52,6 +52,7 @@
 @m-grey40: var(--m-grey40);
 @m-grey40-hover: var(--m-grey40-hover);
 @m-grey41: var(--m-grey41);
+@m-grey42: var(--m-grey42);
 
 @m-black: #000000;
 @m-black0: var(--m-black0);

src/common/components/drawer/index.vue

@@ -75,7 +75,7 @@ export default defineComponent({
 .bottom {
     .position(fixed, auto, 0, -2px, auto);
     width: 586px;
-    height: 330px;
+    height: 380px;
     background: transparent;
     z-index: 10;
     .ant-drawer-content-wrapper {
@@ -85,7 +85,7 @@ export default defineComponent({
 .delistingBottom {
     .position(fixed, auto, 0, -2px, auto);
     width: 586px;
-    height: 440px;
+    height: 450px;
     background: transparent;
     z-index: 10;
     .ant-drawer-content-wrapper {

src/views/order/financing_manager/components/financing_manager_contract/components/buyback/index.vue

@@ -1,89 +1,98 @@
 <template>
-  <!-- 回购仓单 -->
-  <Drawer :title="'回购仓单'"
-          :placement="'right'"
-          :visible="visible"
-          class="delistingBottom"
-          @cancel="cancel">
-    <div class="listed">
-      <div class="formBar">
-        <a-form class="inlineForm dialogForm"
-                ref="formRef"
-                :model="formState"
-                :rules="rules">
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="品种">
-                <span class="white ml10">{{selectedRow.deliverygoodsname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="仓库">
-                <span class="white ml10">{{selectedRow.warehousename}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="履约商品">
-                <span class="white ml10">{{selectedRow.wrtypename}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="购买数量">
-                <span class="white ml10">{{ selectedRow.wrqty + " " + selectedRow.enumdicname }}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="已回购数量">
-                <span class="white ml10">{{ selectedRow.buybackwrpositionqty + " " + selectedRow.enumdicname }}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="待回购数量">
-                <span class="white ml10">{{ selectedRow.remainwrpositionqty + " " + selectedRow.enumdicname }}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="本次回购数量"
-                           name="num"
-                           class="relative">
-                <a-input-number class="commonInput ml10"
-                                :min="1"
-                                v-model:value="formState.num"
-                                style="width: 200px" />
+    <!-- 回购仓单 -->
+    <Drawer
+        :title="'回购仓单'"
+        :placement="'right'"
+        :visible="visible"
+        class="delistingBottom"
+        @cancel="cancel"
+    >
+        <div class="listed">
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="品种">
+                                <span class="white ml10">{{selectedRow.deliverygoodsname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="仓库">
+                                <span class="white ml10">{{selectedRow.warehousename}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="履约商品">
+                                <span class="white ml10">{{selectedRow.wrtypename}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="购买数量">
+                                <span
+                                    class="white ml10"
+                                >{{ selectedRow.wrqty + " " + selectedRow.enumdicname }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="已回购数量">
+                                <span
+                                    class="white ml10"
+                                >{{ selectedRow.buybackwrpositionqty + " " + selectedRow.enumdicname }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="待回购数量">
+                                <span
+                                    class="white ml10"
+                                >{{ selectedRow.remainwrpositionqty + " " + selectedRow.enumdicname }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="本次回购数量" name="num" class="relative">
+                                <a-input-number
+                                    class="commonInput ml10"
+                                    :min="1"
+                                    v-model:value="formState.num"
+                                    style="width: 200px"
+                                />
 
-                <div class="day">吨</div>
-                  <!-- 本次可回购数量=min{资金方对应仓单头寸可用数量，融资合同剩余待回购数量} -->
-                <div class="tip">{{ "本次可回购数量" + selectedRow.remainwrpositionqty + " " + selectedRow.enumdicname }}</div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-                <!--（回购数量/合同剩余数量） * 合同剩余金额 -->
-              <a-form-item label="本次回购金额">
-                <span class="white ml10">{{ (((formState.num ===  0 ? 1 : formState.num) * selectedRow.remainamount) / selectedRow.remainwrpositionqty).toFixed(2) + " 元" }}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="剩余保证金">
-                <span class="white ml10">{{ selectedRow.initmargin + " 元" }}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 type="flex"
-                 justify="center">
-            <a-col :span="24">
-              <a-form-item class="tc">
-                <a-button class="listedBtn"
-                          :loading="loading"
-                          :disabled="loading"
-                          @click="submit">提交</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-    </div>
-  </Drawer>
+                                <span class="input-enumdicname">吨</span>
+                                <!-- 本次可回购数量=min{资金方对应仓单头寸可用数量，融资合同剩余待回购数量} -->
+                                <div
+                                    class="tip"
+                                >{{ "本次可回购数量" + selectedRow.remainwrpositionqty + " " + selectedRow.enumdicname }}</div>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <!--（回购数量/合同剩余数量） * 合同剩余金额 -->
+                            <a-form-item label="本次回购金额">
+                                <span
+                                    class="white ml10"
+                                >{{ (((formState.num === 0 ? 1 : formState.num) * selectedRow.remainamount) / selectedRow.remainwrpositionqty).toFixed(2) + " 元" }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="剩余保证金">
+                                <span class="white ml10">{{ selectedRow.initmargin + " 元" }}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button
+                                class="listedBtn"
+                                :loading="loading"
+                                :disabled="loading"
+                                @click="submit"
+                            >提交</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -95,11 +104,11 @@ import { _closeModal } from '@/common/setup/modal/modal';
 import { handleForm } from './setup';
 import { validateAction } from '@/common/setup/form';
 import { FormState } from './interface';
-import {WarehouseRepurchase} from "@/services/proto/warehousetrade";
-import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
-import {WarehouseRepurchaseReq} from "@/services/proto/warehousetrade/interface";
-import {getTimeValue} from "@/utils/time";
-import Long from "long";
+import { WarehouseRepurchase } from '@/services/proto/warehousetrade';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { WarehouseRepurchaseReq } from '@/services/proto/warehousetrade/interface';
+import { getTimeValue } from '@/utils/time';
+import Long from 'long';
 
 export default defineComponent({
     name: ModalEnum.financing_manager_contract_repurchase_warrant,
@@ -121,7 +130,7 @@ export default defineComponent({
                     ExtBusinessID: getTimeValue(), // uint64 外部业务流水号
                     SCFContractID: Long.fromString(props.selectedRow.scfcontractid), // uint64 SCF合同ID
                     SCFContractType: props.selectedRow.scfcontracttype, // int32 合同类型
-                    WRPositionQty: param.num // uint64 仓单头寸数量
+                    WRPositionQty: param.num, // uint64 仓单头寸数量
                 };
                 requestResultLoadingAndInfo(WarehouseRepurchase, paramReq, loading, ['回购仓单成功', '回购仓单失败:']).then(() => {
                     cancel(true);

src/views/order/financing_manager/components/financing_manager_contract/components/pay/index.vue

@@ -1,52 +1,53 @@
 <template>
-  <!-- 付款-->
-  <Drawer :title="'付款'"
-          :placement="'right'"
-          :visible="visible"
-          class="delistingBottom"
-          @cancel="cancel">
-    <div class="listed">
-      <div class="formBar">
-        <a-form class="inlineForm dialogForm"
-                ref="formRef">
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="借款金额">
-                <span class="white ml10">{{ selectedRow.lenderamount + " 元"}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="剩余金额">
-                <span class="white ml10">{{ selectedRow.remainamount + " 元"}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="已计费用">
-                <span class="white ml10">{{ selectedRow.totalinterest + " 元"}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="费用欠款">
-                <span class="red ml10">{{ selectedRow.interestdebt + " 元"}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 type="flex"
-                 justify="center">
-            <a-col :span="24">
-              <a-form-item class="tc">
-                <a-button class="listedBtn"
-                          :loading="loading"
-                          :disabled="loading"
-                          @click="submit">提交</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-    </div>
-  </Drawer>
+    <!-- 付款-->
+    <Drawer
+        :title="'付款'"
+        :placement="'right'"
+        :visible="visible"
+        class="delistingBottom"
+        @cancel="cancel"
+    >
+        <div class="listed">
+            <a-form class="inlineForm dialogForm" ref="formRef">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="借款金额">
+                                <span class="white ml10">{{ selectedRow.lenderamount + " 元"}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="剩余金额">
+                                <span class="white ml10">{{ selectedRow.remainamount + " 元"}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="已计费用">
+                                <span class="white ml10">{{ selectedRow.totalinterest + " 元"}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="费用欠款">
+                                <span class="red ml10">{{ selectedRow.interestdebt + " 元"}}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button
+                                class="listedBtn"
+                                :loading="loading"
+                                :disabled="loading"
+                                @click="submit"
+                            >提交</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -55,11 +56,11 @@ import Drawer from '@/common/components/drawer/index.vue';
 import { WrScfContract } from '@/services/go/wrtrade/interface';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
-import {PaymentArrears} from "@/services/proto/warehousetrade";
-import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
-import {PaymentArrearsReq} from "@/services/proto/warehousetrade/interface";
-import {getTimeValue} from "@/utils/time";
-import * as Long from "long";
+import { PaymentArrears } from '@/services/proto/warehousetrade';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
+import { PaymentArrearsReq } from '@/services/proto/warehousetrade/interface';
+import { getTimeValue } from '@/utils/time';
+import * as Long from 'long';
 
 export default defineComponent({
     name: ModalEnum.financing_manager_contract_pay_arrears,

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

@@ -1,78 +1,78 @@
 <template>
-  <!-- 延期-->
-  <Drawer :title="'延期申请'"
-          :placement="'right'"
-          class="delistingBottom"
-          :visible="visible"
-          @cancel="cancel">
-    <div class="listed">
-      <div class="formBar">
-        <a-form class="inlineForm dialogForm"
-                ref="formRef"
-                :model="formState"
-                :rules="rules">
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="品种">
-                <span class="white ml10">{{selectedRow.deliverygoodsname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="仓库">
-                <span class="white ml10">{{selectedRow.warehousename}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="履约商品">
-                <span class="white ml10">{{selectedRow.wrtypename}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="当前步骤">
-                <span class="white ml10">{{selectedRow.curstepname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="关联单号">
-                <span class="white ml10">{{selectedRow.relatedorderid}}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="申请延期天数"
-                           name="days"
-                           class="relative">
-                <a-input-number class="commonInput ml10"
-                                :min="1"
-                                v-model:value="formState.days"
-                                style="width: 200px" />
-                <div class="day">天</div>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="备注"
-                           name="remark">
-                <a-input class="commonInput ml10"
-                         v-model:value="formState.remark"
-                         style="width: 420px" />
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 type="flex"
-                 justify="center">
-            <a-col :span="24">
-              <a-form-item class="tc">
-                <a-button class="listedBtn"
-                          :loading="loading"
-                          :disabled="loading"
-                          @click="submit">提交</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-    </div>
-  </Drawer>
+    <!-- 延期-->
+    <Drawer
+        :title="'延期申请'"
+        :placement="'right'"
+        class="delistingBottom"
+        :visible="visible"
+        @cancel="cancel"
+    >
+        <div class="listed">
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="品种">
+                                <span class="white ml10">{{selectedRow.deliverygoodsname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="仓库">
+                                <span class="white ml10">{{selectedRow.warehousename}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="履约商品">
+                                <span class="white ml10">{{selectedRow.wrtypename}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="当前步骤">
+                                <span class="white ml10">{{selectedRow.curstepname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="关联单号">
+                                <span class="white ml10">{{selectedRow.relatedorderid}}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="申请延期天数" name="days" class="relative">
+                                <a-input-number
+                                    class="commonInput ml10"
+                                    :min="1"
+                                    v-model:value="formState.days"
+                                    style="width: 200px"
+                                />
+                                <span class="input-enumdicname">天</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="备注" name="remark">
+                                <a-input
+                                    class="commonInput ml10"
+                                    v-model:value="formState.remark"
+                                    style="width: 420px"
+                                />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button
+                                class="listedBtn"
+                                :loading="loading"
+                                :disabled="loading"
+                                @click="submit"
+                            >提交</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">

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

@@ -1,67 +1,68 @@
 <template>
-  <!-- 付款-->
-  <Drawer :title="'付款'"
-          :placement="'right'"
-          :visible="visible"
-          class="delistingBottom"
-          @cancel="cancel">
-    <div class="listed">
-      <div class="formBar">
-        <a-form class="inlineForm dialogForm"
-                ref="formRef">
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="品种">
-                <span class="white ml10">{{selectedRow.deliverygoodsname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="仓库">
-                <span class="white ml10">{{selectedRow.warehousename}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="履约商品">
-                <span class="white ml10">{{selectedRow.wrtypename}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="履约总金额">
-                <span class="white ml10">{{selectedRow.amount.toFixed(2)}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="当前步骤">
-                <span class="white ml10">{{selectedRow.curstepname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="本次需支付">
-                <span class="white ml10">{{ stepamount }}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="剩余款">
-                <span class="white ml10">{{selectedRow.unpaidamount.toFixed(2)}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24"
-                 type="flex"
-                 justify="center">
-            <a-col :span="24">
-              <a-form-item class="tc">
-                <a-button class="listedBtn"
-                          :loading="loading"
-                          :disabled="loading"
-                          @click="submit">提交</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-    </div>
-  </Drawer>
+    <!-- 付款-->
+    <Drawer
+        :title="'付款'"
+        :placement="'right'"
+        :visible="visible"
+        class="delistingBottom"
+        @cancel="cancel"
+    >
+        <div class="listed">
+            <a-form class="inlineForm dialogForm" ref="formRef">
+                <div class="formBar">
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="品种">
+                                <span class="white ml10">{{selectedRow.deliverygoodsname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="仓库">
+                                <span class="white ml10">{{selectedRow.warehousename}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="履约商品">
+                                <span class="white ml10">{{selectedRow.wrtypename}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="履约总金额">
+                                <span class="white ml10">{{selectedRow.amount.toFixed(2)}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="当前步骤">
+                                <span class="white ml10">{{selectedRow.curstepname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="本次需支付">
+                                <span class="white ml10">{{ stepamount }}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="剩余款">
+                                <span class="white ml10">{{selectedRow.unpaidamount.toFixed(2)}}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button
+                                class="listedBtn"
+                                :loading="loading"
+                                :disabled="loading"
+                                @click="submit"
+                            >提交</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -76,7 +77,7 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { HdWRDealOrder } from '@/services/proto/warehousetrade';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { handlePerformancePlanStep } from '../setup';
-import * as Long from "long";
+import * as Long from 'long';
 
 export default defineComponent({
     name: ModalEnum.performance_information_buy_performance_pay,
@@ -111,7 +112,7 @@ export default defineComponent({
             cancel,
             submit,
             loading,
-            stepamount
+            stepamount,
         };
     },
 });

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

@@ -13,13 +13,9 @@
                 <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
                 <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
             </div>
-            <div class="formBar">
-                <a-form
-                    class="inlineForm dialogForm"
-                    ref="formRef"
-                    :model="formState"
-                    :rules="rules"
-                >
+
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
                     <a-row :gutter="24">
                         <a-col :span="12">
                             <a-form-item label="挂牌方式" name="WRPriceType">
@@ -91,6 +87,7 @@
                                     ::min="0"
                                     :max="selectedRow.enableqty"
                                     class="formSlider"
+                                    style="width: 140px;"
                                 />
                                 <div class="unit">
                                     <span>0</span>
@@ -106,7 +103,7 @@
                                 <a-month-picker
                                     style="width: 140px"
                                     v-model:value="formState.DeliveryMonth"
-                                    :allowClear="false"
+                                    :allowClear="'false'"
                                     class="commonDatePicker dialogDatePicker"
                                 />
                             </a-form-item>
@@ -176,21 +173,21 @@
                             </a-form-item>
                         </a-col>
                     </a-row>
-                    <a-row :gutter="24" type="flex" justify="center">
-                        <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>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                </a-form>
-            </div>
+                </div>
+                <a-row :gutter="24" class="fixedBtns">
+                    <a-col :span="24">
+                        <a-form-item class="btnCenter">
+                            <a-button
+                                class="listedBtn"
+                                :loading="loading"
+                                :disabled="loading"
+                                @click="submit"
+                            >卖出</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
     </Drawer>
 </template>
@@ -373,6 +370,9 @@ export default defineComponent({
             margin-left: 10px;
         }
     }
+    .formBar {
+        max-height: 100%;
+    }
 }
 .mt-20 {
     margin-top: -20px;
@@ -445,10 +445,4 @@ export default defineComponent({
 .ml5 {
     margin-left: 5px;
 }
-
-::v-deep.dialogDatePicker.ant-calendar-picker .ant-input {
-    background: @m-grey21;
-    border: 1px solid @m-grey14;
-    .rounded-corners(3px);
-}
 </style>;

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

@@ -13,13 +13,9 @@
                 <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
                 <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
             </div>
-            <div class="formBar">
-                <a-form
-                    class="inlineForm dialogForm"
-                    ref="formRef"
-                    :model="formState"
-                    :rules="rules"
-                >
+
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
                     <a-row :gutter="24">
                         <a-col :span="12">
                             <a-form-item label="挂牌方式" name="WRPriceType">
@@ -90,6 +86,7 @@
                                     ::min="0"
                                     :max="selectedRow.enableqty"
                                     class="formSlider"
+                                    style="width: 140px;"
                                 />
                                 <div class="unit">
                                     <span>0</span>
@@ -159,27 +156,26 @@
                             </a-form-item>
                         </a-col>
                     </a-row>
-
-                    <a-row :gutter="24" type="flex" justify="center">
-                        <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"
-                                    :loading="loading"
-                                    :disabled="loading"
-                                    @click="cancel"
-                                >取消</a-button>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                </a-form>
-            </div>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button
+                                class="listedBtn"
+                                :loading="loading"
+                                :disabled="loading"
+                                @click="submit"
+                            >卖出</a-button>
+                            <a-button
+                                class="ml10 cancelBtn"
+                                :loading="loading"
+                                :disabled="loading"
+                                @click="cancel"
+                            >取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
     </Drawer>
 </template>
@@ -372,6 +368,9 @@ export default defineComponent({
             margin-left: 10px;
         }
     }
+    .formBar {
+        max-height: 100%;
+    }
 }
 .mt-20 {
     margin-top: -20px;

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

@@ -8,13 +8,8 @@
                 <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
                 <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
             </div>
-            <div class="formBar">
-                <a-form
-                    class="inlineForm dialogForm"
-                    ref="formRef"
-                    :model="formState"
-                    :rules="rules"
-                >
+            <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+                <div class="formBar">
                     <a-row :gutter="24">
                         <a-col :span="12">
                             <a-form-item label="提货数量" name="OutQty">
@@ -41,7 +36,14 @@
                     <a-row :gutter="24">
                         <a-col :span="12" class="mt-20">
                             <a-form-item>
-                                <a-progress class="formProgress" :percent="30" />
+                                <!-- <a-progress class="formProgress" :percent="30" /> -->
+                                <a-slider
+                                    v-model:value="formState.OutQty"
+                                    ::min="0"
+                                    :max="selectedRow.enableqty"
+                                    class="formSlider"
+                                    style="width: 140px;"
+                                />
                                 <div class="unit">
                                     <span>0</span>
                                     <span>{{selectedRow.enableqty}}{{selectedRow.enumdicname}}</span>
@@ -64,6 +66,7 @@
                             <a-form-item label="预约日期" name="AppointmentDate">
                                 <a-date-picker
                                     class="commonDatePicker dialogDatePicker"
+                                    allowClear="false"
                                     v-model:value="formState.AppointmentDate"
                                     style="width: 140px"
                                 />
@@ -82,21 +85,21 @@
                         </a-col>
                         <a-col :span="12">&nbsp;</a-col>
                     </a-row>
-                    <a-row :gutter="24" type="flex" justify="center">
-                        <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>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                </a-form>
-            </div>
+                </div>
+                <a-row :gutter="24">
+                    <a-col :span="24" class="fixedBtns">
+                        <a-form-item class="btnCenter">
+                            <a-button
+                                class="listedBtn"
+                                :loading="loading"
+                                :disabled="loading"
+                                @click="submit"
+                            >提货</a-button>
+                            <a-button class="ml10 cancelBtn" @click="cancel">取消</a-button>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
         </div>
     </Drawer>
 </template>
@@ -209,6 +212,9 @@ export default defineComponent({
             margin-left: 10px;
         }
     }
+    .formBar {
+        max-height: 100%;
+    }
 }
 
 ::v-deep.formProgress {
@@ -267,9 +273,4 @@ export default defineComponent({
 .ml10 {
     margin-left: 10px;
 }
-::v-deep.dialogDatePicker.ant-calendar-picker .ant-input {
-    background: @m-grey21;
-    border: 1px solid @m-grey14;
-    .rounded-corners(3px);
-}
 </style>;