diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js index 07c3792e..87f60379 100644 --- a/src/api/mes/reportWork.js +++ b/src/api/mes/reportWork.js @@ -154,4 +154,13 @@ export function getMesListBom(query) { method: 'get', params: query }); - } \ No newline at end of file + } + + // 查询物料管理列表 +// export function getTeamList() { +// return request({ +// url: '/mes/reportWorkConsume/getTeamList', +// method: 'get' +// }); +// } + \ No newline at end of file diff --git a/src/api/quality/incomeReport.js b/src/api/quality/incomeReport.js new file mode 100644 index 00000000..6e41a14c --- /dev/null +++ b/src/api/quality/incomeReport.js @@ -0,0 +1,93 @@ +import request from '@/utils/request' + +// 查询来料报告列表 +export function listIncome(query) { + return request({ + url: '/quality/qcIncomeReport/list', + method: 'get', + params: query + }); +} + +// 查询来料报告详细 +export function getIncome(recordId) { + return request({ + url: '/quality/qcIncomeReport/' + recordId, + method: 'get' + }); +} + +// 新增来料报告 +export function addIncome(data) { + return request({ + url: '/quality/qcIncomeReport', + method: 'post', + data: data + }); +} + +// 修改来料报告 +export function updateIncome(data) { + return request({ + url: '/quality/qcIncomeReport', + method: 'put', + data: data + }); +} + +// 删除来料报告 +export function delIncome(recordId) { + return request({ + url: '/quality/qcIncomeReport/' + recordId, + method: 'delete' + }); +} + +// 查询BOM物料管理列表 +export function getQcListBom(query) { + return request({ + url: '/quality/qcIncomeReport/getQcListBom', + method: 'get', + params: query + }); + } + +// 查询供应商管理列表 +export function getQcListSupplier(query) { + return request({ + url: '/quality/qcIncomeReport/getQcListSupplier', + method: 'get', + params: query + }); + } + +// 查询人员列表 +export function getQcListUser(query) { + return request({ + url: '/quality/qcIncomeReport/getQcListUser', + method: 'get', + params: query + }); + } + +//状态修改 +export function changeIncomeStatus(recordId, status) { + const data = { + recordId, + status + } + return request({ + url: '/quality/qcIncomeReport/changeIncomeStatus', + method: 'put', + data: data + }) + } + +// 查询检测项列表 +export function getCkeckProjectList(query) { + return request({ + url: '/quality/qcIncomeReport/getCkeckProjectList', + method: 'get', + params: query + }); + } diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index a7df400c..116ad708 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -309,11 +309,18 @@ /> + @@ -434,6 +441,7 @@ export default { {"dictLabel":"报工成功","dictValue":"1"}, {"dictLabel":"报工失败","dictValue":"2"} ], + teamList:[], // 表单校验 rules: { workorderCode:[ @@ -447,16 +455,17 @@ export default { ], machineName: [ { required: true, message: "本次报工线体不能为空", trigger: "blur" } - ], - teamCode: [ - { required: true, message: "本次报工班组不能为空", trigger: "blur" } - ], + ] + //,teamCode: [ + // { required: true, message: "本次报工班组不能为空", trigger: "blur" } + //], } }; }, created() { this.getList(); this.getDate(); + //this.getTeamList(); }, methods: { //产品编码格式化 @@ -464,6 +473,13 @@ export default { return cellValue.slice(7,18); //返回值 }, + //获取班组下拉列表 + //getTeamList(){ + // getTeamList().then(response => { + // this.teamList = response; + // }); + //}, + /**获取默认查询时间段**/ getDate() { let start = this.Fungetdate (0) diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue new file mode 100644 index 00000000..3ad1b3b7 --- /dev/null +++ b/src/views/quality/incomeReport/index.vue @@ -0,0 +1,518 @@ + + + + \ No newline at end of file