零件状态查询

src/api/ManufacturingCenter/StatusQuery.js

@@ -26,8 +26,9 @@ export function searchmachine(num, check, pageCurrent, pageSize) {
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_机床名称_查询数据_分页',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0=int&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output'
+      name: 'PDM_机床名称_查询数据',
+      param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0',
+      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
@@ -37,8 +38,9 @@ export function searchgroup(num, pageCurrent, pageSize) {
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_组件名称_查询数据_分页',
-      param: '机床流水号=' + num + '=int&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output'
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + num,
+      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }

src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue

@@ -470,6 +470,7 @@ export default {
       if (this.MachineValue !== '' && this.MachineValue !== null) {
         this.loading0 = true
         searchtable(this.MachineValue, this.pageCurrent, this.pageSize).then(response => {
+          console.log(response.data)
           this.tableData = response.data.rows
           this.total = response.data.total
           this.loading0 = false
@@ -530,6 +531,7 @@ export default {
     Jurisdiction() {
       this.count = 0
       getMachine2().then(response => {
+        console.log(response.data)
         this.gridData = response.data
         for (let i = 0; i < response.data.length; i++) {
           if (response.data[i].调序权限 === '1') { this.count = this.count + 1 }

src/views/ManufacturingCenter/StatusQuery/index.vue

@@ -381,22 +381,22 @@ export default {
         this.dialogFormVisible2 = true
         this.check6 = 1
         searchmachine(this.entryNameValue, this.check6, this.pageCurrent1, this.pageSize1).then(response => {
-          for (let i = 0; i < response.data.result.length; i++) {
-            if (response.data.result[i].机床开始时间 !== '') {
-              response.data.result[i].机床开始时间 = response.data.result[i].机床开始时间.substr(0, 10)
+          for (let i = 0; i < response.data.total; i++) {
+            if (response.data.rows[i].机床开始时间 !== '') {
+              response.data.rows[i].机床开始时间 = response.data.rows[i].机床开始时间.substr(0, 10)
             }
-            if (response.data.result[i].机床结束时间 !== '') {
-              response.data.result[i].机床结束时间 = response.data.result[i].机床结束时间.substr(0, 10)
+            if (response.data.rows[i].机床结束时间 !== '') {
+              response.data.rows[i].机床结束时间 = response.data.rows[i].机床结束时间.substr(0, 10)
             }
-            if (response.data.result[i].工位属性 === '请选择') {
-              response.data.result[i].工位属性 = ''
+            if (response.data.rows[i].工位属性 === '请选择') {
+              response.data.rows[i].工位属性 = ''
             }
-            if (response.data.result[i].机床主管 === '请选择') {
-              response.data.result[i].机床主管 = ''
+            if (response.data.rows[i].机床主管 === '请选择') {
+              response.data.rows[i].机床主管 = ''
             }
           }
-          this.tableData6 = response.data.result
-          this.total1 = parseInt(response.data.output[0].ItemCount)
+          this.tableData6 = response.data.rows
+          this.total1 = parseInt(response.data.total)
         })
       } else {
         this.$message.warning('请先选择项目')
@@ -415,10 +415,11 @@ export default {
     },
     searchGroupList() { // 查询组号
       if (this.machineToolNumber !== '') {
+        this.tableData7 = []
         this.dialogFormVisible3 = true
         searchgroup(this.machine, this.pageCurrent2, this.pageSize2).then(response => {
-          this.tableData7 = response.data.result
-          this.total2 = parseInt(response.data.output[0].ItemCount)
+          this.tableData7 = response.data.rows
+          this.total2 = parseInt(response.data.total)
         })
       } else {
         this.$message.warning('请先选择机床')
@@ -460,7 +461,6 @@ export default {
       this.searchData()
     },
     handleSizeChange1(val) {
-      this.pageCurrent1 = 1
       this.pageSize1 = val
       this.SearchMachine()
     },
@@ -469,7 +469,6 @@ export default {
       this.SearchMachine()
     },
     handleSizeChange3(val) {
-      this.pageCurrent2 = 1
       this.pageSize2 = val
       this.searchGroupList()
     },