From 5d549525ad2d422ae9af4063f2dcd1f914841ba2 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Thu, 12 May 2022 16:06:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=99=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/mes/md/workstationmachine.js | 44 +++
src/components/itemSelect/index.vue | 2 +-
src/components/machinerySelect/index.vue | 251 ++++++++++++++++
src/components/machinerySelect/single.vue | 268 ++++++++++++++++++
.../mes/md/workstation/components/machine.vue | 146 ++++++++++
src/views/mes/md/workstation/index.vue | 71 ++++-
6 files changed, 775 insertions(+), 7 deletions(-)
create mode 100644 src/api/mes/md/workstationmachine.js
create mode 100644 src/components/machinerySelect/index.vue
create mode 100644 src/components/machinerySelect/single.vue
create mode 100644 src/views/mes/md/workstation/components/machine.vue
diff --git a/src/api/mes/md/workstationmachine.js b/src/api/mes/md/workstationmachine.js
new file mode 100644
index 0000000..78b2b46
--- /dev/null
+++ b/src/api/mes/md/workstationmachine.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备资源列表
+export function listWorkstationmachine(query) {
+ return request({
+ url: '/mes/md/workstationmachine/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询设备资源详细
+export function getWorkstationmachine(recordId) {
+ return request({
+ url: '/mes/md/workstationmachine/' + recordId,
+ method: 'get'
+ })
+}
+
+// 新增设备资源
+export function addWorkstationmachine(data) {
+ return request({
+ url: '/mes/md/workstationmachine',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改设备资源
+export function updateWorkstationmachine(data) {
+ return request({
+ url: '/mes/md/workstationmachine',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除设备资源
+export function delWorkstationmachine(recordId) {
+ return request({
+ url: '/mes/md/workstationmachine/' + recordId,
+ method: 'delete'
+ })
+}
diff --git a/src/components/itemSelect/index.vue b/src/components/itemSelect/index.vue
index 3494739..282ae3f 100644
--- a/src/components/itemSelect/index.vue
+++ b/src/components/itemSelect/index.vue
@@ -103,7 +103,7 @@ import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
- name: "MdItem",
+ name: "MdItemSelect",
dicts: ['sys_yes_no','mes_item_product'],
components: { Treeselect },
data() {
diff --git a/src/components/machinerySelect/index.vue b/src/components/machinerySelect/index.vue
new file mode 100644
index 0000000..4efe764
--- /dev/null
+++ b/src/components/machinerySelect/index.vue
@@ -0,0 +1,251 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/machinerySelect/single.vue b/src/components/machinerySelect/single.vue
new file mode 100644
index 0000000..a33f72d
--- /dev/null
+++ b/src/components/machinerySelect/single.vue
@@ -0,0 +1,268 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ {{""}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/mes/md/workstation/components/machine.vue b/src/views/mes/md/workstation/components/machine.vue
new file mode 100644
index 0000000..1369240
--- /dev/null
+++ b/src/views/mes/md/workstation/components/machine.vue
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
diff --git a/src/views/mes/md/workstation/index.vue b/src/views/mes/md/workstation/index.vue
index d7d3ff1..34db728 100644
--- a/src/views/mes/md/workstation/index.vue
+++ b/src/views/mes/md/workstation/index.vue
@@ -103,7 +103,7 @@
-
+
-
+
@@ -233,10 +233,45 @@
+ 工作站资源
+
+
+
+
+
+
+
+ 设备资源
+ 新增
+
+
+
+
+
+
+
+ 人力资源
+ 新增
+
+ 人员清单
+
+
+
+
+
+ 工装夹具
+ 新增
+
+ 工装夹具清单
+
+
+
+
+
@@ -244,12 +279,23 @@