From 8d0ee0a2c32c7a99afc01b0a0c795d708a9b7955 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 21 九月 2023 09:46:39 +0800
Subject: [PATCH] 概述和产品相关接口联调待完善

---
 src/views/productManage/product/index.vue |   62 +++++++++++++++---------------
 1 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index 08c4dcc..d5e8709 100644
--- a/src/views/productManage/product/index.vue
+++ b/src/views/productManage/product/index.vue
@@ -35,15 +35,16 @@
           </div>
           <div class="right">
             <div class="label">
-              <span>鍗楁柟涓濆发SOUTHSILK 19濮嗙背鐪熶笣鐫¤。濂� 100%妗戣殨涓� 闀跨増濂楄瀹� </span>
+              <span>{{ item.name }}</span>
             </div>
             <div class="price">
               <span>浠锋牸:锟�</span>
-              <span>{{ item.name }}</span>
+              <span>{{ item.salePrice }}</span>
             </div>
             <div class="library">
               <span>鍦ㄥ簱锛�</span>
-              <span>{{ item.name }}</span>
+              <span>{{ item.amount }}</span>
+              <span style="margin-left: 5px">{{ item.unit }}</span>
             </div>
           </div>
         </div>
@@ -127,75 +128,74 @@
       let tableColumn = [
         {
           label: "浜у搧鍚嶇О",
-          prop: "id",
+          prop: "name",
           isShowColumn: true,
           default: true
         },
         {
           label: "鍐呴儴鍙傝��",
-          prop: "deviceName",
+          prop: "internalReference",
           isShowColumn: showcol.includes("鍐呴儴鍙傝��"),
           default: false
         },
         {
           label: "璐熻矗浜�",
-          prop: "id",
+          prop: "principal",
           isShowColumn: true,
           default: true
         },
         {
           label: "浜у搧鏍囩",
-          prop: "deviceId",
+          prop: "productTagName",
           isShowColumn: showcol.includes("浜у搧鏍囩"),
           default: false
         },
         {
           label: "鏉＄爜",
-          prop: "shopName",
+          prop: "barcode",
           isShowColumn: showcol.includes("鏉＄爜"),
           default: false
         },
         {
           label: "閿�鍞环鏍�",
-          prop: "faultLevel",
+          prop: "salePrice",
           isShowColumn: showcol.includes("閿�鍞环鏍�"),
           default: false
         },
         {
           label: "鎴愭湰",
-          prop: "status",
+          prop: "cost",
           isShowColumn: showcol.includes("鎴愭湰"),
-          default: false,
-          status: true
+          default: false
         },
         {
           label: "浜у搧绫诲埆",
-          prop: "faultTime",
+          prop: "categoryName",
           isShowColumn: showcol.includes("浜у搧绫诲埆"),
           default: false
         },
         {
           label: "浜у搧绫诲瀷",
-          prop: "shopName",
+          prop: "productType",
           isShowColumn: showcol.includes("浜у搧绫诲瀷"),
           default: false
         },
         {
           label: "鍦ㄥ簱鏁伴噺",
-          prop: "faultLevel",
+          prop: "amount",
           isShowColumn: showcol.includes("鍦ㄥ簱鏁伴噺"),
           default: false
         },
-        {
-          label: "棰勬祴鏁伴噺",
-          prop: "status",
-          isShowColumn: showcol.includes("棰勬祴鏁伴噺"),
-          default: false,
-          status: true
-        },
+        // {
+        //   label: "棰勬祴鏁伴噺",
+        //   prop: "status",
+        //   isShowColumn: showcol.includes("棰勬祴鏁伴噺"),
+        //   default: false,
+        //   status: true
+        // },
         {
           label: "璁￠噺鍗曚綅",
-          prop: "faultTime",
+          prop: "unit",
           isShowColumn: showcol.includes("璁￠噺鍗曚綅"),
           default: false
         }
@@ -207,28 +207,28 @@
       this.tableList.tableColumn = this.setTableColumn(val)
     },
     // 璇锋眰鏁版嵁
-    async getData(val, content) {
+    async getData(val) {
       await getProductList({
-        [val]: content,
+        keyWord: val,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
-        if (res.data.code === 200) {
-          const list = res.data.data.list.map((item) => {
+        if (res.code === 200) {
+          const list = res.data.map((item) => {
             return {
-              ...item,
-              supplierNumber: item.supplier.number
+              ...item
             }
           })
           this.tableList.tableInfomation = list || []
-          this.pagerOptions.totalCount = res.data.data.total
+          this.pagerOptions.totalCount = res.total
         }
       })
     },
     // 鎼滅储
     searchClick(val) {
       console.log(val)
-      this.getData()
+      this.pagerOptions.currPage = 1
+      this.getData(val)
     },
     // 鏂板缓
     addBtnClick() {

--
Gitblit v1.8.0