查看卡密，添加卡密，编辑商品类型调整

src/api/business/goods.js

@@ -59,3 +59,41 @@ export function salesiteGoodsExport( data) {
   })
 }
 
+/**
+ * Post 方式上传文件
+ */
+export function setCamiloShip(data, config = {},goodsId) {
+  var formData  = new FormData()
+  Object.keys(data).forEach(key => {
+    formData.append(key, data[key])
+  })
+  return request({
+    url: `/api/v1/mp/admin/goods/card/import/${goodsId}`,
+    method: 'post',
+    data: formData ,
+    ...config,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+
+// 下载卡密导入模板
+export function cradDownload() {
+  return request({
+    url: '/api/v1/mp/admin/goods/card/template/download',
+    method: 'post',
+  })
+}
+
+// 查看卡密列表
+export function cradCamiloList(urlParams, data) {
+  return request({
+    url: '/api/v1/mp/admin/goods/card/list',
+    method: 'post',
+    data,
+    urlParams
+  })
+}
+

src/components/Camilo/index.vue

@@ -2,14 +2,18 @@
   <div>
     <el-dialog title="查看卡密" :visible.sync="camiloShow" :before-close="close">
       <el-table :data="camiloData">
-        <el-table-column property="date" label="卡号" min-width="250"></el-table-column>
-        <el-table-column property="name" label="密码（激活码）" min-width="250"></el-table-column>
+        <el-table-column property="cardNo" label="卡号" min-width="250"></el-table-column>
+        <el-table-column property="cardPwd" label="密码（激活码）" min-width="250"></el-table-column>
       </el-table>
+      <pagination :total="total" :page.sync="pageParams.pageNum" :limit.sync="pageParams.pageSize"
+                  @pagination="getList()"/>
     </el-dialog>
   </div>
 </template>
 
 <script>
+import {cradCamiloList} from "../../api/business/goods";
+
 export default {
   name: "camilo",
   props: {
@@ -17,24 +21,45 @@ export default {
       type: Boolean,
       default: true
     },
+    camiloGoodsId: {
+      type: Number,
+      default: 0
+    },
   },
   data() {
     return {
-      camiloData: [{
-        date: '2016-05-02',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-04',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }],
+      pageParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      loading: false,
+      camiloData: [],
+      total: 0,
     };
   },
+  mounted() {
+    this.getList()
+  },
   methods: {
     close() {
       this.$emit('cancel')
     },
+    getList() {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+      cradCamiloList('pageNum=' + this.pageParams.pageNum + '&pageSize=' + this.pageParams.pageSize + '&', {goodsId: this.camiloGoodsId}).then(res => {
+        this.loading = false
+        if (res.code === 0) {
+          this.camiloData = res.rows
+          this.total = res.total
+        }
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+
   }
 }
 </script>

src/views/business/goods/add.vue

@@ -5,7 +5,7 @@
       <el-row :gutter="40" style="width: 500px">
         <el-col :span="23">
           <el-form-item label="商品类型:" prop="type">
-            <el-radio-group v-model="addData.type">
+            <el-radio-group v-model="addData.type" :disabled="addData.goodsId">
               <el-radio :label="1">实物商品</el-radio>
               <el-radio :label="2">卡密商品</el-radio>
             </el-radio-group>
@@ -167,36 +167,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="23">
-          <el-form-item label="使用链接:" v-if="addData.type == '2'">
-            <el-input v-model="addData.type" placeholder="请输入商品采购链接"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="23">
-          <el-form-item label="查看卡密:" v-if="addData.goodsId && addData.type == '2'">
-            <a style="color: #1890FF;" @click="camiloShow = true">查看已有卡密</a>
-          </el-form-item>
-        </el-col>
-        <el-col :span="23">
-          <el-form-item label="添加卡密:" v-if="addData.type == '2'">
-            <a style="color: #1890FF;">下载Excel模版</a>
-            <el-upload
-              ref="upload"
-              :limit="1"
-              :data="reqData"
-              accept=".xlsx, .xls"
-              :headers="upload.headers"
-              :action="upload.url"
-              :disabled="upload.isUploading"
-              :on-progress="handleFileUploadProgress"
-              :on-success="handleFileSuccess"
-              :auto-upload="false"
-              :http-request="reqUploadFile"
-              :on-exceed="exceedMax"
-              drag
-            >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-            </el-upload>
+          <el-form-item label="卡密使用链接:" v-if="addData.type == '2'">
+            <el-input v-model="addData.useLink" placeholder="请输入商品采购链接"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -221,7 +193,6 @@
       :dialog-show="createShow"
       @close="close"
     />
-    <camilo v-if="camiloShow" @cancel="cancel" :camiloShow="camiloShow"></camilo>
   </div>
 </template>
 <script>
@@ -229,7 +200,6 @@ import Upload from '@/components/DragImageUpload'
 import WangEditor from '@/components/WangEditor'
 import Spec from './components/spec'
 import TinyEditor from '@/components/TinyEditor'
-import Camilo from '@/components/Camilo'
 import {getGoodsDetail, addGoods} from '@/api/business/goods'
 import {goodsCategoryListTree} from '@/api/business/category'
 import {getSupplierList} from '@/api/business/supplier'
@@ -237,9 +207,6 @@ import {goodsTagItems} from '@/api/business/tag'
 import {publicFileGetUrl} from "@/api/common"
 import {accDiv, accMul} from '@/utils/util'
 import AddSupplier from "../supplier/components/addSupplier";
-import {randomStr20} from '@/utils/util'
-import {getToken, getSign} from "@/utils/auth";
-
 export default {
   name: 'GoodsAdd',
   components: {
@@ -248,7 +215,6 @@ export default {
     Upload,
     Spec,
     AddSupplier,
-    Camilo
   },
   data() {
     return {
@@ -307,15 +273,6 @@ export default {
         ],
         description: [{required: true, message: '请输入商品详情', trigger: 'blur'}]
       },
-      reqData: {},
-      // 用户导入参数
-      upload: {
-        title: "",// 弹出层标题（用户导入）
-        isUploading: false,// 是否禁用上传
-        url: "",// 上传的地址
-        headers: {},//请求头
-      },
-      camiloShow: false,
 
     }
   },
@@ -375,7 +332,8 @@ export default {
           categoryId,
           supplierId,
           shoppingLink,
-          tagIds
+          tagIds,
+          useLink
         } = res.data
         this.addData = {
           value: accDiv(value, 100),
@@ -397,7 +355,8 @@ export default {
           categoryId,
           supplierId,
           shoppingLink,
-          tagIds
+          tagIds,
+          useLink
         }
         if (description) {
           this.$refs.editor.setContent(description)
@@ -409,7 +368,6 @@ export default {
         }
       })
     }
-    this.getHttpHeader()
   },
   methods: {
     getGoodsCategoryItems() {
@@ -430,9 +388,7 @@ export default {
       this.createShow = false;
       this.getSupplierItems()
     },
-    cancel() {
-      this.camiloShow = false
-    },
+
     getGoodsTagItems() {
       goodsTagItems({}).then(res => {
         this.goodsTagItemsList = res && res.data
@@ -445,48 +401,6 @@ export default {
         this.update()
       }
     },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.isUploading = false;
-    },
-    // 超出限制时的提示
-    exceedMax() {
-      this.$message({
-        message:  '请移除已有文件后再进行上传',
-        type: 'warning'
-      })
-    },
-    //请求头
-    getHttpHeader() {
-      let timestamp = parseInt(new Date().getTime()),
-        nonce = randomStr20();
-      let sign = getSign(this.reqData || {}, timestamp)
-      let url = process.env.VUE_APP_BASE_API + '/api/v1/mp/admin/deliver/order/batchShip' + '?sign=' + sign + '&nonce=' + nonce;
-      this.upload.url = url
-      let headers = {
-        "Authorization": "Bearer " + getToken(),
-        "x-zz-timestamp": timestamp
-      }
-      this.upload.headers = headers
-    },
-    // 自定义文件上传的实现
-    reqUploadFile(param) {
-      var data = this.reqData || {}
-      var params = {
-        file: param.file,
-        ...data
-      }
-      // setBatchShip(params, this.headers).then(response => {
-      //   this.upload.isUploading = false;
-      //   this.$refs.upload.clearFiles();
-      //   if(response.data){
-      //   }
-      // })
-    },
     update(skuList) {
       this.$refs.addItem.validate((valid, items) => {
         if (valid) {

src/views/business/goods/index.vue

@@ -20,16 +20,18 @@
         />
       </el-form-item>
       <el-form-item label="商品类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择是否支持兑换" clearable @change="queryParams.pageNum = 1;getList()">
-          <el-option label="全部" value="" />
-          <el-option label="实物商品" value="1" />
-          <el-option label="卡密商品" value="2" />
+        <el-select v-model="queryParams.type" placeholder="请选择是否支持兑换" clearable
+                   @change="queryParams.pageNum = 1;getList()">
+          <el-option label="全部" value=""/>
+          <el-option label="实物商品" value="1"/>
+          <el-option label="卡密商品" value="2"/>
         </el-select>
       </el-form-item>
       <el-form-item label="商品分类" prop="categoryIdList">
         <el-cascader
           v-model="queryParams.categoryIdList" collapse-tags clearable
-          :options="goodsCategoryItemsList" :props="{ expandTrigger: 'hover', value: 'categoryId',label: 'name', children: 'goodsCategoryList', multiple: true, }"
+          :options="goodsCategoryItemsList"
+          :props="{ expandTrigger: 'hover', value: 'categoryId',label: 'name', children: 'goodsCategoryList', multiple: true, }"
           @change="queryParams.pageNum = 1;getList()"></el-cascader>
       </el-form-item>
       <el-form-item label="商品标签" prop="tagId">
@@ -39,42 +41,49 @@
           clearable
           @change="queryParams.pageNum = 1;getList()"
         >
-          <el-option :label="item.name" :value="item.tagId" v-for="(item, index) in goodsTagItemsList" :key="index" />
+          <el-option :label="item.name" :value="item.tagId" v-for="(item, index) in goodsTagItemsList" :key="index"/>
         </el-select>
       </el-form-item>
       <el-form-item label="上架状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择商品状态" clearable @change="queryParams.pageNum = 1;getList()">
-          <el-option label="全部" value="" />
-          <el-option label="待上架" value="init" />
-          <el-option label="已上架" value="on" />
-          <el-option label="已下架" value="off" />
+        <el-select v-model="queryParams.status" placeholder="请选择商品状态" clearable
+                   @change="queryParams.pageNum = 1;getList()">
+          <el-option label="全部" value=""/>
+          <el-option label="待上架" value="init"/>
+          <el-option label="已上架" value="on"/>
+          <el-option label="已下架" value="off"/>
         </el-select>
       </el-form-item>
       <el-form-item label="是否支持兑换" prop="exchangeShow">
-        <el-select v-model="queryParams.exchangeShow" placeholder="请选择是否支持兑换" clearable @change="queryParams.pageNum = 1;getList()">
-          <el-option label="全部" value="" />
-          <el-option label="支持兑换" value="1" />
-          <el-option label="不支持兑换" value="0" />
-          <el-option label="盲票商品" value="2" />
+        <el-select v-model="queryParams.exchangeShow" placeholder="请选择是否支持兑换" clearable
+                   @change="queryParams.pageNum = 1;getList()">
+          <el-option label="全部" value=""/>
+          <el-option label="支持兑换" value="1"/>
+          <el-option label="不支持兑换" value="0"/>
+          <el-option label="盲票商品" value="2"/>
         </el-select>
       </el-form-item>
       <el-form-item label="供应商" prop="supplierId">
-        <el-select v-model="queryParams.supplierId" placeholder="请选择供应商" filterable clearable  @clear="queryParams.pageNum = 1;getList()" @change="queryParams.pageNum = 1;getList()">
-          <el-option :label="item.name" :value="item.id" v-for="(item, index) in SupplierList" :key="index" />
+        <el-select v-model="queryParams.supplierId" placeholder="请选择供应商" filterable clearable
+                   @clear="queryParams.pageNum = 1;getList()" @change="queryParams.pageNum = 1;getList()">
+          <el-option :label="item.name" :value="item.id" v-for="(item, index) in SupplierList" :key="index"/>
         </el-select>
       </el-form-item>
       <br>
       <el-form-item label="商品成本" prop="minCost">
-        <el-input v-model="queryParams.minCost" placeholder="最低成本" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
+        <el-input v-model="queryParams.minCost" placeholder="最低成本" clearable
+                  @keyup.enter.native="queryParams.pageNum = 1;getList()"/>
       </el-form-item>
       <el-form-item label="-" prop="maxCost">
-        <el-input v-model="queryParams.maxCost" placeholder="最高成本" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
+        <el-input v-model="queryParams.maxCost" placeholder="最高成本" clearable
+                  @keyup.enter.native="queryParams.pageNum = 1;getList()"/>
       </el-form-item>
       <el-form-item label="价格" prop="minValue">
-        <el-input v-model="queryParams.minValue" placeholder="最低价格" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
+        <el-input v-model="queryParams.minValue" placeholder="最低价格" clearable
+                  @keyup.enter.native="queryParams.pageNum = 1;getList()"/>
       </el-form-item>
       <el-form-item label="-" prop="maxValue">
-        <el-input v-model="queryParams.maxValue" placeholder="最高价格" clearable @keyup.enter.native="queryParams.pageNum = 1;getList()" />
+        <el-input v-model="queryParams.maxValue" placeholder="最高价格" clearable
+                  @keyup.enter.native="queryParams.pageNum = 1;getList()"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="queryParams.pageNum = 1;getList()">搜索</el-button>
@@ -83,26 +92,29 @@
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button v-hasPermi="['business:goods:add']" type="primary" icon="el-icon-plus" size="mini" @click="$router.push({ name: 'GoodsAdd' })">添加商品</el-button>
+        <el-button v-hasPermi="['business:goods:add']" type="primary" icon="el-icon-plus" size="mini"
+                   @click="$router.push({ name: 'GoodsAdd' })">添加商品
+        </el-button>
         <!-- <el-button v-hasPermi="['business:goods:on']" type="primary" plain size="mini">上架</el-button> -->
         <!-- <el-button v-hasPermi="['business:goods:off']" type="primary" plain size="mini">下架</el-button> -->
         <!-- <el-button v-hasPermi="['business:goods:remove']" type="danger" plain size="mini">删除</el-button> -->
       </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="infor"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleOrderExport"
-            v-hasPermi="['business:goods:export']"
-          >导出商品</el-button>
+      <el-col :span="1.5">
+        <el-button
+          type="infor"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleOrderExport"
+          v-hasPermi="['business:goods:export']"
+        >导出商品
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="tableData"  @sort-change="sortChannelId">
-      <el-table-column label="商品ID" prop="goodsId" width="60" />
+    <el-table v-loading="loading" :data="tableData" @sort-change="sortChannelId">
+      <el-table-column label="商品ID" prop="goodsId" width="60"/>
       <el-table-column label="商品图片" prop="picUrl" align="center">
         <template slot-scope="{row}">
           <div v-if="row.picUrl">
@@ -115,15 +127,15 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="商品名称" prop="title" />
+      <el-table-column label="商品名称" prop="title"/>
       <el-table-column label="价格" prop="value" sortable="custom">
         <template slot-scope="{row}">
-          ¥{{$numberFormat(row.value)}}
+          ¥{{ $numberFormat(row.value) }}
         </template>
       </el-table-column>
       <el-table-column label="商品成本" prop="cost" sortable="custom" min-width="100px">
         <template slot-scope="{row}">
-          ¥{{$numberFormat(row.cost)}}
+          ¥{{ $numberFormat(row.cost) }}
         </template>
       </el-table-column>
       <el-table-column label="是否支持兑换" prop="exchangeShow" min-width="100px">
@@ -139,41 +151,109 @@
           <span v-if="row.type == '2'">卡密商品</span>
         </template>
       </el-table-column>
-      <el-table-column label="盲豆兑换数量" prop="exchangePrice" sortable="custom" min-width="125" />
-      <el-table-column label="销量" prop="exchangedQty" sortable="custom" />
-      <el-table-column label="库存" prop="quantity" sortable="custom" />
+      <el-table-column label="盲豆兑换数量" prop="exchangePrice" sortable="custom" min-width="125"/>
+      <el-table-column label="销量" prop="exchangedQty" sortable="custom"/>
+      <el-table-column label="库存" prop="quantity" sortable="custom"/>
       <el-table-column label="状态" prop="status">
         <template slot-scope="{row}">
-          <el-tag :type="JSON.parse(row.status).value === 'on' ? 'success' : 'info'">{{ JSON.parse(row.status).desc }}</el-tag>
+          <el-tag :type="JSON.parse(row.status).value === 'on' ? 'success' : 'info'">{{
+              JSON.parse(row.status).desc
+            }}
+          </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="排序" prop="sortWeight"  sortable="custom" align="center" width="140px">
+      <el-table-column label="排序" prop="sortWeight" sortable="custom" align="center" width="140px">
         <template slot-scope="{row, $index}">
-            <el-input-number v-model="row.sortWeight" @change="handleSortChange($index,row.sortWeight)" controls-position="right" size="small"></el-input-number>
+          <el-input-number v-model="row.sortWeight" @change="handleSortChange($index,row.sortWeight)"
+                           controls-position="right" size="small"></el-input-number>
         </template>
       </el-table-column>
       <el-table-column fixed="right" align="center" label="操作" width="140">
         <template slot-scope="{row}">
           <!-- <el-button v-hasPermi="['business:goods:query']" type="text">查看</el-button> -->
-          <el-button v-hasPermi="['business:goods:edit']" type="text" @click="$router.push({ name: 'GoodsEdit', query: { id: row.goodsId } })">编辑</el-button>
-          <el-button v-if="JSON.parse(row.status).value === 'off' || JSON.parse(row.status).value === 'init'" v-hasPermi="['business:goods:on']" type="text" @click="setStatus(row, 'on')">上架</el-button>
-          <el-button v-if="JSON.parse(row.status).value === 'on'" v-hasPermi="['business:goods:off']" type="text" @click="setStatus(row, 'off')">下架</el-button>
-          <el-button v-if="JSON.parse(row.status).value === 'init'" v-hasPermi="['business:coupon:remove']" class="del" type="text" @click="del(row)">删除</el-button>
+          <el-button v-hasPermi="['business:goods:edit']" type="text" @click="handleCamilo(row.goodsId)" v-if="row.type === 2">
+            查看卡密
+          </el-button>
+          <el-button v-hasPermi="['business:goods:edit']" type="text" @click="handleImport(row.goodsId)"
+                     v-if="row.type === 2">添加卡密
+          </el-button>
+          <el-button v-hasPermi="['business:goods:edit']" type="text"
+                     @click="$router.push({ name: 'GoodsEdit', query: { id: row.goodsId } })">编辑
+          </el-button>
+          <el-button v-if="JSON.parse(row.status).value === 'off' || JSON.parse(row.status).value === 'init'"
+                     v-hasPermi="['business:goods:on']" type="text" @click="setStatus(row, 'on')">上架
+          </el-button>
+          <el-button v-if="JSON.parse(row.status).value === 'on'" v-hasPermi="['business:goods:off']" type="text"
+                     @click="setStatus(row, 'off')">下架
+          </el-button>
+          <el-button v-if="JSON.parse(row.status).value === 'init'" v-hasPermi="['business:coupon:remove']" class="del"
+                     type="text" @click="del(row)">删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList()" />
+    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+                @pagination="getList()"/>
+    <!--    查看卡密-->
+    <camilo v-if="camiloShow" @cancel="cancel" :camiloShow="camiloShow" :camiloGoodsId="camiloGoodsId"></camilo>
+    <!--    导入卡密-->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <a style="color: #1890FF;" @click="downloadExcel">下载Excel模版</a>
+      <div style="padding-top: 20px; text-align: center">
+        <el-upload
+          ref="upload"
+          :limit="1"
+          :data="reqData"
+          accept=".xlsx, .xls"
+          :headers="upload.headers"
+          :action="upload.url"
+          :disabled="upload.isUploading"
+          :on-progress="handleFileUploadProgress"
+          :on-success="handleFileSuccess"
+          :auto-upload="false"
+          :http-request="reqUploadFile"
+          :on-exceed="exceedMax"
+          drag
+        >
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <div class="el-upload__tip text-center" slot="tip">
+            <span>仅允许导入 xls xlsx 格式文件。</span>
+          </div>
+        </el-upload>
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="upload.open = false">取 消</el-button>
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { publicFileGetUrl } from "@/api/common"
-import { getGoodsList, delGoods, setGoodsStatus, setTableData, salesiteGoodsExport} from '@/api/business/goods'
-import { goodsCategoryListTree } from '@/api/business/category'
-import { goodsTagItems } from '@/api/business/tag'
-import { accMul } from '@/utils/util'
-import { getSupplierList } from '@/api/business/supplier'
+
+import Camilo from '@/components/Camilo'
+import {publicFileGetUrl} from "@/api/common"
+import {
+  getGoodsList,
+  delGoods,
+  setGoodsStatus,
+  setTableData,
+  salesiteGoodsExport,
+  setCamiloShip, cradDownload
+} from '@/api/business/goods'
+import {goodsCategoryListTree} from '@/api/business/category'
+import {goodsTagItems} from '@/api/business/tag'
+import {accMul} from '@/utils/util'
+import {getSupplierList} from '@/api/business/supplier'
+import {randomStr20} from '@/utils/util'
+import {getToken, getSign} from "@/utils/auth";
+
 export default {
   name: 'List',
+  components: {
+    Camilo
+  },
   data() {
     return {
       IMG_URL: publicFileGetUrl,
@@ -185,6 +265,17 @@ export default {
       goodsCategoryItemsList: [],
       goodsTagItemsList: [],
       SupplierList: [],
+      camiloShow: false,
+      // 用户导入参数
+      upload: {
+        open: false,// 是否显示弹出层（用户导入）
+        title: "",// 弹出层标题（用户导入）
+        isUploading: false,// 是否禁用上传
+        url: "",// 上传的地址
+        headers: {},//请求头
+      },
+      reqData: {},
+      camiloGoodsId: null,
     }
   },
   created() {
@@ -195,24 +286,24 @@ export default {
   },
   methods: {
     //获取供应商
-    getSupplierItems(){
-      getSupplierList('',{}).then(res => {
+    getSupplierItems() {
+      getSupplierList('', {}).then(res => {
         this.SupplierList = res && res.rows
       })
     },
 
     //切换排序
-    sortChannelId(row){
-      if (row){
-        let prop =  row.prop == 'commRate' ? ('t1.'+ row.prop) : row.prop;
+    sortChannelId(row) {
+      if (row) {
+        let prop = row.prop == 'commRate' ? ('t1.' + row.prop) : row.prop;
         this.queryParams.orderByColumn = prop
-        this.queryParams.isAsc = row.order=='ascending'?"asc":"desc";
+        this.queryParams.isAsc = row.order == 'ascending' ? "asc" : "desc";
         this.getList()
       }
     },
 
     //步进器修改
-    handleSortChange(index,sortWeight){
+    handleSortChange(index, sortWeight) {
       this.tableData[index].sortWeight = sortWeight
       let data = {
         goodsId: this.tableData[index].goodsId,
@@ -221,13 +312,96 @@ export default {
       setTableData(data)
     },
 
-    getGoodsCategoryItems(){
-      goodsCategoryListTree("",{}).then(res => {
+    //取消查看卡密
+    cancel() {
+      this.camiloShow = false
+    },
+    //下载excel模版表格
+    downloadExcel() {
+      cradDownload().then(response => {
+        this.download(response.msg);
+      })
+    },
+    //查看卡密
+    handleCamilo(id){
+      this.camiloGoodsId = id
+      this.camiloShow = true
+    },
+    //上传卡密按钮操作
+    handleImport(id) {
+      this.camiloGoodsId = id
+      this.upload.title = "添加卡密";
+      this.upload.open = true;
+      this.getHttpHeader(id)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.getList();
+    },
+    // 超出限制时的提示
+    exceedMax() {
+      this.$message({
+        message: '请移除已有文件后再进行上传',
+        type: 'warning'
+      })
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    //请求头
+    getHttpHeader(id) {
+      let timestamp = parseInt(new Date().getTime()),
+        nonce = randomStr20();
+      var sign = getSign(this.reqData || {}, timestamp)
+      let url = process.env.VUE_APP_BASE_API + `/api/v1/mp/admin/goods/card/import/${id}` + '?sign=' + sign + '&nonce=' + nonce;
+      this.upload.url = url
+      var headers = {
+        "Authorization": "Bearer " + getToken(),
+        "x-zz-timestamp": timestamp
+      }
+      this.upload.headers = headers
+    },
+
+    // 自定义文件上传的实现
+    reqUploadFile(param) {
+      var data = this.reqData || {}
+      var params = {
+        file: param.file,
+        ...data
+      }
+      this.vloading = this.$loading({
+        lock: true,
+        text: "正在导出商品.....",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      setCamiloShip(params, this.headers, this.camiloGoodsId).then(response => {
+        this.vloading.close();
+        this.upload.open = false;
+        this.upload.isUploading = false;
+        this.$refs.upload.clearFiles();
+        this.$message({
+          message: '导入成功',
+          type: 'success'
+        })
+      }).catch(() => {
+        this.vloading.close();
+      })
+    },
+
+    getGoodsCategoryItems() {
+      goodsCategoryListTree("", {}).then(res => {
         this.goodsCategoryItemsList = res && res.rows
       })
     },
 
-    getGoodsTagItems(){
+    getGoodsTagItems() {
       goodsTagItems({}).then(res => {
         this.goodsTagItemsList = res && res.data
       })
@@ -241,24 +415,25 @@ export default {
       // if (reset) {
       //   this.queryParams = { pageNum: 1, pageSize: 20, orderByColumn: '', isAsc: '', }
       // }
-      if(this.queryParams.categoryIdList){
+      if (this.queryParams.categoryIdList) {
         for (let i = 0; i < this.queryParams.categoryIdList.length; i++) {
-          if(this.queryParams.categoryIdList[i][1]){
+          if (this.queryParams.categoryIdList[i][1]) {
             this.queryParams.categoryIdList[i] = this.queryParams.categoryIdList[i][1]
           }
         }
       }
-      getGoodsList('pageNum='+this.queryParams.pageNum + '&pageSize='+this.queryParams.pageSize+'&orderByColumn='+ this.queryParams.orderByColumn +'&isAsc='+ this.queryParams.isAsc +'&', {
+      getGoodsList('pageNum=' + this.queryParams.pageNum + '&pageSize=' + this.queryParams.pageSize + '&orderByColumn=' + this.queryParams.orderByColumn + '&isAsc=' + this.queryParams.isAsc + '&', {
         title: this.queryParams.title,
         goodsId: this.queryParams.goodsId,
+        type: this.queryParams.type ? Number(this.queryParams.type) : this.queryParams.type,
         categoryIdList: this.queryParams.categoryIdList,
         tagId: this.queryParams.tagId,
         status: this.queryParams.status,
         exchangeShow: this.queryParams.exchangeShow, supplierId: this.queryParams.supplierId,
-        minCost: this.queryParams.minCost?accMul(this.queryParams.minCost, 100):this.queryParams.minCost,
-        maxCost: this.queryParams.maxCost?accMul(this.queryParams.maxCost, 100):this.queryParams.maxCost,
-        minValue: this.queryParams.minValue?accMul(this.queryParams.minValue, 100):this.queryParams.minValue,
-        maxValue: this.queryParams.maxValue?accMul(this.queryParams.maxValue, 100):this.queryParams.maxValue
+        minCost: this.queryParams.minCost ? accMul(this.queryParams.minCost, 100) : this.queryParams.minCost,
+        maxCost: this.queryParams.maxCost ? accMul(this.queryParams.maxCost, 100) : this.queryParams.maxCost,
+        minValue: this.queryParams.minValue ? accMul(this.queryParams.minValue, 100) : this.queryParams.minValue,
+        maxValue: this.queryParams.maxValue ? accMul(this.queryParams.maxValue, 100) : this.queryParams.maxValue
       }).then(res => {
         this.loading = false
         if (res.code === 0) {
@@ -273,7 +448,7 @@ export default {
 
     // 重置
     resetQuery() {
-      this.queryParams = { pageNum: 1, pageSize: 10, orderByColumn: '', isAsc: '',}
+      this.queryParams = {pageNum: 1, pageSize: 10, orderByColumn: '', isAsc: '',}
       this.getList();
     },