marymelisa пре 4 година
родитељ
комит
850d9a74c4

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

@@ -536,6 +536,23 @@
 .formFieldSet+.formFieldSet {
     margin-top: 35px;
 }
+// .formFieldSet {
+//     border: 1px solid @m-grey19;
+//     padding: 0 20px 20px;
+// }
+// .formFieldSet + .formFieldSet {
+//     margin-top: 35px;
+// }
+.ant-form {
+    legend {
+        width: auto;
+        margin-left: 20px;
+        font-size: 16px;
+        color: @m-white0;
+        border-bottom: 0;
+        padding: 0 10px;
+    }
+}
 .ant-form {
     legend {
       width: auto;

+ 19 - 7
src/views/business/purchase/components/someprice/index.vue

@@ -1,13 +1,13 @@
 <template>
     <!-- 点价登记-->
-    <a-modal class="custom-detail add-custom "
+    <a-modal class="commonModal custom-detail"
              :title="selectedRow.contracttype===1? '采购合同-点价登记': '销售合同-点价登记'"
              v-model:visible="visible"
              @cancel="cancel"
              width="890px">
         <template #footer>
             <a-button key="submit"
-                      type="primary"
+                      class="cancelBtn"
                       @click="cancel">取消
             </a-button>
             <a-button key="submit"
@@ -91,7 +91,7 @@
                 <a-row :gutter="24">
                     <a-col :span="12">
                         <a-form-item label="点价价格"  name="PricedPrice">
-                            <a-input-number id="dialogInput"  style="width: 200px" v-model:value="formState.PricedPrice" :min="0" placeholder="请输入点价价格"/>
+                            <a-input-number class="dialogInput"  style="width: 200px" v-model:value="formState.PricedPrice" :min="0" placeholder="请输入点价价格"/>
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
@@ -108,10 +108,12 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
-                        <a-form-item label="点价数量" name="PricedQty">
-                            <a-input-number id="dialogInput"  style="width: 200px" v-model:value="formState.PricedQty" :min="0" :max="selectedRow.unpricedqty" placeholder="请输入点价数量"/>
-                            <span class="white">未定价量{{selectedRow.unpricedqty}}{{selectedRow.enumdicname}} </span>
-                            <span class="white" @click="formState.PricedQty = selectedRow.unpricedqty"> 全部登记</span>
+                        <a-form-item label="点价数量" name="PricedQty" class="relative">
+                            <a-input-number  class="dialogInput"  style="width: 200px" v-model:value="formState.PricedQty" :min="0" :max="selectedRow.unpricedqty" placeholder="请输入点价数量"/>
+                            <div class="itemTip">
+                                <span class="white">未定价量{{selectedRow.unpricedqty}}{{selectedRow.enumdicname}} </span>
+                                <span class="white" @click="formState.PricedQty = selectedRow.unpricedqty"> 全部登记</span>
+                            </div>
                         </a-form-item>
                     </a-col>
                 </a-row>
@@ -215,4 +217,14 @@ export default defineComponent({
 </script>
 
 <style lang="less">
+.custom-detail {
+    .ant-modal-content {
+        .ant-modal-body {
+            padding: 24px;
+        }
+    }
+    .itemTip {
+        position: absolute;
+    }
+}
 </style>;

+ 0 - 17
src/views/information/goods/components/add/index.vue

@@ -598,23 +598,6 @@ export default defineComponent({
     width: 100%;
     height: 100%;
     // padding: 30px;
-    .formFieldSet {
-        border: 1px solid @m-grey19;
-        padding: 0 20px 20px;
-    }
-    .formFieldSet + .formFieldSet {
-        margin-top: 35px;
-    }
-    .ant-form {
-        legend {
-            width: auto;
-            margin-left: 20px;
-            font-size: 16px;
-            color: @m-white0;
-            border-bottom: 0;
-            padding: 0 10px;
-        }
-    }
     .ant-form.inlineForm .ant-row.ant-form-item .ant-form-item-label {
         width: 120px !important;
     }

+ 33 - 31
src/views/information/spot-contract/components/detail/index.vue

@@ -340,37 +340,39 @@ export default defineComponent({
 
 <style lang="less">
 .custom-detail {
-  .ant-modal-body {
-    padding-top: 0;
-    padding-left: 0;
-    padding-right: 0;
-    .ant-tabs {
-      background: @m-black11;
-      width: 100%;
-      padding: 0 24px;
-      .ant-tabs-bar {
-        margin-bottom: 0;
-        border-bottom: 0;
-      }
-      .ant-tabs-nav-container {
-        .ant-tabs-nav-wrap {
-          .ant-tabs-nav {
-            .ant-tabs-tab {
-              width: 70px;
-              margin-right: 43px;
-              text-align: center;
-              font-size: 16px;
-              color: #88A0AE;
-              padding: 0;
-              line-height: 45px; 
-            }
-            .ant-tabs-tab-active.ant-tabs-tab {
-              color: #3A87F7;
-            }
-            .ant-tabs-ink-bar {
-              width: 70px !important;
-              background: #3A87F7;
-              .rounded-corners(1px);
+  .ant-modal-content {
+    .ant-modal-body {
+      padding-top: 0;
+      padding-left: 0;
+      padding-right: 0;
+      .ant-tabs {
+        background: @m-black11;
+        width: 100%;
+        padding: 0 24px;
+        .ant-tabs-bar {
+          margin-bottom: 0;
+          border-bottom: 0;
+        }
+        .ant-tabs-nav-container {
+          .ant-tabs-nav-wrap {
+            .ant-tabs-nav {
+              .ant-tabs-tab {
+                width: 70px;
+                margin-right: 43px;
+                text-align: center;
+                font-size: 16px;
+                color: #88A0AE;
+                padding: 0;
+                line-height: 45px; 
+              }
+              .ant-tabs-tab-active.ant-tabs-tab {
+                color: #3A87F7;
+              }
+              .ant-tabs-ink-bar {
+                width: 70px !important;
+                background: #3A87F7;
+                .rounded-corners(1px);
+              }
             }
           }
         }