zpy 11.8

ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue

@@ -437,7 +437,14 @@ export default {
             getDiscipline(id).then((response) => {
                 this.form = response.data;
                 this.isEdit = true;
-                this.dialogTableVisible = true; ``
+                this.dialogTableVisible = true;
+                this.form.gradeId = response.data.gradeId;
+                const params = { gradeId: this.form.gradeId };
+                getClassList(params).then(response => {
+                    this.loading = false;
+                    this.classList = response.data;
+                    console.log("this.classList", this.classList);
+                });
             }).catch(error => {
                 this.$modal.closeLoading();
             })

ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen/index.vue

@@ -463,7 +463,14 @@ export default {
             getDiscipline(id).then((response) => {
                 this.form = response.data;
                 this.isEdit = true;
-                this.dialogTableVisible = true; ``
+                this.dialogTableVisible = true;
+                this.form.gradeId = response.data.gradeId;
+                const params = { gradeId: this.form.gradeId };
+                getClassList(params).then(response => {
+                    this.loading = false;
+                    this.classList = response.data;
+                    console.log("this.classList", this.classList);
+                });
             }).catch(error => {
                 this.$modal.closeLoading();
             })

ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue

@@ -123,16 +123,16 @@
             </el-table-column>
             <el-table-column align="center" prop="punishTime" sortable label="处分时间" width="100" />
             <el-table-column align="center" prop="remark" sortable label="备注" />
-            <el-table-column align="center" fixed="right" label="操作" width="150">
+            <el-table-column align="center" fixed="right" label="操作" width="200">
                 <template slot-scope="scope">
                     <div v-if="scope.row.auditState === '0'">
                         <el-button @click="handleExamine(scope.row)" type="text" size="small">提交</el-button>
                         <el-button @click="handleEdit(scope.row)" type="text" size="small">编辑</el-button>
+                        <el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
                         <el-button @click="handleDelete(scope.row)" type="text" size="small">删除</el-button>
                     </div>
                     <div v-else>
-                        <el-button @click="handleEdit(scope.row)" type="text" size="small">编辑</el-button>
-                        <el-button @click="handleDelete(scope.row)" type="text" size="small">删除</el-button>
+                        <el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
                     </div>
                 </template>
             </el-table-column>
@@ -425,6 +425,26 @@ export default {
             const lastDigit = parseInt(idCard.charAt(idCard.length - 2)); // 获取倒数第二位数字
             return lastDigit % 2 === 0 ? '女' : '男'; // 奇数表示男性，偶数表示女性
         },
+        //查看
+        handleLook(row) {
+            console.log(row);
+            const id = row.id || this.ids;
+            getDiscipline(id).then((response) => {
+                this.form = response.data;
+                this.isEdit = true;
+                this.dialogTableVisible = true;
+                this.form.gradeId = response.data.gradeId;
+                const params = { gradeId: this.form.gradeId };
+                getClassList(params).then(response => {
+                    this.loading = false;
+                    this.classList = response.data;
+                    console.log("this.classList", this.classList);
+                });
+            }).catch(error => {
+                this.$modal.closeLoading();
+            })
+
+        },
 
         //修改
         handleEdit(row) {