Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/api/administration/administration.js

@@ -102,7 +102,7 @@ export function getConditionAndAuditInfo(data) {
  */
 export function myInitiateAudit(data) {
   return request({
-    url: '/workflow/MyInitiateAudit',
+    url: '/workflow/GetMyInitiateAudit',
     method: 'post',
     data
   });
@@ -132,7 +132,7 @@ export function getMyInitiateAuditStatus(data) {
  */
 export function auditworkflowTemplate(data) {
   return request({
-    url: '/workflow/AuditworkflowTemplate',
+    url: '/workflow/GetAuditWorkFlowTemplate',
     method: 'post',
     data
   });
@@ -152,7 +152,7 @@ export function getDictValueList(data) {
  */
 export function calculateDuration(data) {
   return request({
-    url: '/workflow/CalculateDuration',
+    url: '/workflow/GetCalculateDuration',
     method: 'post',
     data
   });
@@ -273,7 +273,7 @@ export function setCareOf(data) {
  */
 export function copyTomyaudit(data) {
   return request({
-    url: '/workflow/CopyTomyaudit',
+    url: '/workflow/GetCopyToMyAudit',
     method: 'post',
     data
   });
@@ -283,7 +283,7 @@ export function copyTomyaudit(data) {
  */
 export function myAudit(data) {
   return request({
-    url: '/workflow/MyAudit',
+    url: '/workflow/GetMyAudit',
     method: 'post',
     data
   });

src/pages/administration/ApprovalStatistical.vue

@@ -234,8 +234,8 @@
           ToAuditId:'0',
           AuditedId:'0',
           TemplateId:0,
-          pageIndex:1,
-          pageSize:15,
+          PageIndex:1,
+          PageSize:15,
           StartTime:'',
           EndTime:'',
         },
@@ -333,7 +333,7 @@
         this.msg.AuditedId='0'
         this.getUserMsg.RB_Branch_id=this.msg.RB_BranchId;
         var qMsg = {
-          EmployeeName: ""
+          School_Id: this.msg.RB_BranchId
         }
 
         queryEmployee(qMsg).then(res => {
@@ -365,11 +365,11 @@
         // },err=>{})
       },
       handleCurrentChange(val) {
-        this.msg.pageIndex = val;
+        this.msg.PageIndex = val;
         this.getList();
       },
       resetPageIndex() {
-        this.msg.pageIndex = 1;
+        this.msg.PageIndex = 1;
         this.currentPage = 1
 
       },