更改get请求传参方式

api/department.js

@@ -203,7 +203,7 @@ export default{
     },
     get(id){
         let model={id:id};
-        return Api.get(`${systemUrl}/Department/get`,{params:model});
+        return Api.get(`${systemUrl}/Department/get`,model);
     },
     //人员管理页面得到组织架构
     getDepartmentTree(data){

pages/basicData/dataDictionary/index.vue

@@ -154,8 +154,8 @@ export default {
   created(){
     var url=`${systemUrl}/DictionaryType/GetPaged`
     service.get(`${url}`).then(response=>{
-      //console.log(response.data.result.items)
-      this.selectdata=response.data.result.items
+      //console.log(response.result.items)
+      this.selectdata=response.result.items
       this.model1=this.selectdata[0].value
       this.loaddata(this.model1)
     });
@@ -177,7 +177,7 @@ export default {
     loaddata(id){
       var url=`${systemUrl}/Dictionary/GetPaged`
       service.get(`${url}`,{params:{TypeId:id}}).then(response=>{
-        this.tbPro.data=response.data.result.items
+        this.tbPro.data=response.result.items
       })
     },
     change(data){
@@ -213,7 +213,7 @@ export default {
     okmysel(bl){
       var url=`${systemUrl}/Dictionary/Delete?id=${this.keyid}`
       service.delete(`${url}`).then(response=>{
-        if(response.data.success)
+        if(response.success)
         {
           this.$Message.success('删除成功')
           this.loaddata(this.model1)
@@ -253,7 +253,7 @@ export default {
             //this.formValidate1.id=
           } 
           service.post(`${url}`,JSON.stringify({Dictionary:this.formValidate1})).then(response=>{
-            if(response.data.success){
+            if(response.success){
               this.$Message.success('保存成功')
               this.loaddata(this.model1)
               this.modal1 = false

pages/basicData/privilegeManagent/index.vue

@@ -212,29 +212,27 @@ export default {
     loaddata: function() {
       var url = `${systemUrl}/Privilege/getprivileges`
       var that = this
-      service.get(`${url}`, { params: this.searchdata }).then((response) => {
+      service.get(`${url}`, this.searchdata ).then((response) => {
         // console.log(response)
-        that.data = response.data.result
+        that.data = response.result
       })
     },
     lodataByid: function(data1) {
       var url = `${systemUrl}/Privilege/GetById`
       service
-        .get(`${url}`, { params: { id: this.clickindex } })
+        .get(`${url}`, { id: this.clickindex })
         .then((response) => {
           //console.log(response)
-          data1 = response.data.result
+          data1 = response.result
           //console.log(data1)
           this.gettree(data1.from_system, data1)
         })
     },
     gettree(sid, data1) {
       service
-        .get(`${systemUrl}/Privilege/getTree`, {
-          params: { from_system: sid,id:this.clickindex}
-        })
+        .get(`${systemUrl}/Privilege/getTree`, { from_system: sid,id:this.clickindex})
         .then((response) => {
-          this.seldata = response.data.result
+          this.seldata = response.result
           this.$refs.addpri.list = []
           if (this.clickindex >= 0) {
             if (data1) {
@@ -363,7 +361,7 @@ export default {
             .post(`${url}`, JSON.stringify({ Privilege: this.formValidate1 }))
             .then((response) => {
               
-              if (response.data.success) {
+              if (response.success) {
                 that.$Message.success('保存成功')
                 that.loaddata()
                 //  that.gettree();
@@ -414,7 +412,7 @@ export default {
       service
         .delete(`${url}?id=${this.keyid}`)
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             that.$Message.success('删除成功')
             that.loaddata()
           }

pages/basicData/roleManagent/index.vue

@@ -374,15 +374,13 @@ export default {
       this.tbPro.loading = true
 
       service
-        .get(`${url}`, {
-          params: searchdata
+        .get(`${url}`, searchdata
             ? searchdata
             : {
                 role_type: this.tabIndex,
                 pageSize: this.pageSize,
                 page: this.current
-              }
-        })
+              })        
         .then((response) => {
           this.tbPro.data = response.result.items
           this.total = response.result.total

pages/basicData/systemlog/index.vue

@@ -172,15 +172,13 @@ export default {
       this.tbPro.loading=true
       var url = `${systemUrl}/AuditLog/GetAll`
       service
-        .get(`${url}`, {
-          params: {
+        .get(`${url}`,  {
             pageSize: this.pageSize,
             page: this.current,
             MethodName: this.model1,
             UserName: this.model2,
             ExecutionTimeStart: this.starttime
-          }
-        })
+          })
         .then((response) => {
           //console.log(response)
           this.total = response.result.totalCount
@@ -231,7 +229,7 @@ export default {
     //         }
     //       })
     //       .then((response) => {
-    //         this.tb = response.data.result.items
+    //         this.tb = response.result.items
     //         const list = this.tb
     //         list.forEach((item, i) => {
     //           var info = item.browserInfo

pages/basicData/user/index.vue

@@ -536,7 +536,7 @@ export default {
     loadrole(type) {
       var url = `${systemUrl}/MyRole/GetRolesAsync`;
       var data = [];
-      service.get(`${url}`, { params: { role_type: type } }).then(response => {
+      service.get(`${url}`, { role_type: type } ).then(response => {
         data = response.result.items;
         if (type == 1) {
           this.authList = data;
@@ -553,7 +553,7 @@ export default {
       this.curId = id;
       this.show3 = true;
       var url = `${systemUrl}/MyUserRole/GetPaged`;
-      service.get(`${url}`, { params: { userId: id } }).then(response => {
+      service.get(`${url}`, { userId: id }).then(response => {
         var data = response.result.items;
         var dt1 = data.filter(function(ite) {
           return ite.role_type == 0;

pages/basicData/userManagent/index.vue

@@ -639,9 +639,9 @@ export default {
       var url = `${systemUrl}/MyRole/GetRolesAsync`
       var data = []
       service
-        .get(`${url}`, { params: { role_type: type } })
+        .get(`${url}`, { role_type: type  })
         .then((response) => {
-          data = response.data.result.items
+          data = response.result.items
 
           if (type == 1) {
             this.authList = data
@@ -701,8 +701,8 @@ export default {
       this.authModel.extra = []
       this.show3 = true
       var url = `${systemUrl}/MyUserRole/GetPaged`
-      service.get(`${url}`, { params: { userId: id } }).then((response) => {
-        var data = response.data.result.items
+      service.get(`${url}`, { userId: id } ).then((response) => {
+        var data = response.result.items
         var dt1 = data.filter(function(ite) {
           return ite.role_type == 0
         })
@@ -790,7 +790,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.authModel.extra = []
             this.authModel.default = []
@@ -826,7 +826,7 @@ export default {
     },
     add() {
       this.$http.sysUser.insert(this.openModel).then((res) => {
-        if (res.data.result) {
+        if (res.result) {
           //刷新列表：
           this.initTable()
 
@@ -838,7 +838,7 @@ export default {
     },
     update() {
       this.$http.sysUser.update(this.openModel).then((res) => {
-        if (res.data.result) {
+        if (res.result) {
           //刷新列表：
           this.initTable()
 
@@ -850,11 +850,11 @@ export default {
     },
     del() {
       this.$http.sysUser.del(this.selectedRow.id).then((res) => {
-        if (res.data.result == 1) {
+        if (res.result == 1) {
           //刷新列表：
           this.initTable()
           this.$Message.info('删除成功!')
-        } else if (res.data.result == 2) {
+        } else if (res.result == 2) {
           this.$Message.info('删除失败,找不到数据!')
         } else {
           this.$Message.info('删除失败!')
@@ -863,7 +863,7 @@ export default {
     },
     reset() {
       this.$http.sysUser.reset(this.selectedRow.id).then((res) => {
-        if (res.data.result == 1) {
+        if (res.result == 1) {
           this.$Message.info('重置成功!')
         } else {
           this.$Message.info('重置失败!')

pages/implement/components/entryrecordMovie.vue

@@ -167,8 +167,8 @@ export default {
         QS.stringify(this.datasearch)
 
       service.get(`${url}`).then((response) => {
-        if (response.data.result != null) {
-          this.moviedata = response.data.result
+        if (response.result != null) {
+          this.moviedata = response.result
         }
       })
     },
@@ -190,11 +190,11 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
 
-            this.ids.push(response.data.result.id)
-            this.moviedata.push(response.data.result)
+            this.ids.push(response.result.id)
+            this.moviedata.push(response.result)
 
             this.cleardata()
             this.$emit(
@@ -238,7 +238,7 @@ export default {
           service
             .delete(`${url}`)
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('删除成功')
                 this.ids.splice(this.ids.indexOf(params.row.id), 1)
                 this.moviedata.splice(this.moviedata.indexOf(params.row), 1)

pages/implement/components/entryrecorddata.vue

@@ -166,8 +166,8 @@ export default {
         QS.stringify(this.datasearch)
 
       service.get(`${url}`).then((response) => {
-        if (response.data.result != null) {
-          this.moviedata = response.data.result
+        if (response.result != null) {
+          this.moviedata = response.result
         }
       })
     },
@@ -245,12 +245,12 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
 
-            this.ids.push(response.data.result.id)
+            this.ids.push(response.result.id)
             this.moviedata.splice(index, 1)
-            this.moviedata.push(response.data.result)
+            this.moviedata.push(response.result)
 
             this.cleardata()
             this.$emit(
@@ -293,7 +293,7 @@ export default {
             service
               .delete(`${url}`)
               .then((response) => {
-                if (response.data.success) {
+                if (response.success) {
                   this.$Message.success('删除成功')
                   this.ids.splice(index, 1)
                   this.moviedata.splice(index, 1)

pages/implement/components/entryrecordfiles.vue

@@ -184,8 +184,8 @@ export default {
         QS.stringify(this.datasearch)
 
       service.get(`${url}`).then((response) => {
-        if (response.data.result != null) {
-          this.moviedata = response.data.result
+        if (response.result != null) {
+          this.moviedata = response.result
         }
       })
     },
@@ -207,11 +207,11 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
 
-            this.ids.push(response.data.result.id)
-            this.moviedata.push(response.data.result)
+            this.ids.push(response.result.id)
+            this.moviedata.push(response.result)
 
             this.cleardata()
             this.$emit(
@@ -255,7 +255,7 @@ export default {
           service
             .delete(`${url}`)
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('删除成功')
                 this.ids.splice(this.ids.indexOf(params.row.id), 1)
                 this.moviedata.splice(this.moviedata.indexOf(params.row), 1)

pages/implement/components/entryrecordlist.vue

@@ -420,8 +420,8 @@ export default {
         this.datasearch.entryID
 
       service.get(`${url}`).then((response) => {
-        this.product_List = response.data.result
-        this.board_List = response.data.result
+        this.product_List = response.result
+        this.board_List = response.result
 
         for (let i = 0; i < this.product_List.length; i++) {
           let obj = this.product_List[i]
@@ -477,7 +477,7 @@ export default {
         `${PlanUrl}/orderexecutequalityrecord/getentryqcrecordlist?` +
         QS.stringify(this.datasearch)
       service.get(`${url}`).then((response) => {
-        this.recorddata = response.data.result
+        this.recorddata = response.result
       })
     },
     handleselfCheckAll() {

pages/implement/components/processRecord.vue

@@ -143,7 +143,7 @@ export default {
         `${PlanUrl}/orderexecutefiles/getbyentryid?entryId=` + this.dispatch_id
 
       service.get(`${url}`).then((response) => {
-        this.cardModeldata = response.data.result[0]
+        this.cardModeldata = response.result[0]
         ;(this.cardModeldata.dispatch_id = this.dispatch_id),
           (this.cardModeldata.execute_id = this.execute_id),
           (this.cardModeldata.order_id = this.order_id)
@@ -165,7 +165,7 @@ export default {
         `${systemUrl}/equipinfo/getbyid?Id=` + this.cardModeldata.equip_id
 
       service.get(`${url}`).then((response) => {
-        let obj = response.data.result
+        let obj = response.result
         this.equipCode = obj.equip_id
         this.equipName = obj.equip_name
         this.equipTypeName = obj.equip_winname
@@ -177,7 +177,7 @@ export default {
         this.cardModeldata.equip_id
 
       service.get(`${url}`).then((response) => {
-        let obj = response.data.result
+        let obj = response.result
         this.fileTempUrlPath = fileUrlDown + obj.file
       })
     },
@@ -207,7 +207,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.loaddata()
             this.cleardata()

pages/implement/components/productReport.vue

@@ -376,9 +376,9 @@ export default {
         QS.stringify(this.datasearch)
 
       service.get(`${url}`).then((response) => {
-        if (response.data.result != null) {
-          this.data1 = response.data.result.items
-          this.datatotal = response.data.result.totalCount
+        if (response.result != null) {
+          this.data1 = response.result.items
+          this.datatotal = response.result.totalCount
         }
       })
     },
@@ -388,8 +388,8 @@ export default {
         this.datasearch.entryID
 
       service.get(`${url}`).then((response) => {
-        this.product_List = response.data.result
-        this.board_List = response.data.result
+        this.product_List = response.result
+        this.board_List = response.result
 
         if (this.datasearch.isMain == 1) {
           this.product_List = []
@@ -506,7 +506,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
 
             this.loaddata()

pages/implement/components/sendCheck.vue

@@ -117,7 +117,7 @@ export default {
         service
           .post(`${url}`, JSON.stringify(this.user))
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
               this.$Message.success('保存成功')
               this.$parent.$parent.loadproduct()
               this.$parent.$parent.sendCheckModal = false
@@ -152,8 +152,8 @@ export default {
         this.user.dispatch_id
 
       service.post(`${url}`).then((response) => {
-        this.product_List = response.data.result
-        this.board_List = response.data.result
+        this.product_List = response.result
+        this.board_List = response.result
       })
     },
     loaduser() {
@@ -167,7 +167,7 @@ export default {
       var url = systemUrl + '/MyRole/GetRolesAsync?' + QS.stringify(params)
 
       service.get(`${url}`).then((response) => {
-        let roles = response.data.result.items
+        let roles = response.result.items
         let roleids = []
         for (let i = 0; i < roles.length; i++) {
           roleids.push(roles[i].id)
@@ -182,8 +182,8 @@ export default {
           `${systemUrl}/myuserrole/GetUsersByRole?ids=` + roleids.join(',')
 
         service.get(`${url}`).then((response) => {
-          for (let j = 0; j < response.data.result.length; j++) {
-            let user = response.data.result[j]
+          for (let j = 0; j < response.result.length; j++) {
+            let user = response.result[j]
             var index = this.checkerlist.filter(function(item) {
               return item.id === user.id
             })

pages/implement/components/sendCheckRecord.vue

@@ -108,9 +108,9 @@ export default {
       var url =
         `${PlanUrl}/ordercheckresult/getpaged?` + QS.stringify(this.datasearch)
       service.get(`${url}`).then((response) => {
-        if (response.data.result != null) {
-          this.moviedata = response.data.result.items
-          this.datatotal = response.data.result.totalCount
+        if (response.result != null) {
+          this.moviedata = response.result.items
+          this.datatotal = response.result.totalCount
         }
       })
     },

pages/implement/components/usercard.vue

@@ -73,9 +73,9 @@ export default {
       service
         .post(`${systemUrl}/user/list`, JSON.stringify(params))
         .then((response) => {
-          if (response.data.result.length > 0) {
-            this.user.user_name = response.data.result[0].userName
-            this.user.user_id = response.data.result[0].id
+          if (response.result.length > 0) {
+            this.user.user_name = response.result[0].userName
+            this.user.user_id = response.result[0].id
             callback()
           } else {
             this.user.cardno = ''
@@ -145,7 +145,7 @@ export default {
                 })
               )
               .then((response) => {
-                if (response.data.success) {
+                if (response.success) {
                   this.$Message.success('保存成功')
                   this.$parent.$parent.loadproduct()
                   this.$parent.$parent.usercardModal = false

pages/mainProcess/index.vue

@@ -195,9 +195,9 @@ export default {
       let urlget = `${PlanUrl}/dispatch/getschemes?RoutingId=` + usId +
         '&IsMain=1&' + 'OrderId=' + order_id
       service.get(`${urlget}`).then((res) => {
-        if (res.data.result) {
+        if (res.result) {
           var savedUl = []
-          res.data.result.map((u) => {
+          res.result.map((u) => {
             let detailnew = {
               detailId: u.routingDetailId, //工序id--后端接收
               detailNumber: u.routingDetailNumber, //工序序号
@@ -229,7 +229,7 @@ export default {
         usId
       service.get(`${urlList}`).then((res) => {
         var ul = []
-        res.data.result.map((u) => {
+        res.result.map((u) => {
           var detail = {
             detailId: u.id, //工序id--后端接收
             detailNumber: u.task_seq, //工序序号

pages/mordent/dispose/index.vue

@@ -348,7 +348,7 @@ export default {
         `${designUrl}/routingqccard/getlistbydetailid?detailID=` +
         this.cardModeldata.routing_detail_id
       service.get(`${url}`).then((response) => {
-        this.data1 = response.data.result
+        this.data1 = response.result
       })
     },
     openNew() {
@@ -389,7 +389,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.newModel = false
             this.cleardata()
@@ -487,7 +487,7 @@ export default {
           service
             .delete(`${url}`)
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('删除成功')
                 this.loaddata()
               } else {

pages/processDesign/ChangeSingle/technicalcoordination/index.vue

@@ -438,16 +438,14 @@ export default {
 
       service
         .get(`${url}`, {
-          params: {
             technical_coordination_code: this.value1,
             dispatch_id: this.formdata.dispatch_id,
             pageindex: this.page,
             pageSize: this.pageSize
-          }
         })
         .then(res => {
-          this.data2 = res.data.result.items;
-          this.total = res.data.result.totalCount;
+          this.data2 = res.result.items;
+          this.total = res.result.totalCount;
         });
     },
 
@@ -480,7 +478,7 @@ export default {
 
       var url1 = `${designUrl}/routingheader/GetCodeByType?code=JJXTD`;
       service.get(`${url1}`).then(response => {
-        this.formdata.technical_coordination_code = response.data.result;
+        this.formdata.technical_coordination_code = response.result;
       });
     },
     handleChange1(date) {
@@ -496,7 +494,7 @@ export default {
           JSON.stringify({ technicalCoordination: this.formdata })
         )
         .then(res => {
-          if (res.data.success) {
+          if (res.success) {
             this.loadchangelist();
             this.$Message.success("保存成功");
             this.show = false;
@@ -504,17 +502,15 @@ export default {
               let url = `${designUrl}/technicalcoordination/getpaged`;
               service
                 .get(`${url}`, {
-                  params: {
                     technical_coordination_code: this.formdata
                       .technical_coordination_code,
                     pageindex: 1,
                     pageSize: 10
-                  }
                 })
                 .then(res => {
                   console.log(res);
                   this.$refs.techSendReview.info.changeInfo =
-                    res.data.result.items[0];
+                    res.result.items[0];
                   this.$refs.techSendReview.technical_coordination_code = this.formdata.technical_coordination_code;
                 });
               this.$refs.techSendReview.modalInfo = true;
@@ -532,9 +528,9 @@ export default {
       this.flag = 1;
       var url2 = `${designUrl}/technicalcoordination/getforedit`;
       service
-        .get(`${url2}`, { params: { Id: params.row.id } })
+        .get(`${url2}`, { Id: params.row.id } )
         .then(response => {
-          this.formdata = response.data.result.technicalCoordination;
+          this.formdata = response.result.technicalCoordination;
         });
       this.show = true;
     },
@@ -549,57 +545,55 @@ export default {
       this.flag = 1;
       var url2 = `${designUrl}/technicalcoordination/getbyid`;
       service
-        .get(`${url2}`, { params: { Id: params.row.id } })
+        .get(`${url2}`, { Id: params.row.id })
         .then(response => {
-          this.$refs.coordinate.formdata = response.data.result;
+          this.$refs.coordinate.formdata = response.result;
         });
       var url3 = `${workflowUrl}/instance/getdetailbycode`;
       service
-        .get(`${url3}`, {
-          params: { code: params.row.technical_coordination_code }
-        })
+        .get(`${url3}`, { code: params.row.technical_coordination_code })
         .then(response => {
           console.log(response);
-          for (var i = 0; i < response.data.result.nodes.length; i++) {
-            var id = response.data.result.nodes[i].id;
-            var status = response.data.result.nodes[i].status;
+          for (var i = 0; i < response.result.nodes.length; i++) {
+            var id = response.result.nodes[i].id;
+            var status = response.result.nodes[i].status;
             if (id == 163 && status == 2) {
-              var context = response.data.result.nodes[i].contextData;
+              var context = response.result.nodes[i].contextData;
               this.$refs.coordinate.formcontextdata = JSON.parse(context);
             }
             if (id == 164 && status == 2) {
               this.$refs.coordinate.hqauditedTime =
-                response.data.result.nodes[i].auditedTime;
+                response.result.nodes[i].auditedTime;
               var nameid =
-                response.data.result.nodes[i].defaultUsers.immutable[0];
+                response.result.nodes[i].defaultUsers.immutable[0];
               var url5 = `${systemUrl}/user/getuser`;
               service
-                .get(`${url5}`, { params: { id: nameid } })
+                .get(`${url5}`, { id: nameid } )
                 .then(response => {
-                  var name = response.data.result.name;
+                  var name = response.result.name;
                   console.log(name);
                   this.$refs.coordinate.name1 = name;
                 });
               // console.log(this.$refs.coordinate.hqauditedTime)
             }
             if (id == 165 && status == 2) {
-              var context = response.data.result.nodes[i].contextData;
+              var context = response.result.nodes[i].contextData;
               var nameid =
-                response.data.result.nodes[i].defaultUsers.immutable[0];
+                response.result.nodes[i].defaultUsers.immutable[0];
               this.$refs.coordinate.formcontextclosedata = JSON.parse(context);
               this.$refs.coordinate.auditedTime =
-                response.data.result.nodes[i].auditedTime;
+                response.result.nodes[i].auditedTime;
               var url4 = `${systemUrl}/user/getuser`;
               service
-                .get(`${url4}`, { params: { id: nameid } })
+                .get(`${url4}`, { id: nameid } )
                 .then(response => {
-                  var name = response.data.result.name;
+                  var name = response.result.name;
                   console.log(name);
                   this.$refs.coordinate.name = name;
                 });
             }
           }
-          //this.$refs.coordinate.formdata = response.data.result
+          //this.$refs.coordinate.formdata = response.result
         });
       this.$refs.coordinate.modelChange1 = true;
     }

pages/processDesign/ChangeSingle/technicalcoordination/techSendReview.vue

@@ -75,7 +75,7 @@ export default {
     //   )
     //   .then((res) => {
     //     console.log(res);
-    //     this.userlist = res.data.result.firstNode.operatorList
+    //     this.userlist = res.result.firstNode.operatorList
     //     console.log(this.userlist);
     //   })
   },
@@ -96,10 +96,10 @@ export default {
      upSave1() {
                           let url = `${designUrl}/technicalcoordination/getpaged`
                     service
-                    .get(`${url}`, { params: {technical_coordination_code: this.technical_coordination_code, pageindex:1,pageSize:10  } })
+                    .get(`${url}`,  {technical_coordination_code: this.technical_coordination_code, pageindex:1,pageSize:10  })
                     .then((res) => {
                       console.log(res)
-                      this.data3 = res.data.result.items
+                      this.data3 = res.result.items
       let operatorIdList = this.returnDataList()
       let itemCode = this.technical_coordination_code;
       this.dataListRetrunNew.idList=[];
@@ -122,10 +122,10 @@ export default {
         })
         //            let url = `${designUrl}/technicalcoordination/getpaged`
         //             service
-        //             .get(`${url}`, { params: {technical_coordination_code: this.technical_coordination_code, pageindex:1,pageSize:10  } })
+        //             .get(`${url}`, {technical_coordination_code: this.technical_coordination_code, pageindex:1,pageSize:10  })
         //             .then((res) => {
         //               console.log(res)
-        //               this.data3 = res.data.result.items
+        //               this.data3 = res.result.items
         //               console.log(this.data3[0].id)
         //               let url = `${workflowUrl}/instance/start`
         //               service
@@ -140,7 +140,7 @@ export default {
         //                      })
         //                   )
         // .then((response) => {
-        //   if (response.data.success) {
+        //   if (response.success) {
         //      this.$Message.success('送审成功')
         //      this.modalchangeInfo = false;
         //      this.modalInfo = false;

pages/processDesign/ChangeSingle/unqualifiedorder/index.vue

@@ -426,16 +426,14 @@ export default {
       let url = `${designUrl}/unqualifiedorder/getpaged`;
       service
         .get(`${url}`, {
-          params: {
             unqualified_order_code: this.value1,
             dispatch_id: this.formdata.dispatch_id,
             pageindex: this.page,
             pageSize: this.pageSize
-          }
         })
         .then(res => {
-          this.data2 = res.data.result.items;
-          this.total = res.data.result.totalCount;
+          this.data2 = res.result.items;
+          this.total = res.result.totalCount;
         });
     },
     handleChange1(date) {
@@ -480,7 +478,7 @@ export default {
 
       var url1 = `${designUrl}/routingheader/GetCodeByType?code=BHGSLD`;
       service.get(`${url1}`).then(response => {
-        this.formdata.unqualified_order_code = response.data.result;
+        this.formdata.unqualified_order_code = response.result;
       });
     },
     // 添加/编辑 弹框的保存
@@ -490,8 +488,8 @@ export default {
         .post(`${url}`, JSON.stringify({ unqualifiedOrder: this.formdata }))
         .then(res => {
           console.log(res);
-          if (res.data.success) {
-            let itemId = res.data.result.id;
+          if (res.success) {
+            let itemId = res.result.id;
             this.dataListRetrunNew.idList.push(itemId);
             this.loadchangelist();
             this.$Message.success("保存成功");
@@ -541,9 +539,9 @@ export default {
       this.flag = 1;
       var url2 = `${designUrl}/unqualifiedorder/getbyid`;
       service
-        .get(`${url2}`, { params: { Id: params.row.id } })
+        .get(`${url2}`, { Id: params.row.id } )
         .then(response => {
-          this.formdata = response.data.result;
+          this.formdata = response.result;
         });
       this.show = true;
     },
@@ -560,67 +558,67 @@ export default {
       this.flag = 1;
       var url2 = `${designUrl}/unqualifiedorder/getbyid`;
       service
-        .get(`${url2}`, { params: { Id: params.row.id } })
+        .get(`${url2}`, { Id: params.row.id } )
         .then(response => {
-          this.$refs.trialOrder.formdata = response.data.result;
+          this.$refs.trialOrder.formdata = response.result;
         });
       var url3 = `${workflowUrl}/instance/getdetailbycode`;
       service
-        .get(`${url3}`, { params: { code: params.row.unqualified_order_code } })
+        .get(`${url3}`, { code: params.row.unqualified_order_code } )
         .then(response => {
           console.log(response);
-          for (var i = 0; i < response.data.result.nodes.length; i++) {
-            var id = response.data.result.nodes[i].id;
-            var status = response.data.result.nodes[i].status;
+          for (var i = 0; i < response.result.nodes.length; i++) {
+            var id = response.result.nodes[i].id;
+            var status = response.result.nodes[i].status;
             if (id == 157 && status == 2) {
-              var context = response.data.result.nodes[i].contextData;
+              var context = response.result.nodes[i].contextData;
               this.$refs.trialOrder.formcontextdata = JSON.parse(context);
               this.$refs.trialOrder.gyauditedTime =
-                response.data.result.nodes[i].auditedTime;
+                response.result.nodes[i].auditedTime;
               var nameid =
-                response.data.result.nodes[i].defaultUsers.immutable[0];
+                response.result.nodes[i].defaultUsers.immutable[0];
               console.log(nameid);
               var url5 = `${systemUrl}/user/getuser`;
               service
-                .get(`${url5}`, { params: { id: nameid } })
+                .get(`${url5}`, { id: nameid } )
                 .then(response => {
-                  var name = response.data.result.name;
+                  var name = response.result.name;
                   console.log(nameid);
                   this.$refs.trialOrder.name3 = name;
                 });
             }
             if (id == 158 && status == 2) {
               this.$refs.trialOrder.hqauditedTime =
-                response.data.result.nodes[i].auditedTime;
+                response.result.nodes[i].auditedTime;
               var nameid =
-                response.data.result.nodes[i].defaultUsers.immutable[0];
+                response.result.nodes[i].defaultUsers.immutable[0];
               var url5 = `${systemUrl}/user/getuser`;
               service
-                .get(`${url5}`, { params: { id: nameid } })
+                .get(`${url5}`, { id: nameid } )
                 .then(response => {
-                  var name = response.data.result.name;
+                  var name = response.result.name;
                   //console.log(name)
                   this.$refs.trialOrder.name2 = name;
                 });
             }
             if (id == 159 && status == 2) {
-              var context = response.data.result.nodes[i].contextData;
+              var context = response.result.nodes[i].contextData;
               this.$refs.trialOrder.formcontextclosedata = JSON.parse(context);
               this.$refs.trialOrder.jyauditedTime =
-                response.data.result.nodes[i].auditedTime;
+                response.result.nodes[i].auditedTime;
               var nameid =
-                response.data.result.nodes[i].defaultUsers.immutable[0];
+                response.result.nodes[i].defaultUsers.immutable[0];
               var url5 = `${systemUrl}/user/getuser`;
               service
-                .get(`${url5}`, { params: { id: nameid } })
+                .get(`${url5}`, { id: nameid } )
                 .then(response => {
-                  var name = response.data.result.name;
+                  var name = response.result.name;
                   //console.log(name)
                   this.$refs.trialOrder.name1 = name;
                 });
             }
           }
-          //this.$refs.trialOrder.formdata = response.data.result
+          //this.$refs.trialOrder.formdata = response.result
         });
       this.$refs.trialOrder.modelChange1 = true;
     }

pages/processDesign/Process/changeSendReview.vue

@@ -75,7 +75,7 @@ export default {
     //   )
     //   .then((res) => {
     //     console.log(res);
-    //     this.userlist = res.data.result.firstNode.operatorList
+    //     this.userlist = res.result.firstNode.operatorList
     //     console.log(this.userlist);
     //   })
   },
@@ -96,10 +96,10 @@ export default {
      upSave1() {
                     let url = `${designUrl}/routingheaderchangeorder/getpaged1`
                     service
-                    .get(`${url}`, { params: {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10  } })
+                    .get(`${url}`, {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 })
                     .then((res) => {
                       console.log(res)
-                      this.data3 = res.data.result.items
+                      this.data3 = res.result.items
                       let operatorIdList = this.returnDataList()
                       let itemCode = this.changeorder_code;
                       this.dataListRetrunNew.idList=[];
@@ -122,10 +122,10 @@ export default {
                     });
         //             let url = `${designUrl}/routingheaderchangeorder/getpaged1`
         //             service
-        //             .get(`${url}`, { params: {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10  } })
+        //             .get(`${url}`,  {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10  })
         //             .then((res) => {
         //               console.log(res)
-        //               this.data3 = res.data.result.items
+        //               this.data3 = res.result.items
         //               console.log(this.data3[0].id)
         //               let url = `${workflowUrl}/instance/start`
         //               service
@@ -140,7 +140,7 @@ export default {
         //                      })
         //                   )
         // .then((response) => {
-        //   if (response.data.success) {
+        //   if (response.success) {
         //      this.$Message.success('送审成功')
         //      this.modalchangeInfo = false;
         //      this.modalInfo = false;

pages/processDesign/Process/changelist.vue

@@ -226,36 +226,36 @@ export default {
       this.$refs.routingchangeorder.flag = 1
       var url2 = `${designUrl}/routingheaderchangeorder/getbyid`
       service
-        .get(`${url2}`, { params: { Id: params.row.id } })
+        .get(`${url2}`, { Id: params.row.id } )
         .then((response) => {
           console.log(response)
           this.$refs.routingchangeorder.changeorder_code =
-            response.data.result.changeorder_code
+            response.result.changeorder_code
           this.$refs.routingchangeorder.routing_header_Id =
-            response.data.result.routing_header_Id
+            response.result.routing_header_Id
           this.$refs.routingchangeorder.formValidate = {
-            id: response.data.result.id,
-            changeorder_code: response.data.result.changeorder_code,
-            routing_header_Id: response.data.result.routing_header_Id,
-            propose_user_id: response.data.result.propose_user_id,
-            propose_user_name: response.data.result.propose_user_name,
-            department_id: response.data.result.department_id,
-            department_name: response.data.result.department_name,
-            technical_name: response.data.result.technical_name,
-            technical_code: response.data.result.technical_code,
-            changed_version: response.data.result.changed_version_id,
-            quantity: response.data.result.quantity,
-            print_data: response.data.result.print_data,
-            executive_branch: response.data.result.executive_branch,
-            executive_branch_id: response.data.result.executive_branch_id,
-            handling_opinions_id: response.data.result.handling_opinions_id,
-            handling_opinions: response.data.result.handling_opinions_id,
-            before_change_content: response.data.result.before_change_content,
-            after_change_content: response.data.result.after_change_content,
-            change_reason: response.data.result.change_reason,
-            effective_date: response.data.result.effective_date,
-            status:response.data.result.status,
-            note:response.data.result.note,
+            id: response.result.id,
+            changeorder_code: response.result.changeorder_code,
+            routing_header_Id: response.result.routing_header_Id,
+            propose_user_id: response.result.propose_user_id,
+            propose_user_name: response.result.propose_user_name,
+            department_id: response.result.department_id,
+            department_name: response.result.department_name,
+            technical_name: response.result.technical_name,
+            technical_code: response.result.technical_code,
+            changed_version: response.result.changed_version_id,
+            quantity: response.result.quantity,
+            print_data: response.result.print_data,
+            executive_branch: response.result.executive_branch,
+            executive_branch_id: response.result.executive_branch_id,
+            handling_opinions_id: response.result.handling_opinions_id,
+            handling_opinions: response.result.handling_opinions_id,
+            before_change_content: response.result.before_change_content,
+            after_change_content: response.result.after_change_content,
+            change_reason: response.result.change_reason,
+            effective_date: response.result.effective_date,
+            status:response.result.status,
+            note:response.result.note,
           }
         })
       this.$refs.routingchangeorder.modelChange = true
@@ -266,78 +266,78 @@ export default {
       //this.flag=1;
       var url2 = `${designUrl}/routingheaderchangeorder/getbyidyl`
       service
-        .get(`${url2}`, { params: { Id: params.row.id } })
+        .get(`${url2}`, { Id: params.row.id })
         .then((response) => {
           console.log(response)
           this.$refs.Preview.changeorder_code =
-            response.data.result.changeorder_code
+            response.result.changeorder_code
           this.$refs.Preview.formValidate = {
-            id: response.data.result.id,
-            changeorder_code: response.data.result.changeorder_code,
-            routing_header_Id: response.data.result.routing_header_Id,
-            propose_user_id: response.data.result.propose_user_id,
-            propose_user_name: response.data.result.propose_user_name,
-            department_id: response.data.result.department_id,
-            department_name: response.data.result.department_name,
-            technical_name: response.data.result.technical_name,
-            technical_code: response.data.result.technical_code,
-            changed_version: response.data.result.changed_version_name,
-            quantity: response.data.result.quantity,
-            print_data: response.data.result.print_data,
-            executive_branch: response.data.result.executive_branch,
-            executive_branch_id: response.data.result.executive_branch_id,
-            handling_opinions_id: response.data.result.handling_opinions_id,
-            handling_opinions: response.data.result.handling_opinions_name,
-            before_change_content: response.data.result.before_change_content,
-            after_change_content: response.data.result.after_change_content,
-            change_reason: response.data.result.change_reason,
-            effective_date: response.data.result.effective_date
+            id: response.result.id,
+            changeorder_code: response.result.changeorder_code,
+            routing_header_Id: response.result.routing_header_Id,
+            propose_user_id: response.result.propose_user_id,
+            propose_user_name: response.result.propose_user_name,
+            department_id: response.result.department_id,
+            department_name: response.result.department_name,
+            technical_name: response.result.technical_name,
+            technical_code: response.result.technical_code,
+            changed_version: response.result.changed_version_name,
+            quantity: response.result.quantity,
+            print_data: response.result.print_data,
+            executive_branch: response.result.executive_branch,
+            executive_branch_id: response.result.executive_branch_id,
+            handling_opinions_id: response.result.handling_opinions_id,
+            handling_opinions: response.result.handling_opinions_name,
+            before_change_content: response.result.before_change_content,
+            after_change_content: response.result.after_change_content,
+            change_reason: response.result.change_reason,
+            effective_date: response.result.effective_date
           }
         })
        var url3 = `${workflowUrl}/instance/getdetailbycode`
       service
-        .get(`${url3}`, { params: { code: params.row.changeorder_code } })
+        .get(`${url3}`, { code: params.row.changeorder_code })
         .then((response) => {
           console.log(response)
-           for (var i = 0; i < response.data.result.nodes.length; i++) {
-           var id= response.data.result.nodes[i].id
-           var status= response.data.result.nodes[i].status
+           for (var i = 0; i < response.result.nodes.length; i++) {
+           var id= response.result.nodes[i].id
+           var status= response.result.nodes[i].status
            if(id==152&&status==2)
            {
-             var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
+             var nameid=response.result.nodes[i].defaultUsers.immutable[0]
              var url5 = `${systemUrl}/user/getuser`
                service
-               .get(`${url5}`, { params: { id: nameid} })
+               .get(`${url5}`, { id: nameid})
                .then((response) => {
-               var name=response.data.result.name
+               var name=response.result.name
                console.log(name)
                this.$refs.Preview.name1=name
                 })
            }
            if(id==153&&status==2)
            {
-             var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
+             var nameid=response.result.nodes[i].defaultUsers.immutable[0]
              var url5 = `${systemUrl}/user/getuser`
                service
-               .get(`${url5}`, { params: { id: nameid} })
+               .get(`${url5}`, { id: nameid})
                .then((response) => {
-               var name=response.data.result.name
+               var name=response.result.name
                console.log(name)
                this.$refs.Preview.name2=name
                 })
             // console.log(this.$refs.coordinate.hqauditedTime)
            }
           }
-          //this.$refs.coordinate.formdata = response.data.result
+          //this.$refs.coordinate.formdata = response.result
         })
       this.$refs.Preview.modelChange1 = true
     },
     loadchangelist() {
       let url = `${designUrl}/routingheaderchangeorder/getpaged`
       service
-        .get(`${url}`, { params: { routing_header_id: this.seleId } })
+        .get(`${url}`, { routing_header_id: this.seleId })
         .then((res) => {
-          this.data2 = res.data.result.items
+          this.data2 = res.result.items
         })
     }
   }

pages/processDesign/Process/detailfiles.vue

@@ -108,7 +108,7 @@ export default {
             })
           )
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
             }
           })
           .catch((error) => {})
@@ -183,7 +183,7 @@ export default {
         `${designUrl}/routingfile/getlistbydetailid?detailID=` +
         this.routing_detail_id
       service.get(`${url}`).then((response) => {
-        response.data.result.forEach((data) => {
+        response.result.forEach((data) => {
           let objImag = {}
           objImag.fileName = data.name
           objImag.filePath = data.url

pages/processDesign/Process/index.vue

@@ -479,8 +479,8 @@ export default {
       var url = `${designUrl}/routingheader/getpaged?` + QS.stringify(model)
 
       service.get(`${url}`).then((response) => {
-        this.datatotal = response.data.result.totalCount
-        this.data1 = response.data.result.items
+        this.datatotal = response.result.totalCount
+        this.data1 = response.result.items
       })
     },
 
@@ -489,7 +489,7 @@ export default {
       service.get(`${url}`).then((response) => {
         let arry = []
 
-        response.data.result.forEach((data) => {
+        response.result.forEach((data) => {
           var that = this
           let arryObj = {}
           arryObj['label'] = data.name
@@ -609,15 +609,15 @@ export default {
       let that = this
       var url = `${designUrl}/routingheader/GetCodeByType?code=ZGY`
       service.get(`${url}`).then((response) => {
-        that.addpdefm.formValidate.code = response.data.result
-        that.addpdefm.gycode = response.data.result
+        that.addpdefm.formValidate.code = response.result
+        that.addpdefm.gycode = response.result
       }) //编号
 
       var url =
         `${designUrl}/productinfo/getbyid?id=` + this.ProductSelected[0].id
       service.get(`${url}`).then((response) => {
-        this.addpdefm.ProductName = response.data.result.name
-        this.addpdefm.ProductCode = response.data.result.drawingNo
+        this.addpdefm.ProductName = response.result.name
+        this.addpdefm.ProductCode = response.result.drawingNo
       }) //产品名称
       this.addpdefm.Loadfile(0)
       this.addpdefm.setshow()
@@ -688,7 +688,7 @@ export default {
             })
           )
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
               if (!next) {
                 if (this.headeroldid == 0) {
                   this.$Message.success('保存成功')
@@ -710,19 +710,19 @@ export default {
               let print_data_versioncode = this.headerInfo
                 .print_data_versioncode
 
-              a.formValidate = response.data.result
+              a.formValidate = response.result
 
               a.formValidate.versioncode = versioncode
               a.formValidate.task_type = task_type
               a.formValidate.development_mode = development_mode
               a.formValidate.print_data_versioncode = print_data_versioncode
 
-              this.headerInfo.id = response.data.result.id
+              this.headerInfo.id = response.result.id
 
-              a.updateEid(response.data.result.id)
+              a.updateEid(response.result.id)
 
               this.modal1 = false
-              this.headerid = response.data.result.id
+              this.headerid = response.result.id
 
               if (this.headeroldid != 0) {
                 var url =
@@ -782,14 +782,14 @@ export default {
       var url =
         `${designUrl}/routingheader/getbyid?id=` + this.headerSelected.id
       service.get(`${url}`).then((response) => {
-        that.addpdefm.formValidate = response.data.result
+        that.addpdefm.formValidate = response.result
         that.addpdefm.isview = this.isview
-        that.addpdefm.ProductName = response.data.result.productName
-        that.addpdefm.ProductCode = response.data.result.productCode
-        this.headerInfo = response.data.result
-        this.headerid = response.data.result.id
-        that.addpdefm.MianVer = response.data.result.mianVer
-        that.addpdefm.MianCode = response.data.result.mianCode
+        that.addpdefm.ProductName = response.result.productName
+        that.addpdefm.ProductCode = response.result.productCode
+        this.headerInfo = response.result
+        this.headerid = response.result.id
+        that.addpdefm.MianVer = response.result.mianVer
+        that.addpdefm.MianCode = response.result.mianCode
 
         that.addpdefm.setshow()
       })
@@ -804,14 +804,14 @@ export default {
       this.headeroldid = 0
       var url = `${designUrl}/routingheader/getbyid?id=` + id
       service.get(`${url}`).then((response) => {
-        that.addpdefm.formValidate = response.data.result
+        that.addpdefm.formValidate = response.result
         that.addpdefm.isview = this.isview
-        that.addpdefm.ProductName = response.data.result.productName
-        that.addpdefm.ProductCode = response.data.result.productCode
-        this.headerInfo = response.data.result
-        this.headerid = response.data.result.id
-        that.addpdefm.MianVer = response.data.result.mianVer
-        that.addpdefm.MianCode = response.data.result.mianCode
+        that.addpdefm.ProductName = response.result.productName
+        that.addpdefm.ProductCode = response.result.productCode
+        this.headerInfo = response.result
+        this.headerid = response.result.id
+        that.addpdefm.MianVer = response.result.mianVer
+        that.addpdefm.MianCode = response.result.mianCode
 
         that.addpdefm.setshow()
       })
@@ -827,14 +827,14 @@ export default {
       this.headeroldid = 0
       var url = `${designUrl}/routingheader/getbyid?id=` + params.row.id
       service.get(`${url}`).then((response) => {
-        that.addpdefm.formValidate = response.data.result
+        that.addpdefm.formValidate = response.result
         that.addpdefm.isview = this.isview
-        that.addpdefm.ProductName = response.data.result.productName
-        that.addpdefm.ProductCode = response.data.result.productCode
-        this.headerInfo = response.data.result
-        this.headerid = response.data.result.id
-        that.addpdefm.MianVer = response.data.result.mianVer
-        that.addpdefm.MianCode = response.data.result.mianCode
+        that.addpdefm.ProductName = response.result.productName
+        that.addpdefm.ProductCode = response.result.productCode
+        this.headerInfo = response.result
+        this.headerid = response.result.id
+        that.addpdefm.MianVer = response.result.mianVer
+        that.addpdefm.MianCode = response.result.mianCode
 
         that.addpdefm.setshow()
       })
@@ -854,7 +854,7 @@ export default {
           service
             .delete(`${url}`)
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('删除成功')
                 this.loaddata()
               }
@@ -949,8 +949,8 @@ export default {
       let that = this
       var url = `${designUrl}/routingheader/GetCodeByType?code=ZY`
       service.get(`${url}`).then((response) => {
-        that.addpdefm.formValidate.code = response.data.result
-        that.addpdefm.gycode = response.data.result
+        that.addpdefm.formValidate.code = response.result
+        that.addpdefm.gycode = response.result
       })
 
       this.addpdefm.setshow()
@@ -991,7 +991,7 @@ export default {
       })
       var url1 = `${designUrl}/routingheader/GetCodeByType?code=JSWJGGD`
       service.get(`${url1}`).then((response) => {
-        this.$refs.routingchangeorder.changeorder_code = response.data.result
+        this.$refs.routingchangeorder.changeorder_code = response.result
       })
       this.$refs.routingchangeorder.modelChange = true
     },
@@ -1002,10 +1002,10 @@ export default {
       this.$refs.changelist.seleId = data.row.id
       let url = `${designUrl}/routingheaderchangeorder/getpaged`
       service
-        .get(`${url}`, { params: { routing_header_id: this.seleId } })
+        .get(`${url}`, { routing_header_id: this.seleId })
         .then((res) => {
           //console.log(res)
-          this.$refs.changelist.data2 = res.data.result.items
+          this.$refs.changelist.data2 = res.result.items
           this.$refs.changelist.myloading = false
           if (this.$refs.changelist.data2.length == 0) {
             this.$Message.error('该工艺规程没有更改单！')

pages/processDesign/Process/processNew.vue

@@ -336,7 +336,7 @@ export default {
         `${designUrl}/routingdetail/getlistbyheaderid?headerID=` +
         this.formprocessValidate.routing_header_id
       service.get(`${url}`).then((response) => {
-        this.data2 = response.data.result
+        this.data2 = response.result
       })
     },
     LoadEquipTypeList() {
@@ -344,7 +344,7 @@ export default {
       let url = `${systemUrl}/equiptype/getlistall`,
         that = this
       service.get(`${url}`).then((res) => {
-        let selectdata = res.data.result
+        let selectdata = res.result
         selectdata.forEach((item) => {
           that.EquipTypeList.push({
             value: item.id,
@@ -358,9 +358,9 @@ export default {
       let url = `${systemUrl}/equipinfo/getlistall`,
         that = this
       service
-        .get(`${url}`, { params: { shopid: '', eqtypeid: 0 } })
+        .get(`${url}`,{ shopid: '', eqtypeid: 0 })
         .then((res) => {
-          let selectdata = res.data.result
+          let selectdata = res.result
           selectdata.forEach((item) => {
             that.EquipList.push({
               value: item.id,
@@ -425,7 +425,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.procedure = false
             this.cleardata()
@@ -500,7 +500,7 @@ export default {
           service
             .delete(`${url}`)
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('删除成功')
                 this.loaddata()
               } else {

pages/processDesign/Process/processfile.vue

@@ -160,7 +160,7 @@ if(this.routing_header_id==0)
         `${designUrl}/routingfile/getlistbyheaderid?isAll=0&headerID=` +
         this.routing_header_id
       service.get(`${url}`).then((response) => {
-        response.data.result.forEach((data) => {
+        response.result.forEach((data) => {
           let objImag = {}
           objImag.fileName = data.name
           objImag.filePath = data.url

pages/processDesign/Process/processview.vue

@@ -479,7 +479,7 @@ export default {
     loaddata(headerID) {
       var url = `${designUrl}/routingheader/getprocessinfo?headerid=` + headerID
       service.get(`${url}`).then((response) => {
-        this.formValidate = response.data.result
+        this.formValidate = response.result
 
         if (this.formValidate.change_order_code == '') {
           this.formValidate.change_order_date = ''

pages/processDesign/Process/quotationBox1.vue

@@ -514,7 +514,7 @@ export default {
       let url = `${designUrl}/routingheader/getlistbyids?` + this.Mianids,
         that = this
       service.get(`${url}`).then((res) => {
-        let selectdata = res.data.result
+        let selectdata = res.result
 
         selectdata.forEach((item) => {
           this.processList.push({
@@ -592,7 +592,7 @@ export default {
       service.get(`${url}`).then((response) => {
         this.oldformValidate = this.formValidate
 
-        this.formValidate = response.data.result
+        this.formValidate = response.result
 
         this.formValidate.up_id = this.oldformValidate.up_id
         this.formValidate.productids = this.oldformValidate.productids
@@ -611,14 +611,14 @@ export default {
         //this.setshow()
 
         if (this.createtype == 2) {
-          this.setparentcreatetype(2, response.data.result.id)
+          this.setparentcreatetype(2, response.result.id)
 
           this.formValidate.id = 0 //克隆为新建，id设置为0
         }
         if (this.createtype == 3) {
           //只读
 
-          this.setparentcreatetype(3, response.data.result.id)
+          this.setparentcreatetype(3, response.result.id)
         }
       })
     },
@@ -639,7 +639,7 @@ export default {
         '&routingType=' +
         this.formValidate.routingType
       service.get(`${url}`).then((response) => {
-        this.RoutingList = response.data.result
+        this.RoutingList = response.result
       })
     },
     setshow() {

pages/processDesign/Process/quotationBox2.vue

@@ -298,11 +298,11 @@ this.isadd03=false;
       this.data02 = []
       this.data03 = []
       service.get(`${url1}`).then((res) => {
-        let selectdata = res.data.result
+        let selectdata = res.result
         if (selectdata == null) {
           var url = `${designUrl}/routingheader/GetCodeByType?code=SWQD`
           service.get(`${url}`).then((response) => {
-            this.formValidate.code = response.data.result
+            this.formValidate.code = response.result
           })
         } else {
           this.formValidate = selectdata.orderBill
@@ -342,7 +342,7 @@ this.isadd03=false;
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             //this.$Message.success('保存成功')
           }
         })
@@ -540,7 +540,7 @@ this.isadd03=false;
         service
           .delete(`${url}`)
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
               this.$Message.success('删除成功')
             } else {
               this.$Message.error('删除失败')

pages/processDesign/Process/quotationBox3.vue

@@ -298,11 +298,11 @@ isview:false,
       this.data02 = []
       this.data03 = []
       service.get(`${url1}`).then((res) => {
-        let selectdata = res.data.result
+        let selectdata = res.result
         if (selectdata == null) {
           var url = `${designUrl}/routingheader/GetCodeByType?code=CPJJD`
           service.get(`${url}`).then((response) => {
-            this.formValidate.code = response.data.result
+            this.formValidate.code = response.result
           })
         } else {
           this.formValidate = selectdata.orderBill
@@ -357,7 +357,7 @@ this.formValidate.product_handover_date =new Date();
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
            // this.$Message.success('保存成功')
           }
         })
@@ -556,7 +556,7 @@ this.formValidate.product_handover_date =new Date();
         service
           .delete(`${url}`)
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
               this.$Message.success('删除成功')
             } else {
               this.$Message.error('删除失败')

pages/processDesign/Process/routingchangeorder.vue

@@ -283,7 +283,7 @@ export default {
     //   )
     //   .then((res) => {
     //     console.log(res);
-    //     this.userlist = res.data.result.firstNode.operatorList
+    //     this.userlist = res.result.firstNode.operatorList
     //     console.log(this.userlist);
     //   })
   },
@@ -338,10 +338,10 @@ export default {
         modalOk() {
               //  let url = `${designUrl}/routingheaderchangeorder/getpaged1`
               //       service
-              //       .get(`${url}`, { params: {changeorder_code: "JSWJGGD_20200219_15", pageindex:1,pageSize:10  } })
+              //       .get(`${url}`, {changeorder_code: "JSWJGGD_20200219_15", pageindex:1,pageSize:10 })
               //       .then((res) => {
               //         console.log(res)
-              //          this.$refs.changeSendReview.info.changeInfo = res.data.result.items[0];
+              //          this.$refs.changeSendReview.info.changeInfo = res.result.items[0];
               //           this.$refs.changeSendReview.changeorder_code = "JSWJGGD_20200219_15";
               //       })
               //       this.$refs.changeSendReview.modalInfo = true;
@@ -373,16 +373,16 @@ export default {
                     };
                              console.log(paramsdata);
                     service.post(`${url}`, JSON.stringify({routingHeaderChangeorder: paramsdata})).then(res=>{
-                        if(res.data.success) {
+                        if(res.success) {
                             this.$Message.success('新增成功')
                             this.modelChange = false;
                             if(this.checked == true){
                     let url = `${designUrl}/routingheaderchangeorder/getpaged1`
                     service
-                    .get(`${url}`, { params: {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10  } })
+                    .get(`${url}`, {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 })
                     .then((res) => {
                       console.log(res)
-                       this.$refs.changeSendReview.info.changeInfo = res.data.result.items[0];
+                       this.$refs.changeSendReview.info.changeInfo = res.result.items[0];
                        this.$refs.changeSendReview.changeorder_code = this.changeorder_code;
                     })
                     this.$refs.changeSendReview.modalInfo = true;
@@ -418,27 +418,27 @@ export default {
                     };
                              console.log(paramsdata);
                     service.post(`${url}`, JSON.stringify({routingHeaderChangeorder: paramsdata})).then(res=>{
-                        if(res.data.success) {
+                        if(res.success) {
                             this.$Message.success('编辑成功')
                             this.modelChange = false;
                             this.$emit('getMessage');
                        if(this.checked == true){
                     let url = `${designUrl}/routingheaderchangeorder/getpaged1`
                     service
-                    .get(`${url}`, { params: {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10  } })
+                    .get(`${url}`, {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10  })
                     .then((res) => {
                       console.log(res)
-                       this.$refs.changeSendReview.info.changeInfo = res.data.result.items[0];
+                       this.$refs.changeSendReview.info.changeInfo = res.result.items[0];
                        this.$refs.changeSendReview.changeorder_code = this.changeorder_code;
                     })
                     this.$refs.changeSendReview.modalInfo = true;
                             }
         //                                         let url = `${designUrl}/routingheaderchangeorder/getpaged1`
         //             service
-        //             .get(`${url}`, { params: {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10  } })
+        //             .get(`${url}`,  {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10  })
         //             .then((res) => {
         //               console.log(res)
-        //               this.data3 = res.data.result.items
+        //               this.data3 = res.result.items
         //               console.log(this.data3[0].id)
         //               let url = `${workflowUrl}/instance/start`
         //               service
@@ -453,7 +453,7 @@ export default {
         //                      })
         //                   )
         // .then((response) => {
-        //   if (response.data.success) {
+        //   if (response.success) {
         //      console.log(response)
         //            }
         //            })
@@ -469,10 +469,10 @@ export default {
         // })
         //             let url = `${designUrl}/routingheaderchangeorder/getpaged1`
         //             service
-        //             .get(`${url}`, { params: {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10  } })
+        //             .get(`${url}`, {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 })
         //             .then((res) => {
         //               console.log(res)
-        //               this.data3 = res.data.result.items
+        //               this.data3 = res.result.items
         //               console.log(this.data3[0].id)
         //               let url = `${workflowUrl}/instance/start`
         //               service
@@ -487,7 +487,7 @@ export default {
         //                      })
         //                   )
         // .then((response) => {
-        //   if (response.data.success) {
+        //   if (response.success) {
         //      console.log(response)
         //            }
         //            })

pages/processDesign/Process/stepModel.vue

@@ -129,7 +129,7 @@ export default {
         `${designUrl}/routingstep/getlistbydetailid?detailID=` +
         this.newModeldata.routing_detail_id
       service.get(`${url}`).then((response) => {
-        this.data01 = response.data.result
+        this.data01 = response.result
       })
     },
 
@@ -169,7 +169,7 @@ let isvalidate = false;
             })
           )
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
            
               this.$Message.success('保存成功');
               this.newModel = false;
@@ -224,7 +224,7 @@ this.newModeldata.name="";
             })
           )
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
            
               this.$Message.success('保存成功');
               this.newModel = false;
@@ -248,7 +248,7 @@ this.newModeldata.name="";
           service
             .delete(`${url}`)
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('删除成功')
                 this.loaddata()
               } else {

pages/processDesign/Process/testingModel.vue

@@ -312,7 +312,7 @@ export default {
         `${designUrl}/routingqccard/getlistbydetailid?detailID=` +
         this.cardModeldata.routing_detail_id
       service.get(`${url}`).then((response) => {
-        this.data1 = response.data.result
+        this.data1 = response.result
       })
     },
     openNew() {
@@ -353,7 +353,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.newModel = false
             this.cleardata()
@@ -451,7 +451,7 @@ export default {
           service
             .delete(`${url}`)
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('删除成功')
                 this.loaddata()
               } else {

pages/processDesign/ProcessRecord/index.vue

@@ -258,23 +258,21 @@ export default {
       let url = `${systemUrl}/processrecord/getpaged`
       service
         .get(`${url}`, {
-          params: {
             eqid: this.value1,
             shopid: this.shopid,
             pageindex: this.page,
             pageSize: this.pageSize
-          }
         })
         .then((res) => {
-          this.data1 = res.data.result.items
-          this.total = res.data.result.totalCount
+          this.data1 = res.result.items
+          this.total = res.result.totalCount
         })
     },
     laodactiontype() {
       let url = `${systemUrl}/equiptype/getpaged`,
         that = this
       service.get(`${url}`).then((res) => {
-        let selectdata = res.data.result.items
+        let selectdata = res.result.items
         selectdata.forEach((item) => {
           that.cityList.push({
             value: item.equip_type_name,
@@ -288,8 +286,8 @@ export default {
       this.cityList1 = []
       let url = `${systemUrl}/processrecord/getequipinfo`,
         that = this
-      service.get(`${url}`, { params: { eqtypeid: id } }).then((res) => {
-        let selectdata = res.data.result.items
+      service.get(`${url}`, { eqtypeid: id }).then((res) => {
+        let selectdata = res.result.items
         selectdata.forEach((item) => {
           that.cityList1.push({
             value: item.equip_id,
@@ -340,7 +338,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify({ processRecord: paramsdata }))
         .then((res) => {
-          if (res.data.success) {
+          if (res.success) {
             this.laodaction()
             this.$Message.success('新增成功')
             this.formItem = {
@@ -385,7 +383,7 @@ export default {
       service
         .delete(`${systemUrl}/processrecord/delete?id=${uId}`)
         .then((res) => {
-          if (res.data.success) {
+          if (res.success) {
             this.laodaction()
             this.$Message.success('删除成功')
           }

pages/processDesign/productTree/addproduct.vue

@@ -83,7 +83,7 @@ export default {
   created(){
     var url=`${designUrl}/productlevel/getdepartmentstree`
     service.get(`${url}`).then(response=>{
-     this.data2= response.data.result
+     this.data2= response.result
      
     })
   },

pages/processDesign/productTree/index.vue

@@ -531,7 +531,7 @@ export default {
         let {name}=this.clickindexLevelData
         this.$refs.addclass.list.push({label: `${name}`, value: this.clickindexLevel})
         var url=`${designUrl}/productlevel/getselecttree`
-        service.get(`${url}`, {params:{id:this.clickindexLevel} }).then(response=>{
+        service.get(`${url}`, {id:this.clickindexLevel}).then(response=>{
           this.$refs.addclass.data=response.result
         })
       }else {

pages/processDesign/setProcess/components/dataDissemination.vue

@@ -106,7 +106,7 @@ export default {
     dataDetail(v) {
       var url = `${designUrl}/orderdatareview/getbyid?id=` + v
       service.get(`${url}`).then((r) => {
-        this.formValidate = r.data.result
+        this.formValidate = r.result
       })
     },
     dataInstal(v) {},

pages/processDesign/setProcess/components/orderData.vue

@@ -145,7 +145,7 @@ export default {
         var url =
           `${designUrl}/orderdatareview/getbyid?id=` + this.formValidate.id
         service.get(`${url}`).then((response) => {
-          this.formValidate = response.data.result
+          this.formValidate = response.result
 
           this.repairimgName = this.formValidate.repair_file_name
           this.supportingimgName = this.formValidate.supporting_file_name
@@ -233,14 +233,14 @@ export default {
         )
         .then((response) => {
           console.log(response)
-          if (response.data.success) {
-            this.formValidate = response.data.result
+          if (response.success) {
+            this.formValidate = response.result
             this.$Message.success('保存成功')
             this.cleardata()
             this.$parent.$parent.loaddata(this.$parent.$parent.orderSearchForm)
             this.$parent.$parent.orderDatadia = false
-            this.code = response.data.result.code
-            // alert(response.data.result.id)
+            this.code = response.result.code
+            // alert(response.result.id)
             if (this.isSendAudit == true) {
               if (this.formValidate.currentstep == 0) {
                 this.schemaIds = '00875796-7675-4c68-bd4f-47e70764dd9e'

pages/processDesign/setProcess/components/orderMaterial.vue

@@ -507,7 +507,7 @@ export default {
         var url =
           `${designUrl}/ordermaterial/getbyid?id=` + this.formValidate.id
         service.get(`${url}`).then((response) => {
-          this.formValidate = response.data.result.orderMaterial
+          this.formValidate = response.result.orderMaterial
           if (this.formValidate.approvalStatus == 1||this.formValidate.approvalStatus == 2||this.formValidate.approvalStatus == 3) {
             this.isview = true
           }else{
@@ -515,13 +515,13 @@ export default {
             this.isview = false
           }
 
-          this.formValidate1 = response.data.result.orderMaterialList
+          this.formValidate1 = response.result.orderMaterialList
         })
       } else {
         this.cleardata()
         var url = `${designUrl}/ordermaterial/getordermateriacode`
         service.get(`${url}`).then((response) => {
-          this.formValidate.code = response.data.result
+          this.formValidate.code = response.result
         })
         this.isview = false
         this.calcplatesnum();
@@ -550,7 +550,7 @@ export default {
       let url = `${designUrl}/ordermateriallist/getmaterialplacodedic`,
         that = this
       service.get(`${url}`).then((res) => {
-        let selectdata = res.data.result
+        let selectdata = res.result
 
         selectdata.forEach((item) => {
           if (item.dictype == 1) {
@@ -575,7 +575,7 @@ export default {
       let url = `${designUrl}/ordermateriallist/getmaterialpowderdic`,
         that = this
       service.get(`${url}`).then((res) => {
-        let selectdata = res.data.result
+        let selectdata = res.result
 
         selectdata.forEach((item) => {
           if (item.dictype == 1) {
@@ -602,7 +602,7 @@ export default {
       let url = `${designUrl}/ordermateriallist/getmaterialscraperdic`,
         that = this
       service.get(`${url}`).then((res) => {
-        let selectdata = res.data.result
+        let selectdata = res.result
 
         selectdata.forEach((item) => {
           if (item.dictype == 1) {
@@ -655,7 +655,7 @@ this.formValidate.productingPreparationPeople=this.productingPreparationPeople;
           })
         )
         .then((response) => {
-          let itemId = response.data.result.orderMaterial.id
+          let itemId = response.result.orderMaterial.id
           // let idIteme = this.$parent.$parent.dataListRetrunNew.idList
           // if(idIteme == []){
           //     idIteme.push(itemId)
@@ -663,7 +663,7 @@ this.formValidate.productingPreparationPeople=this.productingPreparationPeople;
 
           // }
           this.$parent.$parent.dataListRetrunNew.idList.push(itemId)
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.cleardata()
             this.$parent.$parent.loaddata(this.$parent.$parent.orderSearchForm)

pages/processDesign/setProcess/index.vue

@@ -1032,8 +1032,8 @@ export default {
 
       service.get(`${url}`).then((response) => {
         // console.log(response)
-        this.datatotal = response.data.result.totalCount
-        this.data1 = response.data.result.items
+        this.datatotal = response.result.totalCount
+        this.data1 = response.result.items
 
         let count = 1
         for (let i = 0; i < this.data1.length; i++) {
@@ -1175,8 +1175,8 @@ export default {
       let that = this
       var url = `${designUrl}/routingheader/GetCodeByType?code=ZY`
       service.get(`${url}`).then((response) => {
-        that.addpdefm.formValidate.code = response.data.result
-        that.addpdefm.gycode = response.data.result
+        that.addpdefm.formValidate.code = response.result
+        that.addpdefm.gycode = response.result
       })
       this.addpdefm.Mianids = ids.substring(0, ids.length - 1)
       this.addpdefm.ProductName = productNames.toString(',')
@@ -1313,7 +1313,7 @@ export default {
             })
           )
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
               if (!next) {
                 if (this.createtype == 1 || this.createtype == 3) {
                   this.$Message.success('保存成功')
@@ -1331,18 +1331,18 @@ export default {
               let print_data_versioncode = this.headerInfo
                 .print_data_versioncode
 
-              a.formValidate = response.data.result
+              a.formValidate = response.result
 
               a.formValidate.versioncode = versioncode
               a.formValidate.task_type = task_type
               a.formValidate.development_mode = development_mode
               a.formValidate.print_data_versioncode = print_data_versioncode
 
-              this.headerInfo.id = response.data.result.id
+              this.headerInfo.id = response.result.id
               // this.modal1 = false
-              this.headerid = response.data.result.id
+              this.headerid = response.result.id
 
-              this.detailInfo = response.data.result
+              this.detailInfo = response.result
               this.detailInfo.productName = this.headerInfo.productName
               this.detailInfo.routingTypeDesc = this.headerInfo.routingTypeDesc
 
@@ -1356,7 +1356,7 @@ export default {
                   '&headerNewID=' +
                   this.headerid
                 service.post(`${url}`).then((response) => {
-                  if (response.data.success) {
+                  if (response.success) {
                     if (next) {
                       this.headeroldid = 0
                       a.selectpdefmid = 0
@@ -1436,7 +1436,7 @@ export default {
               })
             )
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 if (!next) {
                   this.$Message.success('保存成功')
                 }
@@ -1506,7 +1506,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify({ orderMaterial: this.formValidate }))
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.modal1 = false
             this.$refs.quotationBox1.formValidate = []
@@ -1605,8 +1605,8 @@ export default {
         (routingType == 1 ? 'ZGY' : 'ZY')
 
       service.get(`${url}`).then((response) => {
-        that.addpdefm.formValidate.code = response.data.result
-        that.addpdefm.gycode = response.data.result
+        that.addpdefm.formValidate.code = response.result
+        that.addpdefm.gycode = response.result
       })
 
       let obj = params.row
@@ -1621,8 +1621,8 @@ export default {
         service.get(`${url}`).then((response) => {
           this.addpdefm.formValidate.up_id = obj.mainRoutingID
           this.addpdefm.Mianids = ''
-          this.addpdefm.MianVer = response.data.result.version
-          this.addpdefm.MianCode = response.data.result.code
+          this.addpdefm.MianVer = response.result.version
+          this.addpdefm.MianCode = response.result.code
         })
       }
       this.addpdefm.formValidate.productingPreparationPeople =
@@ -1709,20 +1709,20 @@ export default {
 
       var url = `${designUrl}/routingheader/getbyid?id=` + RoutingID
       service.get(`${url}`).then((response) => {
-        this.addpdefm.formValidate = response.data.result
+        this.addpdefm.formValidate = response.result
 
-        this.addpdefm.ProductName = response.data.result.productName
-        this.addpdefm.ProductCode = response.data.result.productCode
+        this.addpdefm.ProductName = response.result.productName
+        this.addpdefm.ProductCode = response.result.productCode
 
-        this.addpdefm.MianVer = response.data.result.mianVer
-        this.addpdefm.MianCode = response.data.result.mianCode
+        this.addpdefm.MianVer = response.result.mianVer
+        this.addpdefm.MianCode = response.result.mianCode
 
         this.addpdefm.formValidate.orderids = orderids.toString(',')
         this.addpdefm.formValidate.ordercombid = ordercombid
         this.addpdefm.formValidate.platesnum = 1
         var url = `${designUrl}/orderrouting/getbycombid?id=` + ordercombid
         service.get(`${url}`).then((response) => {
-          this.addpdefm.formValidate.platesnum = response.data.result.platesnum
+          this.addpdefm.formValidate.platesnum = response.result.platesnum
         })
         this.addpdefm.setshow()
       })
@@ -1786,17 +1786,17 @@ export default {
       }
       var url = `${designUrl}/routingheader/getbyid?id=` + RoutingID
       service.get(`${url}`).then((response) => {
-        this.addpdefm.formValidate = response.data.result
-        this.headerInfo = response.data.result
-        this.headerid = response.data.result.id
-        this.addpdefm.ProductName = response.data.result.productName
-        this.addpdefm.ProductCode = response.data.result.productCode
-
-        this.addpdefm.MianVer = response.data.result.mianVer
-        this.addpdefm.MianCode = response.data.result.mianCode
+        this.addpdefm.formValidate = response.result
+        this.headerInfo = response.result
+        this.headerid = response.result.id
+        this.addpdefm.ProductName = response.result.productName
+        this.addpdefm.ProductCode = response.result.productCode
+
+        this.addpdefm.MianVer = response.result.mianVer
+        this.addpdefm.MianCode = response.result.mianCode
         var url = `${designUrl}/orderrouting/getbycombid?id=` + ordercombid
         service.get(`${url}`).then((response) => {
-          this.addpdefm.formValidate.platesnum = response.data.result.platesnum
+          this.addpdefm.formValidate.platesnum = response.result.platesnum
         })
         this.addpdefm.formValidate.orderids = orderids.toString(',')
 

pages/processManage/Process/detailfiles.vue

@@ -108,7 +108,7 @@ export default {
             })
           )
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
             }
           })
           .catch((error) => {})
@@ -183,7 +183,7 @@ export default {
         `${designUrl}/routingfile/getlistbydetailid?detailID=` +
         this.routing_detail_id
       service.get(`${url}`).then((response) => {
-        response.data.result.forEach((data) => {
+        response.result.forEach((data) => {
           let objImag = {}
           objImag.fileName = data.name
           objImag.filePath = data.url

pages/processManage/Process/index.vue

@@ -469,8 +469,8 @@ export default {
       var url = `${designUrl}/routingheader/getpaged?` + QS.stringify(model)
 
       service.get(`${url}`).then((response) => {
-        this.datatotal = response.data.result.totalCount
-        this.data1 = response.data.result.items
+        this.datatotal = response.result.totalCount
+        this.data1 = response.result.items
       })
     },
 
@@ -479,7 +479,7 @@ export default {
       service.get(`${url}`).then((response) => {
         let arry = []
 
-        response.data.result.forEach((data) => {
+        response.result.forEach((data) => {
           var that = this
           let arryObj = {}
           arryObj['label'] = data.name
@@ -599,15 +599,15 @@ export default {
       let that = this
       var url = `${systemUrl}/cache/generate_serialcode_x?Code=GY`
       service.get(`${url}`).then((response) => {
-        that.addpdefm.formValidate.code = response.data.result
-        that.addpdefm.gycode = response.data.result
+        that.addpdefm.formValidate.code = response.result
+        that.addpdefm.gycode = response.result
       }) //编号
 
       var url =
         `${designUrl}/productinfo/getbyid?id=` + this.ProductSelected[0].id
       service.get(`${url}`).then((response) => {
-        this.addpdefm.ProductName = response.data.result.name
-        this.addpdefm.ProductCode = response.data.result.drawingNo
+        this.addpdefm.ProductName = response.result.name
+        this.addpdefm.ProductCode = response.result.drawingNo
       }) //产品名称
       this.addpdefm.Loadfile(0)
       this.addpdefm.setshow()
@@ -678,7 +678,7 @@ export default {
             })
           )
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
               if (!next) {
                 if (this.headeroldid == 0) {
                   this.$Message.success('保存成功')
@@ -700,19 +700,19 @@ export default {
               let print_data_versioncode = this.headerInfo
                 .print_data_versioncode
 
-              a.formValidate = response.data.result
+              a.formValidate = response.result
 
               a.formValidate.versioncode = versioncode
               a.formValidate.task_type = task_type
               a.formValidate.development_mode = development_mode
               a.formValidate.print_data_versioncode = print_data_versioncode
 
-              this.headerInfo.id = response.data.result.id
+              this.headerInfo.id = response.result.id
 
-              a.updateEid(response.data.result.id)
+              a.updateEid(response.result.id)
 
               this.modal1 = false
-              this.headerid = response.data.result.id
+              this.headerid = response.result.id
 
               if (this.headeroldid != 0) {
                 var url =
@@ -772,14 +772,14 @@ export default {
       var url =
         `${designUrl}/routingheader/getbyid?id=` + this.headerSelected.id
       service.get(`${url}`).then((response) => {
-        that.addpdefm.formValidate = response.data.result
+        that.addpdefm.formValidate = response.result
         that.addpdefm.isview = this.isview
-        that.addpdefm.ProductName = response.data.result.productName
-        that.addpdefm.ProductCode = response.data.result.productCode
-        this.headerInfo = response.data.result
-        this.headerid = response.data.result.id
-        that.addpdefm.MianVer = response.data.result.mianVer
-        that.addpdefm.MianCode = response.data.result.mianCode
+        that.addpdefm.ProductName = response.result.productName
+        that.addpdefm.ProductCode = response.result.productCode
+        this.headerInfo = response.result
+        this.headerid = response.result.id
+        that.addpdefm.MianVer = response.result.mianVer
+        that.addpdefm.MianCode = response.result.mianCode
 
         that.addpdefm.setshow()
       })
@@ -794,14 +794,14 @@ export default {
       this.headeroldid = 0
       var url = `${designUrl}/routingheader/getbyid?id=` + id
       service.get(`${url}`).then((response) => {
-        that.addpdefm.formValidate = response.data.result
+        that.addpdefm.formValidate = response.result
         that.addpdefm.isview = this.isview
-        that.addpdefm.ProductName = response.data.result.productName
-        that.addpdefm.ProductCode = response.data.result.productCode
-        this.headerInfo = response.data.result
-        this.headerid = response.data.result.id
-        that.addpdefm.MianVer = response.data.result.mianVer
-        that.addpdefm.MianCode = response.data.result.mianCode
+        that.addpdefm.ProductName = response.result.productName
+        that.addpdefm.ProductCode = response.result.productCode
+        this.headerInfo = response.result
+        this.headerid = response.result.id
+        that.addpdefm.MianVer = response.result.mianVer
+        that.addpdefm.MianCode = response.result.mianCode
 
         that.addpdefm.setshow()
       })
@@ -817,14 +817,14 @@ export default {
       this.headeroldid = 0
       var url = `${designUrl}/routingheader/getbyid?id=` + params.row.id
       service.get(`${url}`).then((response) => {
-        that.addpdefm.formValidate = response.data.result
+        that.addpdefm.formValidate = response.result
         that.addpdefm.isview = this.isview
-        that.addpdefm.ProductName = response.data.result.productName
-        that.addpdefm.ProductCode = response.data.result.productCode
-        this.headerInfo = response.data.result
-        this.headerid = response.data.result.id
-        that.addpdefm.MianVer = response.data.result.mianVer
-        that.addpdefm.MianCode = response.data.result.mianCode
+        that.addpdefm.ProductName = response.result.productName
+        that.addpdefm.ProductCode = response.result.productCode
+        this.headerInfo = response.result
+        this.headerid = response.result.id
+        that.addpdefm.MianVer = response.result.mianVer
+        that.addpdefm.MianCode = response.result.mianCode
 
         that.addpdefm.setshow()
       })
@@ -844,7 +844,7 @@ export default {
           service
             .delete(`${url}`)
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('删除成功')
                 this.loaddata()
               }
@@ -952,7 +952,7 @@ export default {
       })
       var url1 = `${designUrl}/routingheader/GetCodeByType?code=JSWJGGD`
       service.get(`${url1}`).then((response) => {
-        this.$refs.routingchangeorder.changeorder_code = response.data.result
+        this.$refs.routingchangeorder.changeorder_code = response.result
       })
       this.$refs.routingchangeorder.modelChange = true
     },
@@ -963,10 +963,10 @@ export default {
       this.$refs.changelist.seleId = data.row.id
       let url = `${designUrl}/routingheaderchangeorder/getpaged`
       service
-        .get(`${url}`, { params: { routing_header_id: this.seleId } })
+        .get(`${url}`, { routing_header_id: this.seleId })
         .then((res) => {
           //console.log(res)
-          this.$refs.changelist.data2 = res.data.result.items
+          this.$refs.changelist.data2 = res.result.items
           this.$refs.changelist.myloading = false
           if (this.$refs.changelist.data2.length == 0) {
             this.$Message.error('该工艺规程没有更改单！')

pages/processManage/Process/processMain.vue

@@ -372,7 +372,7 @@ export default {
       service.get(`${url}`).then((response) => {
         this.oldformValidate = this.formValidate
 
-        this.formValidate = response.data.result
+        this.formValidate = response.result
 
         this.formValidate.up_id = this.oldformValidate.up_id
         this.formValidate.productids = this.oldformValidate.productids
@@ -391,7 +391,7 @@ export default {
         //this.setshow()
 
         if (this.createtype == 2) {
-          this.setparentcreatetype(2, response.data.result.id)
+          this.setparentcreatetype(2, response.result.id)
 
           this.formValidate.id = 0 //克隆为新建，id设置为0
         }
@@ -409,7 +409,7 @@ export default {
         '&routingType=' +
         this.formValidate.routingType
       service.get(`${url}`).then((response) => {
-        this.RoutingList = response.data.result
+        this.RoutingList = response.result
       })
     },
     setshow() {

pages/processManage/Process/processNew.vue

@@ -460,7 +460,7 @@ export default {
         `${designUrl}/routingdetail/getlistbyheaderid?headerID=` +
         this.formprocessValidate.routing_header_id
       service.get(`${url}`).then((response) => {
-        this.data2 = response.data.result
+        this.data2 = response.result
       })
     },
     LoadEquipTypeList() {
@@ -468,7 +468,7 @@ export default {
       let url = `${systemUrl}/equiptype/getlistall`,
         that = this
       service.get(`${url}`).then((res) => {
-        let selectdata = res.data.result
+        let selectdata = res.result
         selectdata.forEach((item) => {
           that.EquipTypeList.push({
             value: item.id,
@@ -482,9 +482,9 @@ export default {
       let url = `${systemUrl}/equipinfo/getlistall`,
         that = this
       service
-        .get(`${url}`, { params: { shopid: '', eqtypeid: 0 } })
+        .get(`${url}`,  { shopid: '', eqtypeid: 0 })
         .then((res) => {
-          let selectdata = res.data.result
+          let selectdata = res.result
           selectdata.forEach((item) => {
             that.EquipList.push({
               value: item.id,
@@ -549,7 +549,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.procedure = false
             this.cleardata()
@@ -667,7 +667,7 @@ export default {
           service
             .delete(`${url}`)
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('删除成功')
                 this.loaddata()
               } else {

pages/processManage/Process/processfile.vue

@@ -160,7 +160,7 @@ if(this.routing_header_id==0)
         `${designUrl}/routingfile/getlistbyheaderid?isAll=0&headerID=` +
         this.routing_header_id
       service.get(`${url}`).then((response) => {
-        response.data.result.forEach((data) => {
+        response.result.forEach((data) => {
           let objImag = {}
           objImag.fileName = data.name
           objImag.filePath = data.url

pages/processManage/Process/processview.vue

@@ -478,7 +478,7 @@ export default {
     loaddata(headerID) {
       var url = `${designUrl}/routingheader/getprocessinfo?headerid=` + headerID
       service.get(`${url}`).then((response) => {
-        this.formValidate = response.data.result
+        this.formValidate = response.result
 
         if (this.formValidate.change_order_code == ''||typeof this.formValidate.change_order_code == 'undefined') {
           this.formValidate.change_order_date = ''

pages/processManage/Process/stepModel.vue

@@ -136,7 +136,7 @@ export default {
         `${designUrl}/routingstep/getlistbydetailid?detailID=` +
         this.newModeldata.routing_detail_id
       service.get(`${url}`).then((response) => {
-        this.data01 = response.data.result
+        this.data01 = response.result
       })
     },
 
@@ -176,7 +176,7 @@ let isvalidate = false;
             })
           )
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
            
               this.$Message.success('保存成功');
               this.newModel = false;
@@ -231,7 +231,7 @@ this.newModeldata.name="";
             })
           )
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
            
               this.$Message.success('保存成功');
               this.newModel = false;
@@ -255,7 +255,7 @@ this.newModeldata.name="";
           service
             .delete(`${url}`)
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('删除成功')
                 this.loaddata()
               } else {

pages/processManage/Process/supporting.vue

@@ -270,7 +270,7 @@ export default {
       var url = `${designUrl}/routingsupporting/getlistbydetailid?detailID=`+this.formprocessValidate.routingDetailId
       
       service.get(`${url}`).then((response) => {
-        this.data1 = response.data.result
+        this.data1 = response.result
       })
     },
     openNew() {
@@ -306,7 +306,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify(this.formprocessValidate))
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.newModel = false
             this.cleardata()
@@ -365,7 +365,7 @@ export default {
           service
             .delete(`${url}`)
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('删除成功')
                 this.loaddata()
               } else {

pages/processManage/Process/testingModel.vue

@@ -317,7 +317,7 @@ export default {
         `${designUrl}/routingqccard/getlistbydetailid?detailID=` +
         this.cardModeldata.routing_detail_id
       service.get(`${url}`).then((response) => {
-        this.data1 = response.data.result
+        this.data1 = response.result
       })
     },
     openNew() {
@@ -358,7 +358,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.newModel = false
             this.cleardata()
@@ -456,7 +456,7 @@ export default {
           service
             .delete(`${url}`)
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('删除成功')
                 this.loaddata()
               } else {

pages/processManage/setProcess/components/dataDissemination.vue

@@ -106,7 +106,7 @@ export default {
     dataDetail(v) {
       var url = `${designUrl}/orderdatareview/getbyid?id=` + v
       service.get(`${url}`).then((r) => {
-        this.formValidate = r.data.result
+        this.formValidate = r.result
       })
     },
     dataInstal(v) {},

pages/processManage/setProcess/components/orderData.vue

@@ -145,7 +145,7 @@ export default {
         var url =
           `${designUrl}/orderdatareview/getbyid?id=` + this.formValidate.id
         service.get(`${url}`).then((response) => {
-          this.formValidate = response.data.result
+          this.formValidate = response.result
 
           this.repairimgName = this.formValidate.repair_file_name
           this.supportingimgName = this.formValidate.supporting_file_name
@@ -233,14 +233,14 @@ export default {
         )
         .then((response) => {
           console.log(response)
-          if (response.data.success) {
-            this.formValidate = response.data.result
+          if (response.success) {
+            this.formValidate = response.result
             this.$Message.success('保存成功')
             this.cleardata()
             this.$parent.$parent.loaddata(this.$parent.$parent.orderSearchForm)
             this.$parent.$parent.orderDatadia = false
-            this.code = response.data.result.code
-            // alert(response.data.result.id)
+            this.code = response.result.code
+            // alert(response.result.id)
             if (this.isSendAudit == true) {
               if (this.formValidate.currentstep == 0) {
                 this.schemaIds = '00875796-7675-4c68-bd4f-47e70764dd9e'

pages/processManage/setProcess/components/orderMaterial.vue

@@ -507,7 +507,7 @@ export default {
         var url =
           `${designUrl}/ordermaterial/getbyid?id=` + this.formValidate.id
         service.get(`${url}`).then((response) => {
-          this.formValidate = response.data.result.orderMaterial
+          this.formValidate = response.result.orderMaterial
           if (this.formValidate.approvalStatus == 1||this.formValidate.approvalStatus == 2||this.formValidate.approvalStatus == 3) {
             this.isview = true
           }else{
@@ -515,13 +515,13 @@ export default {
             this.isview = false
           }
 
-          this.formValidate1 = response.data.result.orderMaterialList
+          this.formValidate1 = response.result.orderMaterialList
         })
       } else {
         this.cleardata()
         var url = `${designUrl}/ordermaterial/getordermateriacode`
         service.get(`${url}`).then((response) => {
-          this.formValidate.code = response.data.result
+          this.formValidate.code = response.result
         })
         this.isview = false
         this.calcplatesnum();
@@ -550,7 +550,7 @@ export default {
       let url = `${designUrl}/ordermateriallist/getmaterialplacodedic`,
         that = this
       service.get(`${url}`).then((res) => {
-        let selectdata = res.data.result
+        let selectdata = res.result
 
         selectdata.forEach((item) => {
           if (item.dictype == 1) {
@@ -575,7 +575,7 @@ export default {
       let url = `${designUrl}/ordermateriallist/getmaterialpowderdic`,
         that = this
       service.get(`${url}`).then((res) => {
-        let selectdata = res.data.result
+        let selectdata = res.result
 
         selectdata.forEach((item) => {
           if (item.dictype == 1) {
@@ -602,7 +602,7 @@ export default {
       let url = `${designUrl}/ordermateriallist/getmaterialscraperdic`,
         that = this
       service.get(`${url}`).then((res) => {
-        let selectdata = res.data.result
+        let selectdata = res.result
 
         selectdata.forEach((item) => {
           if (item.dictype == 1) {
@@ -655,7 +655,7 @@ this.formValidate.productingPreparationPeople=this.productingPreparationPeople;
           })
         )
         .then((response) => {
-          let itemId = response.data.result.orderMaterial.id
+          let itemId = response.result.orderMaterial.id
           // let idIteme = this.$parent.$parent.dataListRetrunNew.idList
           // if(idIteme == []){
           //     idIteme.push(itemId)
@@ -663,7 +663,7 @@ this.formValidate.productingPreparationPeople=this.productingPreparationPeople;
 
           // }
           this.$parent.$parent.dataListRetrunNew.idList.push(itemId)
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.cleardata()
             this.$parent.$parent.loaddata(this.$parent.$parent.orderSearchForm)

pages/processManage/setProcess/index.vue

@@ -834,8 +834,8 @@ export default {
 
       service.get(`${url}`).then((response) => {
         // console.log(response)
-        this.datatotal = response.data.result.totalCount
-        this.data1 = response.data.result.items
+        this.datatotal = response.result.totalCount
+        this.data1 = response.result.items
 
         let count = 1
         for (let i = 0; i < this.data1.length; i++) {
@@ -975,8 +975,8 @@ export default {
       let that = this
       var url = `${designUrl}/routingheader/GetCodeByType?code=ZY`
       service.get(`${url}`).then((response) => {
-        that.addpdefm.formValidate.code = response.data.result
-        that.addpdefm.gycode = response.data.result
+        that.addpdefm.formValidate.code = response.result
+        that.addpdefm.gycode = response.result
       })
       this.addpdefm.Mianids = ids.substring(0, ids.length - 1)
       this.addpdefm.ProductName = productNames.toString(',')
@@ -1113,7 +1113,7 @@ export default {
             })
           )
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
               if (!next) {
                 if (this.createtype == 1 || this.createtype == 3) {
                   this.$Message.success('保存成功')
@@ -1131,18 +1131,18 @@ export default {
               let print_data_versioncode = this.headerInfo
                 .print_data_versioncode
 
-              a.formValidate = response.data.result
+              a.formValidate = response.result
 
               a.formValidate.versioncode = versioncode
               a.formValidate.task_type = task_type
               a.formValidate.development_mode = development_mode
               a.formValidate.print_data_versioncode = print_data_versioncode
 
-              this.headerInfo.id = response.data.result.id
+              this.headerInfo.id = response.result.id
               // this.modal1 = false
-              this.headerid = response.data.result.id
+              this.headerid = response.result.id
 
-              this.detailInfo = response.data.result
+              this.detailInfo = response.result
               this.detailInfo.productName = this.headerInfo.productName
               this.detailInfo.routingTypeDesc = this.headerInfo.routingTypeDesc
 
@@ -1156,7 +1156,7 @@ export default {
                   '&headerNewID=' +
                   this.headerid
                 service.post(`${url}`).then((response) => {
-                  if (response.data.success) {
+                  if (response.success) {
                     if (next) {
                       this.headeroldid = 0
                       a.selectpdefmid = 0
@@ -1236,7 +1236,7 @@ export default {
               })
             )
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 if (!next) {
                   this.$Message.success('保存成功')
                 }
@@ -1306,7 +1306,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify({ orderMaterial: this.formValidate }))
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.modal1 = false
             this.$refs.quotationBox1.formValidate = []
@@ -1405,8 +1405,8 @@ export default {
         (routingType == 1 ? 'ZGY' : 'ZY')
 
       service.get(`${url}`).then((response) => {
-        that.addpdefm.formValidate.code = response.data.result
-        that.addpdefm.gycode = response.data.result
+        that.addpdefm.formValidate.code = response.result
+        that.addpdefm.gycode = response.result
       })
 
       let obj = params.row
@@ -1421,8 +1421,8 @@ export default {
         service.get(`${url}`).then((response) => {
           this.addpdefm.formValidate.up_id = obj.mainRoutingID
           this.addpdefm.Mianids = ''
-          this.addpdefm.MianVer = response.data.result.version
-          this.addpdefm.MianCode = response.data.result.code
+          this.addpdefm.MianVer = response.result.version
+          this.addpdefm.MianCode = response.result.code
         })
       }
       this.addpdefm.formValidate.productingPreparationPeople =
@@ -1509,20 +1509,20 @@ export default {
 
       var url = `${designUrl}/routingheader/getbyid?id=` + RoutingID
       service.get(`${url}`).then((response) => {
-        this.addpdefm.formValidate = response.data.result
+        this.addpdefm.formValidate = response.result
 
-        this.addpdefm.ProductName = response.data.result.productName
-        this.addpdefm.ProductCode = response.data.result.productCode
+        this.addpdefm.ProductName = response.result.productName
+        this.addpdefm.ProductCode = response.result.productCode
 
-        this.addpdefm.MianVer = response.data.result.mianVer
-        this.addpdefm.MianCode = response.data.result.mianCode
+        this.addpdefm.MianVer = response.result.mianVer
+        this.addpdefm.MianCode = response.result.mianCode
 
         this.addpdefm.formValidate.orderids = orderids.toString(',')
         this.addpdefm.formValidate.ordercombid = ordercombid
         this.addpdefm.formValidate.platesnum = 1
         var url = `${designUrl}/orderrouting/getbycombid?id=` + ordercombid
         service.get(`${url}`).then((response) => {
-          this.addpdefm.formValidate.platesnum = response.data.result.platesnum
+          this.addpdefm.formValidate.platesnum = response.result.platesnum
         })
         this.addpdefm.setshow()
       })
@@ -1586,17 +1586,17 @@ export default {
       }
       var url = `${designUrl}/routingheader/getbyid?id=` + RoutingID
       service.get(`${url}`).then((response) => {
-        this.addpdefm.formValidate = response.data.result
-        this.headerInfo = response.data.result
-        this.headerid = response.data.result.id
-        this.addpdefm.ProductName = response.data.result.productName
-        this.addpdefm.ProductCode = response.data.result.productCode
-
-        this.addpdefm.MianVer = response.data.result.mianVer
-        this.addpdefm.MianCode = response.data.result.mianCode
+        this.addpdefm.formValidate = response.result
+        this.headerInfo = response.result
+        this.headerid = response.result.id
+        this.addpdefm.ProductName = response.result.productName
+        this.addpdefm.ProductCode = response.result.productCode
+
+        this.addpdefm.MianVer = response.result.mianVer
+        this.addpdefm.MianCode = response.result.mianCode
         var url = `${designUrl}/orderrouting/getbycombid?id=` + ordercombid
         service.get(`${url}`).then((response) => {
-          this.addpdefm.formValidate.platesnum = response.data.result.platesnum
+          this.addpdefm.formValidate.platesnum = response.result.platesnum
         })
         this.addpdefm.formValidate.orderids = orderids.toString(',')
 

pages/processManage/setProcess/processMain.vue

@@ -450,7 +450,7 @@ export default {
       let url = `${designUrl}/routingheader/getlistbyids?` + this.Mianids,
         that = this;
       service.get(`${url}`).then(res => {
-        let selectdata = res.data.result;
+        let selectdata = res.result;
 
         selectdata.forEach(item => {
           this.processList.push({
@@ -527,7 +527,7 @@ export default {
       service.get(`${url}`).then(response => {
         this.oldformValidate = this.formValidate;
 
-        this.formValidate = response.data.result;
+        this.formValidate = response.result;
 
         this.formValidate.up_id = this.oldformValidate.up_id;
         this.formValidate.productids = this.oldformValidate.productids;
@@ -546,14 +546,14 @@ export default {
         //this.setshow()
 
         if (this.createtype == 2) {
-          this.setparentcreatetype(2, response.data.result.id);
+          this.setparentcreatetype(2, response.result.id);
 
           this.formValidate.id = 0; //克隆为新建，id设置为0
         }
         if (this.createtype == 3) {
           //只读
 
-          this.setparentcreatetype(3, response.data.result.id);
+          this.setparentcreatetype(3, response.result.id);
         }
       });
     },
@@ -571,7 +571,7 @@ export default {
         "&routingType=" +
         this.formValidate.routingType;
       service.get(`${url}`).then(response => {
-        this.RoutingList = response.data.result;
+        this.RoutingList = response.result;
       });
     },
     setshow() {

pages/produce/ordermaterial.vue

@@ -395,7 +395,7 @@ export default {
       let url02 = `${designUrl}/ordermaterial/getbyid?id=` + id
       service.get(`${url02}`).then((res) => {
         console.log(res)
-        this.orderMaterial = res.data.result.orderMaterialList
+        this.orderMaterial = res.result.orderMaterialList
         this.rowData = res.data
       })
       this.matchingModal = true

pages/produce/orderscheduling.vue

@@ -400,7 +400,7 @@ export default {
       let id = data.materialbillId
       let url02 = `${designUrl}/ordermaterial/getbyid?id=` + id
       service.get(`${url02}`).then((res) => {
-        this.orderMaterial = res.data.result.orderMaterialList
+        this.orderMaterial = res.result.orderMaterialList
         this.rowData = res.data
       })
       this.matchingModal = true

pages/produce/taskList.vue

@@ -330,8 +330,8 @@ content="开工"
       laodePage(pageData){
         let url = `${PlanUrl}/orderexecute/waitexecuteorderlist`;
         service.post(`${url}`,pageData).then(res => {
-            this.mDatas = res.data.result.items
-            this.search.total = res.data.result.totalCount
+            this.mDatas = res.result.items
+            this.search.total = res.result.totalCount
         });
       },
       // 搜索

pages/qc/dataTrace/components/dispatched.vue

@@ -253,9 +253,9 @@ export default {
     getlistall(equipids) {
       let url = `${systemUrl}/equipinfo/getlistall?equipids=` + equipids
       service.get(`${url}`).then((res) => {
-        if (res.data.success) {
-          if (res.data.result.length != 0) {
-            this.equipmentData = res.data.result[0]
+        if (res.success) {
+          if (res.result.length != 0) {
+            this.equipmentData = res.result[0]
           } else {
             this.equipmentData = []
             console.log('获取专业工艺设备信息为空.')
@@ -272,9 +272,9 @@ export default {
         `${designUrl}/ordermaterial/getmaterialsupporting?orderId=` + pamasId
       service.get(`${url01}`).then((res) => {
         // console.log(res)
-        if (res.data.success) {
-          if (res.data.result.length != 0) {
-            let baseData = res.data.result
+        if (res.success) {
+          if (res.result.length != 0) {
+            let baseData = res.result
             let powerList = [],
               placodeList = [],
               scraperList = []
@@ -313,8 +313,8 @@ export default {
       let url02 = `${resourceUrl}/materialpowder/itempaged`
       // ,JSON.stringify({Dictionary:this.formValidate1})JSON.stringify(parme)
       service.post(`${url02}`, parme).then((res) => {
-        if (res.data.success && res.data.result.totalCount != 0) {
-          this.Powder = res.data.result.items[0]
+        if (res.success && res.result.totalCount != 0) {
+          this.Powder = res.result.items[0]
         } else {
           console.log('获取粉末数据为空.')
         }
@@ -334,8 +334,8 @@ export default {
       }
       let url02 = `${resourceUrl}/materialplacode/itempaged`
       service.post(`${url02}`, parme).then((res) => {
-        if (res.data.success && res.data.result.totalCount != 0) {
-          this.Placode = res.data.result.items[0]
+        if (res.success && res.result.totalCount != 0) {
+          this.Placode = res.result.items[0]
         } else {
           console.log('获取基板数据为空.')
         }
@@ -355,8 +355,8 @@ export default {
       }
       let url02 = `${resourceUrl}/materialscraper/itempaged`
       service.post(`${url02}`, parme).then((res) => {
-        if (res.data.success && res.data.result.totalCount != 0) {
-          this.Scraper = res.data.result.items[0]
+        if (res.success && res.result.totalCount != 0) {
+          this.Scraper = res.result.items[0]
         } else {
           console.log('获取刮刀数据为空.')
         }

pages/qc/dataTrace/components/mainView.vue

@@ -109,9 +109,9 @@ export default {
     getlistall(equipids) {
       let url02 = `${systemUrl}/equipinfo/getlistall?equipids=` + equipids
       service.get(`${url02}`).then((res) => {
-        if (res.data.success) {
-          if (res.data.result.length != 0) {
-            this.equipmentData = res.data.result[0]
+        if (res.success) {
+          if (res.result.length != 0) {
+            this.equipmentData = res.result[0]
           } else {
             this.equipmentData = []
             console.log('获取主工艺设备信息为空.')

pages/qc/dataTrace/components/orderqcrecord.vue

@@ -223,9 +223,9 @@ export default {
         `${PlanUrl}/orderexecutequalityrecord/getorderqcrecordlist?` +
         QS.stringify(this.qcdatasearch)
       service.get(`${url}`).then((response) => {
-        this.qcrecorddata = response.data.result.items
+        this.qcrecorddata = response.result.items
 
-        this.qcdatatotal = response.data.result.totalCount
+        this.qcdatatotal = response.result.totalCount
         this.getdetail()
       })
     },
@@ -238,7 +238,7 @@ export default {
           routing_header_id
 
         service.get(`${url}`).then((response) => {
-          let detaildata = response.data.result
+          let detaildata = response.result
 
           for (let i = 0; i < this.qcrecorddata.length; i++) {
             let qc = this.qcrecorddata[i]

pages/qc/dataTrace/components/reviewCount.vue

@@ -72,17 +72,17 @@ export default {
             if(pamasId){
                 service.get(`${url}`).then((response) => {
                     console.log(response)
-                    if(response.data.result.length>0){
-                        if(response.data.result[0]){
-                            this.$refs.mainView.craftData = response.data.result[0];
-                            this.headerid = response.data.result[0].id;
-                            this.routingType = response.data.result[0].routingType;
+                    if(response.result.length>0){
+                        if(response.result[0]){
+                            this.$refs.mainView.craftData = response.result[0];
+                            this.headerid = response.result[0].id;
+                            this.routingType = response.result[0].routingType;
                             this.getmainorder(pamasId)
                         }
-                        if(response.data.result[1]){
-                            this.$refs.dispatched.craftData = response.data.result[1];
-                            this.diHeaderid = response.data.result[1].id;
-                            this.diRoutingType = response.data.result[1].routingType;
+                        if(response.result[1]){
+                            this.$refs.dispatched.craftData = response.result[1];
+                            this.diHeaderid = response.result[1].id;
+                            this.diRoutingType = response.result[1].routingType;
                             this.getdisorder(pamasId)
                         }
                         this.$refs.dispatched.getmaterialsupport(pamasId)
@@ -101,13 +101,13 @@ export default {
             let url01 = `${PlanUrl}/orderexecute/getorderproductandequip?orderId=` + pamasId
                 +`&headerid=`+headerid +`&routingType=`+ routingType;
             service.get(`${url01}`).then((res) => {
-                if(res.data.success){
-                    if(res.data.result.equipids){
-                        let equipids = res.data.result.equipids;
-                         this.mainexecuteid = res.data.result.executeid;
+                if(res.success){
+                    if(res.result.equipids){
+                        let equipids = res.result.equipids;
+                         this.mainexecuteid = res.result.executeid;
                         this.$refs.mainView.getlistall(equipids)
                          this.$refs.mainView.getqc(this.mainexecuteid); 
-                        let bandleList = res.data.result.productCode;
+                        let bandleList = res.result.productCode;
                         let codeList = [];// 编号List
                         bandleList.map((item,index)=>{
                             codeList.push(item.productcodes)
@@ -131,13 +131,13 @@ export default {
             let url02 = `${PlanUrl}/orderexecute/getorderproductandequip?orderId=` + pamasId
                 +`&headerid=`+diHeaderid +`&routingType=`+ diRoutingType;
             service.get(`${url02}`).then((res) => {
-                if(res.data.success){
-                    if(res.data.result.equipids){
-                        let equipids = res.data.result.equipids;
-                          this.disexecuteid = res.data.result.executeid;
+                if(res.success){
+                    if(res.result.equipids){
+                        let equipids = res.result.equipids;
+                          this.disexecuteid = res.result.executeid;
                         this.$refs.dispatched.getlistall(equipids)
                         this.$refs.dispatched.getqc(this.disexecuteid); 
-                        let bandleList = res.data.result.productCode;
+                        let bandleList = res.result.productCode;
                         let boardList = [];// 板次List
                         bandleList.map((item,index)=>{
                             boardList.push(item.boardNumber)

pages/qc/dataTrace/index.vue

@@ -312,8 +312,8 @@ export default {
       laodePage(pageData){
         let url = `${PlanUrl}/orderexecute/pageddatamesorders`;
         service.post(`${url}`,pageData).then(res => {
-            this.listTask = res.data.result.items
-            this.search.total = res.data.result.totalCount
+            this.listTask = res.result.items
+            this.search.total = res.result.totalCount
         });
       },
 
@@ -326,8 +326,8 @@ export default {
           "SkipCount": 0, 
           "SimpleSearch": searchData
         }).then(res => {
-          this.listTask = res.data.result.items
-          this.search.total = res.data.result.totalCount
+          this.listTask = res.result.items
+          this.search.total = res.result.totalCount
         });
       },
       searchModel(){

pages/qc/implement/index.vue

@@ -258,10 +258,10 @@ export default {
     loadEntry(ExecuteId) {
       var url = `${PlanUrl}/orderexecute/getentrylist?ExecuteId=` + ExecuteId
       service.get(`${url}`).then((response) => {
-        this.entryData = response.data.result.entryList
+        this.entryData = response.result.entryList
         let data = []
         for (var i = 0; i < this.entryData.length; i++) {
-          if (this.entryData[i].id == response.data.result.currentID) {
+          if (this.entryData[i].id == response.result.currentID) {
             data = this.entryData[i]
           }
         }

pages/qc/taskList/index.vue

@@ -313,8 +313,8 @@ export default {
       laodePage(pageData){
         let url = `${PlanUrl}/ordercheck/waitexecuteorderlist`;
         service.post(`${url}`,pageData).then(res => {
-            this.mDatas = res.data.result.items
-            this.search.total = res.data.result.totalCount
+            this.mDatas = res.result.items
+            this.search.total = res.result.totalCount
         });
       },
       // 搜索

pages/qcimplement/components/backCheck.vue

@@ -94,7 +94,7 @@ export default {
         service
           .post(`${url}`, JSON.stringify(this.mod))
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
               this.$Message.success('操作成功')
               this.$parent.$parent.loadproduct()
               this.$parent.$parent.backCheckModal = false

pages/qcimplement/components/entryrecordlist.vue

@@ -420,8 +420,8 @@ export default {
         this.datasearch.entryID
 
       service.get(`${url}`).then((response) => {
-        this.product_List = response.data.result
-        this.board_List = response.data.result
+        this.product_List = response.result
+        this.board_List = response.result
         if (this.productobj==null||this.datasearch.productcode == ''||typeof (this.datasearch.productcode) == "undefined") {
           for (let i = 0; i < this.product_List.length; i++) {
             let obj = this.product_List[i]
@@ -470,7 +470,7 @@ export default {
         `${PlanUrl}/orderexecutequalityrecord/getentryqcrecordlist?` +
         QS.stringify(this.datasearch)
       service.get(`${url}`).then((response) => {
-        this.recorddata = response.data.result
+        this.recorddata = response.result
       })
     },
     handleselfCheckAll() {

pages/qcimplement/index.vue

@@ -309,10 +309,10 @@ export default {
     loadEntry(ExecuteId) {
       var url = `${PlanUrl}/ordercheck/getentrylist?ExecuteId=` + ExecuteId
       service.get(`${url}`).then((response) => {
-        this.entryData = response.data.result.entryList
+        this.entryData = response.result.entryList
         let data = []
         for (var i = 0; i < this.entryData.length; i++) {
-          if (this.entryData[i].id == response.data.result.currentID) {
+          if (this.entryData[i].id == response.result.currentID) {
             data = this.entryData[i]
             this.currententry = data
             this.currentID = this.entryData[i].id
@@ -395,7 +395,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.updateentrystatus(row.id, 14)
           }
         })
@@ -420,7 +420,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.updateentrystatus(row.id, 14)
           }
         })
@@ -528,8 +528,8 @@ export default {
         '&headerID=' +
         this.data.routing_header_id
       service.get(`${url}`).then((response) => {
-        if (response.data.result != null) {
-          let ordata = response.data.result
+        if (response.result != null) {
+          let ordata = response.result
           for (let j = 0; j < this.data.row.length; j++) {
             let obj = this.data.row[j]
             var gh = ordata.filter(function(number) {

pages/resourceManagement/EquipmentCalendar/components/newEquipment.vue

@@ -114,7 +114,7 @@ export default {
             let url = `${systemUrl}/calendarwork/list`,
                 that = this;
             service.post(`${url}`, parmse).then(res => {
-                let selectdata = res.data.result;
+                let selectdata = res.result;
                  //console.log(selectdata)
                 selectdata.forEach(item => {
                     that.cityList.push({
@@ -127,7 +127,7 @@ export default {
             });
             let url1 = `${systemUrl}/calendarovertime/list`;
             service.post(`${url1}`,parmse).then(res => {
-                let selectdata1 = res.data.result;
+                let selectdata1 = res.result;
                  console.log(selectdata1)
                 selectdata1.forEach(item => {
                     this.cityList1.push({
@@ -152,7 +152,7 @@ export default {
       service.post(`${url}`, JSON.stringify({ equipCalendarWork: this.formItem1,equipCalendarOverTime: this.formItem2 }))
         .then((res) => {
 
-          if (res.data.success) {
+          if (res.success) {
             this.$Message.success('保存成功')
             this.$emit('getMessage');
             this.modalShow = false

pages/resourceManagement/EquipmentCalendar/index.vue

@@ -692,16 +692,14 @@ export default {
       let url = `${systemUrl}/equipinfo/getpagedec`;
       service
         .get(`${url}`, {
-          params: {
             equip_name: this.value1,
             shopid: this.shopid,
             pageindex: this.page,
             pageSize: this.pageSize
-          }
         })
         .then(res => {
-          this.datatable = res.data.result.items;
-          this.total = res.data.result.totalCount;
+          this.datatable = res.result.items;
+          this.total = res.result.totalCount;
         });
     },
     //高级搜索
@@ -816,7 +814,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
         .then(res => {
-          if (res.data.success) {
+          if (res.success) {
             this.changestatus(this.eid);
             this.show = false;
             setTimeout(() => {
@@ -858,7 +856,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
         .then(res => {
-          if (res.data.success) {
+          if (res.success) {
             this.changestatus(this.eid);
             this.show = false;
             setTimeout(() => {
@@ -871,9 +869,9 @@ export default {
     edit(data) {
       this.$refs.equipment.data1 = this.datatable;
       let url = `${systemUrl}/equipbelongtype/getbyid`;
-      service.get(`${url}`, { params: { Id: data.row.id } }).then(res => {
+      service.get(`${url}`, { Id: data.row.id }).then(res => {
         console.log(data);
-        this.typepk = res.data.result;
+        this.typepk = res.result;
         this.$refs.equipment.title = "设置日历";
         this.$refs.equipment.modalShow = true;
         this.$refs.equipment.formItem = {
@@ -900,7 +898,7 @@ export default {
       let url = `${systemUrl}/equipinfo/delete`,
         uId = this.seleId;
       service.delete(`${systemUrl}/equipinfo/delete?id=${uId}`).then(res => {
-        if (res.data.success) {
+        if (res.success) {
           this.laodaction();
           this.$Message.success("删除成功");
         }
@@ -911,10 +909,10 @@ export default {
       this.seleId = data.row.id;
       let url = `${systemUrl}/equipmaintainplan/getpaged`;
       service
-        .get(`${url}`, { params: { equipid: this.seleId, maintain_type: "1" } })
+        .get(`${url}`, { equipid: this.seleId, maintain_type: "1"})
         .then(res => {
           //console.log(res)
-          this.datatable1 = res.data.result.items;
+          this.datatable1 = res.result.items;
           if (this.datatable1.length == 0) {
             this.$Message.error("该设备没有保养数据！");
             this.show3 = false;
@@ -929,10 +927,10 @@ export default {
       this.seleId = data.row.id;
       let url = `${systemUrl}/equipmaintainplan/getpaged`;
       service
-        .get(`${url}`, { params: { equipid: this.seleId, maintain_type: "2" } })
+        .get(`${url}`, { equipid: this.seleId, maintain_type: "2" })
         .then(res => {
           //console.log(res)
-          this.datatable1 = res.data.result.items;
+          this.datatable1 = res.result.items;
           if (this.datatable1.length == 0) {
             this.$Message.error("该设备没有维修数据！");
             this.show3 = false;
@@ -944,10 +942,10 @@ export default {
     loadmain(id) {
       let url = `${systemUrl}/equipmaintainplan/getpaged`;
       service
-        .get(`${url}`, { params: { equipid: id, maintain_type: this.borw } })
+        .get(`${url}`,{ equipid: id, maintain_type: this.borw })
         .then(res => {
           //console.log(res)
-          this.datatable1 = res.data.result.items;
+          this.datatable1 = res.result.items;
         });
     },
     changestatus(id) {
@@ -1004,7 +1002,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
         .then(res => {
-          if (res.data.success) {
+          if (res.success) {
             this.changestatus(this.eid);
             this.loadmain(this.eid);
             setTimeout(() => {

pages/resourceManagement/Storehouse/index.vue

@@ -295,8 +295,8 @@ export default {
     laodaction(name) {
       let url = `${systemUrl}/storeroomlocation/getpaged`,
         that = this
-      service.get(`${url}`, { params: { title: name } }).then((res) => {
-        that.treeData = res.data.result.items
+      service.get(`${url}`,{ title: name }).then((res) => {
+        that.treeData = res.result.items
       })
     },
     selectOption() {
@@ -304,7 +304,7 @@ export default {
         that = this
       that.cityList = []
       service.get(`${url}`).then((res) => {
-        let selectdata = res.data.result.items
+        let selectdata = res.result.items
         for (let i = 0; i < selectdata.length; i++) {
           that.cityList.push({
             value: selectdata[i].title,
@@ -352,7 +352,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify({ storeroomLocation: paramsdata }))
         .then((res) => {
-          if (res.data.success) {
+          if (res.success) {
             this.laodaction()
             this.myloading = false
             this.$Message.success('新增成功')
@@ -367,7 +367,7 @@ export default {
       service
         .delete(`${systemUrl}/storeroomlocation/delete?id=${uId}`)
         .then((res) => {
-          if (res.data.success) {
+          if (res.success) {
             this.laodaction()
             this.$Message.success('删除成功')
           }
@@ -393,7 +393,7 @@ export default {
             service
               .post(`${url}`, JSON.stringify({ storeroomLocation: paramsdata }))
               .then((res) => {
-                if (res.data.success) {
+                if (res.success) {
                   this.laodaction()
                   this.myloading = false
                   this.show02 = false
@@ -416,7 +416,7 @@ export default {
             service
               .post(`${url}`, JSON.stringify({ storeroomLocation: paramsdata }))
               .then((res) => {
-                if (res.data.success) {
+                if (res.success) {
                   this.laodaction()
                   this.myloading = false
                   this.show02 = false
@@ -448,7 +448,7 @@ export default {
         let uId = this.seleId;
         service.delete(`${systemUrl}/storeroomlocation/delete?id=${uId}`)
         .then((res) => {
-          if (res.data.success) {
+          if (res.success) {
             this.laodaction()
             this.$Message.success('删除成功')
           }

pages/resourceManagement/deviceManagement/components/newEquipment.vue

@@ -142,7 +142,7 @@ export default {
             let url = `${systemUrl}/equiptype/getpaged`,
                 that = this;
             service.get(`${url}`, ).then(res => {
-                let selectdata = res.data.result.items;
+                let selectdata = res.result.items;
                 // console.log(selectdata)
                 selectdata.forEach(item => {
                     that.cityList.push({
@@ -198,7 +198,7 @@ export default {
                 };
                // console.log(paramsdata);
                     service.post(`${url}`, JSON.stringify({equipInfo: paramsdata})).then(res=>{
-                        if(res.data.success) {
+                        if(res.success) {
                             this.$emit('getMessage');
                             this.modalShow=false;
                             this.$Message.success('编辑成功');
@@ -230,7 +230,7 @@ export default {
                 };
                 //console.log(this.formItem.equip_type);
                 service.post(`${url}`, JSON.stringify({equipInfo: paramsdata})).then(res=>{
-                    if(res.data.success) {
+                    if(res.success) {
                         this.$emit('getMessage');
                         this.modalShow=false;
                         this.$Message.success('新增成功')

pages/resourceManagement/deviceManagement/index.vue

@@ -748,17 +748,15 @@ export default {
     laodaction() {
       let url = `${systemUrl}/equipinfo/getpaged`
       service
-        .get(`${url}`, {
-          params: {
+        .get(`${url}`,  {
             equip_name: this.value1,
             shopid: this.shopid,
             pageindex: this.page,
             pageSize: this.pageSize
-          }
-        })
+          })
         .then((res) => {
-          this.datatable = res.data.result.items
-          this.total = res.data.result.totalCount
+          this.datatable = res.result.items
+          this.total = res.result.totalCount
         })
     },
     //高级搜索
@@ -873,7 +871,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
         .then((res) => {
-          if (res.data.success) {
+          if (res.success) {
             this.changestatus(this.eid)
             this.show = false
             setTimeout(() => {
@@ -915,7 +913,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
         .then((res) => {
-          if (res.data.success) {
+          if (res.success) {
             this.changestatus(this.eid)
             this.show = false
             setTimeout(() => {
@@ -929,9 +927,9 @@ export default {
       this.$refs.equipment.$refs.refqcFile.newName= data.row.equip_pic
       this.$refs.equipment.data1 = this.datatable
       let url = `${systemUrl}/equipbelongtype/getbyid`
-      service.get(`${url}`, { params: { Id: data.row.id } }).then((res) => {
+      service.get(`${url}`,{ Id: data.row.id }).then((res) => {
          console.log(data)
-        this.typepk = res.data.result
+        this.typepk = res.result
         this.$refs.equipment.title = '编辑设备'
         this.$refs.equipment.modalShow = true
         this.$refs.equipment.formItem = {
@@ -955,7 +953,7 @@ export default {
       service
         .delete(`${systemUrl}/equipinfo/delete?id=${uId}`)
         .then((res) => {
-          if (res.data.success) {
+          if (res.success) {
             this.laodaction()
             this.$Message.success('删除成功')
           }
@@ -966,10 +964,10 @@ export default {
       this.seleId = data.row.id
       let url = `${systemUrl}/equipmaintainplan/getpaged`
       service
-        .get(`${url}`, { params: { equipid: this.seleId, maintain_type: '1' } })
+        .get(`${url}`,{ equipid: this.seleId, maintain_type: '1' })
         .then((res) => {
           //console.log(res)
-          this.datatable1 = res.data.result.items
+          this.datatable1 = res.result.items
           if (this.datatable1.length == 0) {
             this.$Message.error('该设备没有保养数据！')
             this.show3 = false
@@ -984,10 +982,10 @@ export default {
       this.seleId = data.row.id
       let url = `${systemUrl}/equipmaintainplan/getpaged`
       service
-        .get(`${url}`, { params: { equipid: this.seleId, maintain_type: '2' } })
+        .get(`${url}`, { equipid: this.seleId, maintain_type: '2' })
         .then((res) => {
           //console.log(res)
-          this.datatable1 = res.data.result.items
+          this.datatable1 = res.result.items
           if (this.datatable1.length == 0) {
             this.$Message.error('该设备没有维修数据！')
             this.show3 = false
@@ -999,10 +997,10 @@ export default {
     loadmain(id) {
       let url = `${systemUrl}/equipmaintainplan/getpaged`
       service
-        .get(`${url}`, { params: { equipid: id, maintain_type: this.borw } })
+        .get(`${url}`,{ equipid: id, maintain_type: this.borw })
         .then((res) => {
           //console.log(res)
-          this.datatable1 = res.data.result.items
+          this.datatable1 = res.result.items
         })
     },
     changestatus(id) {
@@ -1059,7 +1057,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
         .then((res) => {
-          if (res.data.success) {
+          if (res.success) {
             this.changestatus(this.eid)
             this.loadmain(this.eid)
             setTimeout(() => {

pages/resourceManagement/deviceManagementCP/components/newEquipment.vue

@@ -166,7 +166,7 @@ export default {
             let url = `${systemUrl}/equiptype/getpaged`,
                 that = this;
             service.get(`${url}`, ).then(res => {
-                let selectdata = res.data.result.items;
+                let selectdata = res.result.items;
                 // console.log(selectdata)
                 selectdata.forEach(item => {
                     that.cityList.push({
@@ -225,7 +225,7 @@ export default {
                 };
                // console.log(paramsdata);
                     service.post(`${url}`, JSON.stringify({equipInfo: paramsdata})).then(res=>{
-                        if(res.data.success) {
+                        if(res.success) {
                             this.$emit('getMessage');
                             this.modalShow=false;
                             this.$Message.success('编辑成功');
@@ -261,7 +261,7 @@ export default {
                 };
                 //console.log(this.formItem.equip_type);
                 service.post(`${url}`, JSON.stringify({equipInfo: paramsdata})).then(res=>{
-                    if(res.data.success) {
+                    if(res.success) {
                         this.$emit('getMessage');
                         this.modalShow=false;
                         this.$Message.success('新增成功')

pages/resourceManagement/deviceManagementCP/index.vue

@@ -773,17 +773,15 @@ export default {
     laodaction() {
       let url = `${systemUrl}/equipinfo/getpaged`
       service
-        .get(`${url}`, {
-          params: {
+        .get(`${url}`,{
             equip_name: this.value1,
             shopid: this.shopid,
             pageindex: this.page,
             pageSize: this.pageSize
-          }
         })
         .then((res) => {
-          this.datatable = res.data.result.items
-          this.total = res.data.result.totalCount
+          this.datatable = res.result.items
+          this.total = res.result.totalCount
         })
     },
     //高级搜索
@@ -902,7 +900,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
         .then((res) => {
-          if (res.data.success) {
+          if (res.success) {
             this.changestatus(this.eid)
             this.show = false
             setTimeout(() => {
@@ -944,7 +942,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
         .then((res) => {
-          if (res.data.success) {
+          if (res.success) {
             this.changestatus(this.eid)
             this.show = false
             setTimeout(() => {
@@ -958,9 +956,9 @@ export default {
       this.$refs.equipment.$refs.refqcFile.newName= data.row.equip_pic
       this.$refs.equipment.data1 = this.datatable
       let url = `${systemUrl}/equipbelongtype/getbyid`
-      service.get(`${url}`, { params: { Id: data.row.id } }).then((res) => {
+      service.get(`${url}`, { Id: data.row.id }).then((res) => {
          console.log(data)
-        this.typepk = res.data.result
+        this.typepk = res.result
         this.$refs.equipment.title = '编辑设备'
         this.$refs.equipment.modalShow = true
         this.$refs.equipment.formItem = {
@@ -988,7 +986,7 @@ export default {
       service
         .delete(`${systemUrl}/equipinfo/delete?id=${uId}`)
         .then((res) => {
-          if (res.data.success) {
+          if (res.success) {
             this.laodaction()
             this.$Message.success('删除成功')
           }
@@ -999,10 +997,10 @@ export default {
       this.seleId = data.row.id
       let url = `${systemUrl}/equipmaintainplan/getpaged`
       service
-        .get(`${url}`, { params: { equipid: this.seleId, maintain_type: '1' } })
+        .get(`${url}`,{ equipid: this.seleId, maintain_type: '1' })
         .then((res) => {
           //console.log(res)
-          this.datatable1 = res.data.result.items
+          this.datatable1 = res.result.items
           if (this.datatable1.length == 0) {
             this.$Message.error('该设备没有保养数据！')
             this.show3 = false
@@ -1017,10 +1015,10 @@ export default {
       this.seleId = data.row.id
       let url = `${systemUrl}/equipmaintainplan/getpaged`
       service
-        .get(`${url}`, { params: { equipid: this.seleId, maintain_type: '2' } })
+        .get(`${url}`, { equipid: this.seleId, maintain_type: '2' })
         .then((res) => {
           //console.log(res)
-          this.datatable1 = res.data.result.items
+          this.datatable1 = res.result.items
           if (this.datatable1.length == 0) {
             this.$Message.error('该设备没有维修数据！')
             this.show3 = false
@@ -1032,10 +1030,10 @@ export default {
     loadmain(id) {
       let url = `${systemUrl}/equipmaintainplan/getpaged`
       service
-        .get(`${url}`, { params: { equipid: id, maintain_type: this.borw } })
+        .get(`${url}`,{ equipid: id, maintain_type: this.borw })
         .then((res) => {
           //console.log(res)
-          this.datatable1 = res.data.result.items
+          this.datatable1 = res.result.items
         })
     },
     changestatus(id) {
@@ -1092,7 +1090,7 @@ export default {
       service
         .post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata }))
         .then((res) => {
-          if (res.data.success) {
+          if (res.success) {
             this.changestatus(this.eid)
             this.loadmain(this.eid)
             setTimeout(() => {

pages/resourceManagement/deviceType/index.vue

@@ -192,7 +192,7 @@ export default {
     },
     laodaction(name) {
       let url = `${systemUrl}/equiptype/getpaged`;
-      service.get(`${url}`, { params: { equip_type_name: name } }).then(res => {
+      service.get(`${url}`, { equip_type_name: name }).then(res => {
         this.data1 = res.result.items;
       });
     },
@@ -241,7 +241,7 @@ export default {
         service
           .post(`${url}`, JSON.stringify({ equipType: paramsdata }))
           .then(res => {
-            if (res.data.success) {
+            if (res.success) {
               this.laodaction();
               this.$Message.success("编辑成功");
             }
@@ -266,7 +266,7 @@ export default {
         service
           .post(`${url}`, JSON.stringify({ equipType: paramsdata }))
           .then(res => {
-            if (res.data.success) {
+            if (res.success) {
               this.laodaction();
               this.$Message.success("新增成功");
             }
@@ -301,7 +301,7 @@ export default {
         uId = this.seleId;
       service.delete(`${systemUrl}/equiptype/delete?id=${uId}`).then(res => {
         console.log(res);
-        if (res.data.result == 1) {
+        if (res.result == 1) {
           this.laodaction();
           this.$Message.success("删除成功");
         } else {