style update

src/assets/styles/mixin.less

@@ -2136,7 +2136,7 @@ input:-internal-autofill-selected {
 .noDataTable {
     .ant-table {
         .ant-table-header {
-            height: 35px;
+            // height: 35px;
             margin-bottom: 0 !important;
             overflow: hidden !important;
         }
@@ -2279,7 +2279,7 @@ input:-internal-autofill-selected {
     .ant-input {
         width: 90px;
         background: transparent;
-        font-size: 16px;
+        font-size: 14px;
         color: @m-white6;
     }
     .ant-calendar-picker-icon {

src/assets/styles/theme.css

@@ -47,6 +47,8 @@
     --m-grey43-hover: rgba(136, 160, 174, .8);
     --m-grey44: #7A8A94;
     --m-grey44-hover: rgba(122, 138, 148, .8);
+    --m-grey45: #88A0AE;
+    --m-grey46: transpant;
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -215,6 +217,8 @@
     --m-grey43-hover: rgba(136, 160, 174, .8);
     --m-grey44: #7A8A94;
     --m-grey44-hover: rgba(122, 138, 148, .8);
+    --m-grey45: #88A0AE;
+    --m-grey46: transpant;
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -381,6 +385,8 @@
     --m-grey43-hover: rgba(81, 121, 226, .8);
     --m-grey44: #718FAE;
     --m-grey44-hover: rgba(113, 143, 174, .8);
+    --m-grey45: #394753;
+    --m-grey46: #CBD7DD;
 
     --m-black0: #F8FBFF;
     --m-black1: #ECF2F5;

src/assets/styles/variables.less

@@ -57,6 +57,8 @@
 @m-grey43-hover: var(--m-grey43-hover);
 @m-grey44: var(--m-grey44);
 @m-grey44-hover: var(--m-grey44-hover);
+@m-grey45: var(--m-grey45);
+@m-grey46: var(--m-grey46);
 
 @m-black: #000000;
 @m-black0: var(--m-black0);

src/common/components/filter/index.vue

@@ -66,28 +66,71 @@ export default defineComponent({
     display: inline-flex;
     padding-top: 5px;
     padding-bottom: 1px;
+    .conditionSelect:first-child {
+        margin-right: 10px;
+    }
+    // /deep/.ant-select {
+    //     // margin-right: 10px;
+    //     // border: 1px solid @m-grey37;
+    //     height: 28px;
+    //     // .rounded-corners(3px);
+    //     .ant-select-selector {
+    //         height: 26px;
+    //         .ant-select-selection-search {
+    //             height: 26px;
+    //             .ant-select-selection-search-input {
+    //                 height: 26px;
+    //             }
+    //         }
+    //         // padding: 0 8px;
+    //         // background: @m-grey9;
+    //         // border: none;
+    //         // .rounded-corners(3px);
+    //         // color: @m-grey10;
+    //         // .ant-select-arrow {
+    //         //     right: 8px;
+    //         //     color: @m-grey1;
+    //         // }
+    //     }
+    //     // .ant-select-arrow {
+    //     //     color: @m-grey1;
+    //     // }
+    //     // .ant-select-selection-item {
+    //     //     color: @m-white1;
+    //     // }
+    // }
     .ant-select-single:not(.ant-select-customize-input) {
         margin-right: 10px;
-        border: 1px solid @m-grey37;
         height: 28px;
-        .rounded-corners(3px);
+        line-height: 29px !important;
         .ant-select-selector {
             height: 28px;
-            padding: 0 8px;
-            background: @m-grey9;
-            border: none;
+            border-color: @m-grey46 !important;
             .rounded-corners(3px);
-            color: @m-grey10;
-            .ant-select-arrow {
-                right: 8px;
-                color: @m-grey1;
+            .ant-select-selection-item {
+                line-height: 26px;
+            }
+            .ant-select-selection-search {
+                height: 26px;
+                .ant-select-selection-search-input {
+                    height: 26px;
+                    line-height: 27px !important;
+                }
+            }
+            .ant-select-selection-placeholder {
+                line-height: 26px;
             }
         }
-        .ant-select-arrow {
-            color: @m-grey1;
-        }
-        .ant-select-selection-item {
-            color: @m-white1;
+    }
+    .allDatePicker.ant-calendar-picker {
+        height: 28px !important;
+        border: 1px solid @m-grey46 !important;
+        .ant-calendar-picker-input.ant-input {
+            height: 28px;
+            line-height: 28px;
+            &::placeholder {
+                color: @m-grey10 !important;
+            }
         }
     }
     .conditionSelect + .conditionSelect {

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

@@ -229,11 +229,11 @@ export default defineComponent({
     background: @m-grey9;
     border: none;
     border-radius: 3px 3px 3px 3px;
-    color: @m-grey10;
+    color: @m-grey45;
     .ant-input {
         width: 104px;
         &::placeholder {
-            color: @m-grey10;
+            color: @m-grey45;
             font-size: 14px;
         }
     }

src/views/order/commodity_contract/components/commodity_contract_summary/components/commodity_contract_summary_settlement/index.vue

@@ -1,42 +1,37 @@
 <template>
-  <!-- 交收-->
-  <Drawer :title="'交收'"
-          :placement="'bottom'"
-          :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="24">
-              <a-form-item label="交收数量"
-                           name="num">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.num"
-                                style="width: 100%" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</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="'bottom'" :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="24">
+                            <a-form-item label="交收数量" name="num">
+                                <a-input-number
+                                    class="commonInput"
+                                    v-model:value="formState.num"
+                                    style="width: 100%"
+                                />
+                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</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">

src/views/order/commodity_contract/components/commodity_contract_summary/components/commodity_contract_summary_transfer/index.vue

@@ -1,50 +1,46 @@
 <template>
-  <!-- 转让-->
-  <Drawer :title="'转让'"
-          :placement="'bottom'"
-          :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="24">
-              <a-form-item label="挂牌价"
-                           name="price">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.price"
-                                style="width: 100%" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="挂牌数量"
-                           name="num">
-                <a-input-number class="commonInput"
-                                v-model:value="formState.num"
-                                style="width: 100%" />
-                <span class="input-enumdicname">{{selectedRow.enumdicname}}</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="'bottom'" :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="24">
+                            <a-form-item label="挂牌价" name="price">
+                                <a-input-number
+                                    class="commonInput"
+                                    v-model:value="formState.price"
+                                    style="width: 100%"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="挂牌数量" name="num">
+                                <a-input-number
+                                    class="commonInput"
+                                    v-model:value="formState.num"
+                                    style="width: 100%"
+                                />
+                                <span class="input-enumdicname">{{selectedRow.enumdicname}}</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">

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

@@ -1,74 +1,69 @@
 <template>
-  <!-- 违约-->
-  <Drawer :title="'违约'"
-          :placement="'bottom'"
-          :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">{{selectedRow.deliverygoodsname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="仓库">
-                <span class="white">{{selectedRow.warehousename}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="履约商品">
-                <span class="white">{{selectedRow.wrtypename}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="当前步骤">
-                <span class="white">{{selectedRow.curstepname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="24">
-              <a-form-item label="关联单号">
-                <span class="white">{{selectedRow.relatedorderid}}</span>
-              </a-form-item>
-            </a-col>
-            <!--            <a-col :span="24">-->
-            <!--              <a-form-item label="附件"-->
-            <!--                           name="url">-->
-            <!--                <UploadImg :visible="visible"-->
-            <!--                           :imgList="uploadImgList"-->
-            <!--                           @upload="uploadImgAction" />-->
-            <!--              </a-form-item>-->
-            <!--            </a-col>-->
-            <a-col :span="24">
-              <a-form-item label="备注"
-                           name="remark">
-                <a-input class="commonInput"
-                         v-model:value="formState.remark"
-                         style="width: 100%" />
-              </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="'bottom'" :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">{{selectedRow.deliverygoodsname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="仓库">
+                                <span class="white">{{selectedRow.warehousename}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="履约商品">
+                                <span class="white">{{selectedRow.wrtypename}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="当前步骤">
+                                <span class="white">{{selectedRow.curstepname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+                            <a-form-item label="关联单号">
+                                <span class="white">{{selectedRow.relatedorderid}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <!--            <a-col :span="24">-->
+                        <!--              <a-form-item label="附件"-->
+                        <!--                           name="url">-->
+                        <!--                <UploadImg :visible="visible"-->
+                        <!--                           :imgList="uploadImgList"-->
+                        <!--                           @upload="uploadImgAction" />-->
+                        <!--              </a-form-item>-->
+                        <!--            </a-col>-->
+                        <a-col :span="24">
+                            <a-form-item label="备注" name="remark">
+                                <a-input
+                                    class="commonInput"
+                                    v-model:value="formState.remark"
+                                    style="width: 100%"
+                                />
+                            </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">