Merge branch 'develop/3.0.3' into test

src/views/music/choiceness/detail.vue

@@ -19,7 +19,7 @@
           <el-table-column label="电台名称" prop="subbroadcastName" align="center" show-overflow-tooltip />
           <el-table-column label="节目名称" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.name" :readonly="readonly(scope.row)" />
+              <el-input v-model="scope.row.name" />
             </template>
           </el-table-column>
           <el-table-column label="资源平台" prop="platformId" align="center" :formatter="platformFormatter" />

src/views/music/choiceness/index.vue

@@ -3,12 +3,12 @@
     <!-- 搜索 -->
     <el-form inline size="mini">
       <el-form-item label="电台名称：">
-        <el-input v-model="form.name" placeholder="请输入电台名称" />
+        <el-input v-model="form.name" placeholder="请输入电台名称" clearable />
       </el-form-item>
       <el-form-item label="当前状态：">
         <el-select v-model="form.status" placeholder="请选择当前状态">
           <el-option v-for="item in onOrOffOptions" :key="item.value" :label="item.label"
-            :value="item.value" />
+            :value="item.value" clearable />
         </el-select>
       </el-form-item>
       <el-form-item>