diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index c0daad5..1b7e6bd 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -286,13 +286,13 @@
-
+
-
+
@@ -1684,7 +1684,7 @@ export default {
columnProp: 'testPartNo',
headerAlign: 'center',
align: 'left',
- columnLabel: '物料编码',
+ columnLabel: 'PLM物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -1696,13 +1696,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 102001,
- serialNumber: '103001Table4PartDesc',
+ serialNumber: '103001Table4FinalPartNo',
tableId: '103001Table4',
tableName: '项目物料表',
- columnProp: 'partDesc',
+ columnProp: 'finalPartNo',
headerAlign: 'center',
align: 'left',
- columnLabel: '物料名称',
+ columnLabel: 'IFS物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -1714,13 +1714,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 102001,
- serialNumber: '103001Table4FinalPartNo',
+ serialNumber: '103001Table4PartDesc',
tableId: '103001Table4',
tableName: '项目物料表',
- columnProp: 'finalPartNo',
+ columnProp: 'partDesc',
headerAlign: 'center',
align: 'left',
- columnLabel: 'IFS料号',
+ columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index b2d1d63..c407ed4 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -313,13 +313,13 @@
-
+
-
+
@@ -1676,7 +1676,7 @@ export default {
columnProp: 'testPartNo',
headerAlign: 'center',
align: 'left',
- columnLabel: '物料编码',
+ columnLabel: 'PLM物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -1688,13 +1688,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 102001,
- serialNumber: '102001Table3PartDesc',
+ serialNumber: '102001Table3FinalPartNo',
tableId: '102001Table3',
tableName: '项目物料表',
- columnProp: 'partDesc',
+ columnProp: 'finalPartNo',
headerAlign: 'center',
- align: 'center',
- columnLabel: '物料名称',
+ align: 'left',
+ columnLabel: 'IFS物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -1706,13 +1706,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 102001,
- serialNumber: '102001Table3FinalPartNo',
+ serialNumber: '102001Table3PartDesc',
tableId: '102001Table3',
tableName: '项目物料表',
- columnProp: 'finalPartNo',
+ columnProp: 'partDesc',
headerAlign: 'center',
- align: 'left',
- columnLabel: 'IFS料号',
+ align: 'center',
+ columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index b0f58df..aff6f2e 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -129,10 +129,28 @@ export default {
serialNumber: '5011Table2PartNo',
tableId: '5011Table2',
tableName: '报价详情信息表',
- columnProp: 'partNo',
+ columnProp: 'plmPartNo',
headerAlign: 'center',
align: 'left',
- columnLabel: '物料编码',
+ columnLabel: 'PLM物料编码',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 120
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 5011,
+ serialNumber: '5011Table2PartNo',
+ tableId: '5011Table2',
+ tableName: '报价详情信息表',
+ columnProp: 'ifsPartNo',
+ headerAlign: 'center',
+ align: 'left',
+ columnLabel: 'IFS物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
diff --git a/src/views/modules/quote/detail/quoteGroupDetail.vue b/src/views/modules/quote/detail/quoteGroupDetail.vue
index 42c0c40..f57a9dc 100644
--- a/src/views/modules/quote/detail/quoteGroupDetail.vue
+++ b/src/views/modules/quote/detail/quoteGroupDetail.vue
@@ -118,13 +118,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5011,
- serialNumber: '5011Table2PartNo',
+ serialNumber: '5011Table2PLMPartNo',
tableId: '5011Table2',
tableName: '报价详情信息表',
- columnProp: 'partNo',
+ columnProp: 'plmPartNo',
headerAlign: 'center',
align: 'left',
- columnLabel: '物料编码',
+ columnLabel: 'PLM物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -136,13 +136,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5011,
- serialNumber: '5011Table2PLMPartNo',
+ serialNumber: '5011Table2PartNo',
tableId: '5011Table2',
tableName: '报价详情信息表',
- columnProp: 'plmPartNo',
+ columnProp: 'ifsPartNo',
headerAlign: 'center',
align: 'left',
- columnLabel: 'PLM 物料编码',
+ columnLabel: 'IFS物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
index 214d690..b422fb1 100644
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@@ -272,7 +272,7 @@
-
+
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index ae311b5..4b0eac7 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -259,7 +259,8 @@
-
+
+
Artwork
Artwork
@@ -370,7 +371,7 @@
-
+
@@ -380,12 +381,12 @@
-
+
-
+
@@ -1705,7 +1706,7 @@
columnProp: 'testPartNo',
headerAlign: 'center',
align: 'left',
- columnLabel: '物料编码',
+ columnLabel: 'PLM物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -1717,38 +1718,38 @@
{
userId: this.$store.state.user.name,
functionId: 103001,
- serialNumber: '103001Table3PartDesc',
+ serialNumber: '103001Table3FinalPartNo',
tableId: '103001Table3',
tableName: '项目物料表',
- columnProp: 'partDesc',
+ columnProp: 'finalPartNo',
headerAlign: 'center',
align: 'left',
- columnLabel: '物料名称',
+ columnLabel: 'IFS物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 200
+ columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 103001,
- serialNumber: '103001Table3FinalPartNo',
+ serialNumber: '103001Table3PartDesc',
tableId: '103001Table3',
tableName: '项目物料表',
- columnProp: 'finalPartNo',
+ columnProp: 'partDesc',
headerAlign: 'center',
align: 'left',
- columnLabel: 'IFS料号',
+ columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 120
+ columnWidth: 200
},
{
userId: this.$store.state.user.name,
@@ -2606,10 +2607,10 @@
this.$message.warning('请选择Artwork!')
return
}
- if (this.modalData.trackerName === '' || this.modalData.trackerName == null) {
- this.$message.warning('请选择Artwork!')
- return
- }
+ // if (this.modalData.trackerName === '' || this.modalData.trackerName == null) {
+ // this.$message.warning('请选择Artwork!')
+ // return
+ // }
if (this.modalData.projectId === '' || this.modalData.projectId == null) {
this.$message.warning('请选择项目编码!')
return