diff --git a/src/api/groupManagement/achievement.js b/src/api/groupManagement/achievement.js new file mode 100644 index 0000000..e42f399 --- /dev/null +++ b/src/api/groupManagement/achievement.js @@ -0,0 +1,13 @@ +import request from '@/utils/request' + +/** + * 员工报工清单查询 + * @param {查询条件} data + */ +export function listGroupReportList(query) { + return request({ + url: 'mes/groupManagement/GroupShift/list', + method: 'get', + params: query + }) +} diff --git a/src/api/orderPurchaseManagement/orderProgress.js b/src/api/orderPurchaseManagement/orderProgress.js new file mode 100644 index 0000000..689d11b --- /dev/null +++ b/src/api/orderPurchaseManagement/orderProgress.js @@ -0,0 +1,12 @@ +import request from '@/utils/request' +/** + * 订单进度分页查询 + * @param {查询条件} data + */ +export function listOrderProgress(query) { + return request({ + url: 'mes/deliveryManagement/OrderPurchase/list', + method: 'post', + data: query + }) +} diff --git a/src/api/orderPurchaseManagement/orderpurchase.js b/src/api/orderPurchaseManagement/orderpurchase.js index e270f41..963d0c2 100644 --- a/src/api/orderPurchaseManagement/orderpurchase.js +++ b/src/api/orderPurchaseManagement/orderpurchase.js @@ -7,8 +7,8 @@ import { downFile } from '@/utils/request' export function listOrderPurchase(query) { return request({ url: 'mes/orderManagement/OrderPurchase/list', - method: 'get', - params: query + method: 'post', + data: query }) } diff --git a/src/views/groupManagement/achievement/index.vue b/src/views/groupManagement/achievement/index.vue new file mode 100644 index 0000000..6328eca --- /dev/null +++ b/src/views/groupManagement/achievement/index.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/views/orderPurchaseManagement/deliverySchedule/index.vue b/src/views/orderPurchaseManagement/deliverySchedule/index.vue new file mode 100644 index 0000000..97e85b4 --- /dev/null +++ b/src/views/orderPurchaseManagement/deliverySchedule/index.vue @@ -0,0 +1,236 @@ + + + + + \ No newline at end of file diff --git a/src/views/orderPurchaseManagement/orderPurchase/index.vue b/src/views/orderPurchaseManagement/orderPurchase/index.vue index c44e3ba..4e60dc6 100644 --- a/src/views/orderPurchaseManagement/orderPurchase/index.vue +++ b/src/views/orderPurchaseManagement/orderPurchase/index.vue @@ -2,8 +2,8 @@
- + @@ -16,7 +16,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -312,7 +312,7 @@ const queryParams = reactive({ pageSize: 10, sort: '', sortType: 'asc', - dateRange: [], + importDate: [proxy.$dayjs().startOf('day'), proxy.$dayjs().endOf('day')], orderNoMes: '', purchaseOrderErp: '', materialCode: '', @@ -391,7 +391,7 @@ function handleQuery() { function resetQuery() { proxy.resetForm("queryRef") - queryParams.dateRange = [] + queryParams.importDate = [proxy.$dayjs().startOf('day'), proxy.$dayjs().endOf('day')] queryParams.orderNoMes = '' queryParams.purchaseOrderErp = '' queryParams.materialCode = ''