diff --git a/src/views/pms/brand/index.vue b/src/views/pms/brand/index.vue
index 3d4a734..d26a56d 100644
--- a/src/views/pms/brand/index.vue
+++ b/src/views/pms/brand/index.vue
@@ -50,48 +50,15 @@
           v-hasPermi="['pms:brand:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['pms:brand:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['pms:brand:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['pms:brand:export']"
-        >导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="pmsBrandList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="NAME" align="center" prop="name" v-if="columns[0].visible"/>
-      <el-table-column label="SORT" align="center" prop="sort" v-if="columns[1].visible"/>
-      <el-table-column label="SHOW_STATUS" align="center" prop="showStatus" v-if="columns[2].visible"/>
-      <el-table-column label="品牌logo" align="center" prop="logo" v-if="columns[3].visible"/>
+      <el-table-column label="NAME" align="center" prop="name" />
+      <el-table-column label="SORT" align="center" prop="sort" />
+      <el-table-column label="SHOW_STATUS" align="center" prop="showStatus" />
+      <el-table-column label="品牌logo" align="center" prop="logo" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -187,12 +154,6 @@ export default {
       // 表单校验
       rules: {
       },
-      columns: [
-            { key: 1, label: "NAME", visible:  true  },
-            { key: 2, label: "SORT", visible:  true  },
-            { key: 3, label: "SHOW_STATUS", visible:  true  },
-            { key: 4, label: "品牌logo", visible:  true  },
-                             ],
     };
   },
   created() {
diff --git a/src/views/pms/product/index.vue b/src/views/pms/product/index.vue
index c1cf97f..8f39528 100644
--- a/src/views/pms/product/index.vue
+++ b/src/views/pms/product/index.vue
@@ -1,51 +1,125 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
-      <el-form-item label="名称" prop="name">
+      <el-form-item label="BRAND_ID" prop="brandId">
         <el-input
-          v-model="queryParams.name"
-          placeholder="请输入商品名称"
+          v-model="queryParams.brandId"
+          placeholder="请输入BRAND_ID"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="品牌" prop="brandName">
+      <el-form-item label="CATEGORY_ID" prop="categoryId">
         <el-input
-          v-model="queryParams.brandName"
-          placeholder="请输入品牌名称"
+          v-model="queryParams.categoryId"
+          placeholder="请输入CATEGORY_ID"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="分类" prop="categoryId">
+      <el-form-item label="商品编码" prop="outProductId">
         <el-input
-          v-model="queryParams.categoryId"
-          placeholder="请输入分类名称"
+          v-model="queryParams.outProductId"
+          placeholder="请输入商品编码"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="编码" prop="outProductId">
+      <el-form-item label="NAME" prop="name">
         <el-input
-          v-model="queryParams.outProductId"
-          placeholder="请输入商品编码"
+          v-model="queryParams.name"
+          placeholder="请输入NAME"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
-      <el-form-item label="上架状态" prop="publishStatus">
+      <el-form-item label="主图" prop="pic">
+        <el-input
+          v-model="queryParams.pic"
+          placeholder="请输入主图"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="画册图片，连产品图片限制为5张，以逗号分割" prop="albumPics">
+        <el-input
+          v-model="queryParams.albumPics"
+          placeholder="请输入画册图片，连产品图片限制为5张，以逗号分割"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="上架状态：0->下架；1->上架" prop="publishStatus">
         <el-select v-model="queryParams.publishStatus" placeholder="请选择上架状态：0->下架；1->上架" clearable size="small">
               <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
+      <template v-if="showMoreCondition">
+      <el-form-item label="排序" prop="sort">
+        <el-input
+          v-model="queryParams.sort"
+          placeholder="请输入排序"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="PRICE" prop="price">
+        <el-input
+          v-model="queryParams.price"
+          placeholder="请输入PRICE"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          placeholder="请输入单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商品重量，默认为克" prop="weight">
+        <el-input
+          v-model="queryParams.weight"
+          placeholder="请输入商品重量，默认为克"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="品牌名称" prop="brandName">
+        <el-input
+          v-model="queryParams.brandName"
+          placeholder="请输入品牌名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商品分类名称" prop="productCategoryName">
+        <el-input
+          v-model="queryParams.productCategoryName"
+          placeholder="请输入商品分类名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+    </template>
       <el-form-item class="flex_one tr">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>
       </el-form-item>
     </el-form>
 
@@ -60,16 +134,26 @@
           v-hasPermi="['pms:product:add']"
         >新增</el-button>
       </el-col>
+      </el-col>
     </el-row>
 
     <el-table v-loading="loading" :data="pmsProductList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编码" align="center" prop="outProductId"/>
-      <el-table-column label="主图" align="center" prop="pic"/>
-      <el-table-column label="名称" align="center" prop="name"/>
-      <el-table-column label="价格" align="center" prop="price"/>
-      <el-table-column label="上架状态" align="center" prop="publishStatus"/>
-      <el-table-column label="排序" align="center" prop="sort"/>
+      <el-table-column label="BRAND_ID" align="center" prop="brandId" />
+      <el-table-column label="CATEGORY_ID" align="center" prop="categoryId" />
+      <el-table-column label="商品编码" align="center" prop="outProductId" />
+      <el-table-column label="NAME" align="center" prop="name" />
+      <el-table-column label="主图" align="center" prop="pic" />
+      <el-table-column label="画册图片，连产品图片限制为5张，以逗号分割" align="center" prop="albumPics" />
+      <el-table-column label="上架状态：0->下架；1->上架" align="center" prop="publishStatus" />
+      <el-table-column label="排序" align="center" prop="sort" />
+      <el-table-column label="PRICE" align="center" prop="price" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="商品重量，默认为克" align="center" prop="weight" />
+      <el-table-column label="产品详情网页内容" align="center" prop="detailHtml" />
+      <el-table-column label="移动端网页详情" align="center" prop="detailMobileHtml" />
+      <el-table-column label="品牌名称" align="center" prop="brandName" />
+      <el-table-column label="商品分类名称" align="center" prop="productCategoryName" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -215,6 +299,7 @@ export default {
           { required: true, message: "NAME不能为空", trigger: "blur" }
         ],
       },
