diff --git a/dev_wms_client/src/api/excel.js b/dev_wms_client/src/api/excel.js index 0bb8843..4a16809 100644 --- a/dev_wms_client/src/api/excel.js +++ b/dev_wms_client/src/api/excel.js @@ -83,6 +83,16 @@ export const exportKittingBomRelationWithExcel = (data) => { timeout: 600000 }) } +// 导出物料 +export const exportGoodsExcel = (data) => { + return request({ + url: '/excel/exportGoodsExcel', + method: 'post', + responseType: 'blob', + data: data, + timeout: 600000 + }) +} // 导出库存 export const exportStockExcel = (data) => { return request({ @@ -123,90 +133,20 @@ export const exportKanbanExcel = (data) => { timeout: 600000 }) } - -// 以下待废弃 -export const downloadInRecordExcel = (data) => { +// 导出入库记录 +export const exportInTaskRecordExcel = (data) => { return request({ - url: '/excel/downloadInRecordExcel', + url: '/excel/exportInTaskRecordExcel', method: 'post', responseType: 'blob', data: data, timeout: 600000 }) } - -export const downloadOutRecordExcel = (data) => { +// 导出出库记录 +export const exportOutTaskRecordExcel = (data) => { return request({ - url: '/excel/downloadOutRecordExcel', - method: 'post', - responseType: 'blob', - data: data, - timeout: 600000 - }) -} - -export const downloadInventoryRecordExcel = (data) => { - return request({ - url: '/excel/downloadInventoryRecordExcel', - method: 'post', - responseType: 'blob', - data: data, - timeout: 600000 - }) -} - -export const downloadGoodsExcel = (data) => { - return request({ - url: '/excel/exportBaseGoods', - method: 'post', - responseType: 'blob', - data: data, - timeout: 600000 - }) -} - -export const downloadVehicleExcel = (data) => { - return request({ - url: '/excel/downloadVehicleExcel', - method: 'post', - responseType: 'blob', - data: data, - timeout: 600000 - }) -} - -export const downloadLocationsExcel = (data) => { - return request({ - url: '/excel/downloadLocationsExcel', - method: 'post', - responseType: 'blob', - data: data, - timeout: 600000 - }) -} - -export const queryUploadRecord = (data) => { - return request({ - url: '/excel/queryUploadRecord', - method: 'post', - data: data, - timeout: 100000 - }) -} - -export const downloadClcKanbanRequirementExcel = (data) => { - return request({ - url: '/excel/downloadClcKanbanRequirementExcel', - method: 'post', - responseType: 'blob', - data: data, - timeout: 600000 - }) -} - -export const downloadWorkSummaryExcel = (data) => { - return request({ - url: '/excel/downloadWorkSummaryExcel', + url: '/excel/exportOutTaskRecordExcel', method: 'post', responseType: 'blob', data: data, diff --git a/dev_wms_client/src/api/taskQuery.js b/dev_wms_client/src/api/taskQuery.js index 2d11404..d1bc623 100644 --- a/dev_wms_client/src/api/taskQuery.js +++ b/dev_wms_client/src/api/taskQuery.js @@ -7,4 +7,20 @@ export const queryTasksByPage = (params) => { method: 'post', data: params }) +} +// 分页查询入库记录 +export const queryInTaskRecordByPage = (params) => { + return request({ + url: '/taskQuery/queryInTaskRecordByPage', + method: 'post', + data: params + }) +} +// 分页查询出库记录 +export const queryOutTaskRecordByPage = (params) => { + return request({ + url: '/taskQuery/queryOutTaskRecordByPage', + method: 'post', + data: params + }) } \ No newline at end of file diff --git a/dev_wms_client/src/http/request.js b/dev_wms_client/src/http/request.js index 2f11de9..6211cff 100644 --- a/dev_wms_client/src/http/request.js +++ b/dev_wms_client/src/http/request.js @@ -1,7 +1,7 @@ import axios from 'axios' const request = axios.create({ - baseURL: 'http://localhost:12315/wms', + baseURL: 'https://s4wwjasrsp01.ap.cat.com/wmsServer/wms', timeout: 5000 }) diff --git a/dev_wms_client/src/layout/clcKanban.vue b/dev_wms_client/src/layout/clcKanban.vue index 69635b9..7f87934 100644 --- a/dev_wms_client/src/layout/clcKanban.vue +++ b/dev_wms_client/src/layout/clcKanban.vue @@ -1,96 +1,105 @@ \ No newline at end of file diff --git a/dev_wms_client/src/layout/dbsList.vue b/dev_wms_client/src/layout/dbsList.vue index 744192a..5eeb44c 100644 --- a/dev_wms_client/src/layout/dbsList.vue +++ b/dev_wms_client/src/layout/dbsList.vue @@ -334,7 +334,7 @@ const timeFormat = (row, column, cellValue, index) => { } const rowStyle = ({ row, rowIndex }) => { if (row.dbsStatus == 2) { - return { "color": "red" } + return { "color": "green" } } } const handleSortChange = (data) => { diff --git a/dev_wms_client/src/layout/goodsIn.vue b/dev_wms_client/src/layout/goodsIn.vue index 42444cb..d0ccd70 100644 --- a/dev_wms_client/src/layout/goodsIn.vue +++ b/dev_wms_client/src/layout/goodsIn.vue @@ -30,7 +30,7 @@ 绑定物料 + @click="confirmBinding()">绑定物料 清除输入 @@ -70,8 +70,8 @@ -