diff --git a/src/views/modules/customer/customerGroupInformation.vue b/src/views/modules/customer/customerGroupInformation.vue
index 6d59afb..63e18f6 100644
--- a/src/views/modules/customer/customerGroupInformation.vue
+++ b/src/views/modules/customer/customerGroupInformation.vue
@@ -13,11 +13,11 @@
-
+
-
-
+
+
@@ -99,10 +99,10 @@
-
+
-
-
+
+
@@ -253,7 +253,7 @@ export default {
columnProp: "type",
headerAlign: "center",
align: "center",
- columnLabel: '客户组',
+ columnLabel: '客户组分类',
columnHidden: false,
columnImage: false,
columnSortable: false,
diff --git a/src/views/modules/customer/customerInformationManagement.vue b/src/views/modules/customer/customerInformationManagement.vue
index 8ae0487..826edae 100644
--- a/src/views/modules/customer/customerInformationManagement.vue
+++ b/src/views/modules/customer/customerInformationManagement.vue
@@ -38,7 +38,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 客户组1
-
+
+ 客户组分类(1)
+
-
- 客户组2
-
+
+ 客户组分类(2)
+
@@ -204,7 +175,7 @@
-->
-
+
@@ -1950,7 +1921,7 @@ export default {
mounted() {
this.$nextTick(() => {
- this.height = window.innerHeight / 2 - 30
+ this.height = window.innerHeight / 2 - 50
/*第二个表格高度的动态调整*/
this.secondHeight = window.innerHeight / 2 - 206
})
diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue
index 40e9118..d5f39c4 100644
--- a/src/views/modules/quotation/sellForQuotation.vue
+++ b/src/views/modules/quotation/sellForQuotation.vue
@@ -130,11 +130,13 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{
- `${scope.row[item.columnProp]}${index === 0 ? ("-" + scope.row['versionCode']) : ''}`
- }}
- ![]()
+
+ {{ scope.row[item.columnProp] }}
+
+
+ {{`${scope.row[item.columnProp]}${index === 0 ? ("-" + scope.row['versionCode']) : ''}`}}
+ ![]()
+
@@ -1509,6 +1511,19 @@ export default {
this.$message.error(error)
})
},
+
+ handleRouter(internalInquiryNo){
+ if (this.$router.resolve('quotation-requestForQuote').resolved.name === '404') {
+ this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
+ } else {
+ this.$router.push({
+ name: 'quotation-requestForQuote',
+ params:{
+ quotationNo:internalInquiryNo,
+ }
+ })
+ }
+ }
},
computed: {},
watch: {
diff --git a/src/views/modules/quotation/sellForQuotation/priceCheckDetail/priceCheckDetail.vue b/src/views/modules/quotation/sellForQuotation/priceCheckDetail/priceCheckDetail.vue
index c0bd3be..41badf7 100644
--- a/src/views/modules/quotation/sellForQuotation/priceCheckDetail/priceCheckDetail.vue
+++ b/src/views/modules/quotation/sellForQuotation/priceCheckDetail/priceCheckDetail.vue
@@ -43,7 +43,7 @@ export default {
columnProp: 'associatedPartNo',
headerAlign: 'center',
align: 'left',
- columnLabel: '关联零件号',
+ columnLabel: '关联料号',
columnHidden: false,
showOverflowTooltip: true,
columnImage: false,
@@ -229,7 +229,7 @@ export default {
-
+
+
+
@@ -580,7 +582,9 @@ export default {
+
+
选择
diff --git a/src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue b/src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue
index fd37dd5..f481804 100644
--- a/src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue
+++ b/src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue
@@ -142,9 +142,16 @@ export default {
this.copyDetail.computeToolCost = new Decimal(this.copyDetail.computeToolCost.toFixed(4,Decimal.ROUND_HALF_UP)).toNumber()
this.copyDetail.adjustToolCost = new Decimal(this.copyDetail.adjustToolCost.toFixed(4,Decimal.ROUND_HALF_UP)).toNumber()
// 其他成本
- this.copyPackCost = new Decimal(new Decimal(new Decimal(new Decimal(this.packCost)).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber()
- this.copyShippingCost = new Decimal(new Decimal(new Decimal(this.shippingCost).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber()
-
+ if (this.packCost === 0 || isNaN(this.packCost)){
+ this.packCost = 0;
+ }else {
+ this.copyPackCost = new Decimal(new Decimal(new Decimal(new Decimal(this.packCost)).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber()
+ }
+ if (this.shippingCost === 0 || isNaN(this.shippingCost)){
+ this.shippingCost = 0;
+ }else {
+ this.copyShippingCost = new Decimal(new Decimal(new Decimal(this.shippingCost).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber()
+ }
this.copyDetail.detailOtherCost = new Decimal(this.copyPackCost).add(new Decimal(this.copyShippingCost)).toNumber()
// 管理成本
@@ -209,6 +216,8 @@ export default {
.div(new Decimal(this.copyDetail.quotationDetailQuantity));
this.copyDetail.finalTaxedPrice = new Decimal(this.copyDetail.finalTaxedPrice.toFixed(4,Decimal.ROUND_HALF_UP)).toNumber()
}
+ },
+ watch:{
}
}
diff --git a/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteRouting.vue b/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteRouting.vue
index 8d32dd9..f32657e 100644
--- a/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteRouting.vue
+++ b/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteRouting.vue
@@ -878,6 +878,8 @@ export default {
+
+
@@ -885,7 +887,9 @@ export default {
+
+
选择
diff --git a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
index 0a2a581..c9e9d6b 100644
--- a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
+++ b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
@@ -1109,8 +1109,21 @@ export default {
}
this.quotationDetail = {...row};
this.quotationDetailFlag = true;
+ },
+ handleRouter(internalInquiryNo){
+ if (this.$router.resolve('quotation-requestForQuote').resolved.name === '404') {
+ this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
+ } else {
+ this.$router.push({
+ name: 'quotation-requestForQuote',
+ params:{
+ quotationNo:internalInquiryNo,
+ }
+ })
+ }
}
},
+
}
@@ -1158,8 +1171,13 @@ export default {
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{ scope.row[item.columnProp]}}
- ![]()
+
+ {{ scope.row[item.columnProp] }}
+
+
+ {{ scope.row[item.columnProp]}}
+ ![]()
+