diff --git a/src/api/base/orderManage.js b/src/api/base/orderManage.js index 07ec1c70..2c4a59c8 100644 --- a/src/api/base/orderManage.js +++ b/src/api/base/orderManage.js @@ -173,3 +173,26 @@ export function orderSplit(data) { data }) } + +export function getDetailTree(data) { + return request({ + url: 'base/order/getDetailTree', + method: 'get', + params: data + }) +} +export function getDetailTreeInfo(data) { + return request({ + url: 'base/order/getDetailTreeInfoById', + method: 'get', + params: data + }) +} + +export function orderStop(data) { + return request({ + url: 'base/order/stop', + method: 'post', + params: data + }) +} diff --git a/src/assets/icons/svg/back.svg b/src/assets/icons/svg/back.svg new file mode 100644 index 00000000..004c51b6 --- /dev/null +++ b/src/assets/icons/svg/back.svg @@ -0,0 +1,27 @@ + + + rollback + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/produce/order/base/orderManage/components/orderAdd.vue b/src/views/produce/order/base/orderManage/components/orderAdd.vue index c62a909f..437dcbf5 100644 --- a/src/views/produce/order/base/orderManage/components/orderAdd.vue +++ b/src/views/produce/order/base/orderManage/components/orderAdd.vue @@ -89,6 +89,7 @@ export default { id: '', name: '', code: '', + grade:1, planQuantity: '', planProductId: '', specifications:undefined, diff --git a/src/views/produce/order/base/orderManage/components/orderNum.vue b/src/views/produce/order/base/orderManage/components/orderNum.vue new file mode 100644 index 00000000..c4981fcd --- /dev/null +++ b/src/views/produce/order/base/orderManage/components/orderNum.vue @@ -0,0 +1,37 @@ + + + diff --git a/src/views/produce/order/base/orderManage/index.vue b/src/views/produce/order/base/orderManage/index.vue index 59b17361..7a0c96cc 100644 --- a/src/views/produce/order/base/orderManage/index.vue +++ b/src/views/produce/order/base/orderManage/index.vue @@ -31,9 +31,10 @@ diff --git a/src/views/produce/workOrder/detail.vue b/src/views/produce/workOrder/detail.vue index d3859ebf..3b83d114 100644 --- a/src/views/produce/workOrder/detail.vue +++ b/src/views/produce/workOrder/detail.vue @@ -1,155 +1,175 @@ - diff --git a/src/views/produce/workOrder/workOrderNav.vue b/src/views/produce/workOrder/workOrderNav.vue new file mode 100644 index 00000000..ec754008 --- /dev/null +++ b/src/views/produce/workOrder/workOrderNav.vue @@ -0,0 +1,151 @@ + + + + + + + diff --git a/src/views/quality/currentData/hourData.vue b/src/views/quality/currentData/hourData.vue index 69827e64..ac876041 100644 --- a/src/views/quality/currentData/hourData.vue +++ b/src/views/quality/currentData/hourData.vue @@ -1,3 +1,10 @@ +