5 changed files with 370 additions and 353 deletions
--- a/src/api/product.js
+++ b/src/api/product.js
@ -9,56 +9,56 @@ import request from '@/utils/request'
 export function findAll() {
  return request({
    url: '/sale/manage/specsType/find-all',
-    method: 'get'
+    method: 'get',
  })
 }
 // 查询所有规格jxc
 export function findAllJxc() {
  return request({
    url: 'scm/manage/product-bas/find-all',
-    method: 'get'
+    method: 'get',
  })
 }
 // 产品属性枚举
 export function productType() {
  return request({
    url: '/system/pub/enums/get-product-attr-type',
-    method: 'get'
+    method: 'get',
  })
 }
 // 发货类型
 export function getShipping() {
  return request({
    url: '/system/pub/enums/get-shipping-channel',
-    method: 'get'
+    method: 'get',
  })
 }
 // 单位
 export function getUnit() {
  return request({
    url: '/system/pub/enums/get-unit',
-    method: 'get'
+    method: 'get',
  })
 }
 // 销售模式
 export function saleModel() {
  return request({
    url: 'system/pub/enums/sale-model',
-    method: 'get'
+    method: 'get',
  })
 }
 // 所属分类
 export function classifyAll() {
  return request({
    url: '/sale/manage/classify/find-all',
-    method: 'get'
+    method: 'get',
  })
 }
 // 运输方式
 export function transportType() {
  return request({
    url: '/system/pub/enums/manager-transport-type',
-    method: 'get'
+    method: 'get',
  })
 }
 // 产品新增
