修改

src/main/vue/src/views/performance/ProgrammeEdit.vue

@@ -122,7 +122,32 @@
                                     code !== 602 &&
                                     code !== 603 &&
                                     code !== 604 &&
-                                    code !== 605
+                                    code !== 605 &&
+                                    formData.specialtyId !== 187 &&
+                                    formData.specialtyId !== 188 &&
+                                    formData.specialtyId !== 189 &&
+                                    formData.specialtyId !== 190 &&
+                                    formData.specialtyId !== 191 &&
+                                    formData.specialtyId !== 192 &&
+                                    formData.specialtyId !== 193 &&
+                                    formData.specialtyId !== 194 &&
+                                    formData.specialtyId !== 589 &&
+                                    formData.specialtyId !== 590 &&
+                                    formData.specialtyId !== 591 &&
+                                    formData.specialtyId !== 592 &&
+                                    formData.specialtyId !== 593 &&
+                                    formData.specialtyId !== 594 &&
+                                    formData.specialtyId !== 595 &&
+                                    formData.specialtyId !== 596 &&
+                                    formData.specialtyId !== 597 &&
+                                    formData.specialtyId !== 598 &&
+                                    formData.specialtyId !== 599 &&
+                                    formData.specialtyId !== 600 &&
+                                    formData.specialtyId !== 601 &&
+                                    formData.specialtyId !== 602 &&
+                                    formData.specialtyId !== 603 &&
+                                    formData.specialtyId !== 604 &&
+                                    formData.specialtyId !== 605
                             "
                         >
                             <el-input-number
@@ -134,7 +159,6 @@
                         <el-form-item prop="instructor" label="指导老师">
                             <el-input v-model="formData.instructor" class="width"></el-input>
                         </el-form-item>
-
                         <el-form-item
                             prop="annex"
                             label="作品图片"
@@ -163,7 +187,32 @@
                                     code == 602 ||
                                     code == 603 ||
                                     code == 604 ||
-                                    code == 605
+                                    code == 605 ||
+                                    formData.specialtyId == 187 ||
+                                    formData.specialtyId == 188 ||
+                                    formData.specialtyId == 189 ||
+                                    formData.specialtyId == 190 ||
+                                    formData.specialtyId == 191 ||
+                                    formData.specialtyId == 192 ||
+                                    formData.specialtyId == 193 ||
+                                    formData.specialtyId == 194 ||
+                                    formData.specialtyId == 589 ||
+                                    formData.specialtyId == 590 ||
+                                    formData.specialtyId == 591 ||
+                                    formData.specialtyId == 592 ||
+                                    formData.specialtyId == 593 ||
+                                    formData.specialtyId == 594 ||
+                                    formData.specialtyId == 595 ||
+                                    formData.specialtyId == 596 ||
+                                    formData.specialtyId == 597 ||
+                                    formData.specialtyId == 598 ||
+                                    formData.specialtyId == 599 ||
+                                    formData.specialtyId == 600 ||
+                                    formData.specialtyId == 601 ||
+                                    formData.specialtyId == 602 ||
+                                    formData.specialtyId == 603 ||
+                                    formData.specialtyId == 604 ||
+                                    formData.specialtyId == 605
                             "
                         >
                             <single-upload v-model="formData.annex"></single-upload>
@@ -241,10 +290,10 @@
                                 <div class="label label2">身份证</div>
                             </div>
                             <div class="name imgBox">
-                                <div class="label label1">照片</div>
+                                <div class="label label1">证件照</div>
                             </div>
                             <div class="name imgBox">
-                                <div class="label label3">证书</div>
+                                <div class="label label3">考级证书</div>
                             </div>
                         </div>
                         <div v-for="(item, index) in participants" :key="index">
