commit

src/assets/styles/mixin.less

@@ -235,6 +235,11 @@
                     overflow: hidden;
                 }
             }
+            tr.ant-table-expanded-row:hover { //tr.ant-table-expanded-row, 
+                td {
+                    background-color: @m-blue3;
+                }
+            }
         }
         .ant-table-placeholder {
             border: 0;
@@ -246,6 +251,7 @@
 .dialogTable {
     .ant-table {
         width: 100%;
+        background: transparent;
         table {
             border: 1px solid @m-grey20;
             border-radius: 0;
@@ -300,11 +306,17 @@
 .ant-empty-img-simple-g {
     stroke: @m-grey17;
 }
-
+.ant-modal-wrap {
+    overflow: hidden;
+}
 .add-custom,.commonModal {
+    top: 0;
+    max-height: 100%;
+    padding-bottom: 0;
     .ant-modal-content {
         background: #0F1A25;
         border-radius: 5px;
+        height: 100%;
         .ant-modal-close {
             .ant-modal-close-x {
                 width: 40px;
@@ -330,11 +342,14 @@
         }
         .ant-modal-body {
             min-height: 380px;
+            max-height: calc(100% - 115px);
+            overflow-y: auto;
         }
         .ant-modal-footer {
             border-top: 0;
             text-align: center;
             padding-bottom: 31px;
+            height: 75px;
             .ant-btn-primary {
                 width: 200px;
                 height: 34px;

src/views/information/custom/compoments/add/index.vue

@@ -4,6 +4,8 @@
            title="新增客户资料"
            v-model:visible="visible"
            @cancel="cancel"
+           centered
+           :maskClosable="maskClosableFlag"
            width="890px">
     <template #footer>
       <a-button key="submit"
@@ -195,6 +197,7 @@ export default defineComponent({
     setup() {
         const { visible, cancel } = closeModal('custom_info_btn_add');
         const loading = ref<boolean>(false);
+        const maskClosableFlag = ref<boolean>(false);
         function submit() {
             loading.value = true;
             setTimeout(() => {
@@ -208,6 +211,7 @@ export default defineComponent({
             cancel,
             submit,
             loading,
+            maskClosableFlag
         };
     },
 });

src/views/information/goods/components/add/index.vue

@@ -1,9 +1,12 @@
 <template>
   <!-- 新增现货品种 -->
   <a-modal class="commonModal addSpotVariety"
+           wrapClassName=""
            title="新增现货品种"
            v-model:visible="visible"
            @cancel="cancel"
+           centered
+           :maskClosable="maskClosableFlag"
            width="850px">
     <template #footer>
       <a-button key="submit"
@@ -202,6 +205,7 @@ export default defineComponent({
     setup() {
         const { visible, cancel } = closeModal('spot_contract_btn_add');
         const loading = ref<boolean>(false);
+        const maskClosableFlag = ref<boolean>(false);
         const columns = [
           {
             dataIndex: 'type',
@@ -297,7 +301,8 @@ export default defineComponent({
             dataSource,
             columns,
             dataSource1,
-            columns1
+            columns1,
+            maskClosableFlag
         };
     },
 });
@@ -307,7 +312,7 @@ export default defineComponent({
 .addSpotVariety {
   width: 100%;
   height: 100%;
-  padding: 30px;
+  // padding: 30px;
   .formFieldSet {
     border: 1px solid @m-grey19;
     padding: 0 20px 20px;

src/views/information/spot-contract/components/add/index.vue

@@ -3,6 +3,8 @@
   <a-modal class="commonModal add-spot-contract"
            title="新增现货合同"
            v-model:visible="visible"
+           centered
+           :maskClosable="maskClosableFlag"
            @cancel="cancel"
            width="890px">
     <template #footer>
@@ -208,6 +210,7 @@ export default defineComponent({
     setup() {
         const { visible, cancel } = closeModal('spot_contract_btn_add');
         const loading = ref<boolean>(false);
+        const maskClosableFlag = ref<boolean>(false);
         function submit() {
             loading.value = true;
             setTimeout(() => {
@@ -221,6 +224,7 @@ export default defineComponent({
             cancel,
             submit,
             loading,
+            maskClosableFlag,
         };
     },
 });

src/views/information/spot-contract/list/checkpending/index.vue

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                rowKey="key"
                :expandedRowKeys="expandedRowKeys"

src/views/information/warehouse-info/compoments/add/index.vue

@@ -3,6 +3,8 @@
   <a-modal class="add-warehouse commonModal"
            title="新增仓库信息"
            v-model:visible="visible"
+           centered
+           :maskClosable="maskClosableFlag"
            @cancel="cancel"
            width="890px">
     <template #footer>
@@ -122,6 +124,7 @@ export default defineComponent({
     setup() {
         const { visible, cancel } = closeModal('warehouse_info_btn_add');
         const loading = ref<boolean>(false);
+        const maskClosableFlag = ref<boolean>(false);
         function submit() {
             loading.value = true;
             setTimeout(() => {
@@ -135,6 +138,7 @@ export default defineComponent({
             cancel,
             submit,
             loading,
+            maskClosableFlag,
         };
     },
 });