diff --git a/jjj_erp_admin/src/views/product/base/mfrs/index.vue b/jjj_erp_admin/src/views/product/base/mfrs/index.vue
index 67a7de3..ced01ad 100644
--- a/jjj_erp_admin/src/views/product/base/mfrs/index.vue
+++ b/jjj_erp_admin/src/views/product/base/mfrs/index.vue
@@ -32,62 +32,65 @@
     </div>
     <div class="common-level-rail d-b-c">
       <div class="d-s-c flex-1">
-				 <el-button size="small" type="primary" icon="Plus" @click="addClick"
-        >新增</el-button
+        <el-button size="small" type="primary" icon="Plus" @click="addClick"
+          >新增</el-button
+        >
+      </div>
+      <!-- 分页 -->
+      <el-pagination
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        background
+        :page-sizes="[20, 50, 100]"
+        :current-page="curPage"
+        :page-size="pageSize"
+        layout="total, prev, next, jumper,sizes"
+        :total="totalDataNumber"
       >
-			</div>
-			<!-- 分页 -->
-			<el-pagination small @size-change="handleSizeChange" @current-change="handleCurrentChange" background
-				:page-sizes="[20, 50, 100]" :current-page="curPage" :page-size="pageSize"
-				layout="total, prev, next, jumper,sizes" :total="totalDataNumber">
-			</el-pagination>
-     
+      </el-pagination>
     </div>
 
     <!--内容-->
