@@ -1066,6 +1075,8 @@ export default {
searchData: {
site: this.$store.state.user.site,
partNo: '',
+ plmPartNo: '',
+ ifsPartNo: '',
partDesc: '',
routingType:'',
routingRevision:'',
@@ -1165,6 +1176,8 @@ export default {
partData: {
site: this.$store.state.user.site,
partNo: '',
+ plmPartNo: '',
+ ifsPartNo: '',
partDesc: '',
page: 1,
limit: 10
@@ -1304,6 +1317,8 @@ export default {
type: '',
site: this.$store.state.user.site,
partNo: '',
+ plmPartNo: '',
+ ifsPartNo: '',
partDesc: '',
page: 1,
limit: 10
@@ -1327,13 +1342,31 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 104003,
- serialNumber: '104003Table1PartNo',
+ serialNumber: '104003Table1PlmPartNo',
+ tableId: '104003Table1',
+ tableName: 'Routing信息表',
+ columnProp: 'plmPartNo',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: 'PLM物料编码',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 120
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 104003,
+ serialNumber: '104003Table1IfsPartNo',
tableId: '104003Table1',
tableName: 'Routing信息表',
- columnProp: 'partNo',
+ columnProp: 'ifsPartNo',
headerAlign: 'center',
align: 'center',
- columnLabel: '物料编码',
+ columnLabel: 'IFS物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -1471,10 +1504,21 @@ export default {
],
partColumnList: [
{
- columnProp: 'partNo',
+ columnProp: 'plmPartNo',
headerAlign: "center",
align: "center",
- columnLabel: '物料编码',
+ columnLabel: 'PLM物料编码',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 120
+ },
+ {
+ columnProp: 'ifsPartNo',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: 'IFS物料编码',
columnHidden: false,
columnImage: false,
status: true,
@@ -2277,10 +2321,21 @@ export default {
],
componentPartColumnList: [
{
- columnProp: 'partNo',
+ columnProp: 'plmPartNo',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: 'PLM物料编码',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 100
+ },
+ {
+ columnProp: 'ifsPartNo',
headerAlign: "center",
align: "center",
- columnLabel: '物料编码',
+ columnLabel: 'IFS物料编码',
columnHidden: false,
columnImage: false,
status: true,
@@ -3872,6 +3927,8 @@ export default {
type: '1',
site: this.$store.state.user.site,
partNo: '',
+ plmPartNo: '',
+ ifsPartNo: '',
partDesc: '',
page: 1,
limit: 10
@@ -3952,6 +4009,8 @@ export default {
type: '2',
site: this.$store.state.user.site,
partNo: '',
+ plmPartNo: '',
+ ifsPartNo: '',
partDesc: '',
page: 1,
limit: 10
diff --git a/src/views/modules/part/routingWorkGuidelines.vue b/src/views/modules/part/routingWorkGuidelines.vue
index 47b7265..440de84 100644
--- a/src/views/modules/part/routingWorkGuidelines.vue
+++ b/src/views/modules/part/routingWorkGuidelines.vue
@@ -2,8 +2,11 @@
-
-
+
+
+
+
+
@@ -121,6 +124,8 @@ export default {
searchData: {
site: this.$store.state.user.site,
partNo: '',
+ plmPartNo: '',
+ ifsPartNo: '',
partDesc: '',
routingType: '',
routingRevision: '',
@@ -144,13 +149,31 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 104011,
- serialNumber: '104011Table1PartNo',
+ serialNumber: '104011Table1PlmPartNo',
+ tableId: '104011Table1',
+ tableName: 'Routing表',
+ columnProp: 'plmPartNo',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: 'PLM物料编码',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 120
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 104011,
+ serialNumber: '104011Table1IfsPartNo',
tableId: '104011Table1',
tableName: 'Routing表',
- columnProp: 'partNo',
+ columnProp: 'ifsPartNo',
headerAlign: 'center',
align: 'center',
- columnLabel: '物料编码',
+ columnLabel: 'IFS物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue
index a33d900..39ff741 100644
--- a/src/views/modules/project/projectInfo/com_project_info_part.vue
+++ b/src/views/modules/project/projectInfo/com_project_info_part.vue
@@ -1388,6 +1388,10 @@ import {
customerNo: '',
buNo: '',
buDesc: '',
+ plmPartNo: '',
+ ifsPartNo: '',
+ showInQueryFlag: '',
+ temporaryPartFlag: '',
},
modalFlag: false,
modalDisableFlag: false,
@@ -2003,7 +2007,11 @@ import {
partNoSource: '料号新增',
buNo: '',
buDesc: '',
- partItemList: []
+ partItemList: [],
+ plmPartNo: '',
+ ifsPartNo: '',
+ showInQueryFlag: 'Y',
+ temporaryPartFlag: 'Y',
}
this.partItemList = []
this.modalFlag = true
@@ -2122,7 +2130,11 @@ import {
customerNo: this.searchData.customerId,
buNo: data.rows.buNo,
buDesc: data.rows.buDesc,
- partItemList: []
+ partItemList: [],
+ plmPartNo: row.plmPartNo,
+ ifsPartNo: row.ifsPartNo,
+ showInQueryFlag: row.showInQueryFlag,
+ temporaryPartFlag: row.temporaryPartFlag,
}
this.getPartCharacteristicList(row.testPartNo)
this.modalFlag = true
@@ -2241,7 +2253,11 @@ import {
partNoSource: '料号复制',
buNo: '',
buDesc: '',
- partItemList: []
+ partItemList: [],
+ plmPartNo: row.plmPartNo,
+ ifsPartNo: row.ifsPartNo,
+ showInQueryFlag: row.showInQueryFlag,
+ temporaryPartFlag: row.temporaryPartFlag,
}
this.getPartCharacteristicList(row.testPartNo)
this.modalFlag = true
diff --git a/src/views/modules/project/projectPart/searchProjectPart.vue b/src/views/modules/project/projectPart/searchProjectPart.vue
index d884525..8d80bd2 100644
--- a/src/views/modules/project/projectPart/searchProjectPart.vue
+++ b/src/views/modules/project/projectPart/searchProjectPart.vue
@@ -11,17 +11,17 @@
-
-
+
+
-
-
+
+
-
+
-
+
查询
@@ -292,7 +292,7 @@
columnProp: "testPartNo",
headerAlign: "center",
align: "left",
- columnLabel: "物料编码",
+ columnLabel: "PLM物料编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -531,7 +531,7 @@
columnWidth: 80
},
],
- searchData:{
+ searchData: {
page: 1,
limit: 100,
site: this.$store.state.user.site,