sunlupeng 8 ay önce
ebeveyn
işleme
bb533dce8b

+ 1 - 1
src/api/goodsManage.js

@@ -11,7 +11,7 @@ export function createItem(data) {
 
 export function updateItem(query) {
   return request({
-    url: '/product-category/edit',
+    url: '/product/edit',
     method: 'post',
     data:query
   })

+ 6 - 0
src/permission.js

@@ -109,6 +109,12 @@ const myRoles = [
   'goodsList', 
   'brand',
 
+  'basicSetting', 
+  'supplier', 
+  'warehouse',
+  'express',
+  'store',
+
   'stock',
   'warehousing',
   'warehousingAdd',

+ 16 - 0
src/router/index.js

@@ -68,6 +68,22 @@ export const asyncRouterMap = [
       { path: 'brand', component: _import('goodsManage/brand'), name: 'brand', meta: { title: '品牌管理', noCache: true }},
     ]
   },
+  {
+    path: '/basicSetting',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'basicSetting',
+    meta: {
+      title: '基础设置',
+      icon: 'shangpin'
+    },
+    children: [
+      { path: 'supplier', component: _import('basicSetting/supplier'), name: 'supplier', meta: { title: '供应商管理', noCache: true }},
+      { path: 'warehouse', component: _import('basicSetting/supplier'), name: 'warehouse', meta: { title: '仓库管理', noCache: true }},
+      { path: 'express', component: _import('basicSetting/supplier'), name: 'express', meta: { title: '物流公司', noCache: true }},
+      { path: 'store', component: _import('basicSetting/supplier'), name: 'store', meta: { title: '门店管理', noCache: true }},
+    ]
+  },
   {
       path: '/stock',
       component: Layout,

+ 132 - 103
src/views/basicSetting/supplier.vue

@@ -3,18 +3,20 @@ categoryOptions<template>
 
         <!-- 查询和其他操作 -->
         <div class="filter-container">
-            <el-input clearable class="filter-item" style="width: 200px;" placeholder="商品名称"
-                v-model="listQuery.productName"></el-input>
-            <el-input clearable class="filter-item" style="width: 200px;" placeholder="商品简称"
-                v-model="listQuery.productShortForm"></el-input>
-
-            <treeselect class="filter-item" default-expand-all v-model="listQuery.categoryId" :options="categoryOptions"
-                :normalizer="normalizer" placeholder="商品类别" style="width: 200px" />
-            <el-select class="filter-item" style="width: 200px" v-model="listQuery.brandId" filterable placeholder="品牌">
+            <el-input clearable class="filter-item" style="width: 200px;" placeholder="供应商名称"
+                v-model="listQuery.supplier_name"></el-input>
+                <el-input clearable class="filter-item" style="width: 200px;" placeholder="供应商编号"
+                v-model="listQuery.supplier_num"></el-input>
+            <el-select class="filter-item" style="width: 200px" v-model="listQuery.brandId" filterable placeholder="供应商类别">
+                <el-option v-for="item in brandOptions" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+            </el-select>
+            <el-select class="filter-item" style="width: 200px" v-model="listQuery.brandId" filterable placeholder="申请部门">
                 <el-option v-for="item in brandOptions" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
             </el-select>
-            <el-select v-model="listQuery.status" clearable placeholder="状态" class="filter-item" style="width: 200px;">
+            
+            <el-select v-model="listQuery.status" clearable placeholder="是否启用" class="filter-item" style="width: 200px;">
                 <el-option :key="item.type" v-for="item in goodsStatusList" :label="item.name" :value="item.type">
                 </el-option>
             </el-select>
@@ -23,28 +25,29 @@ categoryOptions<template>
                 @click="handleQuery">查找</el-button>
                 <el-button class="filter-item" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
             <el-button class="filter-item" type="primary" @click="handleAdd" icon="el-icon-plus">添加</el-button>
-            <el-button class="filter-item" :loading="downloadLoading" v-waves icon="el-icon-download" @click="handleDownload">导出</el-button>
+            <el-button class="filter-item" v-waves icon="el-icon-download" @click="handleDownLoad">导出</el-button>
         </div>
 
         <!-- 查询结果 -->
         <el-table size="small" :data="list" v-loading="listLoading" element-loading-text="正在查询中。。。" border fit
             highlight-current-row>
-            <el-table-column align="center" min-width="120px" label="商品编号" prop="productCode">
+            <el-table-column type="index" label="序号" header-align="center" align="center">
             </el-table-column>
-            <el-table-column align="center" min-width="200px" label="商品名称" prop="productName">
+            <el-table-column align="center" min-width="120px" label="供应商编号" prop="supplier_num">
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="商品简称" prop="productShortForm">
+            <el-table-column align="center" min-width="200px" label="供应商名称" prop="supplier_name">
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="商品类别" prop="categoryName">
+            <el-table-column align="center" min-width="80px" label="供应商类别" prop="type_name">
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="品牌" prop="brandName">
+            <el-table-column align="center" min-width="80px" label="地域" prop="supplier_purchas_address">
             </el-table-column>
-            <el-table-column align="center" min-width="100px" label="主图" prop="imgUrl">
-                <template slot-scope="scope">
-                    <img class="good-img" :src="scope.row.imgUrl ? scope.row.imgUrl : require('@/assets/avatar.gif')">
-                </template>
+            <el-table-column align="center" min-width="80px" label="联系人" prop="supplier_contact">
+            </el-table-column>
+            <el-table-column align="center" min-width="80px" label="申请部门" prop="deptName">
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="状态">
+            <el-table-column align="center" min-width="80px" label="登记时间" prop="add_time">
+            </el-table-column>
+            <el-table-column align="center" min-width="100px" label="是否启用">
                 <template slot-scope="props">
                     <span v-if="props.row.status == 0" style="color: #67C23A;font-weight: bold;">启用</span>
                     <span v-if="props.row.status == 1" style="color: #E6A23C;font-weight: bold;">停用</span>
@@ -53,7 +56,7 @@ categoryOptions<template>
             <el-table-column align="center" label="操作" width="240px" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <el-button type="primary" size="small" @click="handleUpdate(scope.row)">编辑</el-button>
-                    <el-button type="danger" size="small" @click="handleDelete(scope.row.productCode)">删除</el-button>
+                    <el-button type="danger" size="small" @click="handleDelete(scope.row.supplier_num)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -72,14 +75,14 @@ categoryOptions<template>
                 label-width="100px" style='margin: 0 50px;'>
                 <el-tabs v-model="activeName" @tab-click="handleClick">
                     <el-tab-pane label="基本信息" name="first">
-                        <el-form-item label="商品名称" prop="productName">
-                            <el-input v-model="dataForm.productName" placeholder="请输入商品名称"></el-input>
+                        <el-form-item label="供应商名称" prop="supplier_name">
+                            <el-input v-model="dataForm.supplier_name" placeholder="请输入供应商名称"></el-input>
                         </el-form-item>
-                        <el-form-item label="商品编号" prop="productCode">
-                            <el-input placeholder="请输入商品编号" v-model="dataForm.productCode"></el-input>
+                        <el-form-item label="商品编号" prop="supplier_num">
+                            <el-input placeholder="请输入商品编号" v-model="dataForm.supplier_num"></el-input>
                         </el-form-item>
-                        <el-form-item label="商品简介" prop="productShortForm">
-                            <el-input v-model="dataForm.productShortForm" placeholder="请输入商品简介"></el-input>
+                        <el-form-item label="商品简介" prop="supplier_num">
+                            <el-input v-model="dataForm.supplier_num" placeholder="请输入商品简介"></el-input>
                         </el-form-item>
 
 
@@ -104,12 +107,13 @@ categoryOptions<template>
                             <el-input v-model="dataForm.costPrice" placeholder="请输入成本价"></el-input>
                         </el-form-item>
                         <el-form-item label="重量(g)" prop="weight">
-                            <el-input v-model="dataForm.weight" placeholder="请输入重量"></el-input>
+                            <!-- <el-input v-model="dataForm.weight" placeholder="请输入重量" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input> -->
+                            <el-input-number v-model="dataForm.weight" :min="1" label="请输入重量"></el-input-number>
                         </el-form-item>
-                        <el-form-item label="状态" prop="freightType">
-                            <el-radio-group v-model="dataForm.freightType">
-                                <el-radio :label="'0'">启用</el-radio>
-                                <el-radio :label="'1'">停用</el-radio>
+                        <el-form-item label="状态" prop="status">
+                            <el-radio-group v-model="dataForm.status">
+                                <el-radio :label="0">启用</el-radio>
+                                <el-radio :label="1">停用</el-radio>
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item style="width: 800px" label="商品图片" prop="imgUrl">
@@ -122,23 +126,23 @@ categoryOptions<template>
 
                     </el-tab-pane>
                     <el-tab-pane label="茶叶属性" name="second">
-                        <el-form-item label="茶叶品牌">
+                        <!-- <el-form-item label="茶叶品牌">
                             <el-select v-model="dataForm.teaTypeId" filterable placeholder="请选择" style="width: 100%">
-                                <el-option :key="item.dictLabel" v-for="item in tes_type" :label="item.dictLabel"
+                                <el-option :key="item.dictLabel" v-for="item in tea_type" :label="item.dictLabel"
                                     :value="item.dictLabel">
                                 </el-option>
                             </el-select>
-                        </el-form-item>
+                        </el-form-item> -->
                         <el-form-item label="茶叶级别">
                             <el-select v-model="dataForm.teaLevel" filterable placeholder="请选择" style="width: 100%">
-                                <el-option :key="item.dictLabel" v-for="item in tes_level" :label="item.dictLabel"
+                                <el-option :key="item.dictLabel" v-for="item in tea_level" :label="item.dictLabel"
                                     :value="item.dictLabel">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="茶叶系列">
                             <el-select v-model="dataForm.teaSeries" filterable placeholder="请选择" style="width: 100%">
-                                <el-option :key="item.dictLabel" v-for="item in tes_series" :label="item.dictLabel"
+                                <el-option :key="item.dictLabel" v-for="item in tea_series" :label="item.dictLabel"
                                     :value="item.dictLabel">
                                 </el-option>
                             </el-select>
@@ -146,7 +150,7 @@ categoryOptions<template>
                         <el-form-item label="包装形式">
                             <el-select v-model="dataForm.teaPackageFormat" filterable placeholder="请选择"
                                 style="width: 100%">
-                                <el-option :key="item.dictLabel" v-for="item in tes_package_format" :label="item.dictLabel"
+                                <el-option :key="item.dictLabel" v-for="item in tea_package_format" :label="item.dictLabel"
                                     :value="item.dictLabel">
                                 </el-option>
                             </el-select>
@@ -156,21 +160,21 @@ categoryOptions<template>
                         </el-form-item>
                         <el-form-item label="采摘季节">
                             <el-radio-group v-model="dataForm.teaGetSeason">
-                                <el-radio v-for="item in tes_get_season" :key="item.dictLabel" :label="item.dictLabel"></el-radio>
+                                <el-radio v-for="item in tea_get_season" :key="item.dictLabel" :label="item.dictLabel"></el-radio>
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="保质期">
-                            <el-input placeholder="数值" v-model="dataForm.teaSellbyDate" class="input-with-select">
-                                <el-select style="width: 80px;" v-model="dataForm.selectType" slot="prepend"
+                            <el-input placeholder="数值" v-model="dataForm.tea_guarantee_number" class="input-with-select">
+                                <el-select style="width: 100px;" v-model="dataForm.tea_guarantee_unit" slot="prepend"
                                     placeholder="请选择">
-                                    <el-option label="年" value="1"></el-option>
-                                    <el-option label="月" value="2"></el-option>
-                                    <el-option label="日" value="3"></el-option>
+                                    <el-option label="年" value=""></el-option>
+                                    <el-option label="月" value=""></el-option>
+                                    <el-option label="日" value=""></el-option>
                                 </el-select>
                             </el-input>
                         </el-form-item>
                         <el-form-item label="生产日期">
-                            <el-date-picker style="width: 100%;" v-model="dataForm.date" type="date"
+                            <el-date-picker style="width: 100%;" v-model="dataForm.product_date" type="date"
                                 placeholder="选择日期"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="陈华年份">
@@ -184,10 +188,7 @@ categoryOptions<template>
                         </el-form-item>
                         <el-form-item label="存储要求">
                             <el-checkbox-group v-model="dataForm.teaStorageRequire">
-                                <el-checkbox label="避光" name="type"></el-checkbox>
-                                <el-checkbox label="防潮" name="type"></el-checkbox>
-                                <el-checkbox label="通风" name="type"></el-checkbox>
-                                <el-checkbox label="冷藏" name="type"></el-checkbox>
+                                <el-checkbox v-for="item in tea_storage_require" :key="item.dictLabel" :label="item.dictLabel" name="type"></el-checkbox>
                             </el-checkbox-group>
                         </el-form-item>
                     </el-tab-pane>
@@ -218,12 +219,12 @@ export default {
     directives: { waves },
     data() {
         return {
-            downloadLoading: false,
-            tes_type:[],
-            tes_level:[],
-            tes_series:[],
-            tes_package_format:[],
-            tes_get_season:[],
+            tea_type:[],
+            tea_level:[],
+            tea_series:[],
+            tea_package_format:[],
+            tea_get_season:[],
+            tea_storage_require:[],
             // 树选项
             categoryOptions: [],
             activeName: 'first',
@@ -244,9 +245,9 @@ export default {
             listQuery: {
                 page: 1,
                 limit: 10,
-                productName: '',
-                productShortForm: '',
-                categoryId: '',
+                supplier_name: '',
+                supplier_num: '',
+                categoryId: undefined,
                 brandId: '',
                 status: '',
             },
@@ -255,16 +256,16 @@ export default {
                 sort: '+id'
             },
             dataForm: {
-                productName: undefined,
-                productCode: undefined,
-                productShortForm: undefined,
+                supplier_name: undefined,
+                supplier_num: undefined,
+                supplier_num: undefined,
                 categoryId: undefined,
                 brandId: undefined,
                 price: undefined,
                 salePrice: undefined,
                 costPrice: undefined,
-                weight: undefined,
-                freightType: '0',
+                weight: 1,
+                status: 0,
                 imgUrl: undefined,
                 teaTypeId: undefined,
                 teaLevel: undefined,
@@ -272,13 +273,13 @@ export default {
                 teaPackageFormat: undefined,
                 teaOrigin: undefined,
                 teaGetSeason: undefined,
-                teaSellbyDate: undefined,
-                selectType: undefined,
-                date: undefined,
+                tea_guarantee_number: undefined,
+                tea_guarantee_unit: '年',
+                product_date: undefined,
                 teaAgingYear: undefined,
                 teaFileUrl: undefined,
                 files: [],
-                teaStorageRequire: undefined,
+                teaStorageRequire: [],
             },
             dialogFormVisible: false,
             dialogStatus: '',
@@ -287,14 +288,38 @@ export default {
                 create: "创建",
             },
             rules: {
-                productName: [{ required: true, message: "请填写商品名称", trigger: "blur" }],
-                productCode: [{ required: true, message: "请填写商品编号", trigger: "blur" }],
+                supplier_name: [{ required: true, message: "请填写供应商名称", trigger: "blur" }],
+                supplier_num: [{ required: true, message: "请填写商品编号", trigger: "blur" }],
                 categoryId: [{ required: true, message: "请选择商品类别", trigger: "blur" }],
-                price: [{ required: true, message: "请填写零售价", trigger: "blur" }],
-                salePrice: [{ required: true, message: "请填写销售价", trigger: "blur" }],
-                costPrice: [{ required: true, message: "请填写成本价", trigger: "blur" }],
-                weight: [{ required: true, message: "请填写重量", trigger: "blur" }],
-                freightType: [{ required: true, message: "请选择状态", trigger: "blur" }],
+                price: [
+                    { required: true, message: "请填写零售价", trigger: "blur" },
+                    {
+                        pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,2})?$/,
+                        message: "请输入合法的金额数字,最多两位小数",
+                        trigger: "blur"
+                    }
+                ],
+                salePrice: [
+                    { required: true, message: "请填写销售价", trigger: "blur" },
+                    {
+                        pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,2})?$/,
+                        message: "请输入合法的金额数字,最多两位小数",
+                        trigger: "blur"
+                    }
+                ],
+                costPrice: [
+                    { required: true, message: "请填写成本价", trigger: "blur" },
+                    {
+                        pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,2})?$/,
+                        message: "请输入合法的金额数字,最多两位小数",
+                        trigger: "blur"
+                    }
+                ],
+                weight: [
+                    { required: true, message: "请填写重量", trigger: "blur" },
+
+                ],
+                status: [{ required: true, message: "请选择状态", trigger: "blur" }],
             },
             dialogListVisible: false,
             fileImgUrl: this.upLoadUrl,
@@ -308,7 +333,7 @@ export default {
     },
     methods: {
         handleDownLoad(){
-            window.location.href = process.env.BASE_API + '/product/export/category?productName=' + this.listQuery.productName + '&productShortForm=' + this.listQuery.productShortForm;
+            window.location.href = process.env.BASE_API + '/product/export/category?supplier_name=' + this.listQuery.supplier_name + '&supplier_num=' + this.listQuery.supplier_num;
         },
         getListCategory() {
             listDept().then(response => {
@@ -330,25 +355,29 @@ export default {
             console.log(tab, event);
         },
         getDictType(){
-            //茶叶品牌tes_type
-            dataTypeList({ dictType: 'tes_type' }).then(response => {
-                this.tes_type = response.data.data;
+            //茶叶品牌tea_type
+            dataTypeList({ dictType: 'tea_type' }).then(response => {
+                this.tea_type = response.data.data;
+            });
+            //茶叶级别tea_level
+            dataTypeList({ dictType: 'tea_level' }).then(response => {
+                this.tea_level = response.data.data;
             });
-            //茶叶级别tes_level
-            dataTypeList({ dictType: 'tes_level' }).then(response => {
-                this.tes_level = response.data.data;
+            //茶叶系列tea_series
+            dataTypeList({ dictType: 'tea_series' }).then(response => {
+                this.tea_series = response.data.data;
             });
-            //茶叶系列tes_series
-            dataTypeList({ dictType: 'tes_series' }).then(response => {
-                this.tes_series = response.data.data;
+            //包装形式tea_package_format
+            dataTypeList({ dictType: 'tea_package_format' }).then(response => {
+                this.tea_package_format = response.data.data;
             });
-            //包装形式tes_package_format
-            dataTypeList({ dictType: 'tes_package_format' }).then(response => {
-                this.tes_package_format = response.data.data;
+            //采摘季节tea_get_season
+            dataTypeList({ dictType: 'tea_get_season' }).then(response => {
+                this.tea_get_season = response.data.data;
             });
-            //采摘季节tes_get_season
-            dataTypeList({ dictType: 'tes_get_season' }).then(response => {
-                this.tes_get_season = response.data.data;
+            //存储要求tea_storage_require
+            dataTypeList({ dictType: 'tea_storage_require' }).then(response => {
+                this.tea_storage_require = response.data.data;
             });
         },
         handleRemoveFile(file, fileList) {
@@ -428,16 +457,16 @@ export default {
         },
         resetForm() {
             this.dataForm = {
-                productName: undefined,
-                productCode: undefined,
-                productShortForm: undefined,
+                supplier_name: undefined,
+                supplier_num: undefined,
+                supplier_num: undefined,
                 categoryId: undefined,
                 brandId: undefined,
                 price: undefined,
                 salePrice: undefined,
                 costPrice: undefined,
-                weight: undefined,
-                freightType: '0',
+                weight: 1,
+                status: 0,
                 imgUrl: undefined,
                 images: [],
                 teaTypeId: undefined,
@@ -446,13 +475,13 @@ export default {
                 teaPackageFormat: undefined,
                 teaOrigin: undefined,
                 teaGetSeason: undefined,
-                teaSellbyDate: undefined,
-                selectType: undefined,
-                date: undefined,
+                tea_guarantee_number: undefined,
+                tea_guarantee_unit: '年',
+                product_date: undefined,
                 teaAgingYear: undefined,
                 teaFileUrl: undefined,
                 files: [],
-                teaStorageRequire: undefined,
+                teaStorageRequire: [],
             };
         },
         handleAdd() {
@@ -540,13 +569,13 @@ export default {
 
             })
         },
-        handleDelete(productCode) {
+        handleDelete(supplier_num) {
             this.$confirm('确认删除吗?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                removeItem({ productCode: productCode }).then(response => {
+                removeItem({ supplier_num: supplier_num }).then(response => {
                     this.$notify({
                         title: '成功',
                         message: '删除成功',
@@ -588,8 +617,8 @@ export default {
             this.listQuery = {
                 page: 1,
                 limit: 10,
-                productName: '',
-                productShortForm: '',
+                supplier_name: '',
+                supplier_num: '',
                 categoryId: '',
                 brandId: '',
                 status: '',

+ 22 - 18
src/views/goodsManage/goodsList.vue

@@ -29,6 +29,8 @@ categoryOptions<template>
         <!-- 查询结果 -->
         <el-table size="small" :data="list" v-loading="listLoading" element-loading-text="正在查询中。。。" border fit
             highlight-current-row>
+            <el-table-column type="index" label="序号" header-align="center" align="center">
+            </el-table-column>
             <el-table-column align="center" min-width="120px" label="商品编号" prop="productCode">
             </el-table-column>
             <el-table-column align="center" min-width="200px" label="商品名称" prop="productName">
@@ -107,10 +109,10 @@ categoryOptions<template>
                             <!-- <el-input v-model="dataForm.weight" placeholder="请输入重量" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input> -->
                             <el-input-number v-model="dataForm.weight" :min="1" label="请输入重量"></el-input-number>
                         </el-form-item>
-                        <el-form-item label="状态" prop="freightType">
-                            <el-radio-group v-model="dataForm.freightType">
-                                <el-radio :label="'0'">启用</el-radio>
-                                <el-radio :label="'1'">停用</el-radio>
+                        <el-form-item label="状态" prop="status">
+                            <el-radio-group v-model="dataForm.status">
+                                <el-radio :label="0">启用</el-radio>
+                                <el-radio :label="1">停用</el-radio>
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item style="width: 800px" label="商品图片" prop="imgUrl">
@@ -161,8 +163,8 @@ categoryOptions<template>
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="保质期">
-                            <el-input placeholder="数值" v-model="dataForm.tea_guarantee_number" class="input-with-select">
-                                <el-select style="width: 80px;" v-model="dataForm.tea_guarantee_unit" slot="prepend"
+                            <el-input placeholder="数值" v-model="dataForm.teaGuaranteeNumber" class="input-with-select">
+                                <el-select style="width: 100px;" v-model="dataForm.teaGuaranteeUnit" slot="prepend"
                                     placeholder="请选择">
                                     <el-option label="年" value="年"></el-option>
                                     <el-option label="月" value="月"></el-option>
@@ -171,8 +173,8 @@ categoryOptions<template>
                             </el-input>
                         </el-form-item>
                         <el-form-item label="生产日期">
-                            <el-date-picker style="width: 100%;" v-model="dataForm.product_date" type="date"
-                                placeholder="选择日期"></el-date-picker>
+                            <el-date-picker style="width: 100%;" v-model="dataForm.productDate" type="date"
+                                placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="陈华年份">
                             <el-input v-model="dataForm.teaAgingYear" placeholder="输入陈华年份"></el-input>
@@ -262,7 +264,7 @@ export default {
                 salePrice: undefined,
                 costPrice: undefined,
                 weight: 1,
-                freightType: '0',
+                status: 0,
                 imgUrl: undefined,
                 teaTypeId: undefined,
                 teaLevel: undefined,
@@ -270,9 +272,9 @@ export default {
                 teaPackageFormat: undefined,
                 teaOrigin: undefined,
                 teaGetSeason: undefined,
-                tea_guarantee_number: undefined,
-                tea_guarantee_unit: '年',
-                product_date: undefined,
+                teaGuaranteeNumber: undefined,
+                teaGuaranteeUnit: '年',
+                productDate: undefined,
                 teaAgingYear: undefined,
                 teaFileUrl: undefined,
                 files: [],
@@ -316,7 +318,7 @@ export default {
                     { required: true, message: "请填写重量", trigger: "blur" },
 
                 ],
-                freightType: [{ required: true, message: "请选择状态", trigger: "blur" }],
+                status: [{ required: true, message: "请选择状态", trigger: "blur" }],
             },
             dialogListVisible: false,
             fileImgUrl: this.upLoadUrl,
@@ -330,7 +332,7 @@ export default {
     },
     methods: {
         handleDownLoad(){
-            window.location.href = process.env.BASE_API + '/product/export/category?productName=' + this.listQuery.productName + '&productShortForm=' + this.listQuery.productShortForm;
+            window.location.href = process.env.BASE_API + '/product/export?productName=' + this.listQuery.productName + '&productShortForm=' + this.listQuery.productShortForm;
         },
         getListCategory() {
             listDept().then(response => {
@@ -463,7 +465,7 @@ export default {
                 salePrice: undefined,
                 costPrice: undefined,
                 weight: 1,
-                freightType: '0',
+                status: 0,
                 imgUrl: undefined,
                 images: [],
                 teaTypeId: undefined,
@@ -472,9 +474,9 @@ export default {
                 teaPackageFormat: undefined,
                 teaOrigin: undefined,
                 teaGetSeason: undefined,
-                tea_guarantee_number: undefined,
-                tea_guarantee_unit: '年',
-                product_date: undefined,
+                teaGuaranteeNumber: undefined,
+                teaGuaranteeUnit: '年',
+                productDate: undefined,
                 teaAgingYear: undefined,
                 teaFileUrl: undefined,
                 files: [],
@@ -482,6 +484,7 @@ export default {
             };
         },
         handleAdd() {
+            this.activeName = 'first';
             this.resetForm();
 
             this.dialogFormVisible = true;
@@ -512,6 +515,7 @@ export default {
             });
         },
         handleUpdate(row) {
+            this.activeName = 'first';
             this.dataForm = Object.assign({}, row);
             if (this.dataForm.imgUrl) {
                 let images = this.dataForm.imgUrl.split(",");