修改

src/views/basicSetting/warehouse.vue

@@ -60,19 +60,19 @@ adminId<template>
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="600px">
       <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="100px">
         <el-form-item label="仓库编号" prop="warehouseCode">
-          <el-input v-model="dataForm.warehouseCode" placeholder="请输入门店编号"></el-input>
+          <el-input v-model="dataForm.warehouseCode" placeholder="请输入仓库编号"></el-input>
         </el-form-item>
         <el-form-item label="仓库名称" prop="warehouseName">
-          <el-input v-model="dataForm.warehouseName" placeholder="请输入门店编号"></el-input>
+          <el-input v-model="dataForm.warehouseName" placeholder="请输入仓库名称"></el-input>
         </el-form-item>
         <el-form-item label="管理员" prop="adminId">
-          <el-input v-model="dataForm.adminId" placeholder="请输入门店编号"></el-input>
+          <el-input v-model="dataForm.adminId" placeholder="请输入仓库管理员"></el-input>
         </el-form-item>
         <el-form-item label="联系电话" prop="adminPhone">
-          <el-input v-model="dataForm.adminPhone" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="请输入门店编号"></el-input>
+          <el-input v-model="dataForm.adminPhone" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="请输入联系电话"></el-input>
         </el-form-item>
         <el-form-item label="仓库地址" prop="warehouseAddress">
-          <el-input v-model="dataForm.warehouseAddress" placeholder="请输入门店编号"></el-input>
+          <el-input v-model="dataForm.warehouseAddress" placeholder="请输入仓库地址"></el-input>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="请输入备注"

src/views/goodsManage/goodsTypeList.vue

@@ -32,6 +32,7 @@
         :default-expand-all="isExpandAll"
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       >
+      <!-- :default-expand-all="isExpandAll" -->
         <el-table-column prop="categoryCode" label="商品类别编号" align="center"></el-table-column>
         <el-table-column prop="categoryName" label="商品类别名称" min-width="180px"></el-table-column>
         <!-- <el-table-column prop="parentId" label="备注" align="center"></el-table-column> -->
@@ -157,8 +158,8 @@
           ],
           categoryCode: [
             { required: true, message: "商品类别编号不能为空", trigger: "blur" },
-            { min: 10, max: 10, message: "商品类别编号必须为10位", trigger: "blur" },
-            { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{10,}$/, message: "商品类别编号必须为10位字母加数字", trigger: "blur" }
+            // { min: 10, max: 10, message: "商品类别编号必须为10位", trigger: "blur" },
+            // { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{10,}$/, message: "商品类别编号必须为10位字母加数字", trigger: "blur" }
           ]
         }
       };