Compare commits

...

4 Commits

Author SHA1 Message Date
61270a542d base eq 2022-03-17 10:56:24 +08:00
3ecaa99a8c Merge branch 'develop' into gtz 2022-03-17 10:52:41 +08:00
79238fca27 1 2022-03-17 10:52:22 +08:00
73d8951bbb Merge pull request '首页对接以及库位详情' (#69) from gtz into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #69
2022-03-16 20:12:20 +08:00
3 changed files with 10 additions and 5 deletions

View File

@ -11,10 +11,10 @@
<div class="right-menu"> <div class="right-menu">
<div v-if="showhome" class="right-menu-back" @click="toHome"> <!-- <div v-if="showhome" class="right-menu-back" @click="toHome">
<svg-icon class="item-icon" icon-class="home" /> <svg-icon class="item-icon" icon-class="home" />
{{ 'navbar.homepage' | i18nFilter }} {{ 'navbar.homepage' | i18nFilter }}
</div> </div> -->
<template> <template>
<lang-select class="right-menu-item hover-effect" /> <lang-select class="right-menu-item hover-effect" />

View File

@ -57,7 +57,7 @@
<!-- <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType"> <!-- <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
<el-input v-model="dataForm.equipmentType" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.EquipmentType')])" clearable :style="{width: '100%'}" /> <el-input v-model="dataForm.equipmentType" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.EquipmentType')])" clearable :style="{width: '100%'}" />
</el-form-item> --> </el-form-item> -->
<el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="EquipmentType"> <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
<el-select v-model="dataForm.equipmentType" :placeholder="this.$t('module.basicData.cache.logisticsEquipment')" default> <el-select v-model="dataForm.equipmentType" :placeholder="this.$t('module.basicData.cache.logisticsEquipment')" default>
<el-option <el-option
v-for="item in options" v-for="item in options"
@ -399,7 +399,7 @@ export default {
code: '', code: '',
enName: '', enName: '',
abbr: '', abbr: '',
equipmentType: this.$t('module.basicData.cache.logisticsEquipment'), equipmentType: '',
spec: '', spec: '',
createTime: '', createTime: '',
enterTime: '', enterTime: '',
@ -442,6 +442,11 @@ export default {
required: true, required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.EquipmentCode')]), message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.EquipmentCode')]),
trigger: 'blur' trigger: 'blur'
}],
equipmentType: [{
required: true,
message: this.$i18nForm(['placeholder.select', this.$t('module.basicData.equipment.EquipmentType')]),
trigger: 'blur'
}] }]
// maintenanceCycle: [{ // maintenanceCycle: [{
// required: true, // required: true,

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: gtz * @LastEditors: gtz
* @LastEditTime: 2022-03-16 20:06:20 * @LastEditTime: 2022-03-17 10:49:54
* @Description: * @Description:
--> -->
<template> <template>