From 3c339c9b699ad95b4f664159f31e1e53913bc66a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
<411641505@qq.com>
Date: Fri, 6 Sep 2024 11:19:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8D=95=E4=BD=8D=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/itemBomSelect/single.vue | 3 ++-
src/components/itemSelect/index.vue | 2 +-
src/components/itemSelect/single.vue | 2 +-
src/views/mes/md/mditem/index.vue | 10 +++++++---
src/views/mes/pro/workorder/index.vue | 2 +-
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/components/itemBomSelect/single.vue b/src/components/itemBomSelect/single.vue
index 06fc555..fad1a14 100644
--- a/src/components/itemBomSelect/single.vue
+++ b/src/components/itemBomSelect/single.vue
@@ -15,7 +15,7 @@
-
+
@@ -74,6 +74,7 @@
bomItemName: null,
bomItemSpec: null,
unitOfMeasure: null,
+ unitName: null,
quantity: null,
enableFlag: null,
attr1: null,
diff --git a/src/components/itemSelect/index.vue b/src/components/itemSelect/index.vue
index 282ae3f..383aaac 100644
--- a/src/components/itemSelect/index.vue
+++ b/src/components/itemSelect/index.vue
@@ -63,7 +63,7 @@
-
+
diff --git a/src/components/itemSelect/single.vue b/src/components/itemSelect/single.vue
index 65fec35..ab1452c 100644
--- a/src/components/itemSelect/single.vue
+++ b/src/components/itemSelect/single.vue
@@ -67,7 +67,7 @@
-
+
diff --git a/src/views/mes/md/mditem/index.vue b/src/views/mes/md/mditem/index.vue
index f96c4a3..f7d7aa7 100644
--- a/src/views/mes/md/mditem/index.vue
+++ b/src/views/mes/md/mditem/index.vue
@@ -122,7 +122,7 @@
-
+
@@ -336,7 +336,9 @@
-
+
+
+
@@ -385,6 +387,7 @@ import { listMdItem, getMdItem, delMdItem, addMdItem, updateMdItem} from "@/api/
import ItemBom from "./components/itembom.vue";
import SOPTab from "./components/sop.vue"
+import SIPTab from "./components/sip.vue"
import { listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
import {genCode} from "@/api/system/autocode/rule"
import { getToken } from "@/utils/auth";
@@ -396,7 +399,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "MdItem",
dicts: ['sys_yes_no','mes_item_product'],
- components: { Treeselect,ItemBom,SOPTab },
+ components: { Treeselect,ItemBom,SOPTab,SIPTab },
data() {
return {
// 遮罩层
@@ -552,6 +555,7 @@ export default {
itemName: undefined,
specification: undefined,
unitOfMeasrue: undefined,
+ unitName: undefined,
enableFlag: undefined,
itemOrProduct: undefined,
enableFlag: 'Y',
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index fc7a94e..472a923 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -720,7 +720,7 @@ export default {
this.form.productCode = obj.itemCode;
this.form.productName = obj.itemName;
this.form.productSpc = obj.specification;
- this.form.unitOfMeasure = obj.unitOfMeasure;
+ this.form.unitOfMeasure = obj.unitName;
}
},
//客户选择弹出框