From 4ecdf58e53fafe5af38819a8af91c1618aeb3450 Mon Sep 17 00:00:00 2001
From: Richie <280645618@qq.com>
Date: Tue, 20 May 2025 15:06:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djd-api=E6=8B=89=E5=8F=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/open-api/pom.xml                   |   6 +
 microservices/jd-api/pom.xml           |   5 +
 vue/src/views/dou/goods/goods_list.vue | 288 +++++++++++++++++++++++++
 vue/src/views/dou/goods/goods_sku.vue  | 288 +++++++++++++++++++++++++
 vue/src/views/dou/goods/index.vue      | 288 ++-----------------------
 vue/src/views/pdd/goods/goods_sku.vue  |  19 +-
 6 files changed, 622 insertions(+), 272 deletions(-)
 create mode 100644 vue/src/views/dou/goods/goods_list.vue
 create mode 100644 vue/src/views/dou/goods/goods_sku.vue

diff --git a/api/open-api/pom.xml b/api/open-api/pom.xml
index 2e2d6947..3e4d2fc4 100644
--- a/api/open-api/pom.xml
+++ b/api/open-api/pom.xml
@@ -91,6 +91,12 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/libs/open-sdk-1.4.30.jar</systemPath>
         </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.13</version> <!-- jd-sdk依赖 -->
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/microservices/jd-api/pom.xml b/microservices/jd-api/pom.xml
index 568bb8df..94fbe74c 100644
--- a/microservices/jd-api/pom.xml
+++ b/microservices/jd-api/pom.xml
@@ -25,6 +25,11 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/libs/open-sdk-1.4.20.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.13</version> <!-- jd-sdk依赖 -->
+        </dependency>
         <dependency>
             <groupId>cn.qihangerp.module</groupId>
             <artifactId>jd</artifactId>
