浏览代码

cssupdate

chen.zujie 4 年之前
父节点
当前提交
b6dad2dfd5

+ 2 - 0
src/assets/styles/mixin.less

@@ -223,6 +223,7 @@
 }
 }
 
 
 .tableConditionInput {
 .tableConditionInput {
+    margin-left:10px;
     width      : 140px;
     width      : 140px;
     height     : 30px;
     height     : 30px;
     line-height: 30px;
     line-height: 30px;
@@ -3113,6 +3114,7 @@ input:-internal-autofill-selected {
     position: sticky;
     position: sticky;
     position: -webkit-sticky;
     position: -webkit-sticky;
     right   : 2px;
     right   : 2px;
+    margin-top:7px;
 }
 }
 
 
 // 步骤条
 // 步骤条

+ 1 - 0
src/common/components/btnList/index.vue

@@ -36,5 +36,6 @@ export default defineComponent({
 <style lang="less">
 <style lang="less">
 .btn-list {
 .btn-list {
     display: inline-flex;
     display: inline-flex;
+    margin-top:7px;
 }
 }
 </style>
 </style>

+ 6 - 7
src/common/components/filter/index.vue

@@ -73,26 +73,25 @@ export default defineComponent({
 }
 }
 .filter-custom-table {
 .filter-custom-table {
     display: inline-flex;
     display: inline-flex;
-    padding-top: 4px;
-    height: 34px;
-    .conditionSelect:first-child {
-        margin-right: 10px;
-    }
+    padding-top: 7px;
+    padding-bottom: 7px;
+    height: 46px;
     .btnDeafault.ant-btn,
     .btnDeafault.ant-btn,
     .operBtn.ant-btn {
     .operBtn.ant-btn {
         height: 26px !important;
         height: 26px !important;
         line-height: 26px !important;
         line-height: 26px !important;
     }
     }
-
+ant-btn operBtn
     .ant-select-single:not(.ant-select-customize-input) + .ant-select-single:not(.ant-select-customize-input),
     .ant-select-single:not(.ant-select-customize-input) + .ant-select-single:not(.ant-select-customize-input),
     .ant-select + .ant-space.ant-space-vertical {
     .ant-select + .ant-space.ant-space-vertical {
         margin-left: 10px;
         margin-left: 10px;
+        margin-top: 12px;
     }
     }
     .ant-select-single:not(.ant-select-customize-input) {
     .ant-select-single:not(.ant-select-customize-input) {
         height: 26px;
         height: 26px;
         line-height: 26px !important;
         line-height: 26px !important;
         .ant-select-selector {
         .ant-select-selector {
-            height: 26px;
+            height: 30px;
             border-color: @m-grey46 !important;
             border-color: @m-grey46 !important;
             background: @m-grey47;
             background: @m-grey47;
             .rounded-corners(3px);
             .rounded-corners(3px);

+ 1 - 1
src/layout/components/bottom.vue

@@ -108,7 +108,7 @@ export default defineComponent({
         .ant-select-selector {
         .ant-select-selector {
             background-color: @m-grey6;
             background-color: @m-grey6;
             border: none;
             border: none;
-            height: 28px;
+            height: 30px;
         }
         }
         .ant-select-arrow {
         .ant-select-arrow {
             top: 15px;
             top: 15px;

+ 8 - 2
src/views/manage/business-review/list/someprice/index.vue

@@ -41,6 +41,8 @@ import { getTableButton } from '@/common/setup/table/button';
 import { QueryBusinessDj } from '@/services/go/ermcp/business-review';
 import { QueryBusinessDj } from '@/services/go/ermcp/business-review';
 import { QryBusinessDjRsp } from '@/services/go/ermcp/business-review/interface';
 import { QryBusinessDjRsp } from '@/services/go/ermcp/business-review/interface';
 import { useRoute } from 'vue-router';
 import { useRoute } from 'vue-router';
+import moment from "moment"
+import { sortTime } from '@/utils/time'
 
 
 export default defineComponent({
 export default defineComponent({
     name: 'business-review-dj',
     name: 'business-review-dj',
@@ -66,10 +68,14 @@ export default defineComponent({
         const queryTableAction = () => {
         const queryTableAction = () => {
             switch (routeName) {
             switch (routeName) {
                 case 'someprice_checkpending':
                 case 'someprice_checkpending':
-                    queryTable(QueryBusinessDj, { applystatus: '1' });
+                    queryTable(QueryBusinessDj, { applystatus: '1' }).then(res => {
+                        tableList.value = sortTime<QryBusinessDjRsp>(res, 'audittime', false);
+                    });
                     break;
                     break;
                 case 'someprice_performance':
                 case 'someprice_performance':
-                    queryTable(QueryBusinessDj, { applystatus: '2' });
+                    queryTable(QueryBusinessDj, { applystatus: '2' }).then(res => {
+                        tableList.value = sortTime<QryBusinessDjRsp>(res, 'audittime', false);
+                    });;
                     break;
                     break;
             }
             }
         };
         };

+ 0 - 3
src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_swap/index.vue

@@ -145,9 +145,6 @@ export default defineComponent({
     display: inline-flex;
     display: inline-flex;
     padding-top: 4px;
     padding-top: 4px;
     height: 34px;
     height: 34px;
-    .conditionSelect:first-child {
-        margin-right: 10px;
-    }
     .btnDeafault.ant-btn,
     .btnDeafault.ant-btn,
     .operBtn.ant-btn {
     .operBtn.ant-btn {
         height: 26px !important;
         height: 26px !important;