@@ -451,6 +500,8 @@ export default {
                 instructor: [{ required: true, message: '请输入指导老师', trigger: 'blur' }],
                 gradingOrganizationId: [{ required: true, message: '请选择考级机构', trigger: 'blur' }],
                 organizationId: [{ required: true, message: '请选择承办单位', trigger: 'blur' }],
+                annex: [{ required: true, message: '请上传作品图片', trigger: 'blur' }],
+                video: [{ required: true, message: '请上传作品视频', trigger: 'blur' }],
                 contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }]
             },
             competitionGroupOptions: [
@@ -496,20 +547,19 @@ export default {
     methods: {
         change(e) {
             this.code = e;
-            console.log(this.code);
+            // console.log(this.code);
         },
         onSave(isSubmit) {
-            // this.$refs.form.validate(valid => {
-            //     if (valid) {
-            //         this.submit();
-            //     } else {
-            //         return false;
-            //     }
-            // });
             if (isSubmit) {
                 this.$refs.form.validate(valid => {
                     if (valid) {
-                        this.submit(isSubmit);
+                        this.$confirm('确定提交吗？提交后节目信息不能修改。', '提示', {
+                            confirmButtonText: '继续',
+                            cancelButtonText: '退出',
+                            type: 'warning'
+                        }).then(() => {
+                            this.submit(isSubmit);
+                        });
                     } else {
                         return false;
                     }
@@ -521,6 +571,7 @@ export default {
         submit(isSubmit) {
             let lenght = this.participants.filter(item => !item.del).length;
             let data = { ...this.formData, quantity: lenght };
+            console.log(data);
             if (isSubmit) {
                 data.status = 1;
             }
@@ -639,7 +690,7 @@ export default {
         width: 110px;
     }
     &.label3 {
-        width: 30px;
+        width: 60px;
     }
 }
 .add-bottom {

src/main/vue/src/views/performance/ProgrammeOrgList.vue

@@ -198,12 +198,41 @@
                     <el-button type="success" @click="editRow(row)" size="mini" plain v-if="row.status == 0"
                         >编辑</el-button
                     >
-                    <el-button type="warning" @click="playVideo(row)" v-if="row.video" size="mini" plain
-                        >浏览视频</el-button
-                    >
-                    <el-button type="warning" @click="playImg(row)" v-if="!row.video" size="mini" plain
+                    <el-button
+                        type="warning"
+                        @click="playImg(row)"
+                        v-if="
+                            row.specialty == '中国画' ||
+                                row.specialty == '美术' ||
+                                row.specialty == '西画' ||
+                                row.specialty == '书法' ||
+                                row.specialty == '漫画' ||
+                                row.specialty == '手工技艺' ||
+                                row.specialty == '摄影' ||
+                                row.specialty == '篆刻' ||
+                                row.specialty == '人物' ||
+                                row.specialty == '山水' ||
+                                row.specialty == '花鸟' ||
+                                row.specialty == '素描' ||
+                                row.specialty == '速写' ||
+                                row.specialty == '水粉画' ||
+                                row.specialty == '水彩画' ||
+                                row.specialty == '油画' ||
+                                row.specialty == '软笔书法' ||
+                                row.specialty == '硬笔书法' ||
+                                row.specialty == '剪纸' ||
+                                row.specialty == '泥塑' ||
+                                row.specialty == '年画' ||
+                                row.specialty == '皮影制作' ||
+                                row.specialty == '陶艺' ||
+                                row.specialty == '染织' ||
+                                row.specialty == '版画'
+                        "
+                        size="mini"
+                        plain
                         >浏览图片</el-button
                     >
+                    <el-button type="warning" @click="playVideo(row)" v-else size="mini" plain>浏览视频</el-button>
                     <el-button @click="showCode(row)" type="primary" size="mini" plain>查看二维码</el-button>
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
@@ -631,6 +660,7 @@ export default {
         //     document.exitPictureInPicture();
         // },
         playVideo(row) {
+            console.log(row);
             this.showViedo = true;
             this.videoUrl = row.video;
         },

src/main/vue/src/views/performance/ProgrammeShow.vue

@@ -86,16 +86,76 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item prop="durationOfWork" label="作品时长" v-if="formData.video">
+                        <el-form-item
+                            prop="durationOfWork"
+                            label="作品时长"
+                            v-if="
+                                formData.specialtyId !== 187 &&
+                                    formData.specialtyId !== 188 &&
+                                    formData.specialtyId !== 189 &&
+                                    formData.specialtyId !== 190 &&
+                                    formData.specialtyId !== 191 &&
+                                    formData.specialtyId !== 192 &&
+                                    formData.specialtyId !== 193 &&
+                                    formData.specialtyId !== 194 &&
+                                    formData.specialtyId !== 589 &&
+                                    formData.specialtyId !== 590 &&
+                                    formData.specialtyId !== 591 &&
+                                    formData.specialtyId !== 592 &&
+                                    formData.specialtyId !== 593 &&
+                                    formData.specialtyId !== 594 &&
+                                    formData.specialtyId !== 595 &&
+                                    formData.specialtyId !== 596 &&
+                                    formData.specialtyId !== 597 &&
+                                    formData.specialtyId !== 598 &&
+                                    formData.specialtyId !== 599 &&
+                                    formData.specialtyId !== 600 &&
+                                    formData.specialtyId !== 601 &&
+                                    formData.specialtyId !== 602 &&
+                                    formData.specialtyId !== 603 &&
+                                    formData.specialtyId !== 604 &&
+                                    formData.specialtyId !== 605
+                            "
+                        >
                             <el-input v-model="formData.durationOfWork" class="width" readonly></el-input>
                         </el-form-item>
                         <el-form-item prop="instructor" label="指导老师">
                             <el-input v-model="formData.instructor" class="width" readonly></el-input>
                         </el-form-item>
-                        <el-form-item prop="annex" label="作品图片" v-if="formData.annex">
+                        <el-form-item
+                            prop="annex"
+                            label="作品图片"
+                            v-if="
+                                formData.specialtyId == 187 ||
+                                    formData.specialtyId == 188 ||
+                                    formData.specialtyId == 189 ||
+                                    formData.specialtyId == 190 ||
+                                    formData.specialtyId == 191 ||
+                                    formData.specialtyId == 192 ||
+                                    formData.specialtyId == 193 ||
+                                    formData.specialtyId == 194 ||
+                                    formData.specialtyId == 589 ||
+                                    formData.specialtyId == 590 ||
+                                    formData.specialtyId == 591 ||
+                                    formData.specialtyId == 592 ||
+                                    formData.specialtyId == 593 ||
+                                    formData.specialtyId == 594 ||
+                                    formData.specialtyId == 595 ||
+                                    formData.specialtyId == 596 ||
+                                    formData.specialtyId == 597 ||
+                                    formData.specialtyId == 598 ||
+                                    formData.specialtyId == 599 ||
+                                    formData.specialtyId == 600 ||
+                                    formData.specialtyId == 601 ||
+                                    formData.specialtyId == 602 ||
+                                    formData.specialtyId == 603 ||
+                                    formData.specialtyId == 604 ||
+                                    formData.specialtyId == 605
+                            "
+                        >
                             <img class="imgBox" :src="formData.annex" alt="" />
                         </el-form-item>
-                        <el-form-item prop="video" label="作品视频" v-if="formData.video">
+                        <el-form-item prop="video" label="作品视频" v-else>
                             <video-upload v-model="formData.video" class="width" :readonly="true"></video-upload>
                         </el-form-item>
                     </el-card>
@@ -161,7 +221,7 @@
                             row-class-name="table-row"
                             cell-class-name="table-cell"
                         >
-                            <el-table-column prop="img" label="照片">
+                            <el-table-column prop="img" label="证件照">
                                 <template slot-scope="{ row }">
                                     <el-image
                                         style="width: 30px; height: 30px;"
@@ -175,7 +235,7 @@
                             <el-table-column prop="birthday" label="出生年月" min-width="100"> </el-table-column>
                             <el-table-column prop="sex" label="性别" min-width="70"> </el-table-column>
                             <el-table-column prop="phone" label="联系方式" min-width="100"> </el-table-column>
-                            <el-table-column prop="certificate" label="证书">
+                            <el-table-column prop="certificate" label="考级证书">
                                 <template slot-scope="{ row }">
                                     <el-image
                                         style="width: 30px; height: 30px;"
@@ -209,7 +269,6 @@ export default {
             this.$http
                 .get('programme/get/' + this.$route.query.id)
                 .then(res => {
-                    console.log(res);
                     this.formData = res;
                     console.log(res);
                     this.$http
@@ -242,7 +301,7 @@ export default {
                         this.levelSingleOptions.push({
                             label: item.name,
                             value: item.id,
-                            desc: item.code
+                            desc: item.formData.specialtyId
                         });
                     });
                 }
@@ -259,7 +318,7 @@ export default {
                         this.levelCollectiveOptions.push({
                             label: item.name,
                             value: item.id,
-                            desc: item.code
+                            desc: item.formData.specialtyId
                         });
                     });
                 }
@@ -303,6 +362,7 @@ export default {
         this.$http
             .post('/artType/allList')
             .then(res => {
+                console.log(res);
                 this.artTypes = this.delChild(res);
             })
             .catch(e => {