Merge branch '04/19replaceMusic' into test

src/views/reaplceMusicPlayer/modals/detail.vue

@@ -24,10 +24,10 @@
           @change="changeSound"
         >
           <el-option
-            v-for="(item, i) in selects.subjects"
+            v-for="(item, i) in soundList"
             :key="i"
-            :label="item.name"
-            :value="item.id"
+            :label="item.text"
+            :value="item.value"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -83,16 +83,12 @@
             <div>{{ scope.row.brand }}{{ scope.row.specification }}</div>
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          prop="payStatus"
-          label="缴费状态"
-        >
-        <template  slot-scope="scope">
-          <div>
-            {{scope.row.payStatus|replacementInsFilter}}
-          </div>
-        </template>
+        <el-table-column align="center" prop="payStatus" label="缴费状态">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.payStatus | replacementInsFilter }}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column align="center" label="其他建议">
           <template slot-scope="scope">
@@ -110,7 +106,10 @@
               <el-button
                 type="text"
                 @click="resetMusic(scope.row)"
-                v-if="permission('replacementInstrumentActivity/update')&&scope.row.payStatus==0"
+                v-if="
+                  permission('replacementInstrumentActivity/update') &&
+                  scope.row.payStatus == 0
+                "
                 >修改</el-button
               >
             </div>
@@ -153,6 +152,15 @@ import { getInstrumentSoundList, getInstrumentActivityList } from "../api";
 import ItemVue from "@/layout/components/Sidebar/Item.vue";
 import Tooltip from "@/components/Tooltip/index";
 import { permission } from "@/utils/directivePage";
+const soundList = [
+  { text: "长笛", value: 2 },
+  { text: "单簧管", value: 4 },
+  { text: "萨克斯", value: 5 },
+  { text: "小号", value: 12 },
+  { text: "圆号", value: 13 },
+  { text: "长号", value: 14 },
+  { text: "上低音号", value: 15 },
+];
 export default {
   components: { pagination, resetInfo, Tooltip },
   props: ["detail"],
@@ -175,6 +183,7 @@ export default {
       dialogVisible: false,
       branchList: [],
       resetRow: null,
+      soundList:soundList
     };
   },
   mounted() {

src/views/reaplceMusicPlayer/modals/resetInfo.vue

@@ -17,10 +17,10 @@
           @change="changeSound"
         >
           <el-option
-            v-for="(item, i) in selects.subjects"
+            v-for="(item, i) in soundList"
             :key="i"
-            :label="item.name"
-            :value="item.id"
+            :label="item.text"
+            :value="item.value"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -44,7 +44,15 @@
 </template>
 <script>
 import { getInstrumentSoundList,updateInstrumentActivity } from "../api";
-
+const soundList = [
+  { text: "长笛", value: 2 },
+  { text: "单簧管", value: 4 },
+  { text: "萨克斯", value: 5 },
+  { text: "小号", value: 12 },
+  { text: "圆号", value: 13 },
+  { text: "长号", value: 14 },
+  { text: "上低音号", value: 15 },
+];
 export default {
   props: ["detail"],
   data() {
@@ -55,6 +63,7 @@ export default {
         instrumentsId: "",
       },
       branchList: [],
+      soundList
     };
   },
   async mounted() {