选填

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

@@ -43,7 +43,7 @@ export default {
     ruleServiceEnd: "མཇུག་དུས་ཐོག་མ་ལས་སྔ་པ་མི་ཆོག",
     ruleConsultOne: "གཅོད་སྨན་རྣམ་པ་འདེམ་རོགས།",
     ruleWeekdayOne: "ཉིན་མཉམ་འདེམ་རོགས།",
-    tipPhoto: "jpg/jpeg/png；10MB（དགོས）",
+    tipPhoto: "jpg/jpeg/png；10MB（འདེམ）",
     unitYuanHour: "ཡུ་ཨན/ཆུ་ཚོད",
     unitPerson: "མི",
     timeSeparator: "ནས"

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

@@ -43,7 +43,7 @@ export default {
     ruleServiceEnd: "结束时间不能早于开始时间",
     ruleConsultOne: "请至少选择一种接诊方式",
     ruleWeekdayOne: "请至少选择一天服务周日",
-    tipPhoto: "支持 jpg、jpeg、png；单张不超过 10MB（必填）",
+    tipPhoto: "支持 jpg、jpeg、png；单张不超过 10MB（选填）",
     unitYuanHour: "元/小时",
     unitPerson: "人",
     timeSeparator: "至"

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

@@ -185,7 +185,7 @@
           </el-form-item>
           <el-form-item prop="consultModesList" :rules="formRules.consultModesList">
             <template slot="label">{{ dtT("formConsultModes") }}</template>
-            <el-checkbox-group v-model="form.consultModesList">
+            <el-checkbox-group v-model="form.consultModesList" @change="validateFormField('consultModesList')">
               <el-checkbox v-for="item in consultModeOptions" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
@@ -207,6 +207,7 @@
               :placeholder="dtT('formServiceStart')"
               :picker-options="timePickerOptions"
               style="width: 160px"
+              @change="validateFormField('serviceStartTime')"
             />
             <span class="time-sep">{{ dtCommon("timeSeparator") }}</span>
             <el-time-select
@@ -214,11 +215,12 @@
               :placeholder="dtT('formServiceEnd')"
               :picker-options="timePickerOptionsEnd"
               style="width: 160px"
+              @change="validateFormField('serviceStartTime')"
             />
           </el-form-item>
           <el-form-item prop="serviceWeekdaysList" :rules="formRules.serviceWeekdaysList">
             <template slot="label">{{ dtT("formServiceWeekdays") }}</template>
-            <el-checkbox-group v-model="form.serviceWeekdaysList">
+            <el-checkbox-group v-model="form.serviceWeekdaysList" @change="validateFormField('serviceWeekdaysList')">
               <el-checkbox v-for="item in weekdayOptions" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
@@ -280,6 +282,7 @@
               :placeholder="dtT('formServiceStart')"
               :picker-options="timePickerOptions"
               style="width: 160px"
+              @change="validateFormField('serviceStartTime')"
             />
             <span class="time-sep">{{ dtCommon("timeSeparator") }}</span>
             <el-time-select
@@ -287,11 +290,12 @@
               :placeholder="dtT('formServiceEnd')"
               :picker-options="timePickerOptionsEnd"
               style="width: 160px"
+              @change="validateFormField('serviceStartTime')"
             />
           </el-form-item>
           <el-form-item prop="serviceWeekdaysList" :rules="formRules.serviceWeekdaysList">
             <template slot="label">{{ dtT("formServiceWeekdays") }}</template>
-            <el-checkbox-group v-model="form.serviceWeekdaysList">
+            <el-checkbox-group v-model="form.serviceWeekdaysList" @change="validateFormField('serviceWeekdaysList')">
               <el-checkbox v-for="item in weekdayOptions" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
@@ -531,7 +535,6 @@ export default {
       }
     },
     formRules() {
-      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" }],
@@ -547,14 +550,14 @@ export default {
         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" },
-          { min: 1, max: 100, message: this.dtCommon("ruleLen1100"), trigger: "blur" }
-        ]
-        rules.feeStandard = [{ required: true, message: this.dtT("ruleFeeStandard"), trigger: "change" }]
-        rules.serviceStartTime = [{ validator: this.validateServiceTime, trigger: "change" }]
-        rules.serviceWeekdaysList = [{ validator: this.validateWeekdays, trigger: "change" }]
+        rules.consultModesList = []
+        rules.serviceArea = [{ max: 100, message: this.dtCommon("ruleLen1100"), trigger: "blur" }]
+        rules.feeStandard = []
+        rules.serviceStartTime = [{ validator: this.validateServiceTimeOptional, trigger: "change" }]
+        rules.serviceWeekdaysList = []
+      } else if (this.isOrgType(t) || this.isTeamType(t) || this.isEquipmentType(t)) {
+        rules.photoFilePath = []
+        rules.introduction = [{ max: 500, message: this.dtCommon("ruleLen1500"), trigger: "blur" }]
       } else {
         rules.photoFilePath = [{ required: true, message: this.dtT("rulePhoto"), trigger: "change" }]
         rules.introduction = [
@@ -563,40 +566,22 @@ export default {
         ]
       }
       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" }
-        ]
-        rules.establishDate = [{ required: true, message: this.dtT("ruleEstablishDate"), trigger: "change" }]
-        rules.teamSize = [{ required: true, message: this.dtT("ruleTeamSize"), trigger: "change" }]
-        rules.personInCharge = [
-          { required: true, message: this.dtT("rulePersonInCharge"), trigger: "blur" },
-          { min: 1, max: 10, message: this.dtCommon("ruleLen110"), trigger: "blur" }
-        ]
+        rules.contactPhone = phoneRuleOptional
+        rules.affiliatedUnit = [{ max: 20, message: this.dtCommon("ruleLen120"), trigger: "blur" }]
+        rules.establishDate = []
+        rules.teamSize = []
+        rules.personInCharge = [{ max: 10, message: this.dtCommon("ruleLen110"), trigger: "blur" }]
       } else if (this.isOrgType(t)) {
         rules.orgLevel = [{ required: true, message: this.dtT("ruleOrgLevel"), trigger: "change" }]
-        rules.detailAddress = [
-          { required: true, message: this.dtT("ruleDetailAddress"), trigger: "blur" },
-          { min: 1, max: 100, message: this.dtCommon("ruleLen1100"), trigger: "blur" }
-        ]
-        rules.personInCharge = [
-          { required: true, message: this.dtT("rulePersonInCharge"), trigger: "blur" },
-          { min: 1, max: 10, message: this.dtCommon("ruleLen110"), trigger: "blur" }
-        ]
-        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" }]
+        rules.detailAddress = [{ max: 100, message: this.dtCommon("ruleLen1100"), trigger: "blur" }]
+        rules.personInCharge = [{ max: 10, message: this.dtCommon("ruleLen110"), trigger: "blur" }]
+        rules.contactPhone = phoneRuleOptional
+        rules.serviceStartTime = [{ validator: this.validateServiceTimeOptional, trigger: "change" }]
+        rules.serviceWeekdaysList = []
+        rules.maxDailyAppointments = []
       } else if (this.isEquipmentType(t)) {
-        rules.equipmentModel = [
-          { required: true, message: this.dtT("ruleEquipmentModel"), trigger: "blur" },
-          { min: 1, max: 10, message: this.dtCommon("ruleLen110"), trigger: "blur" }
-        ]
-        rules.affiliatedUnit = [
-          { required: true, message: this.dtT("ruleAffiliatedUnit"), trigger: "blur" },
-          { min: 1, max: 20, message: this.dtCommon("ruleLen120"), trigger: "blur" }
-        ]
+        rules.equipmentModel = [{ max: 10, message: this.dtCommon("ruleLen110"), trigger: "blur" }]
+        rules.affiliatedUnit = [{ max: 20, message: this.dtCommon("ruleLen120"), trigger: "blur" }]
       }
       return rules
     }
