交收登记样式调整

src/assets/styles/mixin.less

@@ -430,9 +430,9 @@
             font-size: 14px;
             color: @m-grey1;
             width: 100%;
-            div:nth-child(2){
-                margin-top: -10px;
-            }
+            // div:nth-child(2){
+            //     margin-top: -10px;
+            // }
         }
         .ant-form-item-control {
             width: 200px;
@@ -1201,8 +1201,7 @@ input:-internal-autofill-selected {
         }
     }
 }
-
-.ant-radio-group.commonRadioGroup {
+.commonRadioGroup {
     .ant-radio-wrapper {
         color: @m-white0;
         font-size: 14px;
@@ -1221,4 +1220,24 @@ input:-internal-autofill-selected {
             }
         }
     }
+    .ant-radio-wrapper-disabled {
+        .ant-radio-disabled {
+            .ant-radio-inner {
+                border-color:#3A87F7 !important;
+                background: #15202B;
+                &::after {
+                    left: 4px;
+                    top: 4px;
+                    width: 6px;
+                    height: 6px;
+                    background: #3A87F7;
+                    border-radius: 50%;
+                }
+            }
+        }
+        span {
+            color: @m-white0;
+            font-size: 14px;
+        }
+    }
 }

src/views/business/purchase/components/settlement/index.vue

@@ -106,11 +106,11 @@
                         </template>
                         <a-form-item class="relative" v-if="checkedObj.qty" name="ReckonRealQty">
                           <a-input-number  v-model:value="formState.ReckonRealQty" class="dialogInput" style="width: 200px" placeholder="请输入交收量" suffix="单位"/>
-                          <div class="tip"><span>未定价量：40吨</span><a class="blue">全部登记</a></div>
+                          <div class="tip mt10"><span>未定价量：40吨</span><a class="blue fr">全部登记</a></div>
                         </a-form-item>
                         <a-form-item class="relative" v-else>
                           <a-input-number disabled class="dialogInput" style="width: 200px" placeholder="请输入交收量" suffix="单位" />
-                          <div class="tip"><span>未定价量：--吨</span><a class="blue">全部登记</a></div>
+                          <div class="tip mt10"><span class="fl">未定价量：--吨</span><a class="blue fr">全部登记</a></div>
                         </a-form-item>
                       </a-form-item>
                     </a-col>
@@ -123,16 +123,16 @@
                           <a-input-number v-model:value="formState.ReckonOtherAmount" class="dialogInput" style="width: 200px" placeholder="请输入其他费用" suffix="元"/>
                         </a-form-item>
                         <a-form-item v-else>
-                          <a-input-number disabled class="dialogInput" style="width: 200px" placeholder="请输入其他费用" suffix="元"/>
+                          <a-input-number readonly class="dialogInput" style="width: 200px" placeholder="请输入其他费用" suffix="元"/>
                         </a-form-item>
                       </a-form-item>
                     </a-col>
-                    <a-col :span="12">
+                    <a-col :span="12" class="mt10">
                       <a-form-item class="relative">
                         <template #label>
                             <a-checkbox value="调整保证金" v-model:checked="checkedObj.margin" @change="()=>checkedObj.margin = !checkedObj.margin">调整保证金</a-checkbox>
                         </template>
-                        <a-form-item class="relative mt10" v-if="checkedObj.margin">
+                        <a-form-item class="relative" v-if="checkedObj.margin">
                             <a-radio-group class="commonRadioGroup"  v-model:value="checkedObj.adjustMargin">
                               <a-row style="width: 200px">
                                 <a-col :span="12">
@@ -143,7 +143,7 @@
                                 </a-col>
                               </a-row>
                             </a-radio-group>
-                        <div class="tip mt5">
+                        <div class="tip mt10">
                           <a-form-item  name="AddMargin"  v-if="checkedObj.adjustMargin === 1">
                               <a-input-number v-model:value="formState.AddMargin" class="dialogInput" style="width: 200px;" placeholder="请输入调整保证金" suffix="元"/> 
                           </a-form-item >
@@ -152,7 +152,7 @@
                           </a-form-item >
                         </div>
                         </a-form-item >
-                        <a-form-item class="relative mt10" v-else>
+                        <a-form-item class="relative" v-else>
                             <a-radio-group class="commonRadioGroup" disabled>
                               <a-row style="width: 200px">
                                 <a-col :span="12">
@@ -163,18 +163,18 @@
                                 </a-col>
                               </a-row>
                             </a-radio-group>
-                        <div class="tip mt5">
+                        <div class="tip mt10">
                           <a-input-number disabled class="dialogInput" style="width: 200px;" placeholder="请输入调整保证金" suffix="元"/>
                         </div>
                         </a-form-item>
                       </a-form-item >
                     </a-col>
-                    <a-col :span="12">
+                    <a-col :span="12" class="mt10">
                       <a-form-item class="relative">
                         <template #label>
                           <a-checkbox value="调整金额" v-model:checked="checkedObj.justAmount" @change="()=>checkedObj.justAmount = !checkedObj.justAmount">调整金额</a-checkbox>
                         </template>
-                        <a-form-item class="relative mt5" v-if="checkedObj.justAmount">
+                        <a-form-item class="relative" v-if="checkedObj.justAmount">
                             <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustAmount">
                               <a-row style="width: 200px">
                                 <a-col :span="12">
@@ -191,7 +191,7 @@
                                 </a-form-item >
                             </div>
                         </a-form-item>
-                        <a-form-item class="relative mt5" v-else>
+                        <a-form-item class="relative" v-else>
                           <a-radio-group class="commonRadioGroup" disabled>
                             <a-row style="width: 200px">
                               <a-col :span="12">
@@ -210,7 +210,7 @@
                     </a-col>
                     <a-col :span="24">
                       <a-form-item label="备注"
-                                  class="relative mt30 pl40">
+                                  class="relative mt20 pl40">
                         <a-input class="dialogInput"
                                         style="width: 600px"
                                         placeholder="请输入备注信息" v-model:value="formState.Remark"/>
@@ -287,4 +287,9 @@ export default defineComponent({
 </script>
 
 <style lang="less">
+.settlement {
+  .has-error .ant-form-explain {
+    padding-left: 40px;
+  }
+}
 </style>;

src/views/information/goods/list/hedging-variety/index.vue

@@ -50,6 +50,25 @@ export default defineComponent({
 
 <style lang="less">
 .hedging-variety {
+  height: 100%;
+  .flex;
+  flex-direction: column;
+  .spotTableCont {
+        width: 100%;
+        height: calc(100% - 45px);
+        overflow-y: auto;
+        .inlineflex;
+        .leftSpot {
+            width: 180px;
+            height: 100%;
+            background: @m-black4;
+        }
+        .rightCont {
+            flex: 1;
+            height: 100%;
+            background: @m-black2;
+        }
+    }
 }
 </style
 >;