Browse Source

接口对接

wolyshaw 4 years ago
parent
commit
93b91cdfe8
2 changed files with 56 additions and 22 deletions
  1. 8 1
      src/api/businessManager.js
  2. 48 21
      src/views/businessManager/shopManager/purchase-llist.vue

+ 8 - 1
src/api/businessManager.js

@@ -88,4 +88,11 @@ export function updateCostMargin (data) {
     data: qs.stringify(data)
   })
 }
-
+// 进货清单
+export function getGoodsProcurements (data) {
+  return request({
+    url: api + '/goodsProcurement/queryGoodsProcurements',
+    method: 'get',
+    params: data
+  })
+}

+ 48 - 21
src/views/businessManager/shopManager/purchase-llist.vue

@@ -10,7 +10,7 @@
          v-model="searchForm"
       >
         <el-form-item>
-          <el-input v-model="searchForm.search" placeholder="备查货号"/>
+          <el-input clearable v-model="searchForm.search" placeholder="备查货号"/>
         </el-form-item>
         <el-form-item>
           <el-date-picker
@@ -45,41 +45,40 @@
         >
           <el-table-column
             align='center'
-            width="150"
-            prop="transNo"
+            width="180"
+            prop="batchNo"
             label="备查货号"
           />
           <el-table-column
             align='center'
             width="150"
-            prop="transNo"
+            prop="totalQuantity"
             label="进货数量"
           />
           <el-table-column
             align='center'
             width="150"
-            prop="transNo"
+            prop="taxQuantity"
             label="税务数量"
           />
           <el-table-column
             align='center'
             width="150"
-            prop="transNo"
+            prop="discountPrice"
             label="商品采购价1"
           />
           <el-table-column
             align='center'
             width="150"
-            prop="transNo"
+            prop="agreeCostPrice"
             label="商品采购价2"
           />
           <el-table-column
             align='center'
-            width="150"
-            prop="transNo"
+            prop="createTime"
             label="入库日期"
           />
-          <el-table-column
+          <!-- <el-table-column
             align='center'
             width="150"
             fixed="right"
@@ -96,7 +95,7 @@
                 type="text"
               >删除</el-button>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
       </div>
     </div>
@@ -113,7 +112,9 @@
   </div>
 </template>
 <script>
+import dayjs from 'dayjs'
 import purchaseForm from './purchase-form'
+import { getGoodsProcurements } from '@/api/businessManager'
 const initSearchForm = {
   startTime: null,
   endTime: null,
@@ -128,20 +129,51 @@ export default {
     return {
       tableList: [],
       detail: null,
-      editVisible: true,
+      editVisible: false,
       searchForm: {
         ...initSearchForm,
       },
-      orderDate: null
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      orderDate: []
     }
   },
+  mounted() {
+    this.orderDate = [
+      dayjs().format('YYYY-MM-DD'),
+      dayjs().format('YYYY-MM-DD'),
+    ]
+    this.getList()
+  },
   methods: {
     searchOrderDate(val) {
       console.log(val)
     },
-    getList() {},
+    getList() {
+      const form = {
+        ...this.searchForm,
+        enterStorageStartTime: this.orderDate[0],
+        enterStorageEndTime: this.orderDate[1],
+      }
+      getGoodsProcurements({
+        rows: this.pageInfo.limit,
+        page: this.pageInfo.page,
+        ...form
+      })
+        .then(res => {
+          if (res.code == 200 && res.data) {
+            this.tableList = res.data.rows
+            this.pageInfo.total = res.data.total
+          }
+        })
+    },
     onReSet () {
-      this.orderDate = null
+      this.orderDate = []
       this.searchForm = {
         ...initSearchForm,
       }
@@ -156,12 +188,7 @@ export default {
       this.detail = null
     },
     search() {
-      const form = {
-        ...this.searchForm,
-        startTime: this.orderDate[0],
-        endTime: this.orderDate[1],
-      }
-      console.log(form)
+      this.getList()
     },
   },
 }