@@ -687,6 +672,11 @@ export default {
         .filter(Boolean)
         .join("、")
     },
+    validateFormField(field) {
+      this.$nextTick(() => {
+        this.$refs.form && this.$refs.form.validateField(field)
+      })
+    },
     validatePhone(rule, value, callback) {
       if (!value || !PHONE_REG.test(String(value).trim())) {
         callback(new Error(this.dtCommon("rulePhone")))
@@ -732,6 +722,23 @@ export default {
       }
       callback()
     },
+    validateServiceTimeOptional(rule, value, callback) {
+      const start = this.form.serviceStartTime
+      const end = this.form.serviceEndTime
+      if (!start && !end) {
+        callback()
+        return
+      }
+      if (!start || !end) {
+        callback(new Error(this.dtT("ruleServiceTime")))
+        return
+      }
+      if (start > end) {
+        callback(new Error(this.dtCommon("ruleServiceEnd")))
+        return
+      }
+      callback()
+    },
     handleTabClick() {
       this.queryParams.resourceType = TAB_TYPE_MAP[this.activeTab]
       this.queryParams.pageNum = 1
@@ -821,10 +828,14 @@ export default {
       this.resetForm("queryForm")
       this.handleQuery()
     },
+    allConsultModeValues() {
+      return this.consultModeOptions.map((item) => item.value)
+    },
     resetFormModel() {
+      const resourceType = TAB_TYPE_MAP[this.activeTab]
       this.form = {
         id: undefined,
-        resourceType: TAB_TYPE_MAP[this.activeTab],
+        resourceType,
         resourceName: undefined,
         photoFileUrl: undefined,
         photoFilePath: undefined,
@@ -832,13 +843,13 @@ export default {
         contactPhone: undefined,
         affiliatedUnit: undefined,
         detailAddress: undefined,
-        consultModesList: [],
+        consultModesList: this.isVetType(resourceType) ? this.allConsultModeValues() : [],
         serviceArea: undefined,
         feeStandard: undefined,
         serviceStartTime: undefined,
         serviceEndTime: undefined,
         serviceWeekdaysList: [],
-        maxDailyAppointments: undefined,
+        maxDailyAppointments: this.isOrgType(resourceType) ? 30 : undefined,
         establishDate: undefined,
         teamSize: undefined,
         teamMembers: undefined,
@@ -954,7 +965,9 @@ export default {
     },
     handleFormTypeChange() {
       const t = this.normalizeResourceType(this.form.resourceType)
-      if (!this.isVetType(t)) {
+      if (this.isVetType(t)) {
+        this.form.consultModesList = this.allConsultModeValues()
+      } else {
         this.form.detailAddress = undefined
         this.form.consultModesList = []
         this.form.serviceArea = undefined
@@ -968,6 +981,8 @@ export default {
       if (!this.isOrgType(t)) {
         this.form.orgLevel = undefined
         this.form.maxDailyAppointments = undefined
+      } else {
+        this.form.maxDailyAppointments = 30
       }
       if (!this.isVetType(t) && !this.isOrgType(t)) {
         this.form.serviceStartTime = undefined

ruoyi-ui/src/views/techService/techResource/index.vue

@@ -166,7 +166,7 @@
           </el-upload>
           <div class="el-upload__tip">{{ tsCommon("tipPhoto") }}</div>
         </el-form-item>
-        <el-form-item v-if="needCover" prop="coverFilePath">
+        <el-form-item v-if="needCover" prop="coverFilePath" :rules="formRules.coverFilePath">
           <template slot="label">{{ tsT("formCover") }}</template>
           <el-upload
             list-type="picture-card"
@@ -271,6 +271,7 @@
               :placeholder="tsT('formServiceStart')"
               :picker-options="timePickerOptions"
               style="width: 160px"
+              @change="validateFormField('serviceStartTime')"
             />
             <span class="time-sep">{{ tsCommon("timeSeparator") }}</span>
             <el-time-select
@@ -278,11 +279,12 @@
               :placeholder="tsT('formServiceEnd')"
               :picker-options="timePickerOptionsEnd"
               style="width: 160px"
+              @change="validateFormField('serviceStartTime')"
             />
           </el-form-item>
           <el-form-item prop="serviceWeekdaysList" :rules="formRules.serviceWeekdaysList">
             <template slot="label">{{ tsT("formServiceWeekdays") }}</template>
-            <el-checkbox-group v-model="form.serviceWeekdaysList">
+            <el-checkbox-group v-model="form.serviceWeekdaysList" @change="validateFormField('serviceWeekdaysList')">
               <el-checkbox v-for="item in weekdayOptions" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
@@ -605,85 +607,49 @@ export default {
       }
     },
     formRules() {
-      const phoneRule = [{ required: true, message: this.tsT("ruleContactPhone"), trigger: "blur" }, { validator: this.validatePhone, trigger: "blur" }]
-      const len500 = [{ required: true, message: this.tsT("ruleIntroduction"), trigger: "blur" }, { min: 1, max: 500, message: this.tsT("ruleLen1500"), trigger: "blur" }]
+      const phoneRuleOptional = [{ validator: this.validatePhoneOptional, trigger: "blur" }]
       const rules = {
         resourceType: [{ required: true, message: this.tsT("ruleResourceType"), trigger: "change" }],
         resourceName: [{ required: true, validator: this.validateResourceName, trigger: "blur" }]
       }
       const t = this.form.resourceType
       if (this.isExpertType(t) || this.isInstrumentType(t)) {
-        rules.photoFilePath = [{ required: true, message: this.tsT("rulePhoto"), trigger: "change" }]
+        rules.photoFilePath = []
       }
       if (this.isVideoType(t)) {
         rules.videoFilePath = [{ required: true, message: this.tsT("ruleVideo"), trigger: "change" }]
+        rules.coverFilePath = []
       }
       if (this.isExpertType(t) || this.isInstrumentType(t) || this.isVideoType(t)) {
-        rules.introduction = len500
+        rules.introduction = [{ max: 500, message: this.tsT("ruleLen1500"), trigger: "blur" }]
       }
       if (this.isExpertType(t)) {
-        rules.contactPhone = phoneRule
-        rules.affiliatedUnit = [
-          { required: true, message: this.tsT("ruleAffiliatedUnit"), trigger: "blur" },
-          { min: 1, max: 20, message: this.tsT("ruleLen120"), trigger: "blur" }
-        ]
-        rules.detailAddress = [
-          { required: true, message: this.tsT("ruleDetailAddress"), trigger: "blur" },
-          { min: 1, max: 100, message: this.tsT("ruleLen1100"), trigger: "blur" }
-        ]
-        rules.serviceArea = [
-          { required: true, message: this.tsT("ruleServiceArea"), trigger: "blur" },
-          { min: 1, max: 100, message: this.tsT("ruleLen1100"), trigger: "blur" }
-        ]
-        rules.feeStandard = [{ required: true, message: this.tsT("ruleFeeStandard"), trigger: "change" }]
-        rules.serviceStartTime = [{ validator: this.validateServiceTime, trigger: "change" }]
-        rules.serviceWeekdaysList = [{ validator: this.validateWeekdays, trigger: "change" }]
+        rules.contactPhone = phoneRuleOptional
+        rules.affiliatedUnit = [{ max: 20, message: this.tsT("ruleLen120"), trigger: "blur" }]
+        rules.detailAddress = [{ max: 100, message: this.tsT("ruleLen1100"), trigger: "blur" }]
+        rules.serviceArea = [{ max: 100, message: this.tsT("ruleLen1100"), trigger: "blur" }]
+        rules.feeStandard = []
+        rules.serviceStartTime = [{ validator: this.validateServiceTimeOptional, trigger: "change" }]
+        rules.serviceWeekdaysList = []
       } else if (this.isAchievementType(t)) {
         rules.researchDirection = [
           { required: true, message: this.tsT("ruleResearchDirection"), trigger: "change" },
           { min: 1, max: 20, message: this.tsT("ruleLen120"), trigger: "blur" }
         ]
-        rules.achievementSummary = [
-          { required: true, message: this.tsT("ruleAchievementSummary"), trigger: "blur" },
-          { min: 1, max: 500, message: this.tsT("ruleLen1500"), trigger: "blur" }
-        ]
-        rules.keyTechPrinciple = [
-          { required: true, message: this.tsT("ruleKeyTechPrinciple"), trigger: "blur" },
-          { min: 1, max: 500, message: this.tsT("ruleLen1500"), trigger: "blur" }
-        ]
-        rules.techAdvantage = [
-          { required: true, message: this.tsT("ruleTechAdvantage"), trigger: "blur" },
-          { min: 1, max: 500, message: this.tsT("ruleLen1500"), trigger: "blur" }
-        ]
-        rules.completionUnit = [
-          { required: true, message: this.tsT("ruleCompletionUnit"), trigger: "blur" },
-          { min: 1, max: 20, message: this.tsT("ruleLen120"), trigger: "blur" }
-        ]
+        rules.achievementSummary = [{ max: 500, message: this.tsT("ruleLen1500"), trigger: "blur" }]
+        rules.keyTechPrinciple = [{ max: 500, message: this.tsT("ruleLen1500"), trigger: "blur" }]
+        rules.techAdvantage = [{ max: 500, message: this.tsT("ruleLen1500"), trigger: "blur" }]
+        rules.completionUnit = [{ max: 20, message: this.tsT("ruleLen120"), trigger: "blur" }]
       } else if (this.isInstrumentType(t)) {
-        rules.instrumentModel = [
-          { required: true, message: this.tsT("ruleInstrumentModel"), trigger: "blur" },
-          { min: 1, max: 10, message: this.tsT("ruleLen110"), trigger: "blur" }
-        ]
-        rules.affiliatedUnit = [
-          { required: true, message: this.tsT("ruleAffiliatedUnit"), trigger: "blur" },
-          { min: 1, max: 20, message: this.tsT("ruleLen120"), trigger: "blur" }
-        ]
-        rules.storageLocation = [
-          { required: true, message: this.tsT("ruleStorageLocation"), trigger: "blur" },
-          { min: 1, max: 100, message: this.tsT("ruleLen1100"), trigger: "blur" }
-        ]
-        rules.reservationProcess = [
-          { required: true, message: this.tsT("ruleReservationProcess"), trigger: "blur" },
-          { min: 1, max: 500, message: this.tsT("ruleLen1500"), trigger: "blur" }
-        ]
-        rules.personInCharge = [
-          { required: true, message: this.tsT("rulePersonInCharge"), trigger: "blur" },
-          { min: 1, max: 10, message: this.tsT("ruleLen110"), trigger: "blur" }
-        ]
-        rules.contactPhone = phoneRule
-        rules.borrowFee = [{ required: true, message: this.tsT("ruleBorrowFee"), trigger: "change" }]
-        rules.serviceStartTime = [{ validator: this.validateServiceTime, trigger: "change" }]
-        rules.serviceWeekdaysList = [{ validator: this.validateWeekdays, trigger: "change" }]
+        rules.instrumentModel = [{ max: 10, message: this.tsT("ruleLen110"), trigger: "blur" }]
+        rules.affiliatedUnit = [{ max: 20, message: this.tsT("ruleLen120"), trigger: "blur" }]
+        rules.storageLocation = [{ max: 100, message: this.tsT("ruleLen1100"), trigger: "blur" }]
+        rules.reservationProcess = [{ max: 500, message: this.tsT("ruleLen1500"), trigger: "blur" }]
+        rules.personInCharge = [{ max: 10, message: this.tsT("ruleLen110"), trigger: "blur" }]
+        rules.contactPhone = phoneRuleOptional
+        rules.borrowFee = []
+        rules.serviceStartTime = [{ validator: this.validateServiceTimeOptional, trigger: "change" }]
+        rules.serviceWeekdaysList = []
       } else if (this.isVideoType(t)) {
         rules.courseTopic = [{ required: true, message: this.tsT("ruleCourseTopic"), trigger: "change" }]
       }
@@ -817,6 +783,22 @@ 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.tsT("rulePhone")))
+        return
+      }
+      callback()
+    },
+    validateFormField(field) {
+      this.$nextTick(() => {
+        this.$refs.form && this.$refs.form.validateField(field)
+      })
+    },
     validateWeekdays(rule, value, callback) {
       if (!value || !value.length) {
         callback(new Error(this.tsT("ruleWeekdayOne")))
@@ -837,6 +819,23 @@ export default {
       }
       callback()
     },
+    validateServiceTimeOptional(rule, value, callback) {
+      const start = this.form.serviceStartTime
+      const end = this.form.serviceEndTime
+      if (!start && !end) {
+        callback()
+        return
+      }
+      if (!start || !end) {
+        callback(new Error(this.tsT("ruleServiceTime")))
+        return
+      }
+      if (start > end) {
+        callback(new Error(this.tsT("ruleServiceEnd")))
+        return
+      }
+      callback()
+    },
     handleTabClick() {
       this.queryParams.resourceType = TAB_TYPE_MAP[this.activeTab]
       this.queryParams.pageNum = 1