Merge branch 'test'

src/views/device/article/detail.vue

@@ -3,8 +3,7 @@
     <el-form label-width="100px" :model="form" :rules="rules" ref="form">
       <el-form-item label="关联设备：" prop="linkDevice">
         <el-select v-model="form.linkDevice" filterable multiple placeholder="请选择关联设备">
-          <el-option v-for="item in devOptions" :key="item.value" :label="item.label"
-            :value="item.value.toString()" />
+          <el-option v-for="item in devOptions" :key="item.value" :label="item.label" :value="item.value.toString()" />
         </el-select>
       </el-form-item>
       <el-form-item label="文章标题：" prop="title">
@@ -21,8 +20,7 @@
       </el-form-item>
       <el-form-item label="文章状态：" prop="status" v-if="this.form.id">
         <el-select v-model="form.status" placeholder="请选择文章状态">
-          <el-option v-for="item in disabledOptions" :key="item.value" :label="item.label"
-            :value="item.value" />
+          <el-option v-for="item in disabledOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
     </el-form>
@@ -106,6 +104,8 @@ export default {
                 this.$message.success('修改成功！')
                 this.cancel()
               }
+            }).catch(err => {
+              this.form.linkDevice = this.form.linkDevice.split(',')
             })
           } else {
             create(this.form).then(res => {
@@ -113,6 +113,8 @@ export default {
                 this.$message.success('新增成功！')
                 this.cancel()
               }
+            }).catch(err => {
+              this.form.linkDevice = this.form.linkDevice.split(',')
             })
           }
         } else {

src/views/operation/recommend/index.vue

@@ -95,7 +95,7 @@
       </el-form>
       <el-table :data="dialogTableData" v-loading="loading">
         <el-table-column label="模块名称" prop="moduleName" align="center" />
-        <el-table-column label="模块类型" prop="moduleTypeId" align="center" />
+        <el-table-column label="模块类型" prop="moduleTypeId" align="center" :formatter="typeFormatter" />
         <el-table-column label="模块数量" prop="moduleNum" align="center" />
         <el-table-column label="有效时间" align="center">
           <template slot-scope="scope">

src/views/operation/waken/detail.vue

@@ -329,6 +329,8 @@ export default {
               this.$message.success('提交成功！')
               this.form.id ? this.getDevices() : this.cancel()
             }
+          }).catch(err => {
+            this.form.deviceIds = this.form.deviceIds.split(',')
           })
         } else {
           return false

src/views/service/package/detail.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="form" :rules="rules" ref="form" label-width="100px">
       <el-form-item label="关联设备：">
-        <el-select v-model="form.deviceIds" filterable multiple placeholder="请选择关联设备">
+        <el-select v-model="deviceIds" filterable multiple placeholder="请选择关联设备">
           <el-option v-for="item in devOptions" :key="item.value" :label="item.label" :value="item.value.toString()" />
         </el-select>
       </el-form-item>
@@ -84,14 +84,14 @@ export default {
     return {
       // 表单
       form: {},
+      // 关联设备
+      deviceIds: [],
       // 区分
       typeList: this.$route.query.typeList.split(','),
       // 流量套餐
       goodsOptions: [],
       // 爱听专区
       sceneOptions: [],
-      // 关联设备
-      deviceIds: [],
       // 资源平台
       platformOptions: [{
         value: 6,
@@ -126,7 +126,9 @@ export default {
   },
   watch: {
     'form.businessType'(val) {
-      delete this.form.sort
+      if (val !== 5) {
+        delete this.form.sort
+      }
     },
   },
   mounted() {
@@ -145,7 +147,7 @@ export default {
       detail(this.form.id).then(res => {
         if (res.code === 0) {
           this.form = res.data
-          this.form.deviceIds = res.data.deviceIds.split(',')
+          this.deviceIds = res.data.deviceIds.split(',')
         }
       })
     },
@@ -178,7 +180,7 @@ export default {
     getSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          this.form.deviceIds = this.form.deviceIds.join(',')
+          this.form.deviceIds = this.deviceIds.join(',')
           if (this.form.id) {
             edit(this.form).then(res => {
               if (res.code === 0) {
@@ -207,7 +209,7 @@ export default {
     },
 
     // 禁止修改
-    disabled(){
+    disabled() {
       return this.form.id ? true : false
     }
   }