licailing 4 years ago
parent
commit
3465593e83

+ 10 - 10
src/main/vue/src/components/ArrangeLog.vue

@@ -35,7 +35,7 @@
                 </el-form-item>
                 <el-form-item>
                     <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
-                    <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                    <!-- <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button> -->
                     <el-button @click="dialogVisible = false">取消</el-button>
                 </el-form-item>
             </el-form>
@@ -83,14 +83,14 @@ export default {
                         this.$message.error(e.error);
                     });
             }
-            this.$http
-                .post('/artType/allList')
-                .then(res => {
-                    this.artTypes = this.delChild(res);
-                })
-                .catch(e => {
-                    console.log(e);
-                });
+            // this.$http
+            //     .post('/artType/allList')
+            //     .then(res => {
+            //         this.artTypes = this.delChild(res);
+            //     })
+            //     .catch(e => {
+            //         console.log(e);
+            //     });
         },
         submit() {
             let data = { ...this.formData };
@@ -117,7 +117,7 @@ export default {
                 })
                 .then(() => {
                     this.$message.success('删除成功');
-                    this.$router.go(-1);
+                    // this.$router.go(-1);
                 })
                 .catch(e => {
                     if (e !== 'cancel') {

+ 3 - 6
src/main/vue/src/views/performance/ArrangeList.vue

@@ -201,9 +201,9 @@
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->
-            <el-table-column prop="address" label="活动地点" v-if="performance.online"> </el-table-column>
+            <el-table-column prop="address" label="活动地点" v-if="!performance.online"> </el-table-column>
             <el-table-column prop="name" label="分组名称" min-width="130"> </el-table-column>
-            <el-table-column label="时间安排" min-width="100" v-if="performance.online">
+            <el-table-column label="时间安排" min-width="100" v-if="!performance.online">
                 <template slot-scope="{ row }"> {{ getTime(row.startTime) }}-{{ getTime(row.endTime) }} </template>
             </el-table-column>
             <el-table-column prop="quantity" label="节目数量"> </el-table-column>
@@ -280,10 +280,7 @@
                 <el-table-column prop="level" label="参赛级别" min-width="70"> </el-table-column>
                 <el-table-column prop="durationOfWork" label="作品时长" min-width="70"> </el-table-column>
                 <el-table-column prop="quantity" label="参赛人数" min-width="70"> </el-table-column>
-                <el-table-column prop="contact" label="联系人" min-width="68"> </el-table-column>
-                <el-table-column prop="phone" label="联系电话" min-width="95"> </el-table-column>
-                <el-table-column prop="gradingOrganization" label="考级机构" show-overflow-tooltip min-width="160">
-                </el-table-column>
+                <el-table-column prop="gradingOrganization" label="考级机构" min-width="160"> </el-table-column>
                 <el-table-column prop="organization" label="承办单位" min-width="160"> </el-table-column>
                 <el-table-column prop="examPoint" label="考级点"> </el-table-column>
             </el-table>