diff --git a/src/api/retrospect/product.js b/src/api/retrospect/product.js index eb62fb9..2d36224 100644 --- a/src/api/retrospect/product.js +++ b/src/api/retrospect/product.js @@ -10,7 +10,7 @@ export function exportheadexcel (params) { // 获取工单工序追溯数据 export function getPotrace (params) { return request({ - url: '/admin/om/serialorder/potrace', + url: '/admin/om/serialorder/tracewithdetail', method: 'get', params }) @@ -21,4 +21,14 @@ export function getWorkLineList () { url: '/admin/base/workline/query', method: 'get' }) +} + +var a={ + "SerialOrderOPTrace-ArtId": "4997757", + "SerialOrderOPTrace-WorkPlaceId": "OP20", + "SerialOrderOPTrace-StepDesc": " ", + "SerialOrderOPTrace-RecvData": "0", + "SerialOrderOPTrace-Status": "是", + "SerialOrderOPTrace-Remark1": "", + "SerialOrderOPTrace-ExecuteTime": "2021-09-26 14:20:34" } \ No newline at end of file diff --git a/src/views/retrospect/product/index.vue b/src/views/retrospect/product/index.vue index 6327c20..9a7bea9 100644 --- a/src/views/retrospect/product/index.vue +++ b/src/views/retrospect/product/index.vue @@ -119,7 +119,7 @@ :key="item" :label="getColumnName(item)" :show-overflow-tooltip="true" - width="200px" + min-width="200px" > + @@ -159,7 +180,20 @@ export default { loading:false, cellItem:{}, tableHeight:0, - tableDetailsHeight:0 + pagination:{ + pageNumber: 1, + pageSize: 10, + total:0 + }, + detailsHeaders:[ + "SerialOrderOPTrace-ArtId", + "SerialOrderOPTrace-WorkPlaceId", + "SerialOrderOPTrace-StepDesc", + "SerialOrderOPTrace-RecvData", + "SerialOrderOPTrace-Status", + "SerialOrderOPTrace-Remark1", + "SerialOrderOPTrace-ExecuteTime" + ] } }, created(){ @@ -176,7 +210,7 @@ export default { methods:{ // tableHeight高度 setTableHeight(){ - this.tableHeight = (this.$refs.tableHeightRef.offsetHeight-5) || 400; + this.tableHeight = (this.$refs.tableHeightRef.offsetHeight-70) || 400; }, // 导出文件 exportExcel() { @@ -191,11 +225,13 @@ export default { // table数据 getPotrace(){ getPotrace({ - ...this.formData - }).then(({code, data})=>{ + ...this.formData, + ...this.pagination + }).then(({code, data:{records:{data=[], titleLi=[]}, count}})=>{ if(code==200){ - this.headers=data.titleLi; - this.tableData=data.data; + this.headers=titleLi; + this.tableData=data; + this.pagination.total=count; } }) }, diff --git a/src/views/retrospect/productOverview/index.vue b/src/views/retrospect/productOverview/index.vue index 6fd79e0..4621d12 100644 --- a/src/views/retrospect/productOverview/index.vue +++ b/src/views/retrospect/productOverview/index.vue @@ -123,8 +123,10 @@ width="200px" >