123

ruoyi-ui-app/locale/zh.js

@@ -586,8 +586,8 @@ export default {
     formSlotPh: '请选择时段',
     formAddress: '服务地址',
     formAddressPh: '请填写上门或到场地址',
-    formNeed: '服务需求',
-    formNeedPh: '请简要描述动物情况与服务需求',
+    formNeed: '健康档案',
+    formNeedPh: '请简要描述动物发病情况',
     btnCancel: '取消',
     btnSubmit: '提交',
     errBooker: '请填写预约人',
@@ -595,7 +595,7 @@ export default {
     errPhoneFmt: '请输入正确的手机号',
     errSlot: '请选择预约时段',
     errAddress: '请填写服务地址',
-    errNeed: '请填写服务需求',
+    errNeed: '请填写健康档案',
     toastDayFull: '该日期已约满',
     toastPickDate: '请选择可预约的日期',
     dayNotAvailable: '非服务日',

ruoyi-ui/src/lang/zh/diseaseTreatment.js

@@ -259,7 +259,7 @@ export default {
     colTimeSlot: "预约时段",
     colContactPhone: "联系电话",
     colServiceAddress: "服务地址",
-    colServiceRequirement: "服务需求",
+    colServiceRequirement: "健康档案",
     colStatus: "状态",
     colRejectReason: "拒绝理由",
     status0: "待确认",
@@ -273,7 +273,7 @@ export default {
     viewTimeSlot: "预约时段",
     viewContactPhone: "联系电话",
     viewServiceAddress: "服务地址",
-    viewServiceRequirement: "服务需求",
+    viewServiceRequirement: "健康档案",
     viewStatus: "状态",
     viewRejectReason: "拒绝理由",
     viewConfirmTime: "确认时间",

ruoyi-ui/src/views/diseaseTreatment/medicalResource/index.vue

@@ -531,30 +531,22 @@ export default {
       }
     },
     formRules() {
-      const phoneRule = [{ required: true, message: this.dtT("ruleContactPhone"), trigger: "blur" }, { validator: this.validatePhone, trigger: "blur" }]
+      const phoneRuleRequired = [{ required: true, message: this.dtT("ruleContactPhone"), trigger: "blur" }, { validator: this.validatePhone, trigger: "blur" }]
+      const phoneRuleOptional = [{ validator: this.validatePhoneOptional, trigger: "blur" }]
       const rules = {
         resourceType: [{ required: true, message: this.dtT("ruleResourceType"), trigger: "change" }],
         resourceName: [
           { required: true, message: this.dtT("ruleResourceName"), trigger: "blur" },
           { min: 1, max: 10, message: this.dtCommon("ruleLen110"), trigger: "blur" }
-        ],
-        photoFilePath: [{ required: true, message: this.dtT("rulePhoto"), trigger: "change" }],
-        introduction: [
-          { required: true, message: this.dtT("ruleIntroduction"), trigger: "blur" },
-          { min: 1, max: 500, message: this.dtCommon("ruleLen1500"), trigger: "blur" }
         ]
       }
       const t = this.normalizeResourceType(this.form.resourceType)
       if (this.isVetType(t)) {
-        rules.contactPhone = phoneRule
-        rules.affiliatedUnit = [
-          { required: true, message: this.dtT("ruleAffiliatedUnit"), trigger: "blur" },
-          { min: 1, max: 20, message: this.dtCommon("ruleLen120"), trigger: "blur" }
-        ]
-        rules.detailAddress = [
-          { required: true, message: this.dtT("ruleDetailAddress"), trigger: "blur" },
-          { min: 1, max: 100, message: this.dtCommon("ruleLen1100"), trigger: "blur" }
-        ]
+        rules.photoFilePath = []
+        rules.introduction = [{ max: 500, message: this.dtCommon("ruleLen1500"), trigger: "blur" }]
+        rules.contactPhone = phoneRuleOptional
+        rules.affiliatedUnit = [{ max: 20, message: this.dtCommon("ruleLen120"), trigger: "blur" }]
+        rules.detailAddress = [{ max: 100, message: this.dtCommon("ruleLen1100"), trigger: "blur" }]
         rules.consultModesList = [{ validator: this.validateConsultModes, trigger: "change" }]
         rules.serviceArea = [
           { required: true, message: this.dtT("ruleServiceArea"), trigger: "blur" },
@@ -563,8 +555,15 @@ export default {
         rules.feeStandard = [{ required: true, message: this.dtT("ruleFeeStandard"), trigger: "change" }]
         rules.serviceStartTime = [{ validator: this.validateServiceTime, trigger: "change" }]
         rules.serviceWeekdaysList = [{ validator: this.validateWeekdays, trigger: "change" }]
-      } else if (this.isTeamType(t)) {
-        rules.contactPhone = phoneRule
+      } else {
+        rules.photoFilePath = [{ required: true, message: this.dtT("rulePhoto"), trigger: "change" }]
+        rules.introduction = [
+          { required: true, message: this.dtT("ruleIntroduction"), trigger: "blur" },
+          { min: 1, max: 500, message: this.dtCommon("ruleLen1500"), trigger: "blur" }
+        ]
+      }
+      if (this.isTeamType(t)) {
+        rules.contactPhone = phoneRuleRequired
         rules.affiliatedUnit = [
           { required: true, message: this.dtT("ruleAffiliatedUnit"), trigger: "blur" },
           { min: 1, max: 20, message: this.dtCommon("ruleLen120"), trigger: "blur" }
@@ -585,7 +584,7 @@ export default {
           { required: true, message: this.dtT("rulePersonInCharge"), trigger: "blur" },
           { min: 1, max: 10, message: this.dtCommon("ruleLen110"), trigger: "blur" }
         ]
-        rules.contactPhone = phoneRule
+        rules.contactPhone = phoneRuleRequired
         rules.serviceStartTime = [{ validator: this.validateServiceTime, trigger: "change" }]
         rules.serviceWeekdaysList = [{ validator: this.validateWeekdays, trigger: "change" }]
         rules.maxDailyAppointments = [{ required: true, message: this.dtT("ruleMaxDaily"), trigger: "change" }]
@@ -695,6 +694,17 @@ export default {
       }
       callback()
     },
+    validatePhoneOptional(rule, value, callback) {
+      if (!value || !String(value).trim()) {
+        callback()
+        return
+      }
+      if (!PHONE_REG.test(String(value).trim())) {
+        callback(new Error(this.dtCommon("rulePhone")))
+        return
+      }
+      callback()
+    },
     validateConsultModes(rule, value, callback) {
       if (!value || !value.length) {
         callback(new Error(this.dtCommon("ruleConsultOne")))