修改组织架构的年级

src/components/PlanReport.vue

@@ -103,11 +103,11 @@
         </div>
         <div class="table-content">
           <el-form :inline="true" class="demo-form-inline">
-            <el-form-item label="人员类型">
+            <el-form-item label="维度占比">
               <el-select
                 v-model="userType"
                 @change="userTypeChange"
-                placeholder="请选择人员类型"
+                placeholder="请选择维度占比"
               >
                 <el-option label="焦虑" value="焦虑"></el-option>
                 <el-option label="抑郁" value="抑郁"></el-option>
@@ -157,6 +157,9 @@
           :total="total"
         >
         </el-pagination>
+        <div style="text-align: center; font-size: 14px; font-weight: 600;margin-bottom:40px;margin-top:40px">
+          已完成人数中各个维度人员情况
+        </div>
         <el-form :inline="true" class="demo-form-inline">
           <el-form-item label="维度选择">
             <el-select
@@ -237,8 +240,6 @@
           </el-table-column>
           <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
           </el-table-column>
-          <el-table-column prop="dimensionSymptom" label="症状" align="center" width="">
-          </el-table-column>
           <el-table-column
             prop="dimensionName"
             label="维度"
@@ -247,6 +248,8 @@
             width=""
           >
           </el-table-column>
+          <el-table-column prop="dimensionSymptom" label="症状" align="center" width="">
+          </el-table-column>
         </el-table>
         <el-pagination
           class="pag_class"
@@ -726,7 +729,6 @@ export default {
         {},
         (res) => {
           if (res && res.code == 200) {
-            debugger;
             this.subData = res.data.content;
             this.subTotal = res.data.totalElements;
             //调用接口开始查询选择的列表

src/views/manage/channelInfo/orderSettlement.vue

@@ -18,7 +18,7 @@
       <div class="tips">
         <el-form :model="ruleForm" ref="ruleForm" :rules="rules" class="demo-ruleForm">
           <el-form-item
-            label="所属届"
+            label="所属年级"
             prop="grade"
             class="imput_com"
             v-show="isShowGrade"
@@ -26,7 +26,7 @@
             <el-select
               v-model="ruleForm.grade"
               clearable
-              placeholder="请选择所属届"
+              placeholder="请选择所属年级"
               style="width: 100%"
             >
               <el-option
@@ -118,7 +118,7 @@ export default {
       },
       rules: {
         orgName: [{ required: true, message: "请输入组织名称", trigger: "blur" }],
-        grade: [{ required: true, message: "请选择届数", trigger: "change" }],
+        grade: [{ required: true, message: "请选择年级", trigger: "change" }],
       },
       shareholderTypeOptions: [
         {
@@ -169,7 +169,7 @@ export default {
         //
         let obj = {
           value: i + "",
-          label: i + "届",
+          label: i + "级",
         };
         list.push(obj);
       }