Browse Source

优化修改

sunlupeng 5 tháng trước cách đây
mục cha
commit
a6fc113162

+ 2 - 2
src/views/basicSetting/store.vue

@@ -127,8 +127,8 @@ export default {
       rules: {
         storeCode: [
           { required: true, message: "门店编号不能为空", trigger: "blur" },
-          { min: 11, max: 11, message: "门店编号必须为11位", trigger: "blur" },
-          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{11,}$/, message: "门店编号必须为11位字母加数字", trigger: "blur" }
+          // { min: 11, max: 11, message: "门店编号必须为11位", trigger: "blur" },
+          // { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{11,}$/, message: "门店编号必须为11位字母加数字", trigger: "blur" }
         ],
         storeName: [{ required: true, message: '门店名称不能为空', trigger: 'blur' }],
         contactsId: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],

+ 2 - 2
src/views/basicSetting/warehouse.vue

@@ -124,8 +124,8 @@ export default {
       rules: {
         warehouseCode: [
           { required: true, message: "仓库编号不能为空", trigger: "blur" },
-          { min: 11, max: 11, message: "仓库编号必须为11位", trigger: "blur" },
-          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{11,}$/, message: "仓库编号必须为11位字母加数字", trigger: "blur" }
+          // { min: 11, max: 11, message: "仓库编号必须为11位", trigger: "blur" },
+          // { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{11,}$/, message: "仓库编号必须为11位字母加数字", trigger: "blur" }
         ],
         warehouseName: [{ required: true, message: '仓库名称不能为空', trigger: 'blur' }],
         adminId: [{ required: true, message: '管理员不能为空', trigger: 'blur' }],

+ 2 - 2
src/views/customer/business.vue

@@ -133,8 +133,8 @@ export default {
       rules: {
         customerCode: [
           { required: true, message: "企业编号不能为空", trigger: "blur" },
-          { min: 6, max: 6, message: "企业编号必须为6位", trigger: "blur" },
-          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,}$/, message: "企业编号必须为6位字母加数字", trigger: "blur" }
+          // { min: 6, max: 6, message: "企业编号必须为6位", trigger: "blur" },
+          // { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,}$/, message: "企业编号必须为6位字母加数字", trigger: "blur" }
         ],
         companyName: [{ required: true, message: '企业名称不能为空', trigger: 'blur' }],
         contactsName: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],

+ 2 - 2
src/views/customer/distributor.vue

@@ -172,8 +172,8 @@ export default {
       rules: {
         customerCode: [
           { required: true, message: "分销商编号不能为空", trigger: "blur" },
-          { min: 7, max: 7, message: "分销商编号必须为7位", trigger: "blur" },
-          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{7,}$/, message: "分销商编号必须为7位字母加数字", trigger: "blur" }
+          // { min: 7, max: 7, message: "分销商编号必须为7位", trigger: "blur" },
+          // { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{7,}$/, message: "分销商编号必须为7位字母加数字", trigger: "blur" }
         ],
         companyName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
         companyLevel: [{ required: true, message: '请选择合同开始日期', trigger: 'blur' }],

+ 2 - 2
src/views/customer/guest.vue

@@ -131,8 +131,8 @@ export default {
       rules: {
         customerCode: [
           { required: true, message: "散客编号不能为空", trigger: "blur" },
-          { min: 6, max: 6, message: "散客编号必须为7位", trigger: "blur" },
-          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,}$/, message: "散客编号必须为6位字母加数字", trigger: "blur" }
+          // { min: 6, max: 6, message: "散客编号必须为7位", trigger: "blur" },
+          // { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,}$/, message: "散客编号必须为6位字母加数字", trigger: "blur" }
         ],
         customerName: [{ required: true, message: '散客姓名不能为空', trigger: 'blur' }],
       },

+ 2 - 2
src/views/customer/vip.vue

@@ -187,8 +187,8 @@ export default {
       rules: {
         customerCode: [
           { required: true, message: "会员编号不能为空", trigger: "blur" },
-          { min: 14, max: 14, message: "会员编号必须为14位", trigger: "blur" },
-          { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{14,}$/, message: "会员编号必须为14位字母加数字", trigger: "blur" }
+          // { min: 14, max: 14, message: "会员编号必须为14位", trigger: "blur" },
+          // { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{14,}$/, message: "会员编号必须为14位字母加数字", trigger: "blur" }
         ],
         customerName: [{ required: true, message: '会员姓名不能为空', trigger: 'blur' }],
       },

+ 3 - 3
src/views/goodsManage/goodsList.vue

@@ -204,13 +204,13 @@
                         </el-form-item>
                         <el-form-item label="年份">
                             <el-input v-model="dataForm.teaAgingYear" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="请输入年份"></el-input>
-                            <span style="color: #F56C6C;">备注:如有机认证、质检报告等</span>
                         </el-form-item>
                         <el-form-item label="溯源信息" prop="teaFiles">
                             <el-upload :limit="1" :action="fileImgUrl" :file-list="dataForm.files" :on-success="handleFileSuccess"
                                 :before-upload="beforeUploadFile" :on-remove="handleRemoveFile">
                                 <el-button size="small" type="primary">点击上传</el-button>
                             </el-upload>
+                            <span style="color: #F56C6C;">备注:如有机认证、质检报告等</span>
                         </el-form-item>
                         <el-form-item label="存储要求">
                             <el-checkbox-group v-model="dataForm.teaStorageRequire">
@@ -317,8 +317,8 @@ export default {
                 productName: [{ 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]{14,}$/, message: "商品编号必须为14位字母加数字", trigger: "blur" }
+                    // { min: 14, max: 14, message: "商品编号必须为14位", trigger: "blur" },
+                    // { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{14,}$/, message: "商品编号必须为14位字母加数字", trigger: "blur" }
                 ],
                 categoryId: [{ required: true, message: "请选择商品类别", trigger: "blur" }],
                 price: [