diff --git a/src/api/productManagement/proreportwork.js b/src/api/productManagement/proreportwork.js index 357d06f..56e9ad1 100644 --- a/src/api/productManagement/proreportwork.js +++ b/src/api/productManagement/proreportwork.js @@ -1,92 +1,57 @@ import request from '@/utils/request' /** - * 报工表分页查询 + * 报工分页查询 * @param {查询条件} data */ -export function listProReportwork(data) { - return request({ - url: 'mes/productManagement/ProReportwork/list', - method: 'post', - data: data - }) +export function listProReportwork(query) { + return request({ + url: 'BZFM/ProReportwork/list', + method: 'get', + params: query, + }) } /** - * 报工表分页查询 - * @param {查询条件} data - */ -export function listProReportworkByPrint(data) { - return request({ - url: 'mes/productManagement/ProReportwork/list_print', - method: 'post', - data: data - }) -} - -/** - * 新增报工表 + * 新增报工 * @param data */ export function addProReportwork(data) { - return request({ - url: 'mes/productManagement/ProReportwork', - method: 'post', - data: data - }) + return request({ + url: 'BZFM/ProReportwork', + method: 'post', + data: data, + }) } /** - * 修改报工表 + * 修改报工 * @param data */ export function updateProReportwork(data) { - return request({ - url: 'mes/productManagement/ProReportwork', - method: 'PUT', - data: data - }) + return request({ + url: 'BZFM/ProReportwork', + method: 'PUT', + data: data, + }) } /** - * 获取报工表详情 + * 获取报工详情 * @param {Id} */ export function getProReportwork(id) { - return request({ - url: 'mes/productManagement/ProReportwork/' + id, - method: 'get' - }) + return request({ + url: 'BZFM/ProReportwork/' + id, + method: 'get' + }) } /** - * 删除报工表 + * 删除报工 * @param {主键} pid */ export function delProReportwork(pid) { - return request({ - url: 'mes/productManagement/ProReportwork/' + pid, - method: 'delete' - }) -} - -/** - * 根据组id查看组员 - * @param {主键} pid - */ -export function GetPersonsList(id) { - return request({ - url: 'mes/productManagement/ProReportwork/get_persons', - method: 'get', - params: id - }) -} -/** - * 检查是否有报工记录，无记录则新增 - * @param {主键} pid - */ -export function manualGenerationReportwork(query) { - return request({ - url: 'mes/productManagement/ProReportwork/manual_generation_reportwork', - method: 'get', - params: query - }) + return request({ + url: 'BZFM/ProReportwork/delete/' + pid, + method: 'POST' + }) } diff --git a/src/api/productManagement/proreportwork_old.js b/src/api/productManagement/proreportwork_old.js new file mode 100644 index 0000000..357d06f --- /dev/null +++ b/src/api/productManagement/proreportwork_old.js @@ -0,0 +1,92 @@ +import request from '@/utils/request' + +/** + * 报工表分页查询 + * @param {查询条件} data + */ +export function listProReportwork(data) { + return request({ + url: 'mes/productManagement/ProReportwork/list', + method: 'post', + data: data + }) +} + +/** + * 报工表分页查询 + * @param {查询条件} data + */ +export function listProReportworkByPrint(data) { + return request({ + url: 'mes/productManagement/ProReportwork/list_print', + method: 'post', + data: data + }) +} + +/** + * 新增报工表 + * @param data + */ +export function addProReportwork(data) { + return request({ + url: 'mes/productManagement/ProReportwork', + method: 'post', + data: data + }) +} +/** + * 修改报工表 + * @param data + */ +export function updateProReportwork(data) { + return request({ + url: 'mes/productManagement/ProReportwork', + method: 'PUT', + data: data + }) +} +/** + * 获取报工表详情 + * @param {Id} + */ +export function getProReportwork(id) { + return request({ + url: 'mes/productManagement/ProReportwork/' + id, + method: 'get' + }) +} + +/** + * 删除报工表 + * @param {主键} pid + */ +export function delProReportwork(pid) { + return request({ + url: 'mes/productManagement/ProReportwork/' + pid, + method: 'delete' + }) +} + +/** + * 根据组id查看组员 + * @param {主键} pid + */ +export function GetPersonsList(id) { + return request({ + url: 'mes/productManagement/ProReportwork/get_persons', + method: 'get', + params: id + }) +} +/** + * 检查是否有报工记录，无记录则新增 + * @param {主键} pid + */ +export function manualGenerationReportwork(query) { + return request({ + url: 'mes/productManagement/ProReportwork/manual_generation_reportwork', + method: 'get', + params: query + }) +} diff --git a/src/views/productManagement/WorkReport/ProReportwork.vue b/src/views/productManagement/WorkReport/ProReportwork.vue new file mode 100644 index 0000000..a943a65 --- /dev/null +++ b/src/views/productManagement/WorkReport/ProReportwork.vue @@ -0,0 +1,367 @@ + + + + \ No newline at end of file