+      showMoreCondition: false
     };
   },
   created() {
diff --git a/src/views/pms/productCategory/index.vue b/src/views/pms/productCategory/index.vue
index 16d4ab9..d50fe79 100644
--- a/src/views/pms/productCategory/index.vue
+++ b/src/views/pms/productCategory/index.vue
@@ -68,50 +68,17 @@
           v-hasPermi="['pms:productCategory:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['pms:productCategory:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['pms:productCategory:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['pms:productCategory:export']"
-        >导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="pmsProductCategoryList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="上机分类的编号：0表示一级分类" align="center" prop="parentId" v-if="columns[0].visible"/>
-      <el-table-column label="NAME" align="center" prop="name" v-if="columns[1].visible"/>
-      <el-table-column label="分类级别：0->1级；1->2级" align="center" prop="level" v-if="columns[2].visible"/>
-      <el-table-column label="显示状态：0->不显示；1->显示" align="center" prop="showStatus" v-if="columns[3].visible"/>
-      <el-table-column label="SORT" align="center" prop="sort" v-if="columns[4].visible"/>
-      <el-table-column label="图标" align="center" prop="icon" v-if="columns[5].visible"/>
+      <el-table-column label="上机分类的编号：0表示一级分类" align="center" prop="parentId" />
+      <el-table-column label="NAME" align="center" prop="name" />
+      <el-table-column label="分类级别：0->1级；1->2级" align="center" prop="level" />
+      <el-table-column label="显示状态：0->不显示；1->显示" align="center" prop="showStatus" />
+      <el-table-column label="SORT" align="center" prop="sort" />
+      <el-table-column label="图标" align="center" prop="icon" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -215,14 +182,6 @@ export default {
       // 表单校验
       rules: {
       },
-      columns: [
-            { key: 1, label: "上机分类的编号：0表示一级分类", visible:  true  },
-            { key: 2, label: "NAME", visible:  true  },
-            { key: 3, label: "分类级别：0->1级；1->2级", visible:  true  },
-            { key: 4, label: "显示状态：0->不显示；1->显示", visible:  true  },
-            { key: 5, label: "SORT", visible:  true  },
-            { key: 6, label: "图标", visible:  true  },
-                             ],
     };
   },
   created() {
diff --git a/src/views/pms/sku/index.vue b/src/views/pms/sku/index.vue
index e75257a..8c29556 100644
--- a/src/views/pms/sku/index.vue
+++ b/src/views/pms/sku/index.vue
@@ -54,49 +54,16 @@
           v-hasPermi="['pms:sku:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['pms:sku:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['pms:sku:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['pms:sku:export']"
-        >导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="pmsSkuList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="PRODUCT_ID" align="center" prop="productId" v-if="columns[0].visible"/>
-      <el-table-column label="sku编码" align="center" prop="outSkuId" v-if="columns[1].visible"/>
-      <el-table-column label="PRICE" align="center" prop="price" v-if="columns[2].visible"/>
-      <el-table-column label="展示图片" align="center" prop="pic" v-if="columns[3].visible"/>
-      <el-table-column label="商品销售属性，json格式" align="center" prop="spData" v-if="columns[4].visible"/>
+      <el-table-column label="PRODUCT_ID" align="center" prop="productId" />
+      <el-table-column label="sku编码" align="center" prop="outSkuId" />
+      <el-table-column label="PRICE" align="center" prop="price" />
+      <el-table-column label="展示图片" align="center" prop="pic" />
+      <el-table-column label="商品销售属性，json格式" align="center" prop="spData" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -197,13 +164,6 @@ export default {
           { required: true, message: "sku编码不能为空", trigger: "blur" }
         ],
       },
-      columns: [
-            { key: 1, label: "PRODUCT_ID", visible:  true  },
-            { key: 2, label: "sku编码", visible:  true  },
-            { key: 3, label: "PRICE", visible:  true  },
-            { key: 4, label: "展示图片", visible:  true  },
-            { key: 5, label: "商品销售属性，json格式", visible:  true  },
-                             ],
     };
   },
   created() {