设备升级 增加设备类型参数

src/views/device/version/detail.vue

@@ -1,12 +1,17 @@
 <template>
   <div class="app-container">
     <el-form :model="form" :rules="rules" ref="form" label-width="100px" size="small">
-      <el-form-item prop="deviceTypeId" label="设备类型：">
-        <el-select v-model="form.deviceTypeId" placeholder="请选择产品型号" filterable>
+      <el-form-item prop="deviceTypeId" label="设备型号：">
+        <el-select v-model="form.deviceTypeId" placeholder="请选择设备型号" filterable>
           <el-option v-for="item in clientTypeOptions" :key="item.id" :label="item.label"
             :value="item.value" />
         </el-select>
       </el-form-item>
+      <el-form-item prop="type" label="设备类型：">
+        <el-select v-model="form.type" placeholder="请选择设备类型">
+          <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value"/>
+        </el-select>
+      </el-form-item>
       <el-form-item prop="version" label="版本号：">
         <el-input v-model="form.version" placeholder="请输入版本号" />
       </el-form-item>
@@ -42,7 +47,7 @@
             :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="form.userType === 3" label="指定用户：">
+      <el-form-item :prop="user" v-if="form.userType === 3" label="指定用户：">
         <el-input v-model="user" type="textarea" rows="4" placeholder="请输入指定用户手机号,一行一个" />
       </el-form-item>
     </el-form>
@@ -68,6 +73,7 @@ export default {
         id: this.$route.query.id,
         url: ''
       },
+      // 指定用户表单中间参数
       user: '',
       // 是否强制升级 // 是否推送
       Yes_No: [{
@@ -85,10 +91,27 @@ export default {
         value: 3,
         label: '指定'
       }],
+      // 设备类型
+      typeOptions:[{
+        value: 1,
+        label: '蓝牙'
+      },{
+        value: 2,
+        label: 'WiFi'
+      },{
+        value: 3,
+        label: '传统蓝牙'
+      },{
+        value: 4,
+        label: '4G'
+      }],
       // 表单验证
       rules: {
         deviceTypeId: [{
-          required: true, message: '请选择产品型号', trigger: 'change'
+          required: true, message: '请选择设备型号', trigger: 'change'
+        }],
+        type:[{
+          required: true, message: '请选择设备类型', trigger: 'change'
         }],
         version: [{
           required: true, message: '请输入版本号', trigger: 'blur'
@@ -100,7 +123,7 @@ export default {
           required: true, message: '请输入升级标题', trigger: 'blur'
         }],
         content: [{
-          required: true, message: '请输入版本号', trigger: 'blur'
+          required: true, message: '请输入升级描述', trigger: 'blur'
         }],
         isEnforcement: [{
           required: true, message: '是否强制升级', trigger: 'change'
@@ -111,7 +134,8 @@ export default {
         userType: [{
           required: true, message: '请选择推送类型', trigger: 'change'
         }]
-      }
+      },
+
     }
   },
   mounted() {

src/views/device/version/index.vue

@@ -22,6 +22,7 @@
       <el-table-column prop="id" label="型号ID" align="center" />
       <el-table-column prop="title" label="升级标题" align="center" />
       <el-table-column prop="deviceTypeName" label="设备型号" align="center" />
+      <el-table-column prop="type" label="设备类型" align="center" :formatter="typeFormatter" />
       <el-table-column prop="version" label="版本号" align="center" />
       <el-table-column label="下载路径" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -47,8 +48,9 @@
 <script>
 import { getPageList, getVersionDelete } from '@/api/device/version'
 import mixin from './mixin/index'
+import typeOptions from '../mixin/typeOptions'
 export default {
-  mixins: [mixin],
+  mixins: [mixin, typeOptions],
   data() {
     return {
       // 遮罩层