Merge branch '07/06musicArchives' into test

src/views/resetTeaming/components/archicesComponents/modals/performance-form.vue

@@ -91,12 +91,12 @@ export default {
           try {
             const {songs, ...rest} = this.form
             if (this.detail) {
-              await musicGroupPerformanceUpdate([{
+              await musicGroupPerformanceUpdate({
                 ...rest,
                 musicScoreNames: songs,
                 musicGroupId: this.$route.query.id,
                 id: this.detail.id
-              }])
+              })
               this.$message.success('修改成功')
             } else {
               await musicGroupPerformanceAdd({

src/views/resetTeaming/components/archicesComponents/performance.vue

@@ -30,7 +30,11 @@
           align="center"
           prop="startTime"
           label="预计时间"
-        ></el-table-column>
+        >
+          <template slot-scope="scope">
+            {{scope.row.startTime | formatTimer}}
+          </template>
+        </el-table-column>
         <el-table-column
           align="center"
           prop="musicScoreName"
@@ -154,6 +158,7 @@ export default {
       this.$router.push({
         path: '/business/performance',
         query: {
+          id: this.$route.query.id,
           returnUrl: this.$route.fullPath,
           phototype: 'SHOW'
         }

src/views/resetTeaming/components/training-photos/upload/index.vue

@@ -11,7 +11,7 @@
     >
       {{name}}
     </el-form-item>
-    <el-form-item
+    <!-- <el-form-item
       v-else
       label="相册"
       prop="photoAlbumId"
@@ -20,9 +20,9 @@
       <el-select v-model="form.photoAlbumId" placeholder="请选择相册">
         <el-option v-for="item in photos" :key="item.id" :label="item.name" :value="item.id"></el-option>
       </el-select>
-    </el-form-item>
+    </el-form-item> -->
     <el-form-item
-      label="上传相册"
+      :label="name ? '上传相册' : '上传证书'"
     >
       <el-upload
         action="/api-web/uploadFile"