页面修改

src/components/sale/changebill-form.vue

@@ -66,7 +66,7 @@
               <div class="row backInfo_One">
                 <div class="col-6">
                   <span class="backInfo_Title">编号：</span>
-                  <span class="backOtherInfo">{{setingObj.DataObj.BackNum}}</span>
+                  <span class="backOtherInfo">{{setingObj.DataObj.Id}}</span>
                 </div>
                 <div class="col-6">
                   <span class="backInfo_Title">申请人：</span>
@@ -74,62 +74,42 @@
                 </div>
               </div>
               <div class="row backInfo_One">
-                <div class="col-6">
-                  <span class="backInfo_Title">学员姓名：</span>
-                  <span class="backOtherInfo">{{setingObj.DataObj.GuestName}}</span>
-                </div>
-                <div class="col-6">
+                <div class="col-12">
                   <span class="backInfo_Title">申请时间：</span>
                   <span class="backOtherInfo">{{setingObj.CreateTime}}</span>
                 </div>
               </div>
               <div class="backinfo_Item">
-                <span class="role_Line" style="background-color:#F28C1D"></span>教学信息
+                <span class="role_Line" style="background-color:#F28C1D"></span>申请信息
               </div>
               <div class="row backInfo_One">
                 <div class="col-6">
-                  <span class="backInfo_Title">校区：</span>
-                  <span class="backOtherInfo">{{setingObj.DataObj.SchoolName}}</span>
+                  <span class="backInfo_Title">调动类型：</span>
+                  <span class="backOtherInfo">{{setingObj.DataObj.ChangeTypeStr}}</span>
                 </div>
                 <div class="col-6">
-                  <span class="backInfo_Title">班级信息：</span>
+                  <span class="backInfo_Title">调动选项:</span>
                   <span class="backOtherInfo">
-                    {{setingObj.DataObj.ClassName}}
-                    <span style="color:#2961FE;cursor:pointer;"
-                      @click="goClassManage(setingObj.DataObj.ClassName)">{{setingObj.DataObj.ClassNo}}</span>
+                    {{setingObj.DataObj.MoveTypeStr}}
                   </span>
                 </div>
               </div>
               <div class="row backInfo_One">
                 <div class="col-6">
-                  <span class="backInfo_Title">带班老师：</span>
-                  <span class="backOtherInfo">{{setingObj.DataObj.TeacherName}}</span>
-                </div>
-                <div class="col-6">
-                  <span class="backInfo_Title">学习课程：</span>
-                  <span class="backOtherInfo">{{setingObj.DataObj.CourseName}}</span>
+                  <span class="backInfo_Title">班级：</span>
+                  <span class="backOtherInfo">{{setingObj.DataObj.ClassName}}</span>
                 </div>
               </div>
-
-
-
             </div>
-            <div class="replayReason">
-              <div class="replay_Title">退课原因</div>
-              <div style="color:#666666;margin-top:5px;">
-                {{setingObj.DataObj.ApplyReason}}
-              </div>
-            </div>
-
             <div v-if="showType==2">
               <div style="display:flex;justify-content:space-between;align-items:center;margin-top:20px;">
                 <div>审批意见</div>
                 <div>
-                  <q-radio v-model="backBillMsg.AuditStatus" :val="2" label="通过" />
-                  <q-radio v-model="backBillMsg.AuditStatus" :val="3" label="驳回" />
+                  <q-radio v-model="changeBillMsg.AuditStatus" :val="2" label="通过" />
+                  <q-radio v-model="changeBillMsg.AuditStatus" :val="3" label="驳回" />
                 </div>
               </div>
-              <q-input filled stack-label :dense="false" v-model="backBillMsg.Description" type="textarea"
+              <q-input filled stack-label :dense="false" v-model="changeBillMsg.Description" type="textarea"
                 label="审批意见" />
             </div>
             <div style="margin-top:20px;">
@@ -215,9 +195,8 @@
         persistent: true,
         tabCheck: 'first', //默认选第一个
         loading: false,
