diff --git a/klp-ui/src/api/mes/is/inspectionCommission.js b/klp-ui/src/api/mes/is/inspectionCommission.js deleted file mode 100644 index bcd4bca7..00000000 --- a/klp-ui/src/api/mes/is/inspectionCommission.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询检验委托单表列表 -export function listInspectionCommission(query) { - return request({ - url: '/is/inspectionCommission/list', - method: 'get', - params: query - }) -} - -// 查询检验委托单表详细 -export function getInspectionCommission(commissionId) { - return request({ - url: '/is/inspectionCommission/' + commissionId, - method: 'get' - }) -} - -// 新增检验委托单表 -export function addInspectionCommission(data) { - return request({ - url: '/is/inspectionCommission', - method: 'post', - data: data - }) -} - -// 修改检验委托单表 -export function updateInspectionCommission(data) { - return request({ - url: '/is/inspectionCommission', - method: 'put', - data: data - }) -} - -// 删除检验委托单表 -export function delInspectionCommission(commissionId) { - return request({ - url: '/is/inspectionCommission/' + commissionId, - method: 'delete' - }) -} diff --git a/klp-ui/src/api/mes/is/inspectionTask.js b/klp-ui/src/api/mes/is/inspectionTask.js deleted file mode 100644 index ef38aa8c..00000000 --- a/klp-ui/src/api/mes/is/inspectionTask.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询检验任务表列表 -export function listInspectionTask(query) { - return request({ - url: '/is/inspectionTask/list', - method: 'get', - params: query - }) -} - -// 查询检验任务表详细 -export function getInspectionTask(taskId) { - return request({ - url: '/is/inspectionTask/' + taskId, - method: 'get' - }) -} - -// 新增检验任务表 -export function addInspectionTask(data) { - return request({ - url: '/is/inspectionTask', - method: 'post', - data: data - }) -} - -// 修改检验任务表 -export function updateInspectionTask(data) { - return request({ - url: '/is/inspectionTask', - method: 'put', - data: data - }) -} - -// 删除检验任务表 -export function delInspectionTask(taskId) { - return request({ - url: '/is/inspectionTask/' + taskId, - method: 'delete' - }) -} diff --git a/klp-ui/src/api/mes/is/sampleInventory.js b/klp-ui/src/api/mes/is/sampleInventory.js deleted file mode 100644 index a496937a..00000000 --- a/klp-ui/src/api/mes/is/sampleInventory.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询样品库存表列表 -export function listSampleInventory(query) { - return request({ - url: '/is/sampleInventory/list', - method: 'get', - params: query - }) -} - -// 查询样品库存表详细 -export function getSampleInventory(sampleId) { - return request({ - url: '/is/sampleInventory/' + sampleId, - method: 'get' - }) -} - -// 新增样品库存表 -export function addSampleInventory(data) { - return request({ - url: '/is/sampleInventory', - method: 'post', - data: data - }) -} - -// 修改样品库存表 -export function updateSampleInventory(data) { - return request({ - url: '/is/sampleInventory', - method: 'put', - data: data - }) -} - -// 删除样品库存表 -export function delSampleInventory(sampleId) { - return request({ - url: '/is/sampleInventory/' + sampleId, - method: 'delete' - }) -} diff --git a/klp-ui/src/api/mes/qc/inspectionDetail.js b/klp-ui/src/api/mes/qc/inspectionDetail.js new file mode 100644 index 00000000..2734690c --- /dev/null +++ b/klp-ui/src/api/mes/qc/inspectionDetail.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询检验项目明细列表 +export function listInspectionDetail(query) { + return request({ + url: '/wms/inspectionDetail/list', + method: 'get', + params: query + }) +} + +// 查询检验项目明细详细 +export function getInspectionDetail(detailId) { + return request({ + url: '/wms/inspectionDetail/' + detailId, + method: 'get' + }) +} + +// 新增检验项目明细 +export function addInspectionDetail(data) { + return request({ + url: '/wms/inspectionDetail', + method: 'post', + data: data + }) +} + +// 修改检验项目明细 +export function updateInspectionDetail(data) { + return request({ + url: '/wms/inspectionDetail', + method: 'put', + data: data + }) +} + +// 删除检验项目明细 +export function delInspectionDetail(detailId) { + return request({ + url: '/wms/inspectionDetail/' + detailId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/mes/qc/inspectionMain.js b/klp-ui/src/api/mes/qc/inspectionMain.js new file mode 100644 index 00000000..d0b9f3a7 --- /dev/null +++ b/klp-ui/src/api/mes/qc/inspectionMain.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询检验主列表 +export function listInspectionMain(query) { + return request({ + url: '/wms/inspectionMain/list', + method: 'get', + params: query + }) +} + +// 查询检验主详细 +export function getInspectionMain(mainId) { + return request({ + url: '/wms/inspectionMain/' + mainId, + method: 'get' + }) +} + +// 新增检验主 +export function addInspectionMain(data) { + return request({ + url: '/wms/inspectionMain', + method: 'post', + data: data + }) +} + +// 修改检验主 +export function updateInspectionMain(data) { + return request({ + url: '/wms/inspectionMain', + method: 'put', + data: data + }) +} + +// 删除检验主 +export function delInspectionMain(mainId) { + return request({ + url: '/wms/inspectionMain/' + mainId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/mes/qc/inspectionTensile.js b/klp-ui/src/api/mes/qc/inspectionTensile.js new file mode 100644 index 00000000..b9a36a4c --- /dev/null +++ b/klp-ui/src/api/mes/qc/inspectionTensile.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询金属材料室温拉伸试验主记录列表 +export function listInspectionTensile(query) { + return request({ + url: '/wms/inspectionTensile/list', + method: 'get', + params: query + }) +} + +// 查询金属材料室温拉伸试验主记录详细 +export function getInspectionTensile(testId) { + return request({ + url: '/wms/inspectionTensile/' + testId, + method: 'get' + }) +} + +// 新增金属材料室温拉伸试验主记录 +export function addInspectionTensile(data) { + return request({ + url: '/wms/inspectionTensile', + method: 'post', + data: data + }) +} + +// 修改金属材料室温拉伸试验主记录 +export function updateInspectionTensile(data) { + return request({ + url: '/wms/inspectionTensile', + method: 'put', + data: data + }) +} + +// 删除金属材料室温拉伸试验主记录 +export function delInspectionTensile(testId) { + return request({ + url: '/wms/inspectionTensile/' + testId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/mes/qc/inspectionTensileDetail.js b/klp-ui/src/api/mes/qc/inspectionTensileDetail.js new file mode 100644 index 00000000..c790fda3 --- /dev/null +++ b/klp-ui/src/api/mes/qc/inspectionTensileDetail.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询金属材料室温拉伸试验样品明细列表 +export function listInspectionTensileDetail(query) { + return request({ + url: '/wms/inspectionTensileDetail/list', + method: 'get', + params: query + }) +} + +// 查询金属材料室温拉伸试验样品明细详细 +export function getInspectionTensileDetail(detailId) { + return request({ + url: '/wms/inspectionTensileDetail/' + detailId, + method: 'get' + }) +} + +// 新增金属材料室温拉伸试验样品明细 +export function addInspectionTensileDetail(data) { + return request({ + url: '/wms/inspectionTensileDetail', + method: 'post', + data: data + }) +} + +// 修改金属材料室温拉伸试验样品明细 +export function updateInspectionTensileDetail(data) { + return request({ + url: '/wms/inspectionTensileDetail', + method: 'put', + data: data + }) +} + +// 删除金属材料室温拉伸试验样品明细 +export function delInspectionTensileDetail(detailId) { + return request({ + url: '/wms/inspectionTensileDetail/' + detailId, + method: 'delete' + }) +} diff --git a/klp-ui/src/views/mes/is/inspectionCommission/index.vue b/klp-ui/src/views/mes/is/inspectionCommission/index.vue deleted file mode 100644 index 8ce5ae1b..00000000 --- a/klp-ui/src/views/mes/is/inspectionCommission/index.vue +++ /dev/null @@ -1,402 +0,0 @@ - - - diff --git a/klp-ui/src/views/mes/is/inspectionTask/index.vue b/klp-ui/src/views/mes/is/inspectionTask/index.vue deleted file mode 100644 index 4553664f..00000000 --- a/klp-ui/src/views/mes/is/inspectionTask/index.vue +++ /dev/null @@ -1,368 +0,0 @@ - - - diff --git a/klp-ui/src/views/mes/is/sampleInventory/index.vue b/klp-ui/src/views/mes/is/sampleInventory/index.vue deleted file mode 100644 index 5e18f7ed..00000000 --- a/klp-ui/src/views/mes/is/sampleInventory/index.vue +++ /dev/null @@ -1,338 +0,0 @@ - - - diff --git a/klp-ui/src/views/mes/qc/inspectionSample/index.vue b/klp-ui/src/views/mes/qc/inspectionSample/index.vue new file mode 100644 index 00000000..84b709ae --- /dev/null +++ b/klp-ui/src/views/mes/qc/inspectionSample/index.vue @@ -0,0 +1,529 @@ + + + + + diff --git a/klp-ui/src/views/mes/qc/inspectionTensile/index.vue b/klp-ui/src/views/mes/qc/inspectionTensile/index.vue new file mode 100644 index 00000000..faac98dd --- /dev/null +++ b/klp-ui/src/views/mes/qc/inspectionTensile/index.vue @@ -0,0 +1,1115 @@ + + + + + diff --git a/klp-ui/src/views/mes/qc/template/index.vue b/klp-ui/src/views/mes/qc/template/index.vue index 17f98db6..7e1761b6 100644 --- a/klp-ui/src/views/mes/qc/template/index.vue +++ b/klp-ui/src/views/mes/qc/template/index.vue @@ -59,9 +59,6 @@ - - - @@ -72,26 +69,6 @@ - - - - - - - {{ item.itemName }} - - ({{ item.qualitativeQuantitative === 0 ? '定性' : '定量' }}) - - - - - - - - @@ -129,9 +106,9 @@ - 添加现有检查项 - 新建检查项 - 快捷创建检验任务 + + 添加检查项 + diff --git a/klp-ui/src/views/wms/todo/index.vue b/klp-ui/src/views/wms/todo/index.vue index 2ec45127..ae0afe32 100644 --- a/klp-ui/src/views/wms/todo/index.vue +++ b/klp-ui/src/views/wms/todo/index.vue @@ -3,9 +3,9 @@ - + @@ -20,7 +20,7 @@