Explorar el Código

Merge pull request 'base eq add' (#70) from gtz into develop

Reviewed-on: http://git.picaiba.com/mt-ck-00a/mt-ck-wms-ui/pulls/70
pull/71/head
高天泽 hace 2 años
padre
commit
40f426f7f5
Se han modificado 3 ficheros con 10 adiciones y 5 borrados
  1. +2
    -2
      src/layout/components/Navbar.vue
  2. +7
    -2
      src/views/basicData/Equipment/components/equipmentInfo-add.vue
  3. +1
    -1
      src/views/dashboard/components/PortDetail.vue

+ 2
- 2
src/layout/components/Navbar.vue Ver fichero

@@ -11,10 +11,10 @@

<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" />
{{ 'navbar.homepage' | i18nFilter }}
</div>
</div> -->

<template>
<lang-select class="right-menu-item hover-effect" />


+ 7
- 2
src/views/basicData/Equipment/components/equipmentInfo-add.vue Ver fichero

@@ -57,7 +57,7 @@
<!-- <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-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-option
v-for="item in options"
@@ -399,7 +399,7 @@ export default {
code: '',
enName: '',
abbr: '',
equipmentType: this.$t('module.basicData.cache.logisticsEquipment'),
equipmentType: '',
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,


+ 1
- 1
src/views/dashboard/components/PortDetail.vue Ver fichero

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


Cargando…
Cancelar
Guardar