合并代码、解决冲突

public/config/app.config.json

@@ -1,3 +1,3 @@
 {
-    "apiUrl":"http://103.40.249.123:8280/cfg?key=mtp_20"
-}
+    "apiUrl": "http://103.40.249.123:28280/cfg?key=mtp_20"
+}

src/common/components/drawer/index.vue

@@ -1,25 +1,26 @@
 <template>
-  <a-drawer :placement="placement"
-            :closable="false"
-            :visible="visible"
-            :destroyOnClose="true"
-            class="bottomListed"
-            height="405px">
-    <!-- 摘牌是top  挂牌是bottom 期货交易是tradeDialog -->
-    <div class="collapse"
-         @click="cancel">
-      <DoubleRightOutlined />
-    </div>
-    <div class="collapseCont">
-      <div class="title">{{ title }}</div>
-      <div class="content highContent">
-        <!-- <Listed></Listed> -->
-        <!-- <Delisting></Delisting> -->
-        <slot></slot>
-        <!-- <Trade></Trade> -->
-      </div>
-    </div>
-  </a-drawer>
+    <a-drawer
+        :placement="placement"
+        :closable="false"
+        :visible="visible"
+        :destroyOnClose="true"
+        class="bottomListed"
+        height="405px"
+    >
+        <!-- 摘牌是top  挂牌是bottom 期货交易是tradeDialog -->
+        <div class="collapse" @click="cancel">
+            <DoubleRightOutlined />
+        </div>
+        <div class="collapseCont">
+            <div class="title">{{ title }}</div>
+            <div class="content highContent">
+                <!-- <Listed></Listed> -->
+                <!-- <Delisting></Delisting> -->
+                <slot></slot>
+                <!-- <Trade></Trade> -->
+            </div>
+        </div>
+    </a-drawer>
 </template>
 
 <script lang="ts">
@@ -128,6 +129,16 @@ export default defineComponent({
         width: 486px !important;
     }
 }
+.top600 {
+    .position(fixed, 101px, 0, auto, auto);
+    width: 600px;
+    height: 450px;
+    background: transparent;
+    z-index: 11;
+    .ant-drawer-content-wrapper {
+        width: 600px !important;
+    }
+}
 .top500 {
     .position(fixed, 101px, 0, auto, auto);
     width: 500px;

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

@@ -5,7 +5,7 @@
         :placement="'right'"
         :visible="visible"
         @cancel="cancel"
-        class="top486"
+        class="top600"
     >
         <a-spin :spinning="loading">
             <div class="listed">
@@ -32,7 +32,7 @@
                             <a-col :span="7">
                                 <a-select
                                     class="inlineFormSelect dialogTableSelect"
-                                    style="width: 108px"
+                                    style="width: 158px"
                                     placeholder="请选择"
                                     v-model:value="form.pay"
                                 >
@@ -42,14 +42,14 @@
                             <a-col :span="6">
                                 <a-input
                                     class="commonInput dialogTableInput"
-                                    style="width: 100px"
+                                    style="width: 135px"
                                     v-model:value="step1"
                                 ></a-input>
                             </a-col>
                             <a-col :span="7">
                                 <a-input
                                     class="commonInput dialogTableInput"
-                                    style="width: 122px"
+                                    style="width: 157px"
                                     v-model:value="day1"
                                 ></a-input>
                             </a-col>
@@ -187,7 +187,7 @@ export default defineComponent({
         }
         .ant-row.tableContent {
             .ant-col {
-                height: 40px;
+                // height: 40px;
                 line-height: 40px;
                 text-align: center;
                 border-right: 1px solid @m-black6;
@@ -221,5 +221,18 @@ export default defineComponent({
             }
         }
     }
+    .ant-form.inlineForm {
+        .ant-row.ant-form-item {
+            margin-bottom: 5px;
+        }
+        .ant-row.ant-form-item.ant-form-item-with-help {
+            white-space: nowrap;
+            margin-left: 2px;
+        }
+    }
+    .dialogTableSelect,
+    .dialogTableInput {
+        margin-left: 2px;
+    }
 }
 </style>

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

@@ -4,7 +4,7 @@
           :placement="'right'"
           :visible="visible"
           @cancel="cancel"
-          class="top486">
+          class="top600">
     <a-spin :spinning="loading">
       <div class="listed">
         <a-form class="inlineForm dialogForm"
@@ -18,7 +18,7 @@
                              name="name">
                   <a-input class="commonInput"
                            v-model:value="formState.name"
-                           placeholder="请输入模版名称"
+                           placeholder="30天账期"
                            style="width: 260px" />
                 </a-form-item>
               </a-col>
@@ -36,7 +36,7 @@
                 <a-form-item :name="['domains',index, 'steptypeid']"
                              :rules="rules.domains.steptypeid">
                   <a-select class="inlineFormSelect dialogTableSelect"
-                            style="width: 108px"
+                            style="width: 158px"
                             placeholder="请选择"
                             @change="stepTypeChange(parent)"
                             v-model:value="parent.steptypeid">
@@ -52,7 +52,7 @@
                              :rules="rules.domains.stepvalue">
                   <a-input-number class="commonInput dialogTableInput"
                                   :disabled="isSummary(parent)"
-                                  style="width: 100px"
+                                  style="width: 135px"
                                   type="number"
                                   v-model:value="parent.stepvalue"></a-input-number>
                 </a-form-item>
@@ -61,7 +61,7 @@
                 <a-form-item :name="['domains',index, 'stepdays']"
                              :rules="rules.domains.stepdays">
                   <a-input-number class="commonInput dialogTableInput"
-                                  style="width: 122px"
+                                  style="width: 157px"
                                   type="number"
                                   v-model:value="parent.stepdays"></a-input-number>
                 </a-form-item>
@@ -88,8 +88,6 @@
                    class="fixedBtns">
               <a-form-item class="btnCenter">
                 <a-button class="listedBtn"
-                          :loading="loading"
-                          :disabled="loading"
                           @click="submit">确定</a-button>
               </a-form-item>
             </a-col>
@@ -293,7 +291,7 @@ export default defineComponent({
         }
         .ant-row.tableContent {
             .ant-col {
-                height: 40px;
+                // height: 40px;
                 line-height: 40px;
                 text-align: center;
                 border-right: 1px solid @m-black6;
@@ -327,5 +325,18 @@ export default defineComponent({
             }
         }
     }
+    .ant-form.inlineForm {
+        .ant-row.ant-form-item {
+            margin-bottom: 5px;
+        }
+        .ant-row.ant-form-item.ant-form-item-with-help {
+            white-space: nowrap;
+            margin-left: 2px;
+        }
+    }
+    .dialogTableSelect,
+    .dialogTableInput {
+        margin-left: 2px;
+    }
 }
 </style>