diff --git a/vue/src/views/dou/goods/goods_list.vue b/vue/src/views/dou/goods/goods_list.vue
new file mode 100644
index 00000000..dafead98
--- /dev/null
+++ b/vue/src/views/dou/goods/goods_list.vue
@@ -0,0 +1,288 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="108px">
+      <el-form-item label="平台SkuId" prop="skuId">
+        <el-input
+          v-model="queryParams.skuId"
+          placeholder="请输入平台SkuId"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家sku编码" prop="outerId">
+        <el-input
+          v-model="queryParams.outerId"
+          placeholder="请输入商家sku编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="ERP skuId" prop="erpSkuId">
+        <el-input
+          v-model="queryParams.erpSkuId"
+          placeholder="请输入ERP skuId"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+            <el-form-item label="店铺" prop="shopId">
+              <el-select v-model="queryParams.shopId" placeholder="请选择店铺" clearable @change="handleQuery">
+               <el-option
+                  v-for="item in shopList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          :loading="pullLoading"
+          type="success"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handlePull"
+        >API拉取商品数据</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange">
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+<!--      <el-table-column label="ID" align="center" prop="id" />-->
+      <el-table-column label="商品ID" align="center" prop="productId" />
+      <el-table-column label="规格Id" align="center" prop="specId" />
+      <el-table-column label="商品名称" align="center" prop="name" />
+      <el-table-column label="图片" align="center" prop="logo" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.img" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="规格" align="center" prop="specDetailName1" >
+        <template slot-scope="scope">
+          {{scope.row.specDetailName1}}&nbsp;
+          {{scope.row.specDetailName2}}&nbsp;
+          {{scope.row.specDetailName3}}
+        </template>
+      </el-table-column>
+      <!--      <el-table-column label="店铺" align="center" prop="categoryId" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-tag size="small">{{categoryList.find(x=>x.id === scope.row.categoryId).name}}</el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+       <el-table-column label="SKU编码" align="center" prop="code" />
+      <el-table-column label="价格" align="center" prop="price" >
+        <template slot-scope="scope">
+          {{amountFormatter(null,null,scope.row.price/100,0)}}
+        </template>
+      </el-table-column>
+      <el-table-column label="ERP SKU ID" align="center" prop="erpGoodsSkuId" />
+<!--      <el-table-column label="状态" align="center" prop="skuStatus" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-tag size="small" v-if="scope.row.skuStatus === false">已下架</el-tag>-->
+<!--          <el-tag size="small" v-if="scope.row.skuStatus === true">销售中</el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleLink(scope.row)"
+          >关联ERP</el-button>
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+
+    <!-- 添加或修改商品管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="ERP商品SkuId" prop="erpGoodsSkuId">
+          <el-input v-model.number="form.erpGoodsSkuId" placeholder="请输入ERP商品SkuId" />
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+import {listShop} from "@/api/shop/shop";
+import {pullGoodsList, listGoodsSku, getGoodsSku, linkErpGoodsSkuId} from "@/api/dou/goods";
+import {MessageBox} from "element-ui";
+import {isRelogin} from "@/utils/request";
+
+export default {
+  name: "GoodsListDou",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      pullLoading: false,
+      // 总条数
+      total: 0,
+      // 商品管理表格数据
+      goodsList: [],
+      shopList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null
+      },
+      // 表单参数
+      form: {},
+      supplierList: [],
+      categoryList: [],
+      categoryTree: [],
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "不能为空", trigger: "change" }
+        ],
+        erpSkuId: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    listShop({type:400}).then(response => {
+      this.shopList = response.rows;
+      if (this.shopList && this.shopList.length > 0) {
+        this.queryParams.shopId = this.shopList[0].id
+      }
+      this.getList();
+    });
+    // this.getList();
+    this.loading = false;
+  },
+  methods: {
+    amountFormatter(row, column, cellValue, index) {
+      return '￥' + cellValue.toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,');
+    },
+    /** 查询商品管理列表 */
+    getList() {
+      this.loading = true;
+      listGoodsSku(this.queryParams).then(response => {
+        this.goodsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        erpSkuId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleLink(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getGoodsSku(id).then(response => {
+        console.log('=====00000000============',response)
+        this.form = response.data;
+        this.open = true;
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          linkErpGoodsSkuId(this.form).then(response => {
+            this.$modal.msgSuccess("关联成功");
+            this.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    handlePull() {
+      if(this.queryParams.shopId){
+        this.pullLoading = true
+        pullGoodsList({shopId:this.queryParams.shopId}).then(response => {
+          console.log('拉取PDD商品接口返回=====',response)
+          if(response.code === 1401) {
+            MessageBox.confirm('Token已过期，需要重新授权！请前往店铺列表重新获取授权！', '系统提示', { confirmButtonText: '前往授权', cancelButtonText: '取消', type: 'warning' }).then(() => {
+              // isRelogin.show = false;
+              this.$router.push({path:"/shop/shop_list",query:{platform:6}})
+              // store.dispatch('LogOut').then(() => {
+              // location.href = response.data.tokenRequestUrl+'?shopId='+this.queryParams.shopId
+              // })
+            }).catch(() => {
+              isRelogin.show = false;
+            });
+
+            // return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+          }else{
+            this.pullLoading = false
+            this.getList()
+            this.$modal.msgSuccess(JSON.stringify(response));
+          }
+          this.pullLoading = false
+
+        })
+      }else{
+        this.$modal.msgSuccess("请先选择店铺");
+      }
+
+      // this.$modal.msgSuccess("请先配置API");
+    }
+  }
+};
+</script>
diff --git a/vue/src/views/dou/goods/goods_sku.vue b/vue/src/views/dou/goods/goods_sku.vue
new file mode 100644
index 00000000..ed9fc848
--- /dev/null
+++ b/vue/src/views/dou/goods/goods_sku.vue
@@ -0,0 +1,288 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="108px">
+      <el-form-item label="平台SkuId" prop="skuId">
+        <el-input
+          v-model="queryParams.skuId"
+          placeholder="请输入平台SkuId"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商家sku编码" prop="outerId">
+        <el-input
+          v-model="queryParams.outerId"
+          placeholder="请输入商家sku编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="ERP skuId" prop="erpSkuId">
+        <el-input
+          v-model="queryParams.erpSkuId"
+          placeholder="请输入ERP skuId"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+            <el-form-item label="店铺" prop="shopId">
+              <el-select v-model="queryParams.shopId" placeholder="请选择店铺" clearable @change="handleQuery">
+               <el-option
+                  v-for="item in shopList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          :loading="pullLoading"
+          type="success"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handlePull"
+        >API拉取商品数据</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange">
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+<!--      <el-table-column label="ID" align="center" prop="id" />-->
+      <el-table-column label="商品ID" align="center" prop="productId" />
+      <el-table-column label="规格Id" align="center" prop="specId" />
+      <el-table-column label="商品名称" align="center" prop="name" />
+      <el-table-column label="图片" align="center" prop="logo" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.img" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="规格" align="center" prop="specDetailName1" >
+        <template slot-scope="scope">
+          {{scope.row.specDetailName1}}&nbsp;
+          {{scope.row.specDetailName2}}&nbsp;
+          {{scope.row.specDetailName3}}
+        </template>
+      </el-table-column>
+      <!--      <el-table-column label="店铺" align="center" prop="categoryId" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-tag size="small">{{categoryList.find(x=>x.id === scope.row.categoryId).name}}</el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+       <el-table-column label="SKU编码" align="center" prop="code" />
+      <el-table-column label="价格" align="center" prop="price" >
+        <template slot-scope="scope">
+          {{amountFormatter(null,null,scope.row.price/100,0)}}
+        </template>
+      </el-table-column>
+      <el-table-column label="ERP SKU ID" align="center" prop="erpGoodsSkuId" />
+<!--      <el-table-column label="状态" align="center" prop="skuStatus" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-tag size="small" v-if="scope.row.skuStatus === false">已下架</el-tag>-->
+<!--          <el-tag size="small" v-if="scope.row.skuStatus === true">销售中</el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleLink(scope.row)"
+          >关联ERP</el-button>
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+
+    <!-- 添加或修改商品管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="ERP商品SkuId" prop="erpGoodsSkuId">
+          <el-input v-model.number="form.erpGoodsSkuId" placeholder="请输入ERP商品SkuId" />
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+import {listShop} from "@/api/shop/shop";
+import {pullGoodsList, listGoodsSku, getGoodsSku, linkErpGoodsSkuId} from "@/api/dou/goods";
+import {MessageBox} from "element-ui";
+import {isRelogin} from "@/utils/request";
+
+export default {
+  name: "GoodsSkuDou",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      pullLoading: false,
+      // 总条数
+      total: 0,
+      // 商品管理表格数据
+      goodsList: [],
+      shopList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null
+      },
+      // 表单参数
+      form: {},
+      supplierList: [],
+      categoryList: [],
+      categoryTree: [],
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "不能为空", trigger: "change" }
+        ],
+        erpSkuId: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    listShop({type:400}).then(response => {
+      this.shopList = response.rows;
+      if (this.shopList && this.shopList.length > 0) {
+        this.queryParams.shopId = this.shopList[0].id
+      }
+      this.getList();
+    });
+    // this.getList();
+    this.loading = false;
+  },
+  methods: {
+    amountFormatter(row, column, cellValue, index) {
+      return '￥' + cellValue.toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,');
+    },
+    /** 查询商品管理列表 */
+    getList() {
+      this.loading = true;
+      listGoodsSku(this.queryParams).then(response => {
+        this.goodsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        erpSkuId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleLink(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getGoodsSku(id).then(response => {
+        console.log('=====00000000============',response)
+        this.form = response.data;
+        this.open = true;
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          linkErpGoodsSkuId(this.form).then(response => {
+            this.$modal.msgSuccess("关联成功");
+            this.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    handlePull() {
+      if(this.queryParams.shopId){
+        this.pullLoading = true
+        pullGoodsList({shopId:this.queryParams.shopId}).then(response => {
+          console.log('拉取PDD商品接口返回=====',response)
+          if(response.code === 1401) {
+            MessageBox.confirm('Token已过期，需要重新授权！请前往店铺列表重新获取授权！', '系统提示', { confirmButtonText: '前往授权', cancelButtonText: '取消', type: 'warning' }).then(() => {
+              // isRelogin.show = false;
+              this.$router.push({path:"/shop/shop_list",query:{platform:6}})
+              // store.dispatch('LogOut').then(() => {
+              // location.href = response.data.tokenRequestUrl+'?shopId='+this.queryParams.shopId
+              // })
+            }).catch(() => {
+              isRelogin.show = false;
+            });
+
+            // return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+          }else{
+            this.pullLoading = false
+            this.getList()
+            this.$modal.msgSuccess(JSON.stringify(response));
+          }
+          this.pullLoading = false
+
+        })
+      }else{
+        this.$modal.msgSuccess("请先选择店铺");
+      }
+
+      // this.$modal.msgSuccess("请先配置API");
+    }
+  }
+};
+</script>
diff --git a/vue/src/views/dou/goods/index.vue b/vue/src/views/dou/goods/index.vue
index 592b1021..001e9023 100644
--- a/vue/src/views/dou/goods/index.vue
+++ b/vue/src/views/dou/goods/index.vue
@@ -1,287 +1,41 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="108px">
-      <el-form-item label="平台SkuId" prop="skuId">
-        <el-input
-          v-model="queryParams.skuId"
-          placeholder="请输入平台SkuId"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="商家sku编码" prop="outerId">
-        <el-input
-          v-model="queryParams.outerId"
-          placeholder="请输入商家sku编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="ERP skuId" prop="erpSkuId">
-        <el-input
-          v-model="queryParams.erpSkuId"
-          placeholder="请输入ERP skuId"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-            <el-form-item label="店铺" prop="shopId">
-              <el-select v-model="queryParams.shopId" placeholder="请选择店铺" clearable @change="handleQuery">
-               <el-option
-                  v-for="item in shopList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
+      <el-tab-pane label="店铺商品" name="LogisticsCompany" >
+       <goods-list-dou></goods-list-dou>
+      </el-tab-pane>
+      <el-tab-pane label="店铺商品SKU" name="EwaybillAccount" lazy>
+        <goods-sku-dou></goods-sku-dou>
+      </el-tab-pane>
+    </el-tabs>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          :loading="pullLoading"
-          type="success"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handlePull"
-        >API拉取商品数据</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-<!--      <el-table-column label="ID" align="center" prop="id" />-->
-      <el-table-column label="商品ID" align="center" prop="productId" />
-      <el-table-column label="规格Id" align="center" prop="specId" />
-      <el-table-column label="商品名称" align="center" prop="name" />
-      <el-table-column label="图片" align="center" prop="logo" width="100">
-        <template slot-scope="scope">
-          <image-preview :src="scope.row.img" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="规格" align="center" prop="specDetailName1" >
-        <template slot-scope="scope">
-          {{scope.row.specDetailName1}}&nbsp;
-          {{scope.row.specDetailName2}}&nbsp;
-          {{scope.row.specDetailName3}}
-        </template>
-      </el-table-column>
-      <!--      <el-table-column label="店铺" align="center" prop="categoryId" >-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-tag size="small">{{categoryList.find(x=>x.id === scope.row.categoryId).name}}</el-tag>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-       <el-table-column label="SKU编码" align="center" prop="code" />
-      <el-table-column label="价格" align="center" prop="price" >
-        <template slot-scope="scope">
-          {{amountFormatter(null,null,scope.row.price/100,0)}}
-        </template>
-      </el-table-column>
-      <el-table-column label="ERP SKU ID" align="center" prop="erpGoodsSkuId" />
-<!--      <el-table-column label="状态" align="center" prop="skuStatus" >-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-tag size="small" v-if="scope.row.skuStatus === false">已下架</el-tag>-->
-<!--          <el-tag size="small" v-if="scope.row.skuStatus === true">销售中</el-tag>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleLink(scope.row)"
-          >关联ERP</el-button>
-
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-
-    <!-- 添加或修改商品管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="ERP商品SkuId" prop="erpGoodsSkuId">
-          <el-input v-model.number="form.erpGoodsSkuId" placeholder="请输入ERP商品SkuId" />
-        </el-form-item>
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-
-import {listShop} from "@/api/shop/shop";
-import {pullGoodsList, listGoodsSku, getGoodsSku, linkErpGoodsSkuId} from "@/api/dou/goods";
-import {MessageBox} from "element-ui";
-import {isRelogin} from "@/utils/request";
+import GoodsListDou from "@/views/dou/goods/goods_list.vue";
+import GoodsSkuDou from "@/views/dou/goods/goods_sku.vue";
 
 export default {
   name: "GoodsDou",
+  components:{
+    GoodsListDou,GoodsSkuDou
+  },
   data() {
     return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      pullLoading: false,
-      // 总条数
-      total: 0,
-      // 商品管理表格数据
-      goodsList: [],
-      shopList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: null
-      },
-      // 表单参数
-      form: {},
-      supplierList: [],
-      categoryList: [],
-      categoryTree: [],
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "不能为空", trigger: "change" }
-        ],
-        erpSkuId: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-      }
+      activeName: 'LogisticsCompany',
+      typeList: [],
     };
   },
   created() {
-    listShop({type:400}).then(response => {
-      this.shopList = response.rows;
-      if (this.shopList && this.shopList.length > 0) {
-        this.queryParams.shopId = this.shopList[0].id
-      }
-      this.getList();
-    });
-    // this.getList();
-    this.loading = false;
+
+  },
+  mounted() {
+
   },
   methods: {
-    amountFormatter(row, column, cellValue, index) {
-      return '￥' + cellValue.toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,');
-    },
-    /** 查询商品管理列表 */
-    getList() {
-      this.loading = true;
-      listGoodsSku(this.queryParams).then(response => {
-        this.goodsList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        erpSkuId: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    handleLink(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getGoodsSku(id).then(response => {
-        console.log('=====00000000============',response)
-        this.form = response.data;
-        this.open = true;
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          linkErpGoodsSkuId(this.form).then(response => {
-            this.$modal.msgSuccess("关联成功");
-            this.open = false;
-            this.getList();
-          });
-        }
-      });
-    },
-    handlePull() {
-      if(this.queryParams.shopId){
-        this.pullLoading = true
-        pullGoodsList({shopId:this.queryParams.shopId}).then(response => {
-          console.log('拉取PDD商品接口返回=====',response)
-          if(response.code === 1401) {
-            MessageBox.confirm('Token已过期，需要重新授权！请前往店铺列表重新获取授权！', '系统提示', { confirmButtonText: '前往授权', cancelButtonText: '取消', type: 'warning' }).then(() => {
-              // isRelogin.show = false;
-              this.$router.push({path:"/shop/shop_list",query:{platform:6}})
-              // store.dispatch('LogOut').then(() => {
-              // location.href = response.data.tokenRequestUrl+'?shopId='+this.queryParams.shopId
-              // })
-            }).catch(() => {
-              isRelogin.show = false;
-            });
-
-            // return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-          }else{
-            this.pullLoading = false
-            this.getList()
-            this.$modal.msgSuccess(JSON.stringify(response));
-          }
-          this.pullLoading = false
-
-        })
-      }else{
-        this.$modal.msgSuccess("请先选择店铺");
-      }
-
-      // this.$modal.msgSuccess("请先配置API");
+    handleClick(tab, event) {
+      console.log(tab, event);
     }
   }
 };
diff --git a/vue/src/views/pdd/goods/goods_sku.vue b/vue/src/views/pdd/goods/goods_sku.vue
index a59b6343..c6e52ea4 100644
--- a/vue/src/views/pdd/goods/goods_sku.vue
+++ b/vue/src/views/pdd/goods/goods_sku.vue
@@ -44,14 +44,23 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          :loading="pullLoading"
-          type="success"
+          type="primary"
           plain
-          icon="el-icon-download"
+          icon="el-icon-refresh"
           size="mini"
-          @click="handlePull"
-        >API拉取商品数据</el-button>
+          @click="handleLinkOms"
+        >一键关联商品库SKU</el-button>
       </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          :loading="pullLoading"-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handlePull"-->
+<!--        >API拉取商品数据</el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>