叶盏测试调整

src/api/supplier.js

@@ -47,4 +47,12 @@ export function typeListSupplier(query) {
     method: 'get',
     params:query
   })
+}
+
+export function setStateSupplier(query) {
+  return request({
+    url: '/supplier-info/updateStatus',
+    method: 'post',
+    params:query
+  })
 }

src/views/basicSetting/express.vue

@@ -64,16 +64,16 @@ rookieCode<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="110px">
         <el-form-item label="物流公司名称" prop="logisticsName">
-          <el-input v-model="dataForm.logisticsName"></el-input>
+          <el-input v-model="dataForm.logisticsName" placeholder="请输入物流公司名称"></el-input>
         </el-form-item>
         <el-form-item label="快递查询代码" prop="queryCode">
-          <el-input v-model="dataForm.queryCode"></el-input>
+          <el-input v-model="dataForm.queryCode" placeholder="请输入快递查询代码"></el-input>
         </el-form-item>
         <el-form-item label="菜鸟代码" prop="rookieCode">
-          <el-input v-model="dataForm.rookieCode"></el-input>
+          <el-input v-model="dataForm.rookieCode" placeholder="请输入菜鸟代码"></el-input>
         </el-form-item>
         <!-- <el-form-item label="备注" prop="remarks">
-          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="请输入"
+          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="请输入备注"
             v-model="dataForm.remarks">
           </el-input>
         </el-form-item> -->