-        backBillMsg: {
+        changeBillMsg: {
           Id: 0,
-          BackMoney: 0, //实际退款金额
           Description: "", //审批意见
           AuditStatus: 2, //审核状态
           SpecialNode: 0, //是否特殊节点
@@ -233,23 +212,14 @@
       this.getEmployee();
     },
     mounted() {
-      this.backBillMsg.Id = this.setingObj.Id;
-      this.backBillMsg.SpecialNode = this.setingObj.SpecialNode;
-      if (this.backBillMsg.SpecialNode == 1) {
-        this.getBackBillMoney();
-      }
+      console.log("this.setingObj", this.setingObj)
+      this.changeBillMsg.Id = this.setingObj.Id;
+      this.changeBillMsg.SpecialNode = this.setingObj.SpecialNode;
+
 
     },
     methods: {
-      getBackBillMoney() {
-        queryBackBillMoney({
-          BackId: this.setingObj.RelationId
-        }).then(res => {
-          if (res.Code == 1) {
-            this.classPriceObj = res.Data;
-          }
-        });
-      },
+
       closeBackInfo() {
         this.persistent = false;
         this.$emit('close');
@@ -265,8 +235,8 @@
         if (str && str != '') {
           str = str.substr(1);
         }
-        this.backBillMsg.RecipientIds = str;
-        saveBackBillAduit(this.backBillMsg).then(res => {
+        this.changeBillMsg.RecipientIds = str;
+        saveBackBillAduit(this.changeBillMsg).then(res => {
           if (res.Code == 1) {
             this.$q.notify({
               icon: 'iconfont icon-chenggong',

src/components/sale/flowinfo-form.vue

@@ -141,7 +141,12 @@
         </div>
         <div class="back_remark" v-if="subItem.AuditStatus!=1">
           <div class="triangle_border_up"></div>
-          {{subItem.Description}}
+          <template v-if="subItem.Description&&subItem.Description!=''">
+            {{subItem.Description}}
+          </template>
+          <template v-else>
+            无
+          </template>
         </div>
       </div>
     </div>

src/pages/teacher/changeClassManager.vue

@@ -6,7 +6,8 @@
   .Sysuser_Date .el-range-editor.el-input__inner {
     background-color: transparent;
   }
-  .ReceipTypeName{
+
+  .ReceipTypeName {
     display: inline-block;
     padding: 2px 8px;
     color: white;
@@ -14,22 +15,22 @@
     line-height: 16px;
     border-radius: 4px;
   }
+
 </style>
 <template>
   <div class="page-body">
     <div class="page-search row items-center">
       <div class="col row wrap q-col-gutter-md">
         <div class="col-3">
-          <q-input @change="resetSearch" clearable filled v-model="msg.ClassName"
-            label="学员名称/班级名称/老师名称" />
+          <q-input @change="resetSearch" clearable filled v-model="msg.ClassName" label="学员名称/班级名称/老师名称" />
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" clearable filled v-model="msg.AuditStatus" :options="ShowOpts"
-            emit-value map-options label="审核状态" />
+          <q-select @input="resetSearch" clearable filled v-model="msg.AuditStatus" :options="ShowOpts" emit-value
+            map-options label="审核状态" />
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" clearable option-value="Id" option-label="Name" filled v-model="msg.ReceiptType" :options="OrderTypeList"
-            emit-value map-options label="单据类型" />
+          <q-select @input="resetSearch" clearable option-value="Id" option-label="Name" filled
+            v-model="msg.ReceiptType" :options="OrderTypeList" emit-value map-options label="单据类型" />
         </div>
         <div class="col-3 Sysuser_Date">
           <q-field filled>
@@ -87,6 +88,9 @@
       <createbackbill-form v-if="isShowCreateBillForm" :seting-obj="billObj" @close="closeBillForm"
         @success="refreshPage">
       </createbackbill-form>
+      <changebill-form v-if="isShowChangeBillForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
+        @success="refreshPage">
+      </changebill-form>
     </div>
   </div>
 </template>
@@ -97,6 +101,8 @@
   } from '../../api/teacher/index'
 
   import backbillForm from '../../components/sale/backbill-form';
+  import changebillForm from '../../components/sale/changebill-form';
+
   import createbackbillForm from '../../components/sale/createbackbill-form';
   export default {
     meta: {
@@ -104,7 +110,8 @@
     },
     components: {
       backbillForm,
-      createbackbillForm
+      createbackbillForm,
+      changebillForm
     },
     data() {
       return {
@@ -114,7 +121,7 @@
             label: '单号',
             field: 'Id',
             align: 'left'
-          },{
+          }, {
             name: 'Title',
             label: '标题',
             field: 'Title',
@@ -153,8 +160,7 @@
         data: [],
         loading: true,
         applyDateList: [], //申请日期
-        ShowOpts: [
-          {
+        ShowOpts: [{
             label: '审核中',
             value: '1'
           },
@@ -180,12 +186,13 @@
           StartTime: "", //开始时间
           EndTime: "", //结束时间
           Conditon: 1,
-          ReceiptType:'' //单据类型
+          ReceiptType: '' //单据类型
         },
         tabCheck: "1",
         pageCount: 0,
         isShowBillForm: false, //是否显示单据表单
         isShowCreateBillForm: false, //是否显示制单表单
+        isShowChangeBillForm: false, //是否显示调课单据
         billObj: {}, //单据信息
         showType: 1, //1-查看，2-审核
         OrderTypeList: [],
@@ -219,15 +226,22 @@
       //关闭表单
       closeBillForm() {
         this.isShowBillForm = false;
+        this.isShowChangeBillForm = false;
         this.isShowCreateBillForm = false;
         this.billObj = {};
       },
       //显示表单
       showBillForm(item, type) {
-        this.isShowBillForm = true;
+        //调课
+        if (item.ReceiptType == 1) {
+          this.isShowChangeBillForm = true;
+        }
+        //退课
+        else if (item.ReceiptType == 2) {
+          this.isShowBillForm = true;
+        }
         this.showType = type;
         this.billObj = item;
-   
       },
       //重新查询
       resetSearch() {
@@ -263,6 +277,7 @@
       //刷新页面
       refreshPage() {
         this.isShowBillForm = false;
+        this.isShowChangeBillForm = false;
         this.billObj = {};
         this.getStuBackBill();
       },

src/pages/user/billquery.vue

@@ -204,7 +204,6 @@
       },
       //显示表单
       showBillForm(item, type) {
- 
         //调课
         if (item.ReceiptType == 1) {
           this.isShowChangeBillForm = true;