退伍复学-表单数据显示、学务调整专业、页面填写数据调整、

src/views/routine/dis/formSt.vue

@@ -205,7 +205,9 @@
             <td class="input-cell" colspan="8" rowspan="4">
               <!-- <el-input v-model="form.xwIdea" type="textarea" :rows="3" placeholder="请填写意见..."
                 class="opinion-textarea"></el-input> -->
-              {{ form.xwIdea }}拟编入___
+              <div v-if="form.xwStatus == '0' ||  form.xwStatus == null || form.xwStatus == '2'" >{{ form.xwIdea }}拟编入____</div>
+                     <!-- 同意 -->
+                     <div v-if="form.xwStatus == '1'">{{ form.xwIdea || '暂无意见' }},拟编入__{{finalGradeName}}_{{finalClassName}}__</div> 
               <div class="signature-area right-align">
                 <span>审批结果：</span>
                 <el-select v-model="form.xwStatus" placeholder="待审核" class="short-select" disabled>
@@ -374,6 +376,12 @@ export default {
 
       // 班级名称列表
       ClassNameList: [],
+
+      // 最终班级名称
+      finalClassName: null,
+      // 最终年级名称
+      finalGradeName:null,
+
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -438,11 +446,37 @@ export default {
   },
   methods: {
 
+    // 获取学务班级名称列表
+    getXWClassNameList() {
+      getClassName().then(res => {
+        this.ClassNameList = res.data
+        // console.log(this.ClassNameList)
+        if (this.ClassNameList != null) {
+          this.ClassNameList.forEach(element => {
+            if (element.value == this.form.maList[0].finaldata1) {
+              // console.log(element.label)
+              element.children.forEach(elementTwo => {
+                if (elementTwo.value == this.form.maList[0].finaldata2) {
+                  //  console.log(elementTwo.label)
+                  // this.saveClassName =elementTwo.label
+                  elementTwo.children.forEach(elementFree => {
+                    this.finalClassName = elementFree.label
+                     this.classVlue1 = [element.value, elementTwo.value, elementFree.value];
+                    // console.log(elementFree.label)
+                  });
+                }
+              });
+            }
+          });
+        }
+      })
+    },
+
     /** 获取班级名称列表 */
     getClassNameList() {
       getClassName().then(res => {
         this.ClassNameList = res.data
-        // console.log(this.ClassNameList)
+        console.log(this.ClassNameList)
         if (this.ClassNameList != null) {
           this.ClassNameList.forEach(element => {
             if (element.value == this.form.maList[0].data1) {
@@ -450,10 +484,12 @@ export default {
               element.children.forEach(elementTwo => {
                   if (elementTwo.value == this.form.maList[0].data2) {
                     //  console.log(elementTwo.label)
-                    elementTwo.children.forEach(elementFree => {
-                      this.saveClassName = elementFree.label
-                      // console.log(elementFree.label)
-                    });
+                    this.saveClassName =elementTwo.label
+                    // 班级
+                    // elementTwo.children.forEach(elementFree => {
+                    //   this.saveClassName = elementFree.label
+                    //   // console.log(elementFree.label)
+                    // });
                   }
                 });
             }
@@ -483,6 +519,7 @@ export default {
           this.form = response.data
           this.getClassNameList()
           this.listGrade()
+          this.getXWClassNameList()
           // this.active = response.data.status + 1;
         })
       }
@@ -499,6 +536,10 @@ export default {
                       if(element.gradeId == this.form.maList[0].newgrade){
                           this.saveGradeName = element.gradeName
                       }
+                       if (element.gradeId == this.form.maList[0].finallabel) {
+                        this.finalGradeName = element.gradeName
+                    
+                      }
                     });
                 }
             } catch (error) {