zpy

ruoyi-ui/src/views/smartSchool/electronicArchives/teacherAssessment/index.vue

@@ -169,14 +169,14 @@
                 :min-width="screenWidth * 0.05" show-overflow-tooltip />
             <el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable
                 :min-width="screenWidth * 0.05" show-overflow-tooltip />
+            <!-- 2.17新加 jzmydpj-->
+            <el-table-column label="家长满意度评价" align="center" prop="jzmydpj" sortable :min-width="screenWidth * 0.05" />
             <el-table-column label="考核结果" align="center" prop="assessmentResults" sortable
                 :min-width="screenWidth * 0.04">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.assessment_results" :value="scope.row.assessmentResults" />
                 </template>
             </el-table-column>
-            <!-- 2.17新加 jzmydpj-->
-            <el-table-column label="家长满意度评价" align="center" prop="jzmydpj" sortable :min-width="screenWidth * 0.05" />
             <!-- <el-table-column label="总考核成绩" align="center" prop="totalCheckAchievement" sortable fixed="right"
                 width="130px" /> -->
             <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip
@@ -267,7 +267,6 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="智育考核成绩" prop="intellEduCheckAchievement">
@@ -275,6 +274,16 @@
                                 clearable />
                         </el-form-item>
                     </el-col>
+                    <!-- 2.17新加 jzmydpj-->
+                    <el-col :span="12">
+                        <el-form-item label="家长满意度评价" prop="jzmydpj">
+                            <el-input v-model="form.jzmydpj" placeholder="请输入" clearable />
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+
+                <el-row>
                     <el-col :span="12">
                         <el-form-item label="考核结果" prop="assessmentResults">
                             <el-select v-model="form.assessmentResults" clearable placeholder="请选择"
@@ -288,9 +297,6 @@
                             <el-input v-model="form.totalCheckAchievement" type="number" placeholder="请输入" clearable />
                         </el-form-item> -->
                     </el-col>
-                </el-row>
-
-                <el-row>
                     <el-col :span="12">
                         <el-form-item label="班级类型" prop="classType">
                             <el-select v-model="form.classType" placeholder="请选择" clearable style="width: 100%">
@@ -300,6 +306,9 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
+
+                </el-row>
+                <el-row>
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%">
@@ -309,14 +318,6 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                </el-row>
-                <el-row>
-                    <!-- 2.17新加 jzmydpj-->
-                    <el-col :span="12">
-                        <el-form-item label="家长满意度评价" prop="jzmydpj">
-                            <el-input v-model="form.jzmydpj" placeholder="请输入" clearable />
-                        </el-form-item>
-                    </el-col>
                     <el-col :span="12">
                         <el-form-item label="备注" prop="remark">
                             <el-input v-model="form.remark" type="textarea" placeholder="请输入" clearable />
@@ -461,6 +462,9 @@ export default {
                 intellEduCheckAchievement: [
                     { required: true, message: "智育考核成绩不能为空", trigger: "blur" }
                 ],
+                assessmentResults: [
+                    { required: true, message: "考核结果不能为空", trigger: "blur" }
+                ],
                 totalCheckAchievement: [
                     { required: true, message: "总成绩考核不能为空", trigger: "blur" }
                 ],
@@ -470,9 +474,7 @@ export default {
                 sub: [
                     { required: true, message: "学科不能为空", trigger: "blur" }
                 ],
-                assessmentResults: [
-                    { required: true, message: "考核结果不能为空", trigger: "blur" }
-                ],
+
 
             }
         };