del

base-vue/src/assets/scss/_eladmin.scss

@@ -152,7 +152,7 @@
 }
 
 .el-form-item--mini.el-form-item {
-  margin-bottom: 10px !important;
+  // margin-bottom: 10px !important;
 }
 
 //去除编辑文本框为数字时的上下箭头start

base-vue/src/views/modules/car/car-add-or-update.vue

@@ -11,7 +11,7 @@
     <el-form-item label="导航类型" prop="navigationType">
       <el-select v-model="dataForm.navigationType" placeholder="导航类型">
         <el-option
-          v-for="item in navigationTypeOpt"
+          v-for="item in dictData[0]"
           :key="item.value"
           :label="item.label"
           :value="item.value">
@@ -43,7 +43,6 @@
     data () {
       return {
         visible: false,
-        navigationTypeOpt: [],
         dataForm: {
           carId: 0,
           carName: '',
@@ -61,18 +60,10 @@
         }
       }
     },
-    created () {
+    props: {
-      this.getDictDetail()
+      dictData: Array
     },
     methods: {
-      getDictDetail () {
-        this.$http({
-          url: this.$http.adornUrl('/api/dict/dictDetail?code=navigation_type&page=0&size=9999'),
-          method: 'get'
-        }).then(({data}) => {
-          this.navigationTypeOpt = [...data.content]
-        })
-      },
       init (id) {
         this.dataForm.carId = id || 0
         this.visible = true
@@ -86,7 +77,7 @@
             }).then(({data}) => {
               if (data && data.code === 0) {
                 this.dataForm.carName = data.car.carName
-                this.dataForm.navigationType = data.car.navigationType
+                this.dataForm.navigationType = String(data.car.navigationType)
                 this.dataForm.remarks = data.car.remarks
                 this.dataForm.isOn = data.car.isOn
               }

base-vue/src/views/modules/car/car.vue

@@ -27,7 +27,7 @@
         prop="carId"
         header-align="center"
         align="center"
-        label="id">
+        label="ID">
       </el-table-column>
       <el-table-column
         prop="carName"
@@ -40,6 +40,9 @@
         header-align="center"
         align="center"
         label="导航类型">
+        <template slot-scope="scope">
+          {{ dictData[0] | findByValue(scope.row.navigationType) }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="remarks"
@@ -48,10 +51,12 @@
         label="备注">
       </el-table-column>
       <el-table-column
-        prop="isOn"
         header-align="center"
         align="center"
         label="是否启用">
+        <template slot-scope="scope">
+          {{ ['否', '是'][Number(scope.row.isOn)] }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="createUserId"
@@ -87,12 +92,13 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
     <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :dictData="dictData" @refreshDataList="getDataList"></add-or-update>
   </div>
 </template>
 
 <script>
   import AddOrUpdate from './car-add-or-update'
+  import { apiUtils } from '@/utils/dict'
   export default {
     data () {
       return {
@@ -105,9 +111,12 @@
         totalPage: 0,
         dataListLoading: false,
         dataListSelections: [],
-        addOrUpdateVisible: false
+        addOrUpdateVisible: false,
+        dictConfigs: [{type: 'dict', code: 'navigation_type'}],
+        dictData: []
       }
     },
+    mixins: [apiUtils],
     components: {
       AddOrUpdate
     },

base-vue/src/views/modules/client/client.vue

@@ -27,7 +27,7 @@
         prop="clientId"
         header-align="center"
         align="center"
-        label="id">
+        label="ID">
       </el-table-column>
       <el-table-column
         prop="clientName"
@@ -54,10 +54,12 @@
         label="行业">
       </el-table-column>
       <el-table-column
-        prop="isOn"
         header-align="center"
         align="center"
         label="是否启用">
+        <template slot-scope="scope">
+          {{ ['否', '是'][Number(scope.row.isOn)] }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="createTime"

base-vue/src/views/modules/material/material-add-or-update.vue

@@ -14,7 +14,7 @@
     <el-form-item label="物料类型" prop="materialType">
       <el-select v-model="dataForm.materialType" placeholder="物料类型">
         <el-option
-          v-for="item in materialTypeOpt"
+          v-for="item in dictData[0]"
           :key="item.value"
           :label="item.label"
           :value="item.value">
@@ -43,7 +43,6 @@
     data () {
       return {
         visible: false,
-        materialTypeOpt: [],
         dataForm: {
           materialId: 0,
           materialCode: '',
@@ -64,18 +63,10 @@
         }
       }
     },
-    created () {
+    props: {
-      this.getDictDetail()
+      dictData: Array
     },
     methods: {
-      getDictDetail () {
-        this.$http({
-          url: this.$http.adornUrl('/api/dict/dictDetail?code=material_type&page=0&size=9999'),
-          method: 'get'
-        }).then(({data}) => {
-          this.materialTypeOpt = [...data.content]
-        })
-      },
       init (id) {
         this.dataForm.materialId = id || 0
         this.visible = true
@@ -90,7 +81,7 @@
               if (data && data.code === 0) {
                 this.dataForm.materialCode = data.material.materialCode
                 this.dataForm.materialName = data.material.materialName
-                this.dataForm.materialType = data.material.materialType
+                this.dataForm.materialType = String(data.material.materialType)
                 this.dataForm.isOn = data.material.isOn
               }
             })

base-vue/src/views/modules/material/material.vue

@@ -27,7 +27,7 @@
         prop="materialId"
         header-align="center"
         align="center"
-        label="id">
+        label="ID">
       </el-table-column>
       <el-table-column
         prop="materialCode"
@@ -46,12 +46,17 @@
         header-align="center"
         align="center"
         label="物料类型">
+        <template slot-scope="scope">
+          {{ dictData[0] | findByValue(scope.row.materialType) }}
+        </template>
       </el-table-column>
       <el-table-column
-        prop="isOn"
         header-align="center"
         align="center"
         label="是否启用">
+        <template slot-scope="scope">
+          {{ ['否', '是'][Number(scope.row.isOn)] }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="createTime"
@@ -81,12 +86,13 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
     <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :dictData="dictData" @refreshDataList="getDataList"></add-or-update>
   </div>
 </template>
 
 <script>
   import AddOrUpdate from './material-add-or-update'
+  import { apiUtils } from '@/utils/dict'
   export default {
     data () {
       return {
@@ -99,9 +105,12 @@
         totalPage: 0,
         dataListLoading: false,
         dataListSelections: [],
-        addOrUpdateVisible: false
+        addOrUpdateVisible: false,
+        dictConfigs: [{type: 'dict', code: 'material_type'}],
+        dictData: []
       }
     },
+    mixins: [apiUtils],
     components: {
       AddOrUpdate
     },