Jelajahi Sumber

展演修改

licailing 4 tahun lalu
induk
melakukan
eae4e7704a

+ 1 - 1
src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java

@@ -288,7 +288,7 @@ public class ProgrammeService {
 
 
     public void excelTemp(HttpServletResponse response) throws IOException {
     public void excelTemp(HttpServletResponse response) throws IOException {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        File file = new File(Paths.get(System.getProperty("user.dir"), "src", "main", "resources", "templates", "Programme.xlsx").toString());
+        File file = new File(this.getClass().getResource("/templates/Programme.xlsx").getPath());
         InputStream is = new FileInputStream(file);
         InputStream is = new FileInputStream(file);
 
 
         byte[] buffer = new byte[1024];
         byte[] buffer = new byte[1024];

+ 4 - 1
src/main/vue/src/views/performance/ProgrammeEdit.vue

@@ -448,9 +448,12 @@ export default {
                 this.submit(false);
                 this.submit(false);
             }
             }
         },
         },
-        submit() {
+        submit(isSubmit) {
             let lenght = this.participants.filter(item => !item.del).length;
             let lenght = this.participants.filter(item => !item.del).length;
             let data = { ...this.formData, quantity: lenght };
             let data = { ...this.formData, quantity: lenght };
+            if (isSubmit) {
+                data.status = 1;
+            }
             this.saving = true;
             this.saving = true;
             this.$http
             this.$http
                 .post('/programme/save', data, { body: 'json' })
                 .post('/programme/save', data, { body: 'json' })

+ 6 - 0
src/main/vue/src/views/performance/ProgrammeOrgList.vue

@@ -185,6 +185,12 @@
             <el-table-column prop="gradingOrganization" label="考级机构" show-overflow-tooltip min-width="160">
             <el-table-column prop="gradingOrganization" label="考级机构" show-overflow-tooltip min-width="160">
             </el-table-column>
             </el-table-column>
             <el-table-column prop="organization" label="承办单位" min-width="180"> </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="examPoint" label="考级点" min-width="160"> </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="340">
             <el-table-column label="操作" align="center" fixed="right" min-width="340">
                 <template slot-scope="{ row }">
                 <template slot-scope="{ row }">