修改

src/components/sale/changebill-form.vue

@@ -40,6 +40,7 @@
     margin-top: 20px;
     width: 300px;
   }
+
   .backinfoContent .replayReason {
     width: 100%;
     min-height: 100px;
@@ -48,13 +49,16 @@
     padding: 20px;
     margin: 20px 0;
   }
+
   .backinfoContent .replay_Title {
     font-weight: 700;
     color: #111;
-}
+  }
+
   .backinfoContent .baseInfo_Item {
     margin-bottom: 20px;
   }
+
   .backinfoContent .EmpList {
     background-color: #F7F7F7;
     min-height: 70px;
@@ -62,30 +66,36 @@
     border-radius: 3px;
     padding: 15px;
   }
+
   .backinfoContent .normalName {
     color: #999999;
     font-size: 12px;
   }
+
   .backinfoContent .normalInner {
     color: #111111;
     font-weight: bold;
     font-size: 13px;
     margin-top: 5px;
   }
-  .changeBTable th{
+
+  .changeBTable th {
     font-size: 12px;
     font-weight: 400;
     background-color: rgba(0, 0, 0, 0.12);
-    height:40px;
+    height: 40px;
     line-height: 40px;
   }
-  .changeBTable td{
+
+  .changeBTable td {
     text-align: center;
-    height:30px;
+    height: 30px;
   }
-  .BillredClass{
-    color:red;
+
+  .BillredClass {
+    color: red;
   }
+
 </style>
 <template>
   <q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeShenheForm">
@@ -155,10 +165,25 @@
                   </span>
                 </div>
               </div>
-            </div>
               <div class="row backInfo_One">
-              <q-table no-data-label="暂无相关数据" flat style="width:100%;" v-if="setingObj.DataObj.OldChangePlanItemList" :pagination="pages"
-                class="sticky-column-table no-bottom-table" separator="none" :data="setingObj.DataObj.OldChangePlanItemList"
+                <div class="col-6">
+                  <span class="backInfo_Title">变更类型：</span>
+                  <span class="backOtherInfo">
+                    {{setingObj.DataObj.ChangeTypeStr}}
+                  </span>
+                </div>
+                <div class="col-6">
+                  <span class="backInfo_Title">变更范围：</span>
+                  <span class="backOtherInfo">
+                    {{setingObj.DataObj.MoveTypeStr}}
+                  </span>
+                </div>
+              </div>
+
+            </div>
+            <q-table no-data-label="暂无相关数据" flat style="width:100%;" v-if="dataList&&dataList.length>0"
+              :pagination="pages" class="sticky-column-table no-bottom-table" separator="none"
+              :data="dataList"
               :columns="setingObj.DataObj.ChangeType==1?columns:columns2">
               <template v-slot:body-cell-PlanTimeList="props">
                 <q-td :props="props">
@@ -172,15 +197,25 @@
                   <span style="color:red">{{props.row.ClassDate2}}</span>
                 </q-td>
               </template>
+              <template v-slot:body-cell-ClassRoomName="props">
+                <q-td :prop="props">
+                  <span :class="{'BillredClass':setingObj.DataObj.ChangeType==3&&setingObj.DataObj.MoveType==1}">{{props.row.ClassRoomName}}</span>
+                </q-td>
+              </template>
+              <template v-slot:body-cell-TeacherName="props">
+                <q-td :prop="props">
+                  <span :class="{'BillredClass':setingObj.DataObj.ChangeType==2&&setingObj.DataObj.MoveType==1}">{{props.row.TeacherName}}</span>
+                </q-td>
+              </template>
               <template v-slot:body-cell-PlanTimeList2="props">
                 <q-td :props="props">
-                    <div :class="{'BillredClass':setingObj.DataObj.ChangeType==1&&setingObj.DataObj.MoveType==1}" v-for="(item,index) in props.row.PlanTimeList2">
+                  <div :class="{'BillredClass':setingObj.DataObj.ChangeType==1&&setingObj.DataObj.MoveType==1}"
+                    v-for="(item,index) in props.row.PlanTimeList2">
                     {{index+1}}节课 {{item.StartTime}}-{{item.EndTime}}
                   </div>
                 </q-td>
               </template>
             </q-table>
-            </div>
             <template v-if="setingObj.DataObj.ChangeType==1&&setingObj.DataObj.MoveType==2">
               <div class="row backInfo_One">
                 <div class="col EmpList">
@@ -201,7 +236,8 @@
                 <div class="col EmpList">
                   <div class="normalName">选择周几</div>
                   <div class="normalInner">
-                      <span style="margin-right:5px;" v-for="(item,index) in setingObj.DataObj.AllChangePlanModel.WeekDayList">{{item}}</span>
+                    <span style="margin-right:5px;"
+                      v-for="(item,index) in setingObj.DataObj.AllChangePlanModel.WeekDayList">{{item}}</span>
                   </div>
                 </div>
                 <div class="col EmpList">
@@ -233,7 +269,8 @@
                     </th>
                   </tr>
                 </thead>
-                <tbody v-for="(nItem,nIndex) in setingObj.DataObj.AllChangePlanModel.DefaultTimeList" :key="nIndex+10000">
+                <tbody v-for="(nItem,nIndex) in setingObj.DataObj.AllChangePlanModel.DefaultTimeList"
+                  :key="nIndex+10000">
                   <tr v-for="(sItem,sIndex) in nItem.TimeList">
                     <td :rowspan="nItem.TimeList.length" v-if="sIndex==0">
                       <span style="margin-right:5px;" v-for="oItem in nItem.DateList">{{oItem}}</span>
@@ -417,15 +454,16 @@
             align: 'left'
           },
           {
-            name: 'PlanTimeList2',
+            name: 'PlanTimeList',
             label: '上课时间',
-            field: 'PlanTimeList2',
+            field: 'PlanTimeList',
             align: 'left'
           }
         ],
         pages: {
           rowsPerPage: 100000
         },
+        dataList:[]
       }
     },
     created() {
@@ -437,31 +475,35 @@
       this.changeBillMsg.SpecialNode = this.setingObj.SpecialNode;
       if (this.setingObj.DataObj.ChangeType == 1) {
         this.changeTitle = '课程时间变更'
+        if (this.setingObj.DataObj.MoveType == 1) {
+          this.dataList=[];
+          if (this.setingObj.DataObj.OldChangePlanItemList && this.setingObj.DataObj.NewChangePlanItemList) {
+            this.setingObj.DataObj.OldChangePlanItemList.forEach((x,index) => {
+              var obj = {
+                ClassRoomName:x.ClassRoomName,
+                ClassDateStr:x.ClassDateStr,
+                TeacherName:x.TeacherName,
+                PlanTimeList:x.PlanTimeList,
+                ClassDate2:this.setingObj.DataObj.NewChangePlanItemList[index].ClassDateStr,
+                PlanTimeList2:this.setingObj.DataObj.NewChangePlanItemList[index].PlanTimeList
+              }
+              this.dataList.push(obj);
+            })
+            console.log(this.dataList,'datraList');
+          }
+        }
       }
       if (this.setingObj.DataObj.ChangeType == 2) {
         this.changeTitle = '老师变更'
+        this.dataList = this.setingObj.DataObj.NewChangePlanItemList
       }
       if (this.setingObj.DataObj.ChangeType == 3) {
         this.changeTitle = '教室变更'
+        this.dataList = this.setingObj.DataObj.NewChangePlanItemList
       }
       if (this.setingObj.DataObj.ChangeType == 4) {
         this.changeTitle = '取消上课变更'
-      }
-      if (this.setingObj.DataObj.OldChangePlanItemList && this.setingObj.DataObj.NewChangePlanItemList) {
-        this.setingObj.DataObj.OldChangePlanItemList.forEach(x => {
-          this.setingObj.DataObj.NewChangePlanItemList.forEach(y => {
-            x.ClassPlanId2 = y.ClassPlanId;
-            x.ClassRoomId2 = y.ClassRoomId;
-            x.TeacherId2 = y.TeacherId;
-            x.ClassDate2 = y.ClassDateStr;
-            x.PlanTimeList2 = y.PlanTimeList;
-          })
-        })
-      }
-      if(this.setingObj.DataObj.ChangeType==4&&this.setingObj.DataObj.MoveType==1){
-        this.setingObj.DataObj.OldChangePlanItemList.forEach(x => {
-          x.PlanTimeList2 = x.PlanTimeList
-        })
+        this.dataList = this.setingObj.DataObj.NewChangePlanItemList
       }
       console.log(this.setingObj.DataObj.OldChangePlanItemList);
     },