Bläddra i källkod

fix: 登录通知框

zh 2 år sedan
förälder
incheckning
9f20ca8115
2 ändrade filer med 43 tillägg och 5 borttagningar
  1. 3 0
      src/layout/components/Navbar.vue
  2. 40 5
      src/views/dashboard.vue

+ 3 - 0
src/layout/components/Navbar.vue

@@ -729,6 +729,7 @@ export default {
 
 <style lang="scss" scoped>
 @import '~@/styles/variables.scss';
+.right-menu-item{
 ::v-deep .el-input__inner {
   width: 80px;
   font-size: 16px;
@@ -736,6 +737,8 @@ export default {
   color: #333333;
   border: 0 !important;
 }
+}
+
 ::v-deep .is-fixed {
   right: 10px !important;
 }

+ 40 - 5
src/views/dashboard.vue

@@ -217,16 +217,35 @@
         </div>
         <!-- 到货通知 -->
         <div v-show="type == '5'" class="table">
-          <el-table
-            ref="table"
+          <div class="mymain-container">
+        <el-form ref="form"  label-width="80px" label-position="left" size="mini">
+          <el-row>
+            <el-col>
+              <el-form-item prop="specification" label="规格型号">
+                <div style="display: flex">
+                  <el-input v-model="specification" clearable style="margin-right: 10px" />
+                  <el-button
+                    @click="
+                      specification = ''
+                      getListInvoiceOrder()
+                    "
+                    >重置</el-button
+                  >
+                  <el-button type="primary" @click="getListInvoiceOrder">查询</el-button>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="table">
+          <el-table    ref="table"
             v-loading="listLoading"
             :data="arrivalNoticeList"
             element-loading-text="Loading"
             border
             fit
             highlight-current-row
-            stripe
-          >
+            stripe>
             <el-table-column
               property="materialOldNumber"
               align="left"
@@ -265,6 +284,8 @@
             />
           </el-table>
         </div>
+      </div>
+        </div>
         <br />
         <br />
         <!-- 分页 -->
@@ -414,7 +435,8 @@ export default {
       visible: false,
       orderId: '',
       logisticsDetail: [],
-      arrivalNoticeList:[]
+      arrivalNoticeList:[],
+      specification:''
     }
   },
 
@@ -584,6 +606,7 @@ export default {
     },
     // 获取返利确认单数据
     async getRebateList(data) {
+    
       const res = await getRebateOrderList(data)
       this.rebateList = res.data.records
       this.listTotal = res.data.total
@@ -597,6 +620,12 @@ export default {
     },
     // 获取物流列表
     async getListInvoiceOrder(data) {
+      data = {
+        ...data,
+        pageSize: this.pageSize,
+        pageNum: this.currentPage,
+        specification:this.specification
+      }
       const res = await getListInvoiceOrder(data)
       this.invoiceOrderList = res.data.records
       this.listTotal = res.data.total
@@ -680,6 +709,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+::v-deep  .el-input__inner {
+    /* width: 80px; */
+    font-size: 16px;
+    color: #333333;
+    /* border: 0 !important; */
+}
 .dashboard {
   &-container {
     background: #f5f5f5;