Merge branch 'message' of licailing/wenlvju into master

src/main/h5/src/views/Home.vue

@@ -43,7 +43,7 @@
         </div>
         <div class="base-info-item">
           <div class="text1">节目状态</div>
-          <div class="text2" v-if="info.programmeStatus == 'SUBMIT'">
+          <!-- <div class="text2" v-if="info.programmeStatus == 'SUBMIT'">
             审核中
           </div>
           <div class="text2" v-else-if="info.programmeStatus == 'AUDIT_FAILED'">
@@ -55,7 +55,35 @@
           >
             审核未通过
           </div>
-          <div class="text2" v-else>未提交</div>
+          <div class="text2" v-else>未提交</div> -->
+
+          <div
+            class="text2"
+            v-if="row.process == 0 && row.programmeStatus == 'SUBMIT'"
+          >
+            初审中
+          </div>
+          <div
+            class="text2"
+            v-if="row.process == 1 && row.programmeStatus == 'SUBMIT'"
+          >
+            初审通过
+          </div>
+          <div
+            class="text2"
+            v-if="row.process == 2 && row.programmeStatus == 'SUBMIT'"
+          >
+            复审中
+          </div>
+          <div
+            class="text2"
+            v-if="row.process == 3 && row.programmeStatus == 'SUBMIT'"
+          >
+            复审通过
+          </div>
+          <div v-if="row.programmeStatus == 'INITIAL'">未提交</div>
+          <div v-if="row.programmeStatus == 'AUDIT_FAILED'">初审未通过</div>
+          <div v-if="row.programmeStatus == 'REVIEW_FAILED'">复审未通过</div>
         </div>
       </div>
       <div class="base-info">

src/main/java/com/izouma/wenlvju/domain/performance/Programme.java

@@ -93,6 +93,8 @@ public class Programme extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private ProgrammeStatus programmeStatus;
 
+    private int process;
+
 //    @ApiModelProperty(value = "流程")
 //    @Enumerated(EnumType.STRING)
 //    private ProgrammeProcess programmeProcess;

src/main/java/com/izouma/wenlvju/dto/ProgrammeDTO.java

@@ -110,6 +110,10 @@ public class ProgrammeDTO {
     @ExcelIgnore
     private String certificate;
 
+    @ExcelIgnore
+    private int process;
+
+
     @ExcelIgnore
     @ApiModelProperty(value = "状态")
     private ProgrammeStatus programmeStatus;

src/main/vue/src/mixins/pageableTable.js

@@ -8,7 +8,8 @@ export default {
             tableData: [],
             sort: {},
             sortStr: '',
-            tableHeight: 200
+            tableHeight: 200,
+            loadingTable: true
         };
     },
     created() {
@@ -46,9 +47,11 @@ export default {
                     data = { ...data, ...mergeData };
                 }
             }
+            this.loadingTable = true;
             this.$http
                 .post(this.url, data, { body: 'json' })
                 .then(res => {
+                    this.loadingTable = false;
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                     this.totalElements = res.totalElements;
@@ -57,6 +60,7 @@ export default {
                     }
                 })
                 .catch(e => {
+                    this.loadingTable = false;
                     console.log(e);
                     this.$message.error(e.error);
                 });

src/main/vue/src/views/performance/ArrangeList.vue

@@ -183,7 +183,7 @@
             :data="tableData"
             row-key="id"
             ref="table"
-            :empty-text="tableData.length > 0 ? '加载中...' : '暂无数据'"
+            empty-text="暂无数据"
             header-row-class-name="table-header-row"
             header-cell-class-name="table-header-cell"
             row-class-name="table-row"

src/main/vue/src/views/performance/PerformanceList.vue

@@ -17,7 +17,8 @@
             :data="tableData"
             row-key="id"
             ref="table"
-            empty-text="加载中..."
+            v-loading="loadingTable"
+            empty-text="暂无数据"
             header-row-class-name="table-header-row"
             header-cell-class-name="table-header-cell"
             row-class-name="table-row"

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

@@ -202,7 +202,8 @@
             :data="tableData"
             row-key="id"
             ref="table"
-            empty-text="加载中..."
+            v-loading="loadingTable"
+            empty-text="暂无数据"
             header-row-class-name="table-header-row"
             header-cell-class-name="table-header-cell"
             row-class-name="table-row"
@@ -246,15 +247,19 @@
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
                 </template>
             </el-table-column>
-            <el-table-column
-                prop="programmeStatus"
-                label="节目状态"
-                min-width="90"
-                :formatter="programmeStatusFormatter"
-            >
+            <el-table-column prop="programmeStatus" label="节目状态" min-width="90">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
                 </template>
+                <template slot-scope="{ row }">
+                    <span v-if="row.process == 0 && row.programmeStatus == 'SUBMIT'">初审中</span>
+                    <span v-if="row.process == 1 && row.programmeStatus == 'SUBMIT'">初审通过</span>
+                    <span v-if="row.process == 2 && row.programmeStatus == 'SUBMIT'">复审中</span>
+                    <span v-if="row.process == 3 && row.programmeStatus == 'SUBMIT'">复审通过</span>
+                    <span v-if="row.programmeStatus == 'INITIAL'">未提交</span>
+                    <span v-if="row.programmeStatus == 'AUDIT_FAILED'">初审未通过</span>
+                    <span v-if="row.programmeStatus == 'REVIEW_FAILED'">复审未通过</span>
+                </template>
             </el-table-column>
             <el-table-column label="操作" align="left" fixed="right" min-width="260">
                 <template slot-scope="{ row, $index }">

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

@@ -235,15 +235,19 @@
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
                 </template>
             </el-table-column>
-            <el-table-column
-                prop="programmeStatus"
-                label="节目状态"
-                min-width="180"
-                :formatter="programmeStatusFormatter"
-            >
+            <el-table-column prop="programmeStatus" label="节目状态" min-width="180">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
                 </template>
+                <template slot-scope="{ row }">
+                    <span v-if="row.process == 0 && row.programmeStatus == 'SUBMIT'">初审中</span>
+                    <span v-if="row.process == 1 && row.programmeStatus == 'SUBMIT'">初审通过</span>
+                    <span v-if="row.process == 2 && row.programmeStatus == 'SUBMIT'">复审中</span>
+                    <span v-if="row.process == 3 && row.programmeStatus == 'SUBMIT'">复审通过</span>
+                    <span v-if="row.programmeStatus == 'INITIAL'">未提交</span>
+                    <span v-if="row.programmeStatus == 'AUDIT_FAILED'">初审未通过</span>
+                    <span v-if="row.programmeStatus == 'REVIEW_FAILED'">复审未通过</span>
+                </template>
             </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="300">

src/main/vue/src/views/record/RecordList.vue

@@ -68,7 +68,8 @@
             :data="tableData"
             row-key="id"
             ref="table"
-            empty-text="加载中..."
+            v-loading="loadingTable"
+            empty-text="暂无数据"
             header-row-class-name="table-header-row"
             header-cell-class-name="table-header-cell"
             row-class-name="table-row"