diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index 408fe5a..0a183bb 100644
--- a/src/api/mes/reportWork.js
+++ b/src/api/mes/reportWork.js
@@ -273,3 +273,16 @@ export function getPutInOrderList(workorderCode) {
data: data
});
}
+
+// 获取最新物料列表
+export function getNewPrepareData(workorderCode) {
+ const data = {
+ workorderCode
+ }
+ return request({
+ url: '/mes/reportWork/getNewPrepareData',
+ method: 'post',
+ data: data
+ });
+}
+
diff --git a/src/api/mes/reportWorkConsume.js b/src/api/mes/reportWorkConsume.js
index 97d685d..e9d3b3b 100644
--- a/src/api/mes/reportWorkConsume.js
+++ b/src/api/mes/reportWorkConsume.js
@@ -60,6 +60,16 @@ export function getConsumeList(query) {
params: query
});
}
+
+// 2.0查询各级报工损耗列表
+export function getAllLevelConsumeList(query) {
+ return request({
+ url: '/mes/reportWorkConsume/getAllLevelConsumeList',
+ method: 'get',
+ params: query
+ });
+}
+
// 提交报工物料损耗详细列表
export function submitConsumePS(data) {
return request({
@@ -85,3 +95,5 @@ export function getBomList(query) {
params: query
});
}
+
+
diff --git a/src/api/plan/workorder.js b/src/api/plan/workorder.js
index 0c9508d..5dae5ff 100644
--- a/src/api/plan/workorder.js
+++ b/src/api/plan/workorder.js
@@ -24,6 +24,15 @@ export function subChangeWorkOrder(data){
})
}
+// 提交修改工单接口
+export function subChangeWorkOrderPro(data){
+ return request({
+ url:'/plan/pro/workorder/subChangeWorkOrderPro',
+ method:'post',
+ data:data
+ })
+ }
+
// 通过子工单查询父工单对应的批次list
export function getWorkBatchList(data){
return request({
@@ -117,4 +126,4 @@ export function subChangeWorkOrderM(data){
method:'post',
data:data
})
- }
\ No newline at end of file
+ }
diff --git a/src/api/quality/qcGoal.js b/src/api/quality/qcGoal.js
new file mode 100644
index 0000000..672a328
--- /dev/null
+++ b/src/api/quality/qcGoal.js
@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询质量目标列表
+export function listQcGoal(query) {
+ return request({
+ url: '/quality/qcGoal/list',
+ method: 'get',
+ params: query
+ });
+}
+
+// 查询质量目标详细
+export function getQcGoal(id) {
+ return request({
+ url: '/quality/qcGoal/' + id,
+ method: 'get'
+ });
+}
+
+// 查询二级节点
+export function getChildrenList(parentId) {
+ return request({
+ url: '/quality/qcGoal/getChildrenList/' + parentId,
+ method: 'get'
+ });
+}
+
+
+
+// 新增质量目标
+export function addQcGoal(data) {
+ return request({
+ url: '/quality/qcGoal',
+ method: 'post',
+ data: data
+ });
+}
+
+// 修改质量目标
+export function updateQcGoal(data) {
+ return request({
+ url: '/quality/qcGoal',
+ method: 'put',
+ data: data
+ });
+}
+
+// 删除质量目标
+export function delQcGoal(id) {
+ return request({
+ url: '/quality/qcGoal/' + id,
+ method: 'delete'
+ });
+}
+
+export function getGenerate(id) {
+ return request({
+ url: '/quality/qcGoal/generate/' + id,
+ method: 'get',
+ });
+}
\ No newline at end of file
diff --git a/src/api/quality/qcGoalDistribute.js b/src/api/quality/qcGoalDistribute.js
new file mode 100644
index 0000000..77cde6b
--- /dev/null
+++ b/src/api/quality/qcGoalDistribute.js
@@ -0,0 +1,80 @@
+import request from '@/utils/request'
+
+// 查询质量目标分配列表
+export function listQcGoalDistribute(query) {
+ return request({
+ url: '/quality/qcGoalDistribute/list',
+ method: 'get',
+ params: query
+ });
+}
+
+// 查询质量目标分配详细
+export function getQcGoalDistribute(id) {
+ return request({
+ url: '/quality/qcGoalDistribute/' + id,
+ method: 'get'
+ });
+}
+
+// 修改质量目标分配
+export function updateQcGoalDistribute(data) {
+ return request({
+ url: '/quality/qcGoalDistribute',
+ method: 'put',
+ data: data
+ });
+}
+
+// 删除质量目标分配
+export function delQcGoalDistribute(id) {
+ return request({
+ url: '/quality/qcGoalDistribute/' + id,
+ method: 'delete'
+ });
+}
+
+// 查询用户物料未关联列表
+export function getLeftList(query) {
+ return request({
+ url: '/quality/qcGoalDistribute/getLeftList',
+ method: 'get',
+ params: query
+ });
+}
+
+// 查询用户物料已关联列表
+export function getRightList(query) {
+ return request({
+ url: '/quality/qcGoalDistribute/getRightList',
+ method: 'get',
+ params: query
+ });
+}
+
+export function addSupplier(data) {
+ return request({
+ url: '/quality/qcGoalDistribute',
+ method: 'post',
+ data: data
+ });
+}
+
+// 查询用户物料未关联列表
+export function getProductLeftList(query) {
+ return request({
+ url: '/quality/qcGoalDistribute/getProductLeftList',
+ method: 'get',
+ params: query
+ });
+}
+
+// 查询用户物料已关联列表
+export function getProductRightList(query) {
+ return request({
+ url: '/quality/qcGoalDistribute/getProductRightList',
+ method: 'get',
+ params: query
+ });
+}
+
diff --git a/src/api/quality/qcMarket.js b/src/api/quality/qcMarket.js
new file mode 100644
index 0000000..8f09759
--- /dev/null
+++ b/src/api/quality/qcMarket.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询市场不良检验任务列表
+export function listQcMarket(query) {
+ return request({
+ url: '/quality/qcMarket/list',
+ method: 'get',
+ params: query
+ });
+}
+
+// 查询市场不良检验任务详细
+export function getQcMarket(recordId) {
+ return request({
+ url: '/quality/qcMarket/' + recordId,
+ method: 'get'
+ });
+}
+
+// 新增市场不良检验任务
+export function addQcMarket(data) {
+ return request({
+ url: '/quality/qcMarket',
+ method: 'post',
+ data: data
+ });
+}
+
+// 修改市场不良检验任务
+export function updateQcMarket(data) {
+ return request({
+ url: '/quality/qcMarket',
+ method: 'put',
+ data: data
+ });
+}
+
+// 删除市场不良检验任务
+export function delQcMarket(recordId) {
+ return request({
+ url: '/quality/qcMarket/' + recordId,
+ method: 'delete'
+ });
+}
diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue
index 3758ed9..53f9ee2 100644
--- a/src/views/kanban/quality/kanban1.vue
+++ b/src/views/kanban/quality/kanban1.vue
@@ -60,7 +60,7 @@
- 今日已检数量
+ 今日已抽检数量
@@ -70,7 +70,7 @@
- 今日异常数量
+ 今日不良数量
@@ -92,7 +92,7 @@
- 本月异常数量
+ 本月不良数量
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 572bad5..0f7ae3e 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -61,7 +61,7 @@
-
+
-
+
@@ -506,15 +507,23 @@
-
-
-
+
+
+
+
+
-
+
@@ -522,26 +531,18 @@
-
-
-
-
-
-
-
-
-
-
+
-
+
+
-
+
diff --git a/src/views/mes/unitpriceReport/index.vue b/src/views/mes/unitpriceReport/index.vue
index ee57cc0..2462ff6 100644
--- a/src/views/mes/unitpriceReport/index.vue
+++ b/src/views/mes/unitpriceReport/index.vue
@@ -82,13 +82,18 @@
+
+
+
+
+
-
+
-
+
@@ -128,10 +133,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
@@ -143,7 +188,6 @@
-
diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue
index 445148b..8ebcaae 100644
--- a/src/views/quality/incomeReport/index.vue
+++ b/src/views/quality/incomeReport/index.vue
@@ -88,6 +88,7 @@
+
{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
diff --git a/src/views/quality/inventoryReport/index.vue b/src/views/quality/inventoryReport/index.vue
index fcb51b4..c712909 100644
--- a/src/views/quality/inventoryReport/index.vue
+++ b/src/views/quality/inventoryReport/index.vue
@@ -88,6 +88,7 @@
+
{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 8539413..6a747e0 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -11,18 +11,18 @@
>
-
+
-
+
@@ -100,6 +100,7 @@
+
{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index 008a1c2..5d0b65f 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -78,6 +78,7 @@
+
{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
diff --git a/src/views/quality/qcGoal/distribution.vue b/src/views/quality/qcGoal/distribution.vue
new file mode 100644
index 0000000..db29cc4
--- /dev/null
+++ b/src/views/quality/qcGoal/distribution.vue
@@ -0,0 +1,370 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.nookQualityRate }}%
+
+
+
+
+ {{ scope.row.nookRate }}%
+
+
+
+
+
+
+
+ {{ formatCheckType(scope.row.checkType) }}
+
+
+
+
+ 拆解
+ 修改
+ 删除
+ 分配供应商
+ 分配产品
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是否通用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.nookQualityRate }}%
+
+
+
+
+ {{ scope.row.nookRate }}%
+
+
+
+
+
+
+
+ {{ formatCheckType(scope.row.checkType) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+ 检验
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+