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

Merge remote-tracking branch 'origin/master'

java8
yuejiayang 1 year ago
parent
7206ef8037 85b35b0d9e
commit
93cfd08dc2
2 changed files with 16 additions and 511 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/views/modules/quote/detail/primary/quoteDetailCost.vue
  2. 519
      src/views/modules/quote/detail/quoteDetail.vue

8
src/views/modules/quote/detail/primary/quoteDetailCost.vue
View File

@ -587,13 +587,13 @@ export default {
<el-col :span="4">
<el-form-item label="标准币种成本1:" prop="currencyTotalCost1" :show-message="false">
<el-input-number style="width: 100%;" :controls="false"
v-model="quoteDetail.currencyTotalCost1" :step="0" :min="0" :precision="6" disabled/>
v-model="quoteDetail.currencyTotalCost1" :step="0" :min="0" :precision="6"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="标准币种成本2:" prop="currencyTotalCost2" :show-message="false">
<el-input-number style="width: 100%;" :controls="false"
v-model="quoteDetail.currencyTotalCost2" :step="0" :min="0" :precision="6" disabled/>
v-model="quoteDetail.currencyTotalCost2" :step="0" :min="0" :precision="6"/>
</el-form-item>
</el-col>
</el-row>
@ -636,13 +636,13 @@ export default {
<el-col :span="4">
<el-form-item label="报价币种成本1:" prop="quoteCurrencyTotalCost1" :show-message="false">
<el-input-number style="width: 100%;" :controls="false"
v-model="quoteDetail.quoteCurrencyTotalCost1" :step="0" :min="0" :precision="6" disabled/>
v-model="quoteDetail.quoteCurrencyTotalCost1" :step="0" :min="0" :precision="6"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="报价币种成本2:" prop="quoteCurrencyTotalCost2" :show-message="false">
<el-input-number style="width: 100%;" :controls="false"
v-model="quoteDetail.quoteCurrencyTotalCost2" :step="0" :min="0" :precision="6" disabled/>
v-model="quoteDetail.quoteCurrencyTotalCost2" :step="0" :min="0" :precision="6"/>
</el-form-item>
</el-col>
</el-row>

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

@ -112,7 +112,7 @@ export default {
sortLv: 0,
status: true,
fixed: '',
columnWidth: 200
columnWidth: 120
},
{
userId: this.$store.state.user.name,
@ -130,7 +130,7 @@ export default {
sortLv: 0,
status: true,
fixed: '',
columnWidth: 200
columnWidth: 240
},
{
userId: this.$store.state.user.name,
@ -150,131 +150,6 @@ export default {
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2PartCost',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'partCost',
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: '5011Table2BomUnYield',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'bomUnYield',
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: '5011Table2MachineCost',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'machineCost',
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: '5011Table2LabourCost',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'labourCost',
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: '5011Table2FabricateCost',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'fabricateCost',
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: '5011Table2tToolCost',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'toolCost',
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: '5011Table2AdjustPartCost',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'adjustPartCost',
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,
@ -284,7 +159,7 @@ export default {
columnProp: 'adjustBomUnYield',
headerAlign: 'center',
align: 'right',
columnLabel: '调整后材料报价成本',
columnLabel: '报价成本',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -293,24 +168,6 @@ export default {
fixed: '',
columnWidth: 130
},
{
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,
@ -320,7 +177,7 @@ export default {
columnProp: 'adjustLabourCost',
headerAlign: 'center',
align: 'right',
columnLabel: '调整后人工成本',
columnLabel: 'DL',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -338,24 +195,7 @@ export default {
columnProp: 'adjustFabricateCost',
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: '5011Table2AdjustToolCost',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'adjustToolCost',
headerAlign: 'center',
align: 'right',
columnLabel: '调整后工具成本',
columnLabel: 'VOH',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -367,30 +207,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2OtherCost',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'otherCost',
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: '5011Table2ManageCost',
serialNumber: '5011Table2AdjustMachineCost',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'manageCost',
columnProp: 'adjustMachineCost',
headerAlign: 'center',
align: 'right',
columnLabel: '管理成本',
columnLabel: 'FOH',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -398,7 +221,8 @@ export default {
status: true,
fixed: '',
columnWidth: 120
},{
}
,{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2TotalCost',
@ -407,315 +231,14 @@ export default {
columnProp: 'totalCost',
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: '5011Table2ProfitRate',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'profitRate',
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: '5011Table2ProfitAmount',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'profitAmount',
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: '5011Table2UnitPrice',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'unitPrice',
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: '5011Table2TotalPrice',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'totalPrice',
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: '5011Table2TaxRate',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'taxRate',
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: '5011Table2TaxUnitPrice',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'taxUnitPrice',
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: '5011Table2TaxTotalPrice',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'taxTotalPrice',
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: '5011Table2ProcessTime',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'processTime',
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: '5011Table2Yield',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'yield',
headerAlign: 'center',
align: 'right',
columnLabel: 'Yield',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2BomYield',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'bomYield',
headerAlign: 'center',
align: 'right',
columnLabel: 'BOM Yield',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2ParentAttritionRate',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'parentAttritionRate',
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: '5011Table2ChildAttritionRate',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'childAttritionRate',
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: '5011Table2Status',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'status',
headerAlign: 'center',
align: 'center',
columnLabel: '状态',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2CreateBy',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'createBy',
headerAlign: 'center',
align: 'left',
columnLabel: '创建人',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2CreateDate',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'createDate',
headerAlign: 'center',
align: 'center',
columnLabel: '创建日期',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130
},
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2UpdateBy',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'updateBy',
headerAlign: 'center',
align: 'left',
columnLabel: '更新人',
columnLabel: 'Total Cost(RMB.KCT)',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2UpdateDate',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'updateDate',
headerAlign: 'center',
align: 'center',
columnLabel: '更新日期',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130
columnWidth: 140
},
{
userId: this.$store.state.user.name,
@ -735,24 +258,6 @@ export default {
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 5011,
serialNumber: '5011Table2InternalInquiryNo',
tableId: '5011Table2',
tableName: '报价详情信息表',
columnProp: 'internalInquiryNo',
headerAlign: 'center',
align: 'left',
columnLabel: '询价单号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
],
partVisible:false,
activeName:'bom',

Write Preview
Loading…
Cancel
Save