-        <el-table
-         class="flex-1"
-          size="small"
-          :data="tableData"
-          border
-          style="width: 100%"
-          v-loading="loading"
-        >
-          <el-table-column prop="#" label="序号" width="54">
-            <template #default="{ $index }">
-              {{ $index + 1 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="60">
-            <template #default="{ $index }">
-              <el-button
-                @click="removeOptions($index)"
-                type="text"
-                size="small"
-              >
-                删除
-                <!-- <el-icon :size="16">
+    <el-table
+      class="flex-1"
+      size="small"
+      :data="tableData"
+      border
+      style="width: 100%"
+      v-loading="loading"
+    >
+      <el-table-column prop="#" label="序号" width="54">
+        <template #default="{ $index }">
+          {{ $index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="60">
+        <template #default="{ $index }">
+          <el-button @click="removeOptions($index)" type="text" size="small">
+            删除
+            <!-- <el-icon :size="16">
                   <DeleteFilled />
                 </el-icon> -->
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column prop="name" label="单位">
-            <template #default="scope">
-              <template v-if="!scope.row.editing">
-                <div @click="editUnit(scope.row)">{{ scope.row.name }}</div>
-              </template>
-              <template v-else>
-                <el-input
-                  v-model="scope.row.newName"
-                  @blur="saveUnit(scope.row)"
-                  autofocus
-                ></el-input>
-              </template>
-            </template>
-          </el-table-column>
-          <el-table-column prop="createTime" label="创建时间"></el-table-column>
-        </el-table>
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="name" label="品牌名称">
+        <template #default="scope">
+          <template v-if="!scope.row.editing">
+            <div @click="editUnit(scope.row)">{{ scope.row.name }}</div>
+          </template>
+          <template v-else>
+            <el-input
+              v-model="scope.row.newName"
+              @blur="saveUnit(scope.row)"
+              autofocus
+            ></el-input>
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="创建时间"></el-table-column>
+    </el-table>
   </div>
 </template>
 
diff --git a/jjj_erp_admin/src/views/product/base/product/add.vue b/jjj_erp_admin/src/views/product/base/product/add.vue
index a33d7ac..b17c4e7 100644
--- a/jjj_erp_admin/src/views/product/base/product/add.vue
+++ b/jjj_erp_admin/src/views/product/base/product/add.vue
@@ -529,27 +529,18 @@ export default {
       this.form.image.splice(index, 1);
     },
     openProductUpload: function (file_type, file_name, file_index) {
+      console.log(1);
       this.file_name = file_name;
       this.file_index = file_index || 0;
       if (file_type == "image") {
-        if (file_name == "sku") {
-          this.config = {
-            total: 1,
-            fileType: "image",
-          };
-        } else {
-          this.config = {
-            total: 9,
-            fileType: "image",
-          };
-        }
-      } else {
+        console.log(2);
         this.config = {
-          total: 1,
-          fileType: "video",
+          total: 9,
+          fileType: "image",
         };
       }
       this.isProductUpload = true;
+      console.log("isProductUpload", this.isProductUpload);
     },
     handNum(index) {
       this.form.options[index].optionId = index + 65;
diff --git a/jjj_erp_admin/src/views/product/base/product/edit.vue b/jjj_erp_admin/src/views/product/base/product/edit.vue
index 89d33ef..4b447af 100644
--- a/jjj_erp_admin/src/views/product/base/product/edit.vue
+++ b/jjj_erp_admin/src/views/product/base/product/edit.vue
@@ -74,7 +74,7 @@
           <el-col :span="8">
             <el-form-item
               label="分类"
-              prop="name"
+              prop="categoryId"
               :label-width="formLabelWidth"
             >
               <el-tree-select
@@ -93,7 +93,7 @@
           <el-col :span="8">
             <el-form-item
               label="保质期"
-              prop="name"
+              prop="expiryNum"
               :label-width="formLabelWidth"
             >
               <el-input v-model="form.expiryNum" autocomplete="off">
@@ -104,7 +104,7 @@
           <el-col :span="8">
             <el-form-item
               label="货号"
-              prop="name"
+              prop="accountNum"
               :label-width="formLabelWidth"
             >
               <el-input v-model="form.accountNum" autocomplete="off"></el-input>
@@ -113,7 +113,7 @@
           <el-col :span="8">
             <el-form-item
               label="重量"
-              prop="name"
+              prop="weight"
               :label-width="formLabelWidth"
             >
               <el-input v-model="form.weight" autocomplete="off">
@@ -124,7 +124,7 @@
           <el-col :span="8">
             <el-form-item
               label="体积"
-              prop="name"
+              prop="volume"
               :label-width="formLabelWidth"
             >
               <el-input v-model="form.volume" autocomplete="off">
@@ -135,7 +135,7 @@
           <el-col :span="8">
             <el-form-item
               label="条码"
-              prop="name"
+              prop="barCode"
               :label-width="formLabelWidth"
             >
               <el-input v-model="form.barCode" autocomplete="off"></el-input>
@@ -144,7 +144,7 @@
           <el-col :span="16">
             <el-form-item
               label="长宽高"
-              prop="name"
+              prop="grow"
               :label-width="formLabelWidth"
             >
               <div class="d-s-c">
@@ -171,7 +171,7 @@
           <el-col :span="8">
             <el-form-item
               label="品牌"
-              prop="name"
+              prop="mfrs"
               :label-width="formLabelWidth"
             >
               <el-select
@@ -248,7 +248,7 @@
           <el-col :span="24">
             <el-form-item
               label="备注"
-              prop="name"
+              prop="remark"
               :label-width="formLabelWidth"
             >
               <el-input
@@ -449,10 +449,32 @@ export default {
         name: [
           {
             required: true,
-            message: "请输入分类名称",
+            message: "请输入名称",
             trigger: "blur",
           },
         ],
+        expiryNum: [
+          {
+            required: true,
+            message: "请输入保质期",
+            trigger: "blur",
+          },
+        ],
+        accountNum: [
+          {
+            required: true,
+            message: "请输入货号",
+            trigger: "blur",
+          },
+        ],
+        mfrs: [
+          {
+            required: true,
+            message: "请输入品牌",
+            trigger: "blur",
+          },
+        ],
+
         unitId: [
           {
             required: true,
@@ -460,6 +482,13 @@ export default {
             trigger: "blur",
           },
         ],
+        categoryId: [
+          {
+            required: true,
+            message: "请输入分类",
+            trigger: "blur",
+          },
+        ],
         sort: [
           {
             required: true,
@@ -656,6 +685,7 @@ export default {
           fileType: "video",
         };
       }
+      console.log(this.isProductUpload, "this.isProductUpload");
       this.isProductUpload = true;
     },
     handNum(index) {