diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index 9cfe8ac..db49e37 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -158,10 +158,6 @@
-
- 计划人
-
-
@@ -442,6 +438,16 @@
+
+ 计划人
+
+
+
+
+
+
+
+
查询
@@ -1172,7 +1178,7 @@ export default {
'componentPartProductGroupId4SaveData.productGroupId4': {
deep: true,
handler: function (newV, oldV) {
- this.modalData.productGroupId4 = this.componentPartProductGroupId4SaveData.productGroupId4
+ this.partData.productGroupId4 = this.componentPartProductGroupId4SaveData.productGroupId4
}
}
@@ -1255,7 +1261,6 @@ export default {
printUnit: '',
printUnitName: '',
officialFlag: '',
- productGroupId4: ''
},
detailData: {
site: this.$store.state.user.site,
@@ -1309,6 +1314,8 @@ export default {
plmPartNo: '',
ifsPartNo: '',
partDesc: '',
+ partStatus: 'active',
+ productGroupId4: '',
page: 1,
limit: 10
},
@@ -1320,7 +1327,7 @@ export default {
partDesc: '',
status: '',
productGroupId4: '',
- partStatus: 'all',
+ partStatus: 'active',
page: 1,
limit: 10
},
@@ -1744,6 +1751,17 @@ export default {
fixed: '',
columnWidth: 100
},
+ {
+ columnProp: 'productGroupId4',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '计划人',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 100
+ },
{
columnProp: 'partType',
headerAlign: "center",
@@ -3296,7 +3314,6 @@ export default {
officialFlag: row.officialFlag,
alternativeNo: row.alternativeNo,
ifsPartNo: row.ifsPartNo,
- productGroupId4: row.productGroupId4
}
this.subDetailTable = 'bom_sub_detail'
// 查bom明细
@@ -4342,7 +4359,6 @@ export default {
typeFlag: data.rows.modalData.typeFlag,
netWeight: data.rows.modalData.netWeight,
officialFlag: data.rows.modalData.officialFlag,
- productGroupId4: data.rows.modalData.productGroupId4,
}
this.detailDataList = data.rows.detailDataList
this.detailData = data.rows.detailData
@@ -4988,7 +5004,7 @@ export default {
},
queryProductGroupId4Save(){
- this.componentPartProductGroupId4SaveData.productGroupId4 = this.modalData.productGroupId4
+ this.componentPartProductGroupId4SaveData.productGroupId4 = this.partData.productGroupId4
this.componentPartProductGroupId4SaveData.limit = this.pageSize6
this.componentPartProductGroupId4SaveData.page = this.pageIndex6
this.componentPartProductGroupId4SaveData.site = this.$store.state.user.site
@@ -5006,7 +5022,7 @@ export default {
},
getProductGroupId4SaveRowData(row){
- this.modalData.productGroupId4 = row.productGroupId4
+ this.partData.productGroupId4 = row.productGroupId4
this.productGroupId4SaveModelFlag = false
}
}
diff --git a/src/views/modules/part/recipeManagement.vue b/src/views/modules/part/recipeManagement.vue
index f3e65f5..66f31f4 100644
--- a/src/views/modules/part/recipeManagement.vue
+++ b/src/views/modules/part/recipeManagement.vue
@@ -152,10 +152,6 @@
-
- 计划人
-
-
保存
Copy
@@ -321,6 +317,16 @@
+
+ 计划人
+
+
+
+
+
+
+
+
查询
@@ -1060,7 +1066,7 @@ export default {
'componentPartProductGroupId4SaveData.productGroupId4': {
deep: true,
handler: function (newV, oldV) {
- this.modalData.productGroupId4 = this.componentPartProductGroupId4SaveData.productGroupId4
+ this.partData.productGroupId4 = this.componentPartProductGroupId4SaveData.productGroupId4
}
}
@@ -1231,6 +1237,8 @@ export default {
plmPartNo: '',
ifsPartNo: '',
partDesc: '',
+ partStatus: 'active',
+ productGroupId4: '',
page: 1,
limit: 10
},
@@ -1240,6 +1248,7 @@ export default {
plmPartNo: '',
ifsPartNo: '',
partDesc: '',
+ partStatus: 'active',
status: '',
productGroupId4: '',
page: 1,
@@ -3261,7 +3270,6 @@ export default {
officialFlag: row.officialFlag,
alternativeNo: row.alternativeNo,
ifsPartNo: row.ifsPartNo,
- productGroupId4: row.productGroupId4
}
this.subDetailTable = 'recipe_sub_detail'
// 查recipe明细
@@ -4275,8 +4283,7 @@ export default {
engRevision: data.rows.modalData.engRevision,
typeFlag: data.rows.modalData.typeFlag,
netWeight: data.rows.modalData.netWeight,
- officialFlag: data.rows.modalData.officialFlag,
- productGroupId4: data.rows.modalData.productGroupId4,
+ officialFlag: data.rows.modalData.officialFlag
}
this.detailDataList = data.rows.detailDataList
this.detailData = data.rows.detailData
@@ -4784,7 +4791,7 @@ export default {
},
queryProductGroupId4Save(){
- this.componentPartProductGroupId4SaveData.productGroupId4 = this.modalData.productGroupId4
+ this.componentPartProductGroupId4SaveData.productGroupId4 = this.partData.productGroupId4
this.componentPartProductGroupId4SaveData.limit = this.pageSize5
this.componentPartProductGroupId4SaveData.page = this.pageIndex5
this.componentPartProductGroupId4SaveData.site = this.$store.state.user.site
@@ -4802,7 +4809,7 @@ export default {
},
getProductGroupId4SaveRowData(row){
- this.modalData.productGroupId4 = row.productGroupId4
+ this.partData.productGroupId4 = row.productGroupId4
this.productGroupId4SaveModelFlag = false
},
diff --git a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
index bdb6ee1..b5e0c4a 100644
--- a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
+++ b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
@@ -340,6 +340,11 @@ export default {
}
})
}
+ },
+
+ formatDecimal(value) {
+ const num = parseFloat(value);
+ return !isNaN(num) ? num.toFixed(4) : value;
}
},
watch:{
@@ -373,8 +378,11 @@ export default {
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{ scope.row[item.columnProp]}}
-
+
+ {{ formatDecimal(scope.row.unitPriceRate) }}
+
+ {{ scope.row[item.columnProp]}}
+
diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index 89cbf28..4776fa4 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -989,6 +989,10 @@ export default {
this.$router.push({name:`part-partInformation`,params:{partNo:partNo},})
}
},
+ formatDecimal(value) {
+ const num = parseFloat(value);
+ return !isNaN(num) ? num.toFixed(4) : value;
+ }
},
watch:{
quote(newVal,oldVal){
@@ -1077,7 +1081,10 @@ export default {
:min-width="item.columnWidth"
:label="item.columnLabel">
-
+
+ {{ formatDecimal(scope.row.unitPriceRate) }}
+
+
{{ scope.row[item.columnProp] }}
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index 2cce4fb..340403a 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -1409,8 +1409,8 @@
},
//导出excel
async createExportData() {
- this.searchData.limit = -1
- this.searchData.page = 1
+ this.searchData.limit = this.pageSize
+ this.searchData.page = this.pageIndex
await technicalSpecificationListSearch(this.searchData).then(({data}) => {
this.exportList= data.page.list;
})