1

src/components/sale/orderlist.vue

@@ -713,6 +713,7 @@ export default {
         },
         getClassInfo(obj) { //打开班级详情组件
             this.classObjOption = obj;
+          this.classObjOption.School_Id = this.classObjOption.ClassSchoolId
             this.isShowClassInfo = true;
         },
         //关闭班级信息弹窗

src/pages/administration/sendToMeApproval.vue

@@ -270,6 +270,9 @@
   import {
     UploadSelfFile
   } from '../../api/common/common'
+  import {
+    getEmployeeAddrBook
+  } from '../../api/users/user'
   export default {
     data() {
       return {
@@ -409,12 +412,13 @@
         this.outerVisible1=true;
         this.workFlowId=workFlowId;
         this.templateType=templateType;
-        this.apipost('WorkFlow_get_GetDepartMentEmployee', {}, res => {
-          if(res.data.resultCode == 1) {
-
-            this.memberList = res.data.data
+        getEmployeeAddrBook({}).then(res => {
+          if(res.Code == 1) {
+            this.memberList = res.Data;
           }
-        }, err => {})
+        }).catch(() => {
+
+        })
       },
       clearTransferDialog(){
         this.filterText=''
@@ -451,45 +455,52 @@
           this.$message.warning('请选择转交人！')
           return
         }
-        this.apipost('WorkFlow_post_SetCareOf',this.transferMsg,res=>{
-          if(res.data.resultCode == 1) {
-            this.$message.success(res.data.message)
+        setCareOf(this.transferMsg).then(res => {
+          if(res.Code == 1) {
+            this.$message.success(res.Message)
             this.outerVisible1=false;
             this.getList()
-          }else{
-            this.$message.error(res.data.message)
+          }else {
+            this.$message.error(res.Message)
           }
-        },err=>{})
+        }).catch(() => {
+
+        })
+
       },
       agreeApproval(){
         this.appMsg.WorkFlowId=this.workFlowId
         this.appMsg.TemplateType=this.templateType
-        this.apipost('WorkFlow_post_SetConsent',this.appMsg,res=>{
-          if(res.data.resultCode == 1) {
-            this.$message.success(res.data.message)
+        setConsent(this.appMsg).then(res => {
+          if(res.Code == 1) {
+            this.$message.success(res.Message)
             this.outerVisible=false;
             this.getList()
             this.btnClearDialogMsg()
             this.closeLayer()
-          }else{
-            this.$message.error(res.data.message)
+          }else {
+            this.$message.error(res.Message)
           }
-        },err=>{})
+        }).catch(() => {
+
+        })
       },
       rejectApproval(){
         this.appMsg.WorkFlowId=this.workFlowId
         this.appMsg.TemplateType=this.templateType
-        this.apipost('WorkFlow_post_SetNotConsent',this.appMsg,res=>{
-          if(res.data.resultCode == 1) {
-            this.$message.success(res.data.message)
+        setNotConsent(this.appMsg).then(res => {
+          if(res.Code == 1) {
+            this.$message.success(res.Message)
             this.outerVisible=false;
             this.getList()
             this.btnClearDialogMsg()
             this.closeLayer()
-          }else{
-            this.$message.error(res.data.message)
+          }else {
+            this.$message.error(res.Message)
           }
-        },err=>{})
+        }).catch(() => {
+
+        })
       },
 
       withdrawAapproval(workFlowId,templateType){
@@ -498,12 +509,16 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.apipost('app_user_workflow_wndoaudit',{workFlowId:workFlowId,templateType:templateType},res=>{
-            if(res.data.resultCode == 1) {
+
+          undoAudit({workFlowId:workFlowId,templateType:templateType}).then(res => {
+            if(res.Code == 1) {
               this.$message.success('撤回成功。')
               this.getList()
+              this.showlayer = false;
             }
-          },err=>{})
+          }).catch(() => {
+
+          })
         }).catch(() => {
           this.$message.info('已取消撤回。')
         });
@@ -526,15 +541,16 @@
       },
       getDetail(id,type){
         this.showLayer();
-        this.apipost('app_user_workflow_GetAuditInfo',{WorkFlowId:id,TemplateType:type},res=>{
-          if(res.data.resultCode == 1) {
-            this.detailList=res.data.data
-            this.IsAudit=res.data.data.IsAudit
-            this.IsCancel=res.data.data.IsCancel
-            this.IsUpdate=res.data.data.IsUpdate
-
+        getAuditInfo({WorkFlowId:id,TemplateType:type}).then(res => {
+          if(res.Code == 1) {
+            this.detailList=res.Data
+            this.IsAudit=res.Data.IsAudit
+            this.IsCancel=res.Data.IsCancel
+            this.IsUpdate=res.Data.IsUpdate
           }
-        },err=>{})
+        }).catch(() => {
+
+        })
       },
       getList(){
         this.loading=true;
@@ -548,14 +564,6 @@
         }).catch(() => {
 
         })
-        // this.apipost('app_user_workflow_copy_tomyaudit',this.msg,res=>{
-        //   if(res.data.resultCode == 1) {
-        //
-        //     this.list=res.data.data.pageData;
-        //     this.total=res.data.data.count;
-        //     this.loading=false
-        //   }
-        // },err=>{})
       },
       getApplyType(){  //模板类型
         gettemplatetype({}).then(res => {

src/pages/course/course.vue

@@ -112,7 +112,8 @@
             name: 'CourseIntro',
             label: '课程介绍',
             field: 'CourseIntro',
-            align: 'left'
+            align: 'left',
+            style: 'width: 100px',
           },
           {
             name: 'CreateByName',