Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/services/proto/contract/index.ts

@@ -27,7 +27,6 @@ export const contractOperateApply = (param: ContractOperateApplyReq): Promise<an
     const obj = {
         OperateSrc: 2,
         OperatorID: Number(getLongTypeLoginID()),
-        OperateApplyID: getTimeValue()
     }
     Object.assign(param, obj)
     return protoMiddleware<ContractOperateApplyReq>(param, 'ContractOperateApplyReq', 'ContractOperateApplyRsp', 2)

src/views/information/account_info/compoments/add-arbitrage/index.vue

@@ -146,79 +146,6 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
-.add-traders {
-}
-.add-managers {
-}
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-.add-futures {
-}
-.add-futures-son {
-}
 .add-arbitrage {
     .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
         width: 100px;

src/views/information/account_info/compoments/add-business/index.vue

@@ -132,95 +132,5 @@ export default defineComponent({
 <style lang="less">
 .add-business-info {
 }
-.add-traders {
-}
-.add-managers {
-}
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-.add-futures {
-}
-.add-futures-son {
-}
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/information/account_info/compoments/add-child-futures/index.vue

@@ -126,97 +126,7 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
-.add-traders {
-}
-.add-managers {
-}
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-.add-futures {
-}
 .add-futures-son {
 }
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/information/account_info/compoments/add-futures-son/index.vue

@@ -111,97 +111,7 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
-.add-traders {
-}
-.add-managers {
-}
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-.add-futures {
-}
 .add-futures-son {
 }
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/information/account_info/compoments/add-futures/index.vue

@@ -136,97 +136,7 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
-.add-traders {
-}
-.add-managers {
-}
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
 .add-futures {
 }
-.add-futures-son {
-}
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/information/account_info/compoments/add-managers-permission/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 新增角色 -->
-  <a-modal class="commonModal add-powers"
+  <a-modal class="commonModal add-roles"
            title="新增角色"
            v-model:visible="visible"
            @cancel="cancel"
@@ -123,13 +123,7 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
-.add-traders {
-}
-.add-managers {
-}
-.add-powers {
+.add-roles {
     .ant-modal-content {
         .ant-modal-body {
             overflow-x: hidden;
@@ -144,6 +138,8 @@ export default defineComponent({
         color: @m-white0;
         .flex;
         flex-direction: column;
+        overflow-x: auto;
+        overflow-y: hidden;
         .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
             width: 90px;
             span + span {
@@ -157,13 +153,14 @@ export default defineComponent({
             div {
                 align-self: center;
                 align-items: center;
+                white-space: nowrap;
             }
             .powerLeft {
-                width: 84px;
+                width: 120px;
                 padding: 0 8px;
             }
             .powerMiddle {
-                width: 130px;
+                width: 180px;
                 .flex;
                 flex-direction: column;
                 div {
@@ -197,28 +194,5 @@ export default defineComponent({
         }
     }
 }
-.add-futures {
-}
-.add-futures-son {
-}
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/information/account_info/compoments/add-managers/index.vue

@@ -129,97 +129,7 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
-.add-traders {
-}
 .add-managers {
 }
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-.add-futures {
-}
-.add-futures-son {
-}
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/information/account_info/compoments/add-powers/index.vue

@@ -179,12 +179,6 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
-.add-traders {
-}
-.add-managers {
-}
 .add-powers {
     .powerTable {
         width: 100%;
@@ -248,28 +242,5 @@ export default defineComponent({
         }
     }
 }
-.add-futures {
-}
-.add-futures-son {
-}
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/information/account_info/compoments/add-traders/index.vue

@@ -149,98 +149,8 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
 .add-traders {
 }
-.add-managers {
-}
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-.add-futures {
-}
-.add-futures-son {
-}
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;
 

src/views/information/account_info/compoments/managers-permission/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 权限设置 -->
-  <a-modal class="commonModal add-powers"
+  <a-modal class="commonModal powers-setting"
            title="权限设置"
            v-model:visible="visible"
            @cancel="cancel"
@@ -61,13 +61,7 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
-.add-traders {
-}
-.add-managers {
-}
-.add-powers {
+.powers-setting {
     .powerTable {
         width: 100%;
         height: 100%;
@@ -130,28 +124,5 @@ export default defineComponent({
         }
     }
 }
-.add-futures {
-}
-.add-futures-son {
-}
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/information/account_info/compoments/modify-arbitrage/index.vue

@@ -146,79 +146,6 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
-.add-traders {
-}
-.add-managers {
-}
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-.add-futures {
-}
-.add-futures-son {
-}
 .add-arbitrage {
     .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
         width: 100px;

src/views/information/account_info/compoments/modify-business/index.vue

@@ -133,96 +133,6 @@ export default defineComponent({
 <style lang="less">
 .add-business-info {
 }
-.add-traders {
-}
-.add-managers {
-}
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-.add-futures {
-}
-.add-futures-son {
-}
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;
 

src/views/information/account_info/compoments/modify-futures-son/index.vue

@@ -112,97 +112,7 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
-.add-traders {
-}
-.add-managers {
-}
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-.add-futures {
-}
 .add-futures-son {
 }
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/information/account_info/compoments/modify-futures/index.vue

@@ -124,97 +124,7 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
-.add-traders {
-}
-.add-managers {
-}
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
 .add-futures {
 }
-.add-futures-son {
-}
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/information/account_info/compoments/modify-managers/index.vue

@@ -134,97 +134,7 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
-.add-traders {
-}
 .add-managers {
 }
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-.add-futures {
-}
-.add-futures-son {
-}
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/information/account_info/compoments/modify-powers/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 修改权限模板 -->
-  <a-modal class="commonModal add-powers"
+  <a-modal class="commonModal modify-powers"
            title="修改权限模板"
            v-model:visible="visible"
            @cancel="cancel"
@@ -179,13 +179,7 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
-.add-traders {
-}
-.add-managers {
-}
-.add-powers {
+.modify-powers {
     .powerTable {
         width: 100%;
         height: 100%;
@@ -248,28 +242,5 @@ export default defineComponent({
         }
     }
 }
-.add-futures {
-}
-.add-futures-son {
-}
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/information/account_info/compoments/modify-traders-self/index.vue

@@ -107,97 +107,7 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
 .add-traders {
 }
-.add-managers {
-}
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-.add-futures {
-}
-.add-futures-son {
-}
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/information/account_info/compoments/modify-traders/index.vue

@@ -157,97 +157,7 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.add-business-info {
-}
 .add-traders {
 }
-.add-managers {
-}
-.add-powers {
-    .powerTable {
-        width: 100%;
-        height: 100%;
-        border: 3px solid @m-grey11;
-        background-color: @m-black12;
-        font-size: 14px;
-        color: @m-white0;
-        .flex;
-        flex-direction: column;
-        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-            width: 90px;
-            span + span {
-                margin-right: 0;
-            }
-        }
-        .powerRow {
-            width: 100%;
-            display: inline-flex;
-            border-bottom: 3px solid @m-grey11;
-            div {
-                align-self: center;
-                align-items: center;
-            }
-            .powerLeft {
-                width: 84px;
-                padding: 0 8px;
-            }
-            .powerMiddle {
-                width: 130px;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    border: 3px solid @m-grey11;
-                    border-top: 0;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-            .powerRight {
-                flex: 1;
-                .flex;
-                flex-direction: column;
-                div {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    padding: 0 8px;
-                    justify-content: flex-start;
-                    border-bottom: 3px solid @m-grey11;
-                }
-                div:last-child {
-                    border-bottom: 0;
-                }
-            }
-        }
-    }
-}
-.add-futures {
-}
-.add-futures-son {
-}
-.add-arbitrage {
-    .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-        width: 100px;
-        span + span {
-            margin-right: 0;
-        }
-    }
-    .ant-checkbox-group.autoWidth {
-        width: 520px;
-        .ant-checkbox-wrapper {
-            width: auto;
-        }
-    }
-    .checkboxGroupItem {
-        .ant-row {
-            margin-bottom: 10px;
-        }
-    }
-}
 </style
 >;

src/views/manage/business-review/components/settlementAudit/index.vue

@@ -13,11 +13,13 @@
                 :loading="loading"
                 @click="submit">关闭</a-button>
       <a-button key="submit"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 type="primary"
                 :loading="loading"
                 @click="pass">审核通过
       </a-button>
       <a-button key="submit"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 type="primary"
                 :loading="loading"
                 @click="refuse">审核拒绝
@@ -109,6 +111,7 @@ import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
 import Long from 'long';
 import { somePriceControl } from '@/views/manage/business-review/components/setup';
 import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import {isShowContractCheck} from "@/views/manage/inventory-review/setup";
 
 export default defineComponent({
     name: 'business_review_settlement_audit',
@@ -165,7 +168,10 @@ export default defineComponent({
                         OperateType: 3,
                     };
                     somePriceControl(param, loading)
-                        .then((res) => [context.emit('refresh'), cancel()])
+                        .then((res) => {
+                            context.emit('refresh')
+                            cancel()
+                        })
                         .catch((err) => {});
                 },
                 onCancel() {
@@ -185,6 +191,7 @@ export default defineComponent({
             refuse,
             getPriceTypeName,
             getContractTypeName,
+            isShowContractCheck,
         };
     },
 });

src/views/manage/business-review/components/somepriceAudit/index.vue

@@ -13,12 +13,15 @@
                 :loading="loading"
                 @click="cancel">关闭
       </a-button>
-      <a-button key="submit"
+      <a-button
+                v-if="isShowContractCheck(selectedRow.applystatus)"
+                key="submit"
                 type="primary"
                 :loading="loading"
                 @click="pass">审核通过
       </a-button>
       <a-button key="submit"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 type="primary"
                 :loading="loading"
                 @click="refuse">审核拒绝
@@ -116,6 +119,7 @@ import { somePriceControl } from '@/views/manage/business-review/components/setu
 import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
 import * as Long from 'long';
 import { QryBusinessDjRsp } from '@/services/go/ermcp/business-review/interface';
+import {isShowContractCheck} from "@/views/manage/inventory-review/setup";
 
 export default defineComponent({
     name: 'business_review_someprice_audit',
@@ -163,6 +167,7 @@ export default defineComponent({
                     const param: ContractOperateApplyReq = {
                         OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
                         OperateType: 3,
+                        Remark: '',
                     };
                     somePriceControl(param, loading)
                         .then((res) => {
@@ -176,7 +181,6 @@ export default defineComponent({
                 },
             });
         }
-
         return {
             visible,
             cancel,
@@ -187,6 +191,7 @@ export default defineComponent({
             getStatusName,
             maskClosableFlag,
             getPriceTypeName,
+            isShowContractCheck,
         };
     },
 });

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

@@ -37,7 +37,6 @@
         <template #buyusernameOrsellusername="{ record }">
           <a>{{ getAnalogueName(record.contracttype, record.buyusername, record.sellusername) }}</a>
         </template>
-
       </a-table>
     </contextMenu>
     <!-- 点价记录详情 -->
@@ -88,7 +87,7 @@ export default defineComponent({
             registerColumn('table_pcweb_business_aduit_dj', ['contracttype', 'contractno', 'deliverygoodsname'], (e: Column, item: ColumnType, filtered: any) => {
                 if (e.columnfield === 'buyusernameOrsellusername') {
                     item.onFilter = (value: string, record: QryBusinessDjRsp) => {
-                        const { contracttype, buyusername, sellusername } = record;
+                        const { contracttype, buyusername, sellusername, applystatus } = record;
                         if (contracttype === 1) {
                             // 采购
                             return sellusername.includes(value);

src/views/manage/finance-review/components/fundsAudit/index.vue

@@ -15,11 +15,13 @@
       </a-button>
       <a-button key="submit"
                 type="primary"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 :loading="loading"
                 @click="pass">审核通过
       </a-button>
       <a-button key="submit"
                 type="primary"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 :loading="loading"
                 @click="refuse">审核拒绝
       </a-button>
@@ -98,6 +100,7 @@ import { financeControl } from '@/views/manage/finance-review/components/setup';
 import {kxtypeName, stateName} from "@/views/manage/finance-review/setup";
 import {getContractTypeName} from "@/views/information/spot-contract/setup";
 import {getPriceTypeName} from "@/views/business/purchase/setup";
+import {isShowContractCheck} from "@/views/manage/inventory-review/setup";
 
 export default defineComponent({
     name: 'finance_review_funds_audit',
@@ -179,6 +182,7 @@ export default defineComponent({
             getContractTypeName,
             maskClosableFlag,
             stateName,
+            isShowContractCheck,
         };
     },
 });

src/views/manage/finance-review/components/invoiceAudit/index.vue

@@ -15,11 +15,13 @@
             </a-button>
             <a-button key="submit"
                       type="primary"
+                      v-if="isShowContractCheck(selectedRow.applystatus)"
                       :loading="loading"
                       @click="pass">审核通过
             </a-button>
             <a-button key="submit"
                       type="primary"
+                      v-if="isShowContractCheck(selectedRow.applystatus)"
                       :loading="loading"
                       @click="refuse">审核拒绝
             </a-button>
@@ -105,6 +107,7 @@ import {ContractOperateApplyReq} from '@/services/proto/contract/interface';
 import Long from 'long';
 import {somePriceControl} from '@/views/manage/business-review/components/setup';
 import {financeControl} from '@/views/manage/finance-review/components/setup';
+import {isShowContractCheck} from "@/views/manage/inventory-review/setup";
 
 export default defineComponent({
     name: 'finance_review_invoice_audit',
@@ -190,6 +193,7 @@ export default defineComponent({
             getPriceTypeName,
             pass,
             refuse,
+            isShowContractCheck,
         };
     },
 });

src/views/manage/inventory-review/components/checkinAudit/index.vue

@@ -16,11 +16,13 @@
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 @click="pass">审核通过
       </a-button>
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 @click="refuse">审核拒绝
       </a-button>
     </template>
@@ -154,7 +156,7 @@ import { mergeObj } from '@/utils/objHandle';
 import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
-import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
+import {InOutTypeName, isShowContractCheck, isShowContractInfo} from '@/views/manage/inventory-review/setup';
 import { getContractTypeName } from '@/views/information/spot-contract/setup';
 import { getPriceTypeName } from '@/views/business/purchase/setup';
 import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
@@ -253,7 +255,7 @@ export default defineComponent({
             InOutTypeName,
             getGoodsUnitEnumItemName,
             getApplyStatusName,
-
+            isShowContractCheck,
             refuse,
             pass,
         };

src/views/manage/inventory-review/components/checkoutAudit/index.vue

@@ -15,11 +15,13 @@
       </a-button>
       <a-button key="submit"
                 type="primary"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 :loading="loading"
                 @click="pass">审核通过
       </a-button>
       <a-button key="submit"
                 type="primary"
+                v-if="isShowContractCheck(selectedRow.applystatus)"
                 :loading="loading"
                 @click="refuse">审核拒绝
       </a-button>
@@ -147,7 +149,7 @@ import { defineComponent, PropType, reactive, ref, watchEffect } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
-import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
+import {InOutTypeName, isShowContractCheck, isShowContractInfo} from '@/views/manage/inventory-review/setup';
 import { getContractTypeName } from '@/views/information/spot-contract/setup';
 import { getPriceTypeName } from '@/views/business/purchase/setup';
 import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
@@ -248,7 +250,7 @@ export default defineComponent({
             InOutTypeName,
             getGoodsUnitEnumItemName,
             getApplyStatusName,
-
+            isShowContractCheck,
             pass,
             refuse,
         };

src/views/manage/inventory-review/setup.ts

@@ -31,6 +31,14 @@ export function isShowContractInfo(type: number): boolean{
     return (type === 5 || type === 6)
 }
 
+/**
+ * 是否显示审核按钮
+ * @param type
+ */
+export function isShowContractCheck(type: number): boolean{
+    return (type === 1)
+}
+
 // 提示
 export const inventorySign = new Map<number, ResultInfo>([
     [2, ['审核通过成功', '审核失败:']],