修改

build/webpack.dev.conf.js

@@ -72,15 +72,21 @@ module.exports = new Promise((resolve, reject) => {
       // add port to devServer config
       devWebpackConfig.devServer.port = port
 
-      // Add FriendlyErrorsPlugin
-      devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
-        compilationSuccessInfo: {
-          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
-        },
-        onErrors: config.dev.notifyOnErrors
-        ? utils.createNotifierCallback()
-        : undefined
-      }))
+            // Add FriendlyErrorsPlugin
+            devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
+              compilationSuccessInfo: {
+                // messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
+                // 修改启动后终端显示localhost和network访问地址
+                messages: [
+                  `App runing at: `,
+                  `Local: http://localhost:${port}`,
+                  `Network: http://${require('ip').address()}:${port}`,
+                ],
+              },
+              onErrors: config.dev.notifyOnErrors
+              ? utils.createNotifierCallback()
+              : undefined
+            }))
 
       resolve(devWebpackConfig)
     }

config/dev.env.js

@@ -1,9 +1,9 @@
 module.exports = {
 	NODE_ENV: '"development"',
 	ENV_CONFIG: '"dev"',
-  BASE_API: '"https://xiaoyou.dgtis.com/admin"',
+  BASE_API: '"http://192.168.100.208:9083/admin"',
   // OS_API: '"http://10.32.2.208:9081/storage"',
   // BASE_API: '"http://192.168.100.208:9083/admin"',
   // 本地数据库：登录用户名 admin123，密码 admin123
-  OS_API: '"https://xiaoyou.dgtis.com/admin"'
+  OS_API: '"http://192.168.100.208:9083/admin"'
 }

config/index.js

@@ -13,9 +13,9 @@ module.exports = {
     proxyTable: {},
 
     // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
-    port: 9527, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: true,
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
+    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    // autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: false,
     poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-

src/api/giftManage.js

@@ -24,19 +24,19 @@ export function createItem(data) {
   })
 }
 
-export function updateItem(query) {
+export function updateItem(data) {
   return request({
     url: '/mall-sku/festival/edit',
     method: 'post',
-    data:query
+    data
   })
 }
 
-export function giftList(data) {
+export function giftList(query) {
   return request({
-    url: '/mall-welfare/welfare/list',
+    url: '/mall-sku/festival/page',
     method: 'post',
-    data
+    params:query
   })
 }
 
@@ -44,7 +44,7 @@ export function giftState(query) {
   return request({
     url: '/mall-sku/modify/status',
     method: 'post',
-    data:query
+    params:query
   })
 }
 
@@ -52,7 +52,7 @@ export function exchangeHistory(query) {
   return request({
     url: '/mall-sku/skuLog',
     method: 'post',
-    data:query
+    params:query
   })
 }
 
@@ -60,7 +60,7 @@ export function relatedWelfare(query) {
   return request({
     url: '/mall-sku/festival/relation',
     method: 'post',
-    data:query
+    params:query
   })
 }
 
@@ -68,6 +68,6 @@ export function welfareList(query) {
   return request({
     url: '/mall-welfare/welfare/statusList',
     method: 'post',
-    data:query
+    params:query
   })
 }

src/api/goodsManage.js

@@ -2,15 +2,15 @@ import request from '@/utils/request'
 
 export function goodsExchangeRulesDetail(query) {
   return request({
-    url: '/news/getdgtIndustryNews',
-    method: 'post',
-    data: query
+    url: '/news/mall/getNotice',
+    method: 'get',
+    params: query
   })
 }
 
 export function updateGoodsExchangeRules(query) {
   return request({
-    url: '/news/listForDGTSiteNews',
+    url: 'news/createForDGTSiteNews',
     method: 'post',
     data: query
   })
@@ -32,11 +32,11 @@ export function updateItem(query) {
   })
 }
 
-export function goodsList(data) {
+export function goodsList(query) {
   return request({
     url: '/mall-sku/integral/page',
     method: 'post',
-    data
+    params:query
   })
 }
 
@@ -44,7 +44,7 @@ export function goodsState(query) {
   return request({
     url: '/mall-sku/modify/status',
     method: 'post',
-    data:query
+    params:query
   })
 }
 
@@ -52,6 +52,6 @@ export function exchangeHistory(query) {
   return request({
     url: '/mall-sku/skuLog',
     method: 'post',
-    data:query
+    params:query
   })
 }

src/api/public.js

@@ -4,15 +4,15 @@ export function companyTypeList(query) {
     return request({
       url: '/news/createForDGTSiteNews',
       method: 'post',
-      data:query
+      params:query
     })
   }
   
   export function depTypeList(query) {
     return request({
-      url: '/news/createForDGTSiteNews',
+      url: '/sys/user/getDepts',
       method: 'post',
-      data:query
+      params:query
     })
   }
 
@@ -20,6 +20,6 @@ export function companyTypeList(query) {
     return request({
       url: '/sys/user/getAll',
       method: 'post',
-      data:query
+      params:query
     })
   }

src/api/welfareManage.js

@@ -16,19 +16,19 @@ export function updateItem(query) {
   })
 }
 
