Merge branch 'Regulation' of licailing/wenlvju into master

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

@@ -575,9 +575,9 @@ export default {
             let lenght = this.participants.filter(item => !item.del).length;
             let data = { ...this.formData, quantity: lenght };
             if (isSubmit) {
-                data.status = 'SUBMIT';
+                data.programmeStatus = 'SUBMIT';
             } else {
-                data.status = 'INITIAL';
+                data.programmeStatus = 'INITIAL';
             }
             this.saving = true;
             this.$http

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

@@ -185,12 +185,12 @@
             <el-table-column prop="gradingOrganization" label="考级机构" show-overflow-tooltip min-width="160">
             </el-table-column>
             <el-table-column prop="organization" label="承办单位" min-width="180"> </el-table-column>
-            <el-table-column prop="status" label="节目状态" min-width="180"
-                ><template slot-scope="{ row }">
-                    <span v-if="row.status == 0">未提交</span>
-                    <span v-else>已提交</span>
-                </template></el-table-column
-            >
+            <el-table-column
+                prop="programmeStatus"
+                label="节目状态"
+                min-width="180"
+                :formatter="programmeStatusFormatter"
+            ></el-table-column>
             <!-- <el-table-column prop="examPoint" label="考级点" min-width="160"> </el-table-column> -->
             <el-table-column label="操作" align="center" fixed="right" min-width="270">
                 <template slot-scope="{ row }">
@@ -331,7 +331,8 @@ export default {
             programmeStatusOptions: [
                 { label: '未提交', value: 'INITIAL' },
                 { label: '已提交', value: 'SUBMIT' },
-                { label: '初选未通过', value: 'AUDIT_FAILED' }
+                { label: '初选未通过', value: 'AUDIT_FAILED' },
+                { label: '审核未通过', value: 'REVIEW_FAILED' }
             ]
         };
     },
@@ -446,6 +447,13 @@ export default {
         }
     },
     methods: {
+        programmeStatusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.programmeStatusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
         competitionGroupFormatter(row, column, cellValue, index) {
             let selectedOption = this.competitionGroupOptions.find(i => i.value === cellValue);
             if (selectedOption) {