提交

src/views/MiniMall/Inventory/Comp/InventoryRecord.vue

@@ -51,8 +51,8 @@
 
     <el-table class="mt-20px" :data="tableList" border>
       <el-table-column type="index" width="50px" />
-      <el-table-column prop="" label="产品名称" />
-      <el-table-column prop="" label="规格" />
+      <el-table-column prop="productName" label="产品名称" />
+      <el-table-column prop="specsName" label="规格" />
       <el-table-column label="变动类型">
         <template #default="{ row }">
           {{ ['', '入库', '出库'][row.changeType] }}
@@ -61,8 +61,8 @@
       <el-table-column prop="num" label="数量" />
       <el-table-column prop="money" label="金额" />
       <el-table-column prop="changeTime" label="变动时间" :formatter="dateFormatter" />
-      <el-table-column prop="changeUser" label="变动人员" />
-      <el-table-column prop="" label="所属仓库" />
+      <el-table-column prop="changeUserName" label="变动人员" />
+      <el-table-column prop="warehouseName" label="所属仓库" />
       <el-table-column prop="remark" label="备注" />
     </el-table>
     <Pagination

src/views/MiniMall/Inventory/Comp/Warehouse.vue

@@ -25,12 +25,19 @@
           <el-button
             type="primary"
             style="padding: 0"
+            :disabled="row.type == 1"
             text
             @click="openForm('update', row.warehouseId)"
           >
             修改
           </el-button>
-          <el-button type="danger" style="padding: 0" text @click="handleRemove(row.warehouseId)">
+          <el-button
+            type="danger"
+            style="padding: 0"
+            :disabled="row.type == 1"
+            text
+            @click="handleRemove(row.warehouseId)"
+          >
             删除
           </el-button>
         </template>