-export function welfareList(data) {
+export function welfareList(query) {
   return request({
     url: '/mall-welfare/welfare/list',
     method: 'post',
-    data
+    params:query
   })
 }
 
 export function welfareState(query) {
   return request({
-    url: '/mall-welfare/welfare/status',
+    url: 'mall-welfare/modify/status',
     method: 'post',
-    data:query
+    params:query
   })
 }
 

src/utils/request.js

@@ -28,8 +28,8 @@ service.interceptors.response.use(
     const res = response.data
     let errmsg = res.errmsg;
     if (res.errno !== 0) {
-      if(res.errno==303){
-        MessageBox.alert('没有权限登录系统，请输入重新登录', '已退出', {
+      if(res.errno==401){
+        MessageBox.alert('没有权限登录系统，请重新登录', '已退出', {
           confirmButtonText: '重新登录',
           type: 'error'
         }).then(() => {
@@ -37,15 +37,8 @@ service.interceptors.response.use(
             location.reload()
           })
         })
-      }else if(errmsg !="" && errmsg !=null && res.errno != 401){//401是未登录
-        MessageBox.alert(errmsg,errmsg, {
-          confirmButtonText: '确定',
-          type: 'warning'
-        }).then(() => {
-
-        })
-      }else{
-        MessageBox.alert('超时自动退出系统，请重新登录', '已退出', {
+      }else if(res.errno==403){
+        MessageBox.alert('登录超时自动退出系统，请重新登录', '已退出', {
           confirmButtonText: '重新登录',
           type: 'error'
         }).then(() => {
@@ -53,6 +46,11 @@ service.interceptors.response.use(
             location.reload()
           })
         })
+      }else{
+        MessageBox.alert(errmsg,'操作失败', {
+          confirmButtonText: '确定',
+          type: 'error'
+        }).then(() => {})
       }
       return Promise.reject('error')
     } else {
@@ -61,7 +59,7 @@ service.interceptors.response.use(
   }, error => {
     console.log('err' + error)// for debug
     Message({
-      message: '登录连接超时（后台不能连接，请联系系统管理员）',
+      message: '连接超时（后台不能连接，请联系系统管理员）',
       type: 'error',
       duration: 5 * 1000
     })

src/views/giftManage/giftList.vue

@@ -7,8 +7,8 @@
                 v-model="listQuery.name"></el-input>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="礼品编号"
                 v-model="listQuery.seq"></el-input>
-            <el-date-picker class="filter-item" v-model="listQuery.shelfTime" type="datetime" placeholder="礼品上架时间">
-            </el-date-picker>
+            <!-- <el-date-picker class="filter-item" v-model="listQuery.shelfTime" type="datetime" placeholder="礼品上架时间">
+            </el-date-picker> -->
             <el-select v-model="listQuery.status" clearable placeholder="状态" style="top: -4px;width: 200px;">
                 <el-option :key="item.type" v-for="item in goodsStatusList" :label="item.name" :value="item.type">
                 </el-option>
@@ -27,7 +27,7 @@
             <el-table-column align="center" min-width="100px" label="礼品名称" prop="name">
             </el-table-column>
 
-            <el-table-column align="center" min-width="100px" label="礼品编号" prop="seq">
+            <el-table-column align="center" min-width="120px" label="礼品编号" prop="seq">
             </el-table-column>
 
             <el-table-column align="center" min-width="80px" label="礼品属性">
@@ -49,8 +49,8 @@
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="礼品所在地" prop="location">
             </el-table-column>
-            <el-table-column align="center" min-width="150px" label="上架时间" prop="shelfTime">
-            </el-table-column>
+            <!-- <el-table-column align="center" min-width="150px" label="上架时间" prop="shelfTime">
+            </el-table-column> -->
             <el-table-column align="center" min-width="80px" label="礼品状态">
                 <template slot-scope="props">
                     <span v-if="props.row.status == 1">上架</span>
@@ -88,8 +88,8 @@
         <!-- 员工积分记录列表 -->
         <el-dialog title="兑换记录" :visible.sync="dialogListVisible" width="70%">
             <div class="filter-container">
-                <el-select v-model="itemListQuery.deptId" clearable placeholder="部门" style="top: -4px;width: 200px;">
-                    <el-option :key="item.type" v-for="item in depTypeList" :label="item.name" :value="item.type">
+                <el-select filterable v-model="itemListQuery.deptId" clearable placeholder="部门" style="top: -4px;width: 200px;">
+                    <el-option :key="item.deptId" v-for="item in depTypeList" :label="item.deptName" :value="item.deptId">
                     </el-option>
                 </el-select>
                 <el-input clearable class="filter-item" style="width: 200px;" placeholder="员工名称"
@@ -104,19 +104,21 @@
                 highlight-current-row>
                 <el-table-column type="index" label="序号" header-align="center" align="center">
                 </el-table-column>
-                <el-table-column align="center" min-width="100px" label="部门" prop="deptName">
+                <el-table-column align="center" width="200px" label="部门" prop="deptName">
+                </el-table-column>
+                <el-table-column align="center" label="员工姓名" prop="purchaser">
                 </el-table-column>
-                <el-table-column align="center" min-width="100px" label="员工姓名" prop="purchaserName">
+                <el-table-column align="center" label="兑换方式" prop="deliveryTypeName">
                 </el-table-column>
-                <el-table-column align="center" min-width="100px" label="兑换方式" prop="deliveryName">
+                <el-table-column align="center" label="联系人" prop="contact">
                 </el-table-column>
-                <el-table-column align="center" min-width="80px" label="联系人" prop="contact">
+                <el-table-column align="center" width="120px" label="联系方式" prop="contactPhone">
                 </el-table-column>
-                <el-table-column align="center" min-width="80px" label="联系方式" prop="contactPhone">
+                <el-table-column align="center" width="200px" label="地址" prop="contactAddr">
                 </el-table-column>
-                <el-table-column align="center" min-width="80px" label="地址/邮箱" prop="contactAddr">
+                <el-table-column align="center" width="200px" label="邮箱" prop="contactEmail">
                 </el-table-column>
-                <el-table-column align="center" min-width="80px" label="兑换时间" prop="createTime">
+                <el-table-column align="center" width="150px" label="兑换时间" prop="createTime">
                 </el-table-column>
             </el-table>
 
@@ -160,7 +162,7 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item style="width: 800px" label="礼品图片">
+                <el-form-item style="width: 800px" label="礼品图片" prop="imgUrl">
                     <el-tooltip content="建议图片宽高比260*200" placement="top-start">
                         <el-upload :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images"
                             :on-success="handleGallerySucess" :on-exceed="handleExceed" :before-upload="uploadBannerImg"
@@ -169,10 +171,6 @@
                         </el-upload>
                     </el-tooltip>
                 </el-form-item>
-
-                <!-- <el-form-item label="积分" prop="integral">
-                    <el-input v-model="dataForm.integral"></el-input>
-                </el-form-item> -->
                 <el-form-item label="库存量" prop="actualStock">
                     <el-input-number :precision="0" :step="1" v-model="dataForm.actualStock"></el-input-number>
                 </el-form-item>
@@ -185,10 +183,10 @@
         </el-dialog>
 
          <!-- 关联福利操作 -->
-        <el-dialog title="管理福利" :visible.sync="dialogRelatedVisible" width="40%">
+        <el-dialog title="关联福利" :visible.sync="dialogRelatedVisible" width="40%">
             <div class="filter-container">
-                <el-select v-model="relatedId" multiple style="width: 100%;" placeholder="请选择">
-                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                <el-select clearable v-model="welfareId" style="width: 100%;" placeholder="请选择">
+                    <el-option v-for="item in options" :key="item.id" :label="item.title" :value="item.id">
                     </el-option>
                 </el-select>
             </div>
@@ -218,7 +216,7 @@
   
 <script>
 import { createItem, updateItem, giftList, giftState, exchangeHistory, relatedWelfare, welfareList } from "@/api/giftManage";
-import { companyTypeList, depTypeList } from "@/api/public";
+import { depTypeList } from "@/api/public";
 import waves from "@/directive/waves"; // 水波纹指令
 import Tinymce from '@/components/Tinymce'
 
@@ -228,21 +226,9 @@ export default {
     directives: { waves },
     data() {
         return {
-            relatedId:[],
+            welfareId:'',
             skuId:'',
-            options: [{
-                value: 1,
-                label: '中秋福利'
-            }, {
-                value: 2,
-                label: '端午福利'
-            }, {
-                value: 3,
-                label: '国庆福利'
-            }, {
-                value: 4,
-                label: '元旦福利'
-            }],
+            options: [],
             locationList:['洛阳','北京','上海'],
             productAttributeList: [
                 {
@@ -299,7 +285,7 @@ export default {
                     seq: 'sp123456',
                     productAttribute: 0,
                     title: '中秋福利,国庆福利',
-                    relatedId:[1,3],
+                    welfareId:1,
                     actualStock: '12',
                     deliveryType: 0,
                     location: '北京',
@@ -313,7 +299,7 @@ export default {
                     seq: 'sp123456',
                     productAttribute: 1,
                     title: '端午福利',
-                    relatedId:[2],
+                    welfareId:1,
                     actualStock: '12',
                     deliveryType: 1,
                     location: '上海',
@@ -327,7 +313,7 @@ export default {
                     seq: 'sp123456',
                     productAttribute: 1,
                     title: '',
-                    relatedId:[],
+                    welfareId:1,
                     actualStock: '12',
                     deliveryType: 1,
                     location: '洛阳',
@@ -419,16 +405,20 @@ export default {
     },
     created() {
         // this.getCompanyTypeList();
-        // this.getDepTypeList(); 
-        // this.getList();
+        this.getDepTypeList(); 
+        this.getList();
     },
     methods: {
         getWelfareList(){
-            welfareList({status:0}).then(response => {
+            welfareList({status:1}).then(response => {
                 this.options = response.data.data;
-            }).catch(() => {
-                this.options = []
-            });
+                // this.options.push(
+                //     {
+                //         id:'',
+                //         title:'请选择'
+                //     }
+                // )
+            }).catch(() => {});
         },
         changeProductAttribute(val) {
             this.dataForm.deliveryType = '';
@@ -460,7 +450,7 @@ export default {
                 let response = fileList[i].response;
                 let url = response.data.url;
                 images.push(url);
-                this.dataForm.image = images.join(",");
+                this.dataForm.imgUrl = images.join(",");
             }
         },
         uploadBannerImg(file) {
@@ -474,7 +464,7 @@ export default {
             );
         },
         handleGallerySucess(res, file, fileList) {
-            this.dataForm.image = ""; // 清空画廊图片数组
+            this.dataForm.imgUrl = ""; // 清空画廊图片数组
 
             let images = [];
             for (let i in fileList) {
@@ -489,7 +479,7 @@ export default {
                 }
             }
 
-            this.dataForm.image = images.join(",");
+            this.dataForm.imgUrl = images.join(",");
         },
         resetForm() {
             this.dataForm = {
@@ -518,13 +508,7 @@ export default {
             
             this.$refs["dataForm"].validate((valid) => {
                 if (valid) {
-                    console.log(this.dataForm);
-                    if (!this.dataForm.imgUrl) {
-                        this.$alert("请上传礼品图片", "提示", {
-                            confirmButtonText: "确定",
-                        });
-                    } else {
-                        createItem(this.dataForm)
+                    createItem(this.dataForm)
                             .then((response) => {
                                 this.getList();
                                 this.dialogFormVisible = false;
@@ -537,7 +521,6 @@ export default {
                                 this.reload();
                             })
                             .catch(() => { });
-                    }
                 }
             });
         },
@@ -585,12 +568,7 @@ export default {
         updateData() {
             this.$refs['dataForm'].validate((valid) => {
                 if (valid) {
-                    if (!this.dataForm.imgUrl) {
-                        this.$alert("请上传礼品图片", "提示", {
-                            confirmButtonText: "确定",
-                        });
-                    } else {
-                        updateItem(this.dataForm).then(() => {
+                    updateItem(this.dataForm).then(() => {
                             this.dialogFormVisible = false
                             this.$notify({
                                 title: '成功',
@@ -600,22 +578,19 @@ export default {
                             })
                             this.getList()
                         })
-                    }
 
                 }
 
             })
         },
         handleRelated(row) {
-            this.relatedId = row.relatedId.split(",");
+            this.welfareId = row.welfareId;
             this.skuId = row.skuId;
-            // this.getWelfareList();
+            this.getWelfareList();
             this.dialogRelatedVisible = true
         },
         handleRelatedWelfare(){
-            const welfareId = this.relatedId.join(",");
-            console.log(this.relatedId);
-            // relatedWelfare({ skuId: this.skuId, welfareId: welfareId }).then(response => {
+            relatedWelfare({ skuId: this.skuId, welfareId: this.welfareId }).then(response => {
                 this.dialogRelatedVisible = false;
                 this.$notify({
                     title: '成功',
@@ -623,8 +598,8 @@ export default {
                     type: 'success',
                     duration: 2000
                 })
-            //     this.getList()
-            // })
+                this.getList()
+            })
         },
         changeGoodsState(id, index) {
             giftState({ skuId: id, status: index }).then(response => {
@@ -650,8 +625,7 @@ export default {
                         type: 'success',
                         duration: 2000
                     })
-                    const index = this.list.indexOf(row)
-                    this.list.splice(index, 1)
+                    this.getList()
                 })
             }).catch(() => {
 
@@ -661,9 +635,7 @@ export default {
         getDepTypeList() {
             depTypeList().then(response => {
                 this.depTypeList = response.data.data;
-            }).catch(() => {
-                this.depTypeList = []
-            });
+            }).catch(() => {});
         },
         getList() {
             this.listLoading = true
@@ -718,7 +690,7 @@ export default {
 
         handleView(row) {
             this.itemListQuery.id = row.id;
-            // this.getItemList()
+            this.getItemList()
             this.dialogListVisible = true
         },
     }

src/views/goodsManage/goodsList.vue

@@ -27,7 +27,7 @@
             <el-table-column align="center" min-width="100px" label="商品名称" prop="name">
             </el-table-column>
 
-            <el-table-column align="center" min-width="100px" label="商品编号" prop="seq">
+            <el-table-column align="center" min-width="120px" label="商品编号" prop="seq">
             </el-table-column>
 
             <el-table-column align="center" min-width="80px" label="商品属性">
@@ -40,7 +40,9 @@
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="库存量" prop="actualStock">
             </el-table-column>
-
+            <el-table-column align="center" min-width="100px" label="可兑换库存量" prop="stock">
+            </el-table-column>
+            
             <el-table-column align="center" min-width="80px" label="兑换方式">
                 <template slot-scope="props">
                     <span v-if="props.row.deliveryType == 1">快递</span>
@@ -49,8 +51,8 @@
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="商品所在地" prop="location">
             </el-table-column>
-            <el-table-column align="center" min-width="150px" label="上架时间" prop="shelfTime">
-            </el-table-column>
+            <!-- <el-table-column align="center" min-width="150px" label="上架时间" prop="shelfTime">
+            </el-table-column> -->
             <el-table-column align="center" min-width="80px" label="商品状态">
                 <template slot-scope="props">
                     <span v-if="props.row.status == 1">上架</span>
@@ -83,40 +85,41 @@
         </div>
 
         <!-- 员工积分记录列表 -->
-        <el-dialog title="兑换记录" :visible.sync="dialogListVisible" width="70%">
+        <el-dialog title="兑换记录" :visible.sync="dialogListVisible" width="70%" style="overflow: auto;">
             <div class="filter-container">
-                <el-select v-model="itemListQuery.deptId" clearable placeholder="部门" style="top: -4px;width: 200px;">
-                    <el-option :key="item.type" v-for="item in depTypeList" :label="item.name" :value="item.type">
+                <el-select filterable v-model="itemListQuery.deptId" clearable placeholder="部门" style="top: -4px;width: 200px;">
+                    <el-option :key="item.deptId" v-for="item in depTypeList" :label="item.deptName" :value="item.deptId">
                     </el-option>
                 </el-select>
                 <el-input clearable class="filter-item" style="width: 200px;" placeholder="员工名称"
-                    v-model="itemListQuery.purchaserName"></el-input>
+                    v-model="itemListQuery.userName"></el-input>
                 <el-button class="filter-item" type="primary" v-waves icon="el-icon-search"
                     @click="itemHandleFilter">查找</el-button>
-                <el-button class="filter-item" type="primary" v-waves icon="el-icon-download">导出</el-button>
+                <el-button class="filter-item" type="primary" @click="handleDownLoad" v-waves icon="el-icon-download">导出</el-button>
 
             </div>
             <!-- 查询结果 -->
             <el-table size="small" :data="itemList" v-loading="listLoading" element-loading-text="正在查询中。。。" border fit
-                highlight-current-row>
-                <el-table-column type="index" label="序号" header-align="center" align="center">
+            highlight-current-row>
+            <el-table-column type="index" label="序号" header-align="center" align="center">
                 </el-table-column>
-                <el-table-column align="center" min-width="100px" label="部门" prop="deptName">
+                <el-table-column align="center" width="200px" label="部门" prop="deptName">
                 </el-table-column>
-                <el-table-column align="center" min-width="100px" label="员工姓名" prop="purchaserName">
+                <el-table-column align="center" label="员工姓名" prop="purchaser">
                 </el-table-column>
-                <el-table-column align="center" min-width="100px" label="兑换方式" prop="deliveryName">
+                <el-table-column align="center" label="兑换方式" prop="deliveryTypeName">
                 </el-table-column>
-                <el-table-column align="center" min-width="80px" label="联系人" prop="contact">
+                <el-table-column align="center" label="联系人" prop="contact">
                 </el-table-column>
-                <el-table-column align="center" min-width="80px" label="联系方式" prop="contactPhone">
+                <el-table-column align="center" width="120px" label="联系方式" prop="contactPhone">
                 </el-table-column>
-                <el-table-column align="center" min-width="80px" label="地址/邮箱" prop="contactAddr">
+                <el-table-column align="center" width="200px" label="地址" prop="contactAddr">
                 </el-table-column>
-                <el-table-column align="center" min-width="80px" label="兑换时间" prop="createTime">
+                <el-table-column align="center" width="200px" label="邮箱" prop="contactEmail">
                 </el-table-column>
-            </el-table>
-
+                <el-table-column align="center" width="150px" label="兑换时间" prop="createTime">
+                </el-table-column>
+        </el-table>
             <!-- 分页 -->
             <div class="pagination-container">
                 <el-pagination background @size-change="itemHandleSizeChange" @current-change="itemHandleCurrentChange"
@@ -127,7 +130,7 @@
         </el-dialog>
         <!-- 添加或修改对话框 -->
         <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="70%">
-            <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="100px" style='width:700px;margin-left:50px;'>
+            <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="100px" style='width:700px; margin-left:50px;'>
                 <el-form-item label="商品名称" prop="name">
                     <el-input v-model="dataForm.name"></el-input>
                 </el-form-item>
@@ -202,7 +205,7 @@
   
 <script>
 import { createItem, updateItem, goodsList, goodsState, exchangeHistory } from "@/api/goodsManage";
-import { companyTypeList, depTypeList } from "@/api/public";
+import { depTypeList } from "@/api/public";
 import waves from "@/directive/waves"; // 水波纹指令
 import Tinymce from '@/components/Tinymce'
 
@@ -306,7 +309,7 @@ export default {
                 {
                     id: 1,
                     deptName: '软件工程院',
-                    purchaserName: '张三',
+                    userName: '张三',
                     deliveryName: '邮寄',
                     contact: '李四',
                     contactPhone: '13613885046',
@@ -316,7 +319,7 @@ export default {
                 {
                     id: 2,
                     deptName: '软件工程院',
-                    purchaserName: '张三',
+                    userName: '张三',
                     deliveryName: '邮寄',
                     contact: '李四',
                     contactPhone: '13613885046',
@@ -326,7 +329,7 @@ export default {
                 {
                     id: 3,
                     deptName: '软件工程院',
-                    purchaserName: '张三',
+                    userName: '张三',
                     deliveryName: '邮寄',
                     contact: '李四',
                     contactPhone: '13613885046',
@@ -349,8 +352,9 @@ export default {
             itemListQuery: {
                 page: 1,
                 limit: 10,
+                skuId:'',
                 deptId: '',
-                purchaserName: '',
+                userName: '',
             },
             dataForm: {
                 name: undefined,
@@ -384,10 +388,13 @@ export default {
     },
     created() {
         // this.getCompanyTypeList();
-        // this.getDepTypeList(); 
+        this.getDepTypeList(); 
         this.getList();
     },
     methods: {
+        handleDownLoad(){
+            window.location.href = process.env.BASE_API + '/mall-sku/exportSkuLog?skuId=' + this.itemListQuery.skuId + '&deptId=' + this.itemListQuery.deptId + '&userName=' + this.itemListQuery.userName;
+        },
         changeProductAttribute(val) {
             this.dataForm.deliveryType = '';
             this.dataForm.location = '';
@@ -587,9 +594,7 @@ export default {
         getDepTypeList() {
             depTypeList().then(response => {
                 this.depTypeList = response.data.data;
-            }).catch(() => {
-                this.depTypeList = []
-            });
+            }).catch(() => {});
         },
         getList() {
             this.listLoading = true
@@ -643,9 +648,8 @@ export default {
         },
 
         handleView(row) {
-            this.itemListQuery.id = row.id;
-            // getPointRulesType()
-            // this.getItemList()
+            this.itemListQuery.skuId = row.skuId;
+            this.getItemList();
             this.dialogListVisible = true
         },
     }