diff --git a/src/api/product/category.js b/src/api/product/category.js
index ae4c349..b3bcc4c 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -9,6 +9,14 @@ export function listCategory(query) {
   })
 }
 
+
+export function listCategoryAll(query) {
+  return request({
+    url: '/product/category/list',
+    method: 'get',
+    params: query
+  })
+}
 // 查询品类信息详细
 export function getCategory(id) {
   return request({
diff --git a/src/views/product/category/index.vue b/src/views/product/category/index.vue
index b25ff2f..464fdd2 100644
--- a/src/views/product/category/index.vue
+++ b/src/views/product/category/index.vue
@@ -68,7 +68,7 @@
           <image-preview :src="scope.row.image" :width="50" :height="50"/>
         </template>
       </el-table-column>
-      <el-table-column label="父级品类" align="center" prop="parentId" />
+      <el-table-column label="父级品类" align="center" prop="parentName" />
       <el-table-column label="是否启用" align="center" prop="start">
         <template slot-scope="scope">
 <!--          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.start"/>-->
diff --git a/src/views/product/rule/index.vue b/src/views/product/rule/index.vue
index 4aff985..722973c 100644
--- a/src/views/product/rule/index.vue
+++ b/src/views/product/rule/index.vue
@@ -101,6 +101,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['product:rule:edit']"
+            :disabled="scope.row.flag"
           >修改</el-button>
           <el-button
             size="mini"
@@ -108,6 +109,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['product:rule:remove']"
+            :disabled="scope.row.flag"
           >删除</el-button>
         </template>
       </el-table-column>