Merge branch 'message' of licailing/wenlvju into master

src/main/vue/src/components/ArrangeLog.vue

@@ -68,8 +68,7 @@ export default {
                 ]
             },
             arrid: '',
-            timeRange: '',
-            artTypes: []
+            timeRange: ''
         };
     },
     methods: {
@@ -99,14 +98,6 @@ export default {
                         this.$message.error(e.error);
                     });
             }
-            // this.$http
-            //     .post('/artType/allList')
-            //     .then(res => {
-            //         this.artTypes = this.delChild(res);
-            //     })
-            //     .catch(e => {
-            //         console.log(e);
-            //     });
         },
         submit() {
             let data = { ...this.formData };

src/main/vue/src/components/OrganLog.vue

@@ -75,7 +75,6 @@ export default {
             dateRange: [],
             audits: [],
             grading: [],
-            artTypes: [],
             readonly: true,
             collaborates: [],
             expert: [],

src/main/vue/src/components/ProgrammeLog.vue

@@ -247,7 +247,6 @@ export default {
             levelCollectiveOptions: [],
             gradingOrganizationIdOptions: [],
             organizationIdOptions: [],
-            artTypes: [],
             optionProps: {
                 value: 'id',
                 label: 'name',

src/main/vue/src/components/ProgrammeLog1.vue

@@ -244,7 +244,6 @@ export default {
             levelCollectiveOptions: [],
             gradingOrganizationIdOptions: [],
             organizationIdOptions: [],
-            artTypes: [],
             optionProps: {
                 value: 'id',
                 label: 'name',

src/main/vue/src/views/performance/ProgScoreAdminList.vue

@@ -380,7 +380,7 @@ export default {
                 this.$message.error(e.error);
             });
         this.$http
-            .post('/artType/allList')
+            .post('/artType/allNotExtra')
             .then(res => {
                 this.artTypes = this.delChild(res);
             })

src/main/vue/src/views/performance/ProgrammeGroupList.vue

@@ -288,36 +288,6 @@ export default {
                     }
                 });
         },
-        showCode(row) {
-            this.dialogCode = true;
-            this.dialogUrl =
-                'http://wljtest.izouma.com/h5/home?performanceId=' +
-                row.performanceId +
-                '&performanceApplyId=' +
-                row.id;
-        },
-        getCode(value) {
-            return this.forTree(this.artTypes, value).code;
-        },
-        forTree(list, value) {
-            var result = null;
-            if (!list) {
-                return;
-            }
-            for (var i in list) {
-                if (result !== null) {
-                    break;
-                }
-                var item = list[i];
-                if (item.id == value) {
-                    result = item;
-                    break;
-                } else if (item.children && item.children.length > 0) {
-                    result = this.forTree(item.children, value);
-                }
-            }
-            return result;
-        },
         closeEvent() {
             document.exitPictureInPicture();
         },

src/main/vue/src/views/performance/ProgrammeList.vue

@@ -541,7 +541,7 @@ export default {
                 this.$message.error(e.error);
             });
         this.$http
-            .post('/artType/allList')
+            .post('/artType/allNotExtra')
             .then(res => {
                 this.artTypes = this.delChild(res);
             })

src/main/vue/src/views/performance/ProgrammeResultList.vue

@@ -353,7 +353,7 @@ export default {
                 this.$message.error(e.error);
             });
         this.$http
-            .post('/artType/allList')
+            .post('/artType/allNotExtra')
             .then(res => {
                 this.artTypes = this.delChild(res);
             })

src/main/vue/src/views/performance/ProgrammeScoreList.vue

@@ -377,7 +377,7 @@ export default {
     created() {
         this.morning = isSameDay(addHours(new Date(), 12), new Date());
         this.$http
-            .post('/artType/allList')
+            .post('/artType/allNotExtra')
             .then(res => {
                 this.artTypes = this.delChild(res);
             })