From 39da99ddf2d09ccc476d91dd8b6aa3c18fad8f17 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Wed, 1 Sep 2021 10:54:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E8=89=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
hb_client/src/api/equipment.js | 6 +
hb_client/src/api/mtm.js | 97 +++-
hb_client/src/router/index.js | 8 +
hb_client/src/views/mtm/material.vue | 44 +-
hb_client/src/views/mtm/process.vue | 24 +-
hb_client/src/views/mtm/productprocess.vue | 637 ++++++++++++++++++---
hb_client/src/views/mtm/step.vue | 42 +-
hb_client/src/views/mtm/stepdo.vue | 62 ++
8 files changed, 834 insertions(+), 86 deletions(-)
create mode 100644 hb_client/src/views/mtm/stepdo.vue
diff --git a/hb_client/src/api/equipment.js b/hb_client/src/api/equipment.js
index 6b67c5b..0256eb9 100644
--- a/hb_client/src/api/equipment.js
+++ b/hb_client/src/api/equipment.js
@@ -7,6 +7,12 @@ export function getpEquipmentList(query) {
params: query
})
}
+export function getEquipmentAll() {
+ return request({
+ url: '/em/equipment/',
+ method: 'get'
+ })
+}
export function createEquipment(data) {
return request({
url: '/em/equipment/',
diff --git a/hb_client/src/api/mtm.js b/hb_client/src/api/mtm.js
index b8ce267..92a05dc 100644
--- a/hb_client/src/api/mtm.js
+++ b/hb_client/src/api/mtm.js
@@ -14,6 +14,12 @@ export function createMaterial(data) {
data
})
}
+export function getMaterial(id) {
+ return request({
+ url: `/mtm/material/${id}/`,
+ method: 'get'
+ })
+}
export function updateMaterial(id, data) {
return request({
url: `/mtm/material/${id}/`,
@@ -64,7 +70,12 @@ export function getStepList(id) {
method: 'get'
})
}
-
+export function getStep(id) {
+ return request({
+ url: `/mtm/step/${id}/`,
+ method: 'get'
+ })
+}
export function createStep(data) {
return request({
url: '/mtm/step/',
@@ -114,4 +125,88 @@ export function deleteProductprocess(id, data) {
method: 'delete',
data
})
+}
+//输入物料
+
+export function getInputmaterialList(query) {
+ return request({
+ url: '/mtm/inputmaterial/',
+ method: 'get',
+ params: query
+ })
+}
+export function createInputmaterial(data) {
+ return request({
+ url: '/mtm/inputmaterial/',
+ method: 'post',
+ data
+ })
+}
+export function updateInputmaterial(id, data) {
+ return request({
+ url: `/mtm/inputmaterial/${id}/`,
+ method: 'put',
+ data
+ })
+}
+export function deleteInputmaterial(id, data) {
+ return request({
+ url: `/mtm/inputmaterial/${id}/`,
+ method: 'delete',
+ data
+ })
+}
+//输出物料
+
+export function getOutputmaterialList(query) {
+ return request({
+ url: '/mtm/outputmaterial/',
+ method: 'get',
+ params: query
+ })
+}
+export function createOutputmaterial(data) {
+ return request({
+ url: '/mtm/outputmaterial/',
+ method: 'post',
+ data
+ })
+}
+export function updateOutputmaterial(id, data) {
+ return request({
+ url: `/mtm/outputmaterial/${id}/`,
+ method: 'put',
+ data
+ })
+}
+export function deleteOutputmaterial(id, data) {
+ return request({
+ url: `/mtm/outputmaterial/${id}/`,
+ method: 'delete',
+ data
+ })
+}
+//子工序
+//输出物料
+
+export function getUsedstepList(query) {
+ return request({
+ url: '/mtm/usedstep/',
+ method: 'get',
+ params: query
+ })
+}
+export function createUsedstep(data) {
+ return request({
+ url: '/mtm/usedstep/',
+ method: 'post',
+ data
+ })
+}
+export function deleteUsedstep(id, data) {
+ return request({
+ url: `/mtm/usedstep/${id}/`,
+ method: 'delete',
+ data
+ })
}
\ No newline at end of file
diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js
index 0ed6d97..924dfbc 100644
--- a/hb_client/src/router/index.js
+++ b/hb_client/src/router/index.js
@@ -122,6 +122,14 @@ export const asyncRoutes = [
component: () => import('@/views/mtm/step.vue'),
meta: { title: '子工序', perms: ['vendor_manage'] },
hidden: true
+ }
+ ,
+ {
+ path: 'stepdo/:id',
+ name: 'StepDo',
+ component: () => import('@/views/mtm/stepdo.vue'),
+ meta: { title: '子工序查看', perms: ['vendor_manage'] },
+ hidden: true
},
{
path: '/mtm/productprocess/',
diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue
index 562a81e..06c5182 100644
--- a/hb_client/src/views/mtm/material.vue
+++ b/hb_client/src/views/mtm/material.vue
@@ -56,7 +56,9 @@
{{ scope.row.number }}
-
+
+ {{ scope.row.unit }}
+
-
+
+
+
+
+
+
@@ -118,6 +129,14 @@
+
+
+
@@ -131,7 +150,7 @@
@@ -219,4 +723,7 @@ export default {
border-radius: 4px;
min-height: 36px;
}
+ .box-card{
+ height:130px;
+ }
\ No newline at end of file
diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index 6240c91..19f8556 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -36,8 +36,8 @@
操作查看
-
+
+
+
+
+
+
+
@@ -96,7 +106,7 @@
+
\ No newline at end of file