Merge branch 'develop' into fzq

2022-03-18 15:01:06 +08:00
parent 15f9fb0f5b 114bfeccf3
commit 445ad7f280
14 changed files with 1223 additions and 853 deletions
--- a/src/views/basicData/Equipment/components/equipmentInfo-add.vue
+++ b/src/views/basicData/Equipment/components/equipmentInfo-add.vue
@@ -399,7 +399,7 @@ export default {
        code: '',
        enName: '',
        abbr: '',
-        equipmentType: this.$t('module.basicData.cache.logisticsEquipment'),
+        equipmentType: '1',
        spec: '',
        createTime: '',
        enterTime: '',
@@ -442,6 +442,11 @@ export default {
          required: true,
          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.EquipmentCode')]),
          trigger: 'blur'
+        }],
+        equipmentType: [{
+          required: true,
+          message: this.$i18nForm(['placeholder.select', this.$t('module.basicData.equipment.EquipmentType')]),
+          trigger: 'blur'
        }]
        // maintenanceCycle: [{
        //   required: true,