Merge branch '0601Action' into test

src/views/accompaniment/modals/form.vue

@@ -52,11 +52,16 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        prop="isOpenMetronome"
+        prop="sysMusicScore.isOpenMetronome"
         label="节拍器"
         :rules="[{required: true, message: '请选择节拍器'}]"
       >
-        <el-select style="width: 100%!important;" v-model="form.isOpenMetronome" placeholder="请选择节拍器" @change="rankChange">
+        <el-select
+          style="width: 100% !important"
+          v-model="form.sysMusicScore.isOpenMetronome"
+          placeholder="请选择节拍器"
+          @change="rankChange"
+        >
           <!-- <el-option
             :value="item.id"
             :label="item.name"
@@ -103,7 +108,7 @@
         prop="sysMusicScore.url"
         :rules="[
           {
-            required: form.isOpenMetronome ? false : true,
+            required: form.sysMusicScore.isOpenMetronome ? false : true,
             message: '请上传原音',
           },
         ]"
@@ -119,7 +124,7 @@
         prop="sysMusicScore.metronomeUrl"
         :rules="[
           {
-            required: form.isOpenMetronome ? true : false,
+            required: form.sysMusicScore.isOpenMetronome ? true : false,
             message: '原音(含节拍器)',
           },
         ]"
@@ -268,8 +273,9 @@ export default {
       memberRankList: [], // 会员列表
       form: {
         rankIdType: 0, // 收费会员类型 默认免费
-        isOpenMetronome: 0, // 是否开启节拍器 默认关闭
+
         sysMusicScore: {
+            isOpenMetronome: 0, // 是否开启节拍器 默认关闭
           name: "",
           rankIds: "", // 收费会员编号
           url: "",
@@ -301,8 +307,9 @@ export default {
     await this.FetchTree();
     await this.memberRank();
     if (this.detail) {
-      // console.log(this.detail)
+      console.log(this.detail)
       this.$set(this.form, "sysMusicScore", {
+        isOpenMetronome:Number(this.detail.isOpenMetronome),
         name: this.detail.name,
         url: this.detail.url,
         rankIds: this.detail.rankIds,