lipenghui před 5 měsíci
rodič
revize
4c9569a5f5

+ 0 - 10
src/views/Login/Login.vue

@@ -104,16 +104,6 @@ $prefix-cls: #{$namespace}-login;
     background-color: var(--login-bg-color);
   }
 }
-.el-input__wrapper {
-  background-color: transparent !important;
-  height: 3.5em;
-  color: white;
-  box-shadow: none !important;
-  border-radius: 0;
-  border: none !important;
-  border-bottom: 1px solid #bacde0 !important;
-  outline: none;
-}
 .el-input__inner {
   color: white;
 }

+ 10 - 0
src/views/Login/components/LoginForm.vue

@@ -333,6 +333,16 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-input__wrapper {
+  background-color: transparent !important;
+  height: 3.5em;
+  color: white;
+  box-shadow: none !important;
+  border-radius: 0;
+  border: none !important;
+  border-bottom: 1px solid #bacde0 !important;
+  outline: none;
+}
 :deep(.anticon) {
   &:hover {
     color: var(--el-color-primary) !important;

+ 6 - 1
src/views/supplier/certificate/CertificateForm.vue

@@ -3,7 +3,7 @@
     <el-form
       ref="formRef"
       :model="formData"
-      :rules="formRules"
+      :rules="ifAlone==null?aloneFormRules:formRules"
       label-width="100px"
       v-loading="formLoading"
     >
@@ -70,6 +70,11 @@ const formRules = reactive<FormRules>({
   type: [{ required: true, message: '证件类型不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '证件名称不能为空', trigger: 'blur' }]
 })
+const aloneFormRules = reactive<FormRules>({
+  supplierId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
+  type: [{ required: true, message: '证件类型不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '证件名称不能为空', trigger: 'blur' }]
+})
 const formRef = ref() // 表单 Ref
 const props = defineProps({
   supplierId: { type: Number, default: () => null },

+ 1 - 1
src/views/supplier/certificate/index.vue

@@ -8,7 +8,7 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="供应商" prop="supplierId" v-if="ifAlone">
+      <el-form-item label="供应商" prop="supplierId" v-if="ifAlone==null">
         <el-input
           v-model="queryParams.supplierId"
           placeholder="请输入供应商"

+ 5 - 1
src/views/supplier/connect/ConnectRecordForm.vue

@@ -3,7 +3,7 @@
     <el-form
       ref="formRef"
       :model="formData"
-      :rules="formRules"
+      :rules="ifAlone==null?aloneFormRules:formRules"
       label-width="100px"
       v-loading="formLoading"
     >
@@ -77,6 +77,10 @@ const props = defineProps({
   ifAlone: { type: Boolean, default: () => null },
 })
 const formRules = reactive<FormRules>({
+  // supplierId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
+  contactName: [{ required: true, message: '供应商联系人不能为空', trigger: 'blur' }],
+})
+const aloneFormRules = reactive<FormRules>({
   supplierId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
   contactName: [{ required: true, message: '供应商联系人不能为空', trigger: 'blur' }],
 })

+ 1 - 1
src/views/supplier/connect/index.vue

@@ -8,7 +8,7 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="供应商" prop="supplierId" v-if="ifAlone">
+      <el-form-item label="供应商" prop="supplierId" v-if="ifAlone==null">
         <el-input
           v-model="queryParams.supplierId"
           placeholder="请输入供应商"

+ 20 - 1
src/views/supplier/contact/ContactForm.vue

@@ -3,7 +3,7 @@
     <el-form
       ref="formRef"
       :model="formData"
-      :rules="formRules"
+      :rules="ifAlone==null?aloneFormRules:formRules"
       label-width="100px"
       v-loading="formLoading"
     >
@@ -80,6 +80,25 @@ const formData = ref({
   supplierName: undefined
 })
 const formRules = reactive<FormRules>({
+  // supplierId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+
+  email: [
+    {
+      type: 'email',
+      message: '请输入正确的邮箱地址',
+      trigger: ['blur', 'change']
+    }
+  ],
+  telephone: [{ required: true, message: '电话不能为空', trigger: 'blur' },
+    {
+      pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
+      message: '请输入正确的手机号码',
+      trigger: 'blur'
+    }
+  ]
+})
+const aloneFormRules = reactive<FormRules>({
   supplierId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
 

+ 1 - 1
src/views/supplier/contact/index.vue

@@ -8,7 +8,7 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="供应商" prop="supplierId" v-if="ifAlone">
+      <el-form-item label="供应商" prop="supplierId" v-if="ifAlone==null">
         <el-input
           v-model="queryParams.supplierId"
           placeholder="请输入供应商"

+ 5 - 1
src/views/supplier/coreproduct/CoreProductForm.vue

@@ -3,7 +3,7 @@
     <el-form
       ref="formRef"
       :model="formData"
-      :rules="formRules"
+      :rules="ifAlone==null?aloneFormRules:formRules"
       label-width="100px"
       v-loading="formLoading"
     >
@@ -68,6 +68,10 @@ const formData = ref({
   advantage: undefined,
 })
 const formRules = reactive<FormRules>({
+  // supplierId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
+  productId: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
+})
+const aloneFormRules = reactive<FormRules>({
   supplierId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
   productId: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
 })

+ 1 - 1
src/views/supplier/coreproduct/index.vue

@@ -8,7 +8,7 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="供应商" prop="supplierId" v-if="ifAlone">
+      <el-form-item label="供应商" prop="supplierId" v-if="ifAlone==null">
         <el-input
           v-model="queryParams.supplierId"
           placeholder="请输入供应商"

+ 1 - 1
src/views/supplier/product/index.vue

@@ -71,7 +71,7 @@
             type="primary"
             v-if="scope.row.parentId > 0"
             @click="handleViewSpu(scope.row.id)"
-            v-hasPermi="['supplier:category:query']"
+            v-hasPermi="['supplier:product-category:query']"
           >
             查看产品
           </el-button>