update

src/components/CommodityMan/goodsList.vue

@@ -2,7 +2,7 @@
   <div class="goodsList">
     <div class="head-title">
         商品列表
-        <el-button style="float:right;margin-top: -5px;margin-left:20px;" size="small" type="primary">商品导出</el-button>
+        <el-button @click="Export" style="float:right;margin-top: -5px;margin-left:20px;" size="small" type="primary">商品导出</el-button>
         <el-button @click="CommonJump('goodsListEdit')" style="float:right;margin-top: -5px;margin-left:20px;" size="small" type="primary">添加商品</el-button>
         <el-button style="float:right;margin-top: -5px;margin-left:20px;" size="small" type="primary">更新所有商品销量</el-button>
 
@@ -170,8 +170,8 @@
             width="200"
             label="操作">
             <template slot-scope="scope">
-                <img @click="Delete(scope.row)" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/edit.png" alt="">
-                <img @click="Edit(scope.row,6)" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/del.png" alt="">
+                <img @click="CommonJump('goodsListEdit',{GoodsId:scope.row.Id})" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/edit.png" alt="">
+                <img @click="Delete(scope.row)"  style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/del.png" alt="">
             </template>    
             </el-table-column>
         </el-table>
@@ -435,7 +435,16 @@ export default {
         this.getRule();
     },
     methods:{
-        
+        Export(){
+            let msg = this.msg;
+            msg = JSON.parse(JSON.stringify(msg));
+            msg.pageSize=999;
+            this.JavaGetLocalFile(
+            "/api/product/GetProductGoodsListToExcel",
+            msg,
+            "商品列表.xls"
+            );
+        },
         plsetOk(){
             if(this.plszMsg.Type==7){
                 // if(this.plszMsg.FreightId==0){
@@ -608,7 +617,7 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                this.apipost('/api/product/DelProductServiceInfo',{ServiceId:item.Id},
+                this.apipost('/api/product/DelProcudtGoodsInfo',{GoodsId:item.Id},
                     res => {
                     if (res.data.resultCode === 1) {
                         this.getList();