@ -129,14 +129,14 @@ export function productListJxc(params) {
 export function productDel(id) {
  return request({
    url: '/sale/manage/product/' + id,
-    method: 'delete'
+    method: 'delete',
  })
 }
 // 删除产品jxc
 export function productDelJxc(id) {
  return request({
    url: 'scm/manage/product-bas/' + id,
-    method: 'delete'
+    method: 'delete',
  })
 }
 // 产品详情
@ -215,7 +215,7 @@ export function classifyUpdate(data) {
 export function classifyDel(id) {
  return request({
    url: '/sale/manage/classify/' + id,
-    method: 'delete'
+    method: 'delete',
  })
 }
 // 规格类型列表
@ -254,7 +254,7 @@ export function specsTypeUpdate(data) {
 export function specsTypeDel(id) {
  return request({
    url: '/sale/manage/specsType/' + id,
-    method: 'delete'
+    method: 'delete',
  })
 }
 // 导出产品分类
@ -285,7 +285,7 @@ export function areaClassIfyList(params) {
 export function areaClassifyDel(id) {
  return request({
    url: '/sale/manage/area-classify/' + id,
-    method: 'delete'
+    method: 'delete',
  })
 }

@ -325,7 +325,7 @@ export function getAreaClassify(params) {
 export function getEWaresPermissionTypeList() {
  return request({
    url: '/system/pub/enums/getEWaresPermissionTypeList',
-    method: 'get'
+    method: 'get',
  })
 }
 // 根据id查询商品规格
@ -364,14 +364,14 @@ export function get_hierarchy_list(params) {
 export function presale_status() {
  return request({
    url: '/system/pub/enums/presale-status',
-    method: 'get'
+    method: 'get',
  })
 }
 // 查询供应方式
 export function supply_way() {
  return request({
    url: '/system/pub/enums/supply-way',
-    method: 'get'
+    method: 'get',
  })
 }
 // 标签分类
@ -431,7 +431,7 @@ export function waresList(params) {
 export function waresDel(id) {
  return request({
    url: '/sale/manage/wares/' + id,
-    method: 'delete'
+    method: 'delete',
  })
 }
 // 商品新增
@ -496,7 +496,7 @@ export function postageList(params) {
 export function postageDel(id) {
  return request({
    url: '/sale/manage/postage/' + id,
-    method: 'delete'
+    method: 'delete',
  })
 }
 // 计费方式
@ -527,7 +527,7 @@ export function findAllArea(params) {
 export function orderType() {
  return request({
    url: '/system/pub/enums/special-area',
-    method: 'get'
+    method: 'get',
  })
 }

@ -615,7 +615,7 @@ export function unitDetail(params) {
 export function unitDel(id) {
  return request({
    url: '/sale/manage/unit/' + id,
-    method: 'delete'
+    method: 'delete',
  })
 }

@ -741,7 +741,14 @@ export function productFind(params) {
    params
  })
 }
-
+// 产品基本信息1
+export function productFind1(params) {
+  return request({
+    url: 'scm/manage/product-bas/find-by-bas-all',
+    method: 'get',
+    params
+  })
+}
 // 供应商商品列表
 export function thProductList(params) {
  return request({
--- a/src/views/configManage/systemconfiguration/index.vue
+++ b/src/views/configManage/systemconfiguration/index.vue
@ -220,11 +220,6 @@
              <el-input v-model="formd.sort" clearable />
            </el-form-item>
          </el-col>
-          <el-col :span="24">
-            <el-form-item label="分享图片">
-              <imageUpload v-model="formd.sharePosterImage" />
-            </el-form-item>
-          </el-col>
        </el-row>
      </el-form>
      <span slot="footer" class="dialog-footer">
@ -241,7 +236,6 @@

 <script>
 import topBar from '@/components/topBar/checked.vue'
-import ImageUpload from '@/components/ImageUpload'
 import {
  getvertexList,
  deleteVertex,
@ -255,13 +249,10 @@ import {
 import { updateVertexs } from '@/api/settle'
 import { getRouters } from '@/api/settle'
 import { topList } from './mixins'
-import { getToken } from '@/utils/auth'
-
 export default {
  name: 'Txpz',
  components: {
-    topBar,
-    ImageUpload
+    topBar
  },
  data() {
    return {
@ -269,8 +260,7 @@ export default {
        vertexName: '', // 体系名称
        // memberCode: "", //体系编号
        memberCode: '', // 体系编号
-        regionVertexPkId: '', // 区域分组
-        sharePosterImage: '' // 分享图片
+        regionVertexPkId: '' // 区域分组
      },
      moren: 'txpz',
      topList: topList,
@ -301,12 +291,7 @@ export default {
        ]
      },
      vertexList: [],
-      groupList: [],
-      uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload',
-      fileList: [],
-      headers: {
-        Authorization: getToken()
-      }
+      groupList: []
    }
  },
  created() {
@ -316,23 +301,6 @@ export default {
    this.getUserRoute()
  },
  methods: {
-    handleUploadSuccess(res) {
-      if (res.code === 200) {
-        this.fileList.push(res.data)
-      } else {
-        this.$message({
-          type: 'error',
-          message: '上传失败'
-        })
-      }
-    },
-    removeFile(file, fileList) {
-      this.fileList.forEach((item, index) => {
-        if (file.uid === item.uid) {
-          this.fileList.splice(index, 1)
-        }
-      })
-    },
    getUserRoute() {
      getRouters().then((res) => {
        console.log(res.data, 'res.data', this.topList)
--- a/src/views/financial/onlinePayDetails/index.vue
+++ b/src/views/financial/onlinePayDetails/index.vue
@ -6,190 +6,136 @@
 -->
 <template>
  <div class="page">
-    <topBar
-      v-if="topList.length > 0"
-      :top-list="topList"
-      :moren="moren"
-    />
+    <topBar v-if="topList.length > 0"
+            :topList="topList"
+            :moren="moren"></topBar>
    <div class="main">
-      <el-form
-        ref="select"
+      <el-form ref="select"
               :model="select"
               style="background-color: #fff"
-        label-width="100px"
-      >
+               label-width="100px">
        <el-row>
          <!-- 一层 -->
          <el-col :span="4">
            <el-form-item :label="'会员编号'">
-              <el-input
-                v-model="select.memberCode"
-                clearable
-              />
+              <el-input clearable
+                        v-model="select.memberCode"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item :label="'会员姓名'">
-              <el-input
-                v-model="select.memberName"
-                clearable
-              />
+              <el-input clearable
+                        v-model="select.memberName"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item :label="'交易金额'">
-              <el-input
-                v-model="select.businessMoney"
-                clearable
-              />
+              <el-input clearable
+                        v-model="select.businessMoney"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item :label="'交易类型'">
-              <el-select
-                v-model="select.businessType"
-                clearable
+              <el-select clearable
                         :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in tradeTypeList"
+                         v-model="select.businessType">
+                <el-option v-for="item in tradeTypeList"
                           :key="item.value"
                           :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="订单类型">
-              <el-select
-                v-model="select.orderType"
-                clearable
-                :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in orderTypeList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+                           :value="item.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item :label="'支付渠道'">
-              <el-select
-                v-model="select.payChannel"
-                clearable
+              <el-select clearable
                         :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in channelList"
+                         v-model="select.payChannel">
+                <el-option v-for="item in channelList"
                           :key="item.value"
                           :label="item.label"
-                  :value="item.value"
-                />
+                           :value="item.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item :label="'支付方式'">
-              <el-select
-                v-model="select.payType"
-                clearable
+              <el-select clearable
                         :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in peyTypeList"
+                         v-model="select.payType">
+                <el-option v-for="item in peyTypeList"
                           :key="item.value"
                           :label="item.label"
-                  :value="item.value"
-                />
+                           :value="item.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item :label="'支付状态'">
-              <el-select
-                v-model="select.payStatus"
-                clearable
+              <el-select clearable
                         :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in statusList"
+                         v-model="select.payStatus">
+                <el-option v-for="item in statusList"
                           :key="item.value"
                           :label="item.label"
-                  :value="item.value"
-                />
+                           :value="item.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item :label="'单据编号'">
-              <el-input
-                v-model="select.businessCode"
-                clearable
-              />
+              <el-input clearable
+                        v-model="select.businessCode"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item :label="'下单日期'">
-              <el-date-picker
-                v-model="select.creationTime"
+              <el-date-picker v-model="select.creationTime"
                              value-format="yyyy-MM-dd"
                              type="daterange"
                              :range-separator="'至'"
                              :start-placeholder="'开始日期'"
-                :end-placeholder="'结束日期'"
-              />
+                              :end-placeholder="'结束日期'">
+              </el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item :label="'支付日期'">
-              <el-date-picker
-                v-model="select.payTime"
+              <el-date-picker v-model="select.payTime"
+                              @change="changeTime1"
                              value-format="yyyy-MM-dd"
                              type="daterange"
                              :range-separator="'至'"
                              :start-placeholder="'开始日期'"
-                :end-placeholder="'结束日期'"
-                @change="changeTime1"
-              />
+                              :end-placeholder="'结束日期'">
+              </el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="4">
-            <el-button
-              class="my_search"
+            <el-button class="my_search"
                       style="margin-left: 30px"
-              @click="getDataList"
-            > {{ '搜索' }}</el-button>
+                       @click="getDataList"> {{ '搜索' }}</el-button>
            <el-button class="my_reset" @click="reset"> {{ '重置' }}</el-button>
          </el-col>
        </el-row>
      </el-form>
      <div class="maintop">
        <div class="mainbtn">
-          <el-button
-            v-has-buttons="['OnlinePayDetailsExport']"
-            size="small"
-            class="thebtn2"
+          <el-button size="small"
                     @click="handleExport"
-          > {{ '导出' }}</el-button>
+                     v-has-buttons="['OnlinePayDetailsExport']"
+                     class="thebtn2"> {{ '导出' }}</el-button>
        </div>
      </div>
      <div class="maintable">
-        <el-table
-          :data="tableData"
+        <el-table :data="tableData"
                  height="640px"
                  style="width: 100%"
                  :header-cell-style="{ background: '#EEEEEE' }"
                  :row-class-name="tableRowClassName"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            type="selection"
-            width="55"
-          />
+                  @selection-change="handleSelectionChange">
+          <el-table-column type="selection"
+                           width="55"> </el-table-column>
 <!--          <el-table-column align="center"-->
 <!--                           prop="title"-->
 <!--                           :label="'国家'">-->
@ -201,105 +147,87 @@
 <!--              </div>-->
 <!--            </template>-->
 <!--          </el-table-column>-->
-          <el-table-column
-            align="center"
+          <el-table-column align="center"
                           prop="memberCode"
                           :label="'会员编号'"
-            width="140"
-          />
-          <el-table-column
-            align="center"
+                           width="140">
+          </el-table-column>
+          <el-table-column align="center"
                           prop="memberName"
-            :label="'会员姓名'"
-          />
-          <el-table-column
-            align="center"
+                           :label="'会员姓名'">
+          </el-table-column>
+          <el-table-column align="center"
                           prop="phone"
                           label="联系方式"
-            width="140"
-          />
-          <el-table-column
-            align="center"
+                           width="140">
+          </el-table-column>
+          <el-table-column align="center"
                           prop="businessTypeVal"
-            :label="'交易类型'"
-          />
-          <el-table-column
-            align="center"
-            prop="orderTypeVal"
-            label="订单类型"
-          />
-          <el-table-column
-            align="center"
+                           :label="'交易类型'">
+          </el-table-column>
+          <el-table-column align="center"
                           prop="businessMoney"
                           :formatter="stateFormat"
-            :label="'交易金额'"
-            width="150"
-          />
-          <el-table-column
-            align="center"
+                            :label="'交易金额'+`(${isLocalSymbol()})`"
+                           width="150">
+          </el-table-column>
+          <el-table-column align="center"
                           prop="payMoney"
                           :formatter="stateFormat"
-            label="实际支付金额"
-            width="150"
-          />
+                           label="实际支付金额(¥)"
+                           width="150">
+          </el-table-column>
+          <!-- <el-table-column align="center"
+                           prop="payMoney"
+                           :formatter="stateFormat"
+                            :label="'交易金额'+`(${isLocals()})`" width="150">
+          </el-table-column>
+          <el-table-column align="center"
+                           :formatter="stateFormat"
+                           prop="settleTradeBalance"
+                           label="实际支付金额($)" width="150">
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="exchangeRate"
+                            :label="'汇率'">
+          </el-table-column> -->

-          <el-table-column
-            align="center"
+          <el-table-column align="center"
                           prop="payChannelVal"
-            :label="'支付渠道'"
-          />
-          <el-table-column
-            align="center"
+                           :label="'支付渠道'">
+          </el-table-column>
+          <el-table-column align="center"
                           prop="payTypeVal"
-            :label="'支付方式'"
-          />
-          <el-table-column
-            align="center"
+                           :label="'支付方式'">
+          </el-table-column>
+          <el-table-column align="center"
                           prop="payStatusVal"
-            :label="'支付状态'"
-          />
-          <el-table-column
-            align="center"
+                           :label="'支付状态'">
+          </el-table-column>
+          <el-table-column align="center"
                           prop="creationTime"
                           :label="'下单日期'"
-            width="180"
-          />
-          <el-table-column
-            align="center"
+                           width="180">
+          </el-table-column>
+          <el-table-column align="center"
                           prop="payTime"
                           :label="'支付日期'"
-            width="180"
-          />
-          <el-table-column
-            align="center"
+                           width="180">
+          </el-table-column>
+          <el-table-column align="center"
                           prop="businessCode"
-            :label="'单据编号'"
-          />
-          <el-table-column
-            align="center"
-            prop="mainAccountMoney"
-            label="主账户金额"
-            width="150"
-          />
-          <el-table-column
-            align="center"
-            prop="subAccountMoney"
-            label="子账户金额"
-            width="150"
-          />
-          <el-table-column
-            align="center"
+                           min-width="180px"
+                           :label="'单据编号'">
+          </el-table-column>
+          <el-table-column align="center"
                           prop="time"
                           :label="'操作'"
-            fixed="right"
-          >
+                           fixed="right">
            <template slot-scope="scope">
-              <el-button
+              <el-button @click="toFixed(scope.row.pkId)"
                         style="color: #ffad41"
                         type="text"
-                size="small"
-                @click="toFixed(scope.row.pkId)"
-              >
+                         size="small">
                {{ '导出' }}
              </el-button>
            </template>
@ -307,13 +235,11 @@
        </el-table>
      </div>
    </div>
-    <pagination
-      v-show="total>0"
+    <pagination v-show="total>0"
                :total="total"
                :page.sync="queryParams.pageNum"
                :limit.sync="queryParams.pageSize"
-      @pagination="getDataList"
-    />
+                @pagination="getDataList" />
  </div>
 </template>

@ -325,27 +251,25 @@ import { userCountryList } from '@/api/user'
 export default {
  name: 'Bzpz',
  components: {
-    topBar
+    topBar,
  },
  filters: {
     isAgree(val) {
      if (!val) {
-        return '允许'
+        return '允许';
      } else {
-        return '禁止'
-      }
+        return '禁止';
      }
    },
+  },
  data() {
    return {
      creationTime: [],
-      select: {
-        orderType: ''
-      },
+      select: {},
      // 查询参数
      queryParams: {
        pageNum: 1,
-        pageSize: 50
+        pageSize: 50,
      },
      total: 0,
      dialogVisible: false,
@ -356,48 +280,26 @@ export default {
      peyTypeList: [
        {
          value: '1',
-          label: '支付宝'
+          label: '支付宝',
        },
        {
          value: '2',
-          label: '微信'
+          label: '微信',
        },
        {
          value: '3',
-          label: '银行卡'
-        }
-      ],
-      orderTypeList: [
-        {
-          value: '-1',
-          label: '充值订单'
+          label: '银行卡',
        },
-        {
-          value: '1',
-          label: '注册订单'
-        },
-        {
-          value: '2',
-          label: '升级订单'
-        },
-        {
-          value: '3',
-          label: '复购订单'
-        },
-        {
-          value: '10',
-          label: '重消订单'
-        }
      ],
      tradeTypeList: [],
      moren: 'onlinePayDetails',
      topList: [
        {
          name: '在线支付明细',
-          path: 'onlinePayDetails'
-        }
+          path: 'onlinePayDetails',
+        },
      ],
-      countryList: []
+      countryList: [],
    }
  },
  mounted() {
@ -460,7 +362,7 @@ export default {
      this.$confirm( '是否确认导出所有数据项?', '警告', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
      }).then((_) => {
        this.download(
          '/pay/manage/online-payment/export',
@ -476,8 +378,8 @@ export default {
        return 'success-row'
      }
      return ''
-    }
-  }
+    },
+  },
 }
 </script>
 <style scoped lang="scss">
--- a/src/views/goodsManage/productRelease/jcsz.vue
+++ b/src/views/goodsManage/productRelease/jcsz.vue
@ -366,7 +366,70 @@
          {{ '确认' }}</el-button>
      </div>
    </div>
-
+    <!-- 产品弹框 -->
+    <el-dialog
+      :title="'添加'"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      width="50%"
+      center
+      :before-close="handleClose1"
+    >
+      <div class="cpHeight">
+        <el-row>
+          <el-col :span="22">
+            <el-input
+              v-model="select.query"
+              clearable
+              :placeholder="'请输入'"
+              prefix-icon="el-icon-search"
+              @keyup.enter.native="getProduct"
+            />
+          </el-col>
+          <el-col :span="2">
+            <el-button type="primary" size="small" @click="getProduct">
+              {{ '搜索' }}</el-button>
+          </el-col>
+        </el-row>
+        <div style="height: 10px" />
+        <el-table
+          ref="multipleTable"
+          :data="productList"
+          height="500px"
+          style="width: 100%"
+          :header-cell-style="{ background: '#EEEEEE' }"
+          :row-class-name="tableRowClassName"
+          @select-all="onSelectAll"
+          @select="selected"
+        >
+          <el-table-column type="selection" width="55" />
+          <el-table-column
+            align="center"
+            prop="productName"
+            :label="'产品名称'"
+          />
+          <el-table-column
+            align="center"
+            prop="productCode"
+            :label="'产品编号'"
+          />
+          <el-table-column align="center" prop="unitStr" :label="'单位'" />
+        </el-table>
+      </div>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getProduct"
+      />
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose1">{{ '取消' }}</el-button>
+        <el-button type="primary" @click="sureProduct">{{
+          '确认'
+        }}</el-button>
+      </span>
+    </el-dialog>
    <!-- 规格 -->
    <el-dialog
      :title="'添加'"
@ -596,7 +659,7 @@ export default {
    // 获取排序
    this.getSort()
    // 获取产品
-    // this.getProduct()
+    this.getProduct()
  },
  methods: {
    sureProduct() {
@ -619,7 +682,12 @@ export default {
    opProduct() {
      this.dialogVisible = true
    },
-
+    getProduct() {
+      api.productFind1(Object.assign({}, this.queryParams, this.select)).then((res) => {
+        this.productList = res.rows
+        this.total = res.total
+      })
+    },
    getRepurchaseType() {
      api.repurchaseType().then((res) => {
        this.repurchaseTypeList = res.data
--- a/src/views/goodsManage/productRelease/productDetail.vue
+++ b/src/views/goodsManage/productRelease/productDetail.vue
@ -519,7 +519,70 @@
        > {{ '确认' }}</el-button>
      </div>
    </div>
-
+    <!-- 产品弹框 -->
+    <el-dialog
+      :title="'添加'"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      width="50%"
+      center
+      :before-close="handleClose1"
+    >
+      <div class="cpHeight">
+        <el-row>
+          <el-col :span="22">
+            <el-input
+              v-model="select.query"
+              clearable
+              :placeholder="'请输入'"
+              prefix-icon="el-icon-search"
+              @keyup.enter.native="getProduct"
+            />
+          </el-col>
+          <el-col :span="2">
+            <el-button type="primary" size="small" @click="getProduct">
+              {{ '搜索' }}</el-button>
+          </el-col>
+        </el-row>
+        <div style="height: 10px" />
+        <el-table
+          ref="multipleTable"
+          :data="productList"
+          height="500px"
+          style="width: 100%"
+          :header-cell-style="{ background: '#EEEEEE' }"
+          :row-class-name="tableRowClassName"
+          @select-all="onSelectAll"
+          @select="selected"
+        >
+          <el-table-column type="selection" width="55" />
+          <el-table-column
+            align="center"
+            prop="productName"
+            :label="'产品名称'"
+          />
+          <el-table-column
+            align="center"
+            prop="productCode"
+            :label="'产品编号'"
+          />
+          <el-table-column align="center" prop="unitStr" :label="'单位'" />
+        </el-table>
+      </div>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getProduct"
+      />
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose1">{{ '取消' }}</el-button>
+        <el-button type="primary" @click="sureProduct">{{
+          '确认'
+        }}</el-button>
+      </span>
+    </el-dialog>
    <!-- 规格 -->
    <el-dialog
      :title="'添加'"
@ -761,6 +824,7 @@ export default {
    this.getTransportType()
    // 复购类型
    this.getRepurchaseType()
+    this.getProduct()
  },
  methods: {
    sureProduct() {
@ -780,7 +844,15 @@ export default {
    handleClose1() {
      this.dialogVisible = false
    },
-
+    opProduct() {
+      this.dialogVisible = true
+    },
+    getProduct() {
+      api.productFind1(Object.assign({}, this.queryParams, this.select)).then((res) => {
+        this.productList = res.rows
+        this.total = res.total
+      })
+    },
    getRepurchaseType() {
      api.repurchaseType().then((res) => {
        this.repurchaseTypeList = res.data