@@ -123,8 +123,8 @@ export default {
       dialogFormVisible: false,
       dialogStatus: '',
       textMap: {
-        update: '编辑',
-        create: '创建'
+        update: '编辑物流公司',
+        create: '添加物流公司'
       },
       rules: {
         logisticsName: [{ required: true, message: '物流公司名称不能为空', trigger: 'blur' }],

src/views/basicSetting/store.vue

@@ -63,22 +63,22 @@ contactsId<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="storeCode">
-          <el-input v-model="dataForm.storeCode"></el-input>
+          <el-input v-model="dataForm.storeCode" placeholder="请输入门店编号"></el-input>
         </el-form-item>
         <el-form-item label="门店名称" prop="storeName">
-          <el-input v-model="dataForm.storeName"></el-input>
+          <el-input v-model="dataForm.storeName" placeholder="请输入门店名称"></el-input>
         </el-form-item>
         <el-form-item label="联系人" prop="contactsId">
-          <el-input v-model="dataForm.contactsId"></el-input>
+          <el-input v-model="dataForm.contactsId" placeholder="请输入联系人"></el-input>
         </el-form-item>
         <el-form-item label="联系电话" prop="contactsPhone">
-          <el-input v-model="dataForm.contactsPhone"></el-input>
+          <el-input v-model="dataForm.contactsPhone" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="请输入联系电话"></el-input>
         </el-form-item>
         <el-form-item label="门店地址" prop="storeAddress">
-          <el-input v-model="dataForm.storeAddress"></el-input>
+          <el-input v-model="dataForm.storeAddress" placeholder="请输入门店地址"></el-input>
         </el-form-item>
         <!-- <el-form-item label="备注" prop="remarks">
-          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="请输入"
+          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="请输入备注"
             v-model="dataForm.remarks">
           </el-input>
         </el-form-item> -->
@@ -121,11 +121,15 @@ export default {
       dialogFormVisible: false,
       dialogStatus: '',
       textMap: {
-        update: '编辑',
-        create: '创建'
+        update: '编辑门店',
+        create: '添加门店'
       },
       rules: {
-        storeCode: [{ required: true, message: '门店编号不能为空', trigger: 'blur' }],
+        storeCode: [
+          { required: true, message: "门店编号不能为空", trigger: "blur" },
+          { min: 11, max: 11, message: "门店编号必须为11位", trigger: "blur" },
+          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/, message: "门店编号必须为11位字母加数字", trigger: "blur" }
+        ],
         storeName: [{ required: true, message: '门店名称不能为空', trigger: 'blur' }],
         contactsId: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
         contactsPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],

src/views/basicSetting/supplier.vue

@@ -7,10 +7,10 @@
                 v-model="listQuery.supplierName"></el-input>
                 <el-input clearable class="filter-item" style="width: 200px;" placeholder="供应商编号"
                 v-model="listQuery.supplierNum"></el-input>
-            <el-select class="filter-item" style="width: 200px" v-model="listQuery.typeId" filterable placeholder="供应商类别">
+            <!-- <el-select class="filter-item" style="width: 200px" v-model="listQuery.typeId" filterable placeholder="供应商类别">
                 <el-option v-for="item in brandOptions" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
-            </el-select>
+            </el-select> -->
             <treeselect class="filter-item" default-expand-all v-model="listQuery.responsibleDept" :options="categoryOptions"
                 :normalizer="normalizer" placeholder="申请部门" style="width: 200px" />
             
@@ -35,8 +35,8 @@
             </el-table-column>
             <el-table-column align="center" min-width="200px" label="供应商名称" prop="supplierName">
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="供应商类别" prop="typeName">
-            </el-table-column>
+            <!-- <el-table-column align="center" min-width="80px" label="供应商类别" prop="typeName">
+            </el-table-column> -->
             <el-table-column align="center" min-width="80px" label="地域" prop="supplierPurchasAddress">
             </el-table-column>
             <el-table-column align="center" min-width="80px" label="联系人" prop="supplierContact">
@@ -54,6 +54,10 @@
             <el-table-column align="center" label="操作" width="240px" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <el-button type="primary" size="small" @click="handleUpdate(scope.row)">编辑</el-button>
+                    <el-button v-if="scope.row.isEnable == 1" type="success" size="small"
+                        @click="changeState(scope.row.id, scope.row.isEnable)">启用</el-button>
+                    <el-button v-if="scope.row.isEnable == 0" type="warning" size="small"
+                        @click="changeState(scope.row.id, scope.row.isEnable)">停用</el-button>
                     <el-button type="danger" size="small" @click="handleDelete(scope.row)">删除</el-button>
                 </template>
             </el-table-column>
@@ -74,60 +78,60 @@
                 <el-tabs v-model="activeName" @tab-click="handleClick">
                     <el-tab-pane label="基础信息" name="first">
                         <el-form-item label="供应商名称" prop="supplierName">
-                            <el-input v-model="dataForm.supplierName" placeholder="请输入"></el-input>
+                            <el-input v-model="dataForm.supplierName" placeholder="请输入供应商名称"></el-input>
                         </el-form-item>
                         <el-form-item v-if="dataForm.supplierNum" label="供应商编号" prop="supplierNum">
                             <el-input disabled v-model="dataForm.supplierNum"></el-input>
                         </el-form-item>
                         <el-form-item label="类别" prop="typeId">
-                            <el-select style="width: 100%" v-model="dataForm.typeId" filterable placeholder="请选择">
+                            <el-select style="width: 100%" v-model="dataForm.typeId" filterable placeholder="请选择类别">
                                 <el-option v-for="item in brandOptions" :key="item.value" :label="item.label" :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="地域" prop="supplierPurchasAddress">
-                            <el-input v-model="dataForm.supplierPurchasAddress" placeholder="请输入"></el-input>
+                            <el-input v-model="dataForm.supplierPurchasAddress" placeholder="请输入地域"></el-input>
                         </el-form-item>
                         <el-form-item label="注册资本金" prop="registeredCapital">
                             <el-input v-model="dataForm.registeredCapital" placeholder="请输入注册资本金(万元)"></el-input>
                         </el-form-item>
                         <el-form-item label="银行卡号" prop="bankCardNo">
-                            <el-input v-model="dataForm.bankCardNo" placeholder="请输入"></el-input>
+                            <el-input v-model="dataForm.bankCardNo" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="请输入银行卡号"></el-input>
                         </el-form-item>
                         <el-form-item label="银行名称" prop="bankCardName">
-                            <el-input v-model="dataForm.bankCardName" placeholder="请输入"></el-input>
+                            <el-input v-model="dataForm.bankCardName" placeholder="请输入银行名称"></el-input>
                         </el-form-item>
                         <el-form-item label="纳税性质" prop="nature">
-                            <el-select style="width: 100%" v-model="dataForm.nature" filterable placeholder="请选择">
+                            <el-select style="width: 100%" v-model="dataForm.nature" filterable placeholder="请选择纳税性质">
                                 <el-option value="一般纳税人">一般纳税人</el-option>
                                 <el-option value="小规模纳税人">小规模纳税人</el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="税率" prop="taxrate">
-                            <el-select style="width: 100%" v-model="dataForm.taxrate" filterable placeholder="请选择">
+                            <el-select style="width: 100%" v-model="dataForm.taxrate" filterable placeholder="请选择税率">
                                 <el-option value="0%">0%</el-option>
                                 <el-option value="1%">1%</el-option>
                                 <el-option value="3%">3%</el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="联系人" prop="supplierContact">
-                            <el-input v-model="dataForm.supplierContact" placeholder="请输入"></el-input>
+                            <el-input v-model="dataForm.supplierContact" placeholder="请输入联系人"></el-input>
                         </el-form-item>
                         <el-form-item label="联系电话" prop="supplierPhone">
-                            <el-input v-model="dataForm.supplierPhone" placeholder="请输入"></el-input>
+                            <el-input v-model="dataForm.supplierPhone" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="请输入联系电话"></el-input>
                         </el-form-item>
                         <el-form-item label="单位地址" prop="supplierAddress">
-                            <el-input v-model="dataForm.supplierAddress" placeholder="请输入"></el-input>
+                            <el-input v-model="dataForm.supplierAddress" placeholder="请输入单位地址"></el-input>
                         </el-form-item>
                         <el-form-item label="申请部门" prop="responsibleDept">
                             <treeselect default-expand-all v-model="dataForm.responsibleDept" :options="categoryOptions"
-                                :normalizer="normalizer" placeholder="请选择" />
+                                :normalizer="normalizer" placeholder="请选择申请部门" />
                         </el-form-item>
                         <el-form-item label="申请事由" prop="supplierRemark">
                             <el-input
                                 type="textarea"
                                 :autosize="{ minRows: 2, maxRows: 4}"
-                                placeholder="请输入"
+                                placeholder="请输入申请事由"
                                 v-model="dataForm.supplierRemark">
                             </el-input>
                         </el-form-item>
@@ -135,7 +139,7 @@
                     <el-tab-pane label="营业执照" name="second">
                        
                         <el-form-item label="名称" prop="businessName">
-                            <el-input v-model="dataForm.businessName" placeholder="请输入产地"></el-input>
+                            <el-input v-model="dataForm.businessName" placeholder="请输入名称"></el-input>
                         </el-form-item>
                         <el-form-item label="开始日期" prop="businessStartTime">
                             <el-date-picker style="width: 100%;" v-model="dataForm.businessStartTime" type="date" value-format="yyyy-MM-dd"
@@ -176,7 +180,7 @@
                     </el-tab-pane>
                     <el-tab-pane label="供应商资质信息" name="fourth">
                         <el-form-item label="名称" prop="qualifiedName">
-                            <el-input v-model="dataForm.qualifiedName" placeholder="请输入"></el-input>
+                            <el-input v-model="dataForm.qualifiedName" placeholder="请输入名称"></el-input>
                         </el-form-item>
                         <el-form-item label="开始日期" prop="qualifiedStartTime">
                             <el-date-picker style="width: 100%;" v-model="dataForm.qualifiedStartTime" type="date" value-format="yyyy-MM-dd"
@@ -210,7 +214,7 @@
     </div>
 </template>
 <script>
-import { createSupplier, updateSupplier, listSupplier, deleteSupplier, typeListSupplier } from "@/api/supplier";
+import { createSupplier, updateSupplier, listSupplier, deleteSupplier, typeListSupplier,setStateSupplier } from "@/api/supplier";
 import { listDept } from "@/api/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -286,8 +290,8 @@ export default {
             dialogFormVisible: false,
             dialogStatus: '',
             textMap: {
-                update: "编辑",
-                create: "创建",
+                update: "编辑供应商",
+                create: "添加供应商",
             },
             rules: {
                 supplierName: [{ required: true, message: "请填写供应商名称", trigger: "blur" }],
@@ -328,6 +332,17 @@ export default {
         handleDownLoad(){
             window.location.href = process.env.BASE_API + '/supplier-info/export';
         },
+        changeState(id, isEnable) {
+            setStateSupplier({ id: id, isEnable: isEnable }).then(response => {
+                this.$notify({
+                    title: '成功',
+                    message: '状态修改成功',
+                    type: 'success',
+                    duration: 2000
+                })
+                this.getList()
+            })
+        },
         getListDept() {
             listDept().then(response => {
                 this.categoryOptions = this.handleTree(response.data.data, "deptId");

src/views/basicSetting/warehouse.vue

@@ -60,22 +60,22 @@ 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"></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"></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"></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"></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"></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="请输入"
+          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="请输入备注"
             v-model="dataForm.remarks">
           </el-input>
         </el-form-item>
@@ -118,11 +118,15 @@ export default {
       dialogFormVisible: false,
       dialogStatus: '',
       textMap: {
-        update: '编辑',
-        create: '创建'
+        update: '编辑仓库',
+        create: '添加仓库'
       },
       rules: {
-        warehouseCode: [{ required: true, message: '仓库编号不能为空', trigger: 'blur' }],
+        warehouseCode: [
+          { required: true, message: "仓库编号不能为空", trigger: "blur" },
+          { min: 11, max: 11, message: "仓库编号必须为11位", trigger: "blur" },
+          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/, message: "仓库编号必须为11位字母加数字", trigger: "blur" }
+        ],
         warehouseName: [{ required: true, message: '仓库名称不能为空', trigger: 'blur' }],
         adminId: [{ required: true, message: '管理员不能为空', trigger: 'blur' }],
         adminPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],

src/views/goodsManage/goodsList.vue

@@ -94,8 +94,8 @@
                         <el-form-item label="商品编号" prop="productCode">
                             <el-input placeholder="请输入商品编号" v-model="dataForm.productCode"></el-input>
                         </el-form-item>
-                        <el-form-item label="商品简介" prop="productShortForm">
-                            <el-input v-model="dataForm.productShortForm" placeholder="请输入商品简介"></el-input>
+                        <el-form-item label="商品简称" prop="productShortForm">
+                            <el-input v-model="dataForm.productShortForm" placeholder="请输入商品简称"></el-input>
                         </el-form-item>
 
 
@@ -117,7 +117,7 @@
                         </el-form-item>
 
                         <el-form-item label="品牌" prop="brandId">
-                            <el-select style="width: 100%" v-model="dataForm.brandId" filterable placeholder="品牌">
+                            <el-select style="width: 100%" v-model="dataForm.brandId" filterable placeholder="请选择品牌">
                                 <el-option v-for="item in brandOptions" :key="item.value" :label="item.label" :value="item.value">
                                 </el-option>
                             </el-select>
@@ -159,21 +159,21 @@
                             </el-select>
                         </el-form-item> -->
                         <el-form-item label="茶叶级别">
-                            <el-select v-model="dataForm.teaLevel" filterable placeholder="请选择" style="width: 100%">
+                            <el-select v-model="dataForm.teaLevel" filterable placeholder="请选择茶叶级别" style="width: 100%">
                                 <el-option :key="item.dictLabel" v-for="item in tea_level" :label="item.dictLabel"
                                     :value="item.dictLabel">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="茶叶系列">
-                            <el-select v-model="dataForm.teaSeries" filterable placeholder="请选择" style="width: 100%">
+                            <el-select v-model="dataForm.teaSeries" filterable placeholder="请选择茶叶系列" style="width: 100%">
                                 <el-option :key="item.dictLabel" v-for="item in tea_series" :label="item.dictLabel"
                                     :value="item.dictLabel">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="包装形式">
-                            <el-select v-model="dataForm.teaPackageFormat" filterable placeholder="请选择"
+                            <el-select v-model="dataForm.teaPackageFormat" multiple filterable placeholder="请选择包装形式"
                                 style="width: 100%">
                                 <el-option :key="item.dictLabel" v-for="item in tea_package_format" :label="item.dictLabel"
                                     :value="item.dictLabel">
@@ -189,7 +189,7 @@
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="保质期">
-                            <el-input placeholder="数值" v-model="dataForm.teaGuaranteeNumber" class="input-with-select">
+                            <el-input placeholder="数值" v-model="dataForm.teaGuaranteeNumber" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" class="input-with-select">
                                 <el-select style="width: 100px;" v-model="dataForm.teaGuaranteeUnit" slot="prepend"
                                     placeholder="请选择">
                                     <el-option label="年" value="年"></el-option>
@@ -203,7 +203,7 @@
                                 placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="陈化年份">
-                            <el-input v-model="dataForm.teaAgingYear" placeholder="请输入陈化年份"></el-input>
+                            <el-input v-model="dataForm.teaAgingYear" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="请输入陈化年份"></el-input>
                         </el-form-item>
                         <el-form-item label="溯源信息" prop="teaFiles">
                             <el-upload :limit="1" :action="fileImgUrl" :file-list="dataForm.files" :on-success="handleFileSuccess"
@@ -295,7 +295,7 @@ export default {
                 teaTypeId: undefined,
                 teaLevel: undefined,
                 teaSeries: undefined,
-                teaPackageFormat: undefined,
+                teaPackageFormat: [],
                 teaOrigin: undefined,
                 teaGetSeason: undefined,
                 teaGuaranteeNumber: undefined,
@@ -309,12 +309,16 @@ export default {
             dialogFormVisible: false,
             dialogStatus: '',
             textMap: {
-                update: "编辑",
-                create: "创建",
+                update: "编辑商品",
+                create: "添加商品",
             },
             rules: {
                 productName: [{ required: true, message: "请填写商品名称", trigger: "blur" }],
-                productCode: [{ required: true, message: "请填写商品编号", trigger: "blur" }],
+                productCode: [
+                    { required: true, message: "请填写商品编号", trigger: "blur" },
+                    { min: 14, max: 14, message: "商品编号必须为14位", trigger: "blur" },
+                    { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/, message: "商品编号必须为14位字母加数字", trigger: "blur" }
+                ],
                 categoryId: [{ required: true, message: "请选择商品类别", trigger: "blur" }],
                 price: [
                     { required: true, message: "请填写零售价", trigger: "blur" },
@@ -497,7 +501,7 @@ export default {
                 teaTypeId: undefined,
                 teaLevel: undefined,
                 teaSeries: undefined,
-                teaPackageFormat: undefined,
+                teaPackageFormat: [],
                 teaOrigin: undefined,
                 teaGetSeason: undefined,
                 teaGuaranteeNumber: undefined,

src/views/goodsManage/goodsTypeList.vue

@@ -5,14 +5,14 @@
         <el-input
         class="filter-item" style="width: 200px;"
             v-model="listQuery.categoryCode"
-            placeholder="请输入类别编号"
+            placeholder="请输入商品类别编号"
             clearable
             @keyup.enter.native="handleQuery"
           />
           <el-input
           class="filter-item" style="width: 200px;"
             v-model="listQuery.categoryName"
-            placeholder="请输入类别名称"
+            placeholder="请输入商品类别名称"
             clearable
             @keyup.enter.native="handleQuery"
           />   
@@ -32,8 +32,8 @@
         :default-expand-all="isExpandAll"
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       >
-        <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="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> -->
         <el-table-column label="创建时间" align="center" prop="createDate">
         </el-table-column>
@@ -43,7 +43,7 @@
               size="small"
               type="primary"
               @click="handleUpdate(scope.row)"
-            >修改</el-button>
+            >编辑</el-button>
             <el-button
               size="small"
               type="success"
@@ -59,13 +59,13 @@
         </el-table-column>
       </el-table>
   
-      <!-- 添加或修改类别对话框 -->
+      <!-- 添加或修改商品类别对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="150px">
           <el-row>
             <el-col :span="24" v-if="isShowParent">
               
-              <el-form-item label="上级名称" prop="parentId">
+              <el-form-item label="上级商品类别名称" prop="parentId">
                  <el-cascader
                  style="width: 100%;"
                   v-model="form.parentId"
@@ -77,42 +77,42 @@
                     checkStrictly: true
                   }"
                 />
-                <!-- <treeselect v-model="form.parentId" @select="departTreeSelected" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级类型" /> -->
+                <!-- <treeselect v-model="form.parentId" @select="departTreeSelected" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级类别" /> -->
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24" v-if="isShowParent">
-              <el-form-item label="上级编号" prop="categoryParentCode">
+              <el-form-item label="上级商品类别编号" prop="categoryParentCode">
                 <el-input v-model="form.categoryParentCode" readonly />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="类别名称" prop="categoryName">
-                <el-input v-model="form.categoryName" placeholder="请输入类别类型" />
+              <el-form-item label="商品类别名称" prop="categoryName">
+                <el-input v-model="form.categoryName" placeholder="请输入商品类别名称" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="类别编号" prop="categoryCode">
-                <el-input v-model="form.categoryCode" placeholder="请输入类别编号" />
+              <el-form-item label="商品类别编号" prop="categoryCode">
+                <el-input v-model="form.categoryCode" placeholder="请输入商品类别编号" />
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm">确 定</el-button>
         </div>
       </el-dialog>
     </div>
   </template>
   
   <script>
-  import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/goodsTypeList";
+  import { listDept, getDept, delDept, addDept, updateDept, } from "@/api/goodsTypeList";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import waves from "@/directive/waves"; // 水波纹指令
@@ -127,7 +127,7 @@
         loading: true,
         // 表格树数据
         deptList: [],
-        // 类别树选项
+        // 商品类别树选项
         // deptOptions: [],
         // 弹出层标题
         title: "",
@@ -147,17 +147,19 @@
         // 表单校验
         rules: {
           parentId: [
-            { required: true, message: "上级类型不能为空", trigger: "blur" }
+            { required: true, message: "上级商品类别不能为空", trigger: "blur" }
           ],
           categoryParentCode: [
-            { required: true, message: "上级编号不能为空", trigger: "blur" }
+            { required: true, message: "上级商品类别编号不能为空", trigger: "blur" }
           ],
           categoryName: [
-            { required: true, message: "类别名称不能为空", trigger: "blur" }
+            { required: true, message: "商品类别名称不能为空", trigger: "blur" }
           ],
           categoryCode: [
-            { required: true, message: "类别编号不能为空", trigger: "blur" }
-          ],
+            { required: true, message: "商品类别编号不能为空", trigger: "blur" },
+            { min: 10, max: 10, message: "商品类别编号必须为10位", trigger: "blur" },
+            { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/, message: "商品类别编号必须为10位字母加数字", trigger: "blur" }
+          ]
         }
       };
     },
@@ -173,7 +175,7 @@
       handleDownLoad(){
             window.location.href = process.env.BASE_API + '/product-category/export/category';
         },
-      /** 查询类别列表 */
+      /** 查询商品类别列表 */
       getList() {
         this.loading = true;
         listDept(this.listQuery).then(response => {
@@ -182,7 +184,7 @@
           this.loading = false;
         });
       },
-      /** 转换类别数据结构 */
+      /** 转换商品类别数据结构 */
       normalizer(node) {
         if (node.children && !node.children.length) {
           delete node.children;
@@ -231,7 +233,7 @@
           this.form.categoryParentCode = row.categoryCode;
         }
         this.open = true;
-        this.title = "添加类别";
+        this.title = "添加商品类别";
         // listDept().then(response => {
         //   this.deptOptions = this.handleTree(response.data.data, "id");
         // });
@@ -256,18 +258,7 @@
             this.form.parentId = data.id;
           }
           this.open = true;
-          this.title = "修改类别";
-          // listDept().then(response => {
-          //   this.deptOptions = this.handleTree(response.data.data, "id");
-          // });
-          // listDeptExcludeChild({id:row.id}).then(response => {
-          //   this.deptOptions = this.handleTree(response.data.data, "id");
-          //   if (this.deptOptions.length == 0) {
-          //     const noResultsOptions = { id: this.form.parentId, children: [] };
-          //     // const noResultsOptions = { id: this.form.parentId, categoryName: this.form.parentName, children: [] };
-          //     this.deptOptions.push(noResultsOptions);
-          //   }
-          // });
+          this.title = "修改商品类别";
         });
 
       },