wilson
/
ccl_plm-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2026-03-13 

优化
master
fengyuan_yang 1 month ago
parent
b3b8922033
commit
d3557ad72c
3 changed files with 84 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      src/views/modules/quote/detail/quoteDetail.vue
  2. 72
      src/views/modules/quote/detail/quoteGroupDetail.vue
  3. 20
      src/views/modules/quote/quoteDetailReport.vue

72
src/views/modules/quote/detail/quoteDetail.vue
View File

@ -245,24 +245,24 @@ export default {
fixed: '', fixed: '',
columnWidth: 60 columnWidth: 60
}, },
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2QuoteTaxRate',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'quoteTaxRate',
headerAlign: 'center',
align: 'right',
columnLabel: 'Margin%',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 60
},
// {
// userId: this.$store.state.user.name,
// functionId: 5011,
// serialNumber: '5011Table2QuoteTaxRate',
// tableId: '5011Table2',
// tableName: '报价详情信息表',
// columnProp: 'quoteTaxRate',
// headerAlign: 'center',
// align: 'right',
// columnLabel: 'Margin%',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 60
// },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5011, functionId: 5011,
@ -317,24 +317,24 @@ export default {
fixed: '', fixed: '',
columnWidth: 120 columnWidth: 120
}, },
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2AdjustMachineCost',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'adjustMachineCost',
headerAlign: 'center',
align: 'right',
columnLabel: '机器成本',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
// {
// userId: this.$store.state.user.name,
// functionId: 5011,
// serialNumber: '5011Table2AdjustMachineCost',
// tableId: '5011Table2',
// tableName: '报价详情信息表',
// columnProp: 'adjustMachineCost',
// headerAlign: 'center',
// align: 'right',
// columnLabel: '机器成本',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 120
// },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5011, functionId: 5011,

72
src/views/modules/quote/detail/quoteGroupDetail.vue
View File

@ -223,24 +223,24 @@ export default {
fixed: '', fixed: '',
columnWidth: 120 columnWidth: 120
}, },
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2AdjustMachineCost',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'adjustMachineCost',
headerAlign: 'center',
align: 'right',
columnLabel: '机器成本',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
// {
// userId: this.$store.state.user.name,
// functionId: 5011,
// serialNumber: '5011Table2AdjustMachineCost',
// tableId: '5011Table2',
// tableName: '报价详情信息表',
// columnProp: 'adjustMachineCost',
// headerAlign: 'center',
// align: 'right',
// columnLabel: '机器成本',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 120
// },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5011, functionId: 5011,
@ -385,24 +385,24 @@ export default {
fixed: '', fixed: '',
columnWidth: 100 columnWidth: 100
}, },
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2QuoteTaxRate',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'quoteTaxRate',
headerAlign: 'center',
align: 'right',
columnLabel: 'Margin%',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},
// {
// userId: this.$store.state.user.name,
// functionId: 5011,
// serialNumber: '5011Table2QuoteTaxRate',
// tableId: '5011Table2',
// tableName: '报价详情信息表',
// columnProp: 'quoteTaxRate',
// headerAlign: 'center',
// align: 'right',
// columnLabel: 'Margin%',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 80
// },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5011, functionId: 5011,

20
src/views/modules/quote/quoteDetailReport.vue
View File

@ -87,11 +87,11 @@
<span>{{ scope.row.adjustLabourCost | numberFormat }}</span> <span>{{ scope.row.adjustLabourCost | numberFormat }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="adjustMachineCost" label="机器成本" width="120" align="right">
<template slot-scope="scope">
<span>{{ scope.row.adjustMachineCost | numberFormat }}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="adjustMachineCost" label="机器成本" width="120" align="right">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.adjustMachineCost | numberFormat }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="adjustToolCost" label="工具成本" width="120" align="right"> <el-table-column prop="adjustToolCost" label="工具成本" width="120" align="right">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.adjustToolCost | numberFormat }}</span> <span>{{ scope.row.adjustToolCost | numberFormat }}</span>
@ -137,11 +137,11 @@
<span>{{ scope.row.quoteProfitAmount | numberFormat }}</span> <span>{{ scope.row.quoteProfitAmount | numberFormat }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="quoteTaxRate" label="Margin%" width="100" align="right">
<template slot-scope="scope">
<span>{{ scope.row.quoteTaxRate | numberFormat }}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="quoteTaxRate" label="Margin%" width="100" align="right">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.quoteTaxRate | numberFormat }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="quoteTaxTotalPrice" label="Price ¥(ex VAT)" width="130" align="right"> <el-table-column prop="quoteTaxTotalPrice" label="Price ¥(ex VAT)" width="130" align="right">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.quoteTaxTotalPrice | numberFormat }}</span> <span>{{ scope.row.quoteTaxTotalPrice | numberFormat }}</span>

Write Preview
Loading…
Cancel
Save