瀏覽代碼

style update

marymelisa 4 年之前
父節點
當前提交
e51b350d25

+ 2 - 2
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"
+}

+ 32 - 21
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;

+ 18 - 5
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>

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

@@ -1,101 +1,123 @@
 <template>
-  <!--新增履约模板-->
-  <Drawer :title="'新增履约模板'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top486">
-    <a-spin :spinning="loading">
-      <div class="listed">
-        <a-form class="inlineForm dialogForm"
-                ref="formRef"
-                :model="formState"
-                :rules="rules">
-          <div class="formBar">
-            <a-row :gutter="24">
-              <a-col :span="24">
-                <a-form-item label="模版名称"
-                             name="name">
-                  <a-input class="commonInput"
-                           v-model:value="formState.name"
-                           placeholder="30天账期"
-                           style="width: 260px" />
-                </a-form-item>
-              </a-col>
-            </a-row>
-            <a-row class="tableTitle">
-              <a-col :span="7">步骤类型</a-col>
-              <a-col :span="6">步骤值(%)</a-col>
-              <a-col :span="7">距离上一步天数</a-col>
-              <a-col :span="4">操作</a-col>
-            </a-row>
-            <a-row class="tableContent"
-                   v-for="(parent, index) in formState.domains"
-                   :key="parent">
-              <a-col :span="7">
-                <a-form-item :name="['domains',index, 'steptypeid']"
-                             :rules="rules.domains.steptypeid">
-                  <a-select class="inlineFormSelect dialogTableSelect"
-                            style="width: 108px"
-                            placeholder="请选择"
-                            @change="stepTypeChange(parent)"
-                            v-model:value="parent.steptypeid">
-                    <a-select-option v-for="item in list"
-                                     :key="item.steptypeid"
-                                     :value="item.steptypeid">{{item.steptypename}}
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <a-col :span="6">
-                <a-form-item :name="['domains',index, 'stepvalue']"
-                             :rules="rules.domains.stepvalue">
-                  <a-input-number class="commonInput dialogTableInput"
-                                  :disabled="isSummary(parent)"
-                                  style="width: 100px"
-                                  type="number"
-                                  v-model:value="parent.stepvalue"></a-input-number>
-                </a-form-item>
-              </a-col>
-              <a-col :span="7">
-                <a-form-item :name="['domains',index, 'stepdays']"
-                             :rules="rules.domains.stepdays">
-                  <a-input-number class="commonInput dialogTableInput"
-                                  style="width: 122px"
-                                  type="number"
-                                  v-model:value="parent.stepdays"></a-input-number>
-                </a-form-item>
-              </a-col>
-              <a-col :span="4">
-                <svg class="icon svg-icon"
-                     @click="deleteTemp(index)"
-                     aria-hidden="true">
-                  <use xlink:href="#icon-shanchu" />
-                </svg>
-                <PlusCircleOutlined v-if="showAddTempBtn(index)"
-                                    @click="addTemp()" />
-              </a-col>
-            </a-row>
-            <div class="noticeTip">
-              <div>注意事项:</div>
-              <div>1、买方支付汇总值必须为100%;</div>
-              <div>2、卖方收款汇总值必须为100%;</div>
-              <div>3、配置卖方收款之前要有买方支付,且其值不能多于买方支付的值。</div>
+    <!--新增履约模板-->
+    <Drawer
+        :title="'新增履约模板'"
+        :placement="'right'"
+        :visible="visible"
+        @cancel="cancel"
+        class="top600"
+    >
+        <a-spin :spinning="loading">
+            <div class="listed">
+                <a-form
+                    class="inlineForm dialogForm"
+                    ref="formRef"
+                    :model="formState"
+                    :rules="rules"
+                >
+                    <div class="formBar">
+                        <a-row :gutter="24">
+                            <a-col :span="24">
+                                <a-form-item label="模版名称" name="name">
+                                    <a-input
+                                        class="commonInput"
+                                        v-model:value="formState.name"
+                                        placeholder="30天账期"
+                                        style="width: 260px"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                        </a-row>
+                        <a-row class="tableTitle">
+                            <a-col :span="7">步骤类型</a-col>
+                            <a-col :span="6">步骤值(%)</a-col>
+                            <a-col :span="7">距离上一步天数</a-col>
+                            <a-col :span="4">操作</a-col>
+                        </a-row>
+                        <a-row
+                            class="tableContent"
+                            v-for="(parent, index) in formState.domains"
+                            :key="parent"
+                        >
+                            <a-col :span="7">
+                                <a-form-item
+                                    :name="['domains',index, 'steptypeid']"
+                                    :rules="rules.domains.steptypeid"
+                                >
+                                    <a-select
+                                        class="inlineFormSelect dialogTableSelect"
+                                        style="width: 158px"
+                                        placeholder="请选择"
+                                        @change="stepTypeChange(parent)"
+                                        v-model:value="parent.steptypeid"
+                                    >
+                                        <a-select-option
+                                            v-for="item in list"
+                                            :key="item.steptypeid"
+                                            :value="item.steptypeid"
+                                        >{{item.steptypename}}</a-select-option>
+                                    </a-select>
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="6">
+                                <a-form-item
+                                    :name="['domains',index, 'stepvalue']"
+                                    :rules="rules.domains.stepvalue"
+                                >
+                                    <a-input-number
+                                        class="commonInput dialogTableInput"
+                                        :disabled="isSummary(parent)"
+                                        style="width: 135px"
+                                        type="number"
+                                        v-model:value="parent.stepvalue"
+                                    ></a-input-number>
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="7">
+                                <a-form-item
+                                    :name="['domains',index, 'stepdays']"
+                                    :rules="rules.domains.stepdays"
+                                >
+                                    <a-input-number
+                                        class="commonInput dialogTableInput"
+                                        style="width: 157px"
+                                        type="number"
+                                        v-model:value="parent.stepdays"
+                                    ></a-input-number>
+                                </a-form-item>
+                            </a-col>
+                            <a-col :span="4">
+                                <svg
+                                    class="icon svg-icon"
+                                    @click="deleteTemp(index)"
+                                    aria-hidden="true"
+                                >
+                                    <use xlink:href="#icon-shanchu" />
+                                </svg>
+                                <PlusCircleOutlined
+                                    v-if="showAddTempBtn(index)"
+                                    @click="addTemp()"
+                                />
+                            </a-col>
+                        </a-row>
+                        <div class="noticeTip">
+                            <div>注意事项:</div>
+                            <div>1、买方支付汇总值必须为100%;</div>
+                            <div>2、卖方收款汇总值必须为100%;</div>
+                            <div>3、配置卖方收款之前要有买方支付,且其值不能多于买方支付的值。</div>
+                        </div>
+                    </div>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="fixedBtns">
+                            <a-form-item class="btnCenter">
+                                <a-button class="listedBtn" @click="submit">确定</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"
-                          @click="submit">确定</a-button>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-    </a-spin>
-  </Drawer>
+        </a-spin>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -274,7 +296,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;
@@ -308,5 +330,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>