lilei 2 gadi atpakaļ
vecāks
revīzija
ed642e6d13

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1677479645433
+  "version": 1677482112501
 }

+ 55 - 13
src/components/index.less

@@ -305,17 +305,6 @@
       margin-right: 8px;
       margin-left: 0;
     }
-    .alert-message{
-      strong{
-        color: #f12929;
-      }
-    }
-    .action-buttons{
-      button {
-        margin-right: 8px;
-        margin-left: 0;
-      }
-    }
   }
   .table-operator-nobor{
     padding: 0 0 10px 0;
@@ -334,8 +323,7 @@
     padding: 7px 0 4px;
     box-shadow: 0 0 20px #dcdee2;
   }
-
-  .jg-page-wrap{
+  .jg-page-wrap,.jg-drawer-wrap{
     .table-page-search-wrapper{
       margin-bottom: 6px;
       .ant-form.ant-form-inline .ant-form-item .ant-input, .ant-form.ant-form-inline .ant-form-item .ant-select-selection{
@@ -352,6 +340,60 @@
       }
     }
   }
+  .jg-page-wrap{
+    .table-operator{
+      .alert-message{
+        strong{
+          color: #f12929;
+        }
+      }
+      .action-buttons{
+        button {
+          margin-right: 8px;
+          margin-left: 0;
+        }
+      }
+    }
+    .header-bar{
+      margin-bottom: 6px;
+      .sub-title{
+        font-size: 12px;
+        color: #808695;
+        margin-left: 10px;
+      }
+    }
+    .choosedList-cont{
+      .baseInfo-bar{
+        padding:10px 10px 0 10px;
+        border-bottom:6px solid #f0f0f0;
+      }
+      .choosed-table{
+        padding:10px;
+        .ant-input-number-sm input{
+          text-align: center;
+        }
+      }
+      .footer-bar{
+        position:absolute;
+        width:100%;
+        bottom:0;
+        display:flex;
+        justify-content: flex-end;
+        align-items: center;
+        padding: 8px;
+        border-top: 1px solid #eee;
+        > div{
+          &:first-child{
+            padding: 0 15px;
+            strong{
+              color: #ed1c24;
+              font-size: 18px;
+            }
+          }
+        }
+      }
+    }
+  }
 }
 // 确认框居中
 .confirm-center{

+ 2 - 14
src/views/common/shopingCatModal.vue

@@ -7,7 +7,7 @@
     :get-container="false"
     :wrap-style="{ position: 'absolute' }"
     @close="onClose"
-    wrapClassName="shopingCat-drawer">
+    wrapClassName="shopingCat-drawer jg-drawer-wrap">
      <div slot="title">
        <strong>{{title}}</strong>
        <span style="color: #ed1c24;;margin-left:10px;font-size: 12px;">注意:仅可添加本供应商有经销权且总部已上线的产品</span>
@@ -84,18 +84,6 @@ export default {
       height: 100%;
     }
   }
-  .table-page-search-wrapper{
-    .ant-form.ant-form-inline .ant-form-item .ant-input, .ant-form.ant-form-inline .ant-form-item .ant-select-selection{
-      border:0;
-    }
-    .ant-form.ant-form-inline .ant-form-item{
-      border:1px solid #dadada;
-      border-radius: 3px;
-      .ant-form-item-label{
-        padding-left: 11px;
-        padding-right: 0!important;
-      }
-    }
-  }
+  
 }
 </style>

+ 1 - 14
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -8,7 +8,7 @@
     :get-container="false"
     :wrap-style="{ position: 'absolute' }"
     @close="onClose"
-    wrapClassName="chooseProduct-drawer">
+    wrapClassName="chooseProduct-drawer jg-drawer-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="chooseProduct-drawer-box">
         <!-- 搜索条件 -->
@@ -325,18 +325,5 @@ export default {
       text-align: center;
     }
   }
-  .table-page-search-wrapper{
-      .ant-form.ant-form-inline .ant-form-item .ant-input, .ant-form.ant-form-inline .ant-form-item .ant-select-selection{
-        border:0;
-      }
-      .ant-form.ant-form-inline .ant-form-item{
-        border:1px solid #dadada;
-        border-radius: 3px;
-        .ant-form-item-label{
-          padding-left: 11px;
-          padding-right: 0!important;
-        }
-      }
-    }
 }
 </style>

+ 6 - 80
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -1,6 +1,6 @@
 <template>
-  <div v-if="showPage" class="purchaseNewOrderEdit-wrap">
-    <a-page-header :ghost="false" :backIcon="false" class="purchaseNewOrderEdit-cont">
+  <div v-if="showPage" class="jg-page-wrap purchaseNewOrderEdit-wrap">
+    <a-page-header :ghost="false" :backIcon="false" class="header-bar">
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
         <p class="billno">单号:{{ detail&&detail.purchaseBillNo }}</p>
