From 3a584014054dacfdbd35e7ef3f140b7ff21fbe68 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 15 Aug 2023 14:22:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=AE=A1=E7=90=86-=E7=94=9F?=
=?UTF-8?q?=E4=BA=A7=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/technology/process.js | 26 ++++++++++++++++++++++
src/views/technology/process/index.vue | 22 +++++++++++++++---
src/views/technology/process/single.vue | 6 ++---
src/views/technology/process/singleBom.vue | 5 +----
4 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/src/api/technology/process.js b/src/api/technology/process.js
index 5aa0f776..f7a1bd52 100644
--- a/src/api/technology/process.js
+++ b/src/api/technology/process.js
@@ -51,3 +51,29 @@ export function delProcess(processId) {
method: 'delete'
})
}
+
+// 查询设备管理列表
+export function listEquipment(query) {
+ return request({
+ url: '/technology/pro/process/selectEquipmentList',
+ method: 'get',
+ params: query
+ });
+}
+
+// 查询设备管理详细
+export function getEquipment(equipmentId) {
+ return request({
+ url: '/technology/pro/process/e/' + equipmentId,
+ method: 'get'
+ });
+}
+
+// 查询BOM物料管理列表
+export function listBom(query) {
+ return request({
+ url: '/technology/pro/process/bomList',
+ method: 'get',
+ params: query
+ });
+}
diff --git a/src/views/technology/process/index.vue b/src/views/technology/process/index.vue
index 1778f87f..1cb135f5 100644
--- a/src/views/technology/process/index.vue
+++ b/src/views/technology/process/index.vue
@@ -224,6 +224,23 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="参数1温度" prop="param1">
+ <el-input v-model="form.param1" type="input" placeholder="请输入温度" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="参数2湿度" prop="param2">
+ <el-input v-model="form.param2" type="input" placeholder="请输入湿度" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="参数3" prop="param3">
+ <el-input v-model="form.param3" type="input" placeholder="请输入参数3" />
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="工序SOP" prop="fileList">
@@ -334,8 +351,7 @@
</template>
<script>
-import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/technology/process";
-import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment";
+import { listProcess, getProcess, delProcess, addProcess, updateProcess ,listEquipment,getEquipment} from "@/api/technology/process";
import Processcontent from "./content.vue";
import ItemSelect from "./single.vue";
@@ -382,7 +398,7 @@ export default {
// 显示搜索条件
showSearch: true,
// 总条数
- total: 0,
+ total:0,
// 生产工序表格数据
processList:[],
equipmentList:[],
diff --git a/src/views/technology/process/single.vue b/src/views/technology/process/single.vue
index ae9da398..209dbe26 100644
--- a/src/views/technology/process/single.vue
+++ b/src/views/technology/process/single.vue
@@ -64,7 +64,7 @@
</el-table>
<pagination
- v-show="total>0"
+ v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@@ -80,7 +80,7 @@
</template>
<script>
-import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment";
+import { listProcess, getProcess, delProcess, addProcess, updateProcess ,listEquipment,getEquipment} from "@/api/technology/process";
import { treeselect } from "@/api/wms/equipment";
// import Treeselect from "@riophae/vue-treeselect";
// import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -122,7 +122,7 @@ export default {
// 显示搜索条件
showSearch: true,
// 总条数
- total: 0,
+ total:0,
// 设备产品表格数据
itemList: null,
// 树选项
diff --git a/src/views/technology/process/singleBom.vue b/src/views/technology/process/singleBom.vue
index f14e51bd..126ba54a 100644
--- a/src/views/technology/process/singleBom.vue
+++ b/src/views/technology/process/singleBom.vue
@@ -78,10 +78,7 @@
</template>
<script>
-import { listBom, getBom, delBom, addBom, updateBom } from "@/api/wms/bom";
-// import Treeselect from "@riophae/vue-treeselect";
-// import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
+import {listBom} from "@/api/technology/process";
export default {
name: "ItemSingleBom",
// components: { Treeselect },