@@ -40,7 +40,7 @@
     <!-- 产品列表 -->
     <div ref="tableSearch" class="choosedList-cont">
       <!-- 基础信息 -->
-      <div style="padding:10px 10px 0 10px;border-bottom:6px solid #f0f0f0;" v-if="isShowBisiceInfo">
+      <div class="baseInfo-bar" v-if="isShowBisiceInfo">
         <a-descriptions size="small">
           <div slot="title">基础信息</div>
           <a-descriptions-item label="供应商">
@@ -65,7 +65,7 @@
         </a-descriptions>
       </div>
       <!-- 已选产品 -->
-      <div id="purchaseTable">
+      <div class="purchaseTable">
         <div class="choosed-table" v-if="detail&&detail.totalCategory">
           <!-- 搜索条件 -->
           <div class="table-page-search-wrapper" v-if="showSearch">
@@ -127,7 +127,7 @@
         </div>
       </div>
       <!-- 底部栏 -->
-      <div class="footer-cont" v-if="detail&&detail.totalCategory">
+      <div class="footer-bar" v-if="detail&&detail.totalCategory">
         <!-- 总计 -->
         <div>
           <span style="color:#666;">
@@ -147,7 +147,6 @@
             :loading="subLoading"
             @click="handleSubmit"
             style="padding: 0 60px;">提交</a-button>
-            <!-- <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button> -->
         </div>
       </div>
     </div>
@@ -575,80 +574,7 @@ export default {
       position: relative;
       background-color: #fff;
       height: calc(100% - 60px);
-      .chooseBox-title{
-        display:flex;
-        justify-content: space-between;
-        align-items: center;
-        border-top: 1px solid #eee;
-        border-bottom: 1px solid #eee;
-        padding: 8px 0;
-        .actions-button{
-          button{
-            margin-left: 10px;
-            margin-right: 10px;
-          }
-        }
-        .import-btn{
-          margin-left: 15px;
-        }
-        .sub-title{
-          font-size: 14px;
-          color: #333;
-          margin-left: 10px;
-          font-weight:bold;
-        }
-        .tag-txt{
-          font-size: 12px;
-          color: #ed1c24;
-          margin: 0 15px;
-        }
-      }
-      .choosed-table{
-        padding:10px;
-      }
-      .footer-cont{
-        position:absolute;
-        width:100%;
-        bottom:0;
-        display:flex;
-        justify-content: flex-end;
-        align-items: center;
-        padding: 8px;
-        border-top: 1px solid #eee;
-        > div{
-          &:first-child{
-            padding: 0 15px;
-            strong{
-              color: #ed1c24;
-              font-size: 18px;
-            }
-          }
-        }
-      }
-      .ant-input-number-sm input{
-        text-align: center;
-      }
-    }
-    .purchaseNewOrderEdit-cont{
-      margin-bottom: 6px;
-      .sub-title{
-        font-size: 12px;
-        color: #808695;
-        margin-left: 10px;
-      }
-    }
-    .table-page-search-wrapper{
-      .ant-form.ant-form-inline .ant-form-item .ant-input, .ant-form.ant-form-inline .ant-form-item .ant-select-selection{
-        border:0;
-      }
-      .ant-form.ant-form-inline .ant-form-item{
-        border:1px solid #dadada;
-        border-radius: 3px;
-        .ant-form-item-label{
-          padding-left: 11px;
-          padding-right: 0!important;
-        }
-      }
     }
+     
   }
 </style>

+ 2 - 14
src/views/purchasingManagement/purchaseOrderNew/outStockModal.vue

@@ -11,7 +11,7 @@
     wrapClassName="outStock-modal"
   >
     <a-spin :spinning="spinning" tip="Loading...">
-      <div class="outStock-con">
+      <div class="outStock-con jg-drawer-wrap">
         <div>
           <div ref="searchBox" class="table-page-search-wrapper">
             <a-form layout="inline" @keyup.enter.native="searchForm">
@@ -306,18 +306,6 @@ export default {
         padding: 10px 0;
       }
     }
-    .table-page-search-wrapper{
-      .ant-form.ant-form-inline .ant-form-item .ant-input, .ant-form.ant-form-inline .ant-form-item .ant-select-selection{
-        border:0;
-      }
-      .ant-form.ant-form-inline .ant-form-item{
-        border:1px solid #dadada;
-        border-radius: 3px;
-        .ant-form-item-label{
-          padding-left: 11px;
-          padding-right: 0!important;
-        }
-      }
-    }
+   
   }
 </style>