|
@@ -446,7 +446,7 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
{ title: '事故单主题', width: 120, dataIndex: 'accidentTheme', className: 'replacecolor' },
|
|
|
- { title: '责任人', width: 120, dataIndex: 'responsibilityPerson1', className: 'replacecolor' },
|
|
|
+ { title: '责任人', width: 100, dataIndex: 'responsibilityPerson1', className: 'replacecolor' },
|
|
|
// { title: '币种', width: 120, dataIndex: 'moneyType', className: 'replacecolor' },
|
|
|
// { title: '金额', dataIndex: 'amount', width: 120, className: 'replacecolor' }
|
|
|
],
|
|
@@ -454,13 +454,13 @@ export default {
|
|
|
|
|
|
// 费用支出 表头
|
|
|
costPayColumns: [
|
|
|
- { title: '账套号', width: 120, dataIndex: 'setNo', className: 'replacecolor' },
|
|
|
- { title: '支出单号', width: 120, dataIndex: 'disbursementSlipNo', className: 'replacecolor' },
|
|
|
- { title: '费用项目', dataIndex: 'expenseItem', width: 120, className: 'replacecolor' },
|
|
|
+ { title: '账套号', width: '10%', dataIndex: 'setNo', className: 'replacecolor' },
|
|
|
+ { title: '支出单号', width: '10%', dataIndex: 'disbursementSlipNo', className: 'replacecolor' },
|
|
|
+ { title: '费用项目', dataIndex: 'expenseItem', width: '10%', className: 'replacecolor' },
|
|
|
{
|
|
|
title: '美元',
|
|
|
dataIndex: 'disbursedOriginalmoney',
|
|
|
- width: 120,
|
|
|
+ width: '10%',
|
|
|
className: 'replacecolor' ,
|
|
|
customRender: (text, record, index) => {
|
|
|
if(text!==''&&text){
|
|
@@ -471,7 +471,7 @@ export default {
|
|
|
{
|
|
|
title: '人民币(不含税)',
|
|
|
dataIndex: 'disbursedLocalmoney',
|
|
|
- width: 120, className: 'replacecolor',
|
|
|
+ width: '10%', className: 'replacecolor',
|
|
|
customRender: (text, record, index) => {
|
|
|
if(text!==''&&text){
|
|
|
return Number(text).toFixed(2)
|
|
@@ -481,7 +481,7 @@ export default {
|
|
|
{
|
|
|
title: '人民币(税额)',
|
|
|
dataIndex: 'shuiemoney',
|
|
|
- width: 120,
|
|
|
+ width: '10%',
|
|
|
className: 'replacecolor',
|
|
|
customRender: (text, record, index) => {
|
|
|
if(text!==''&&text){
|
|
@@ -492,15 +492,15 @@ export default {
|
|
|
{
|
|
|
title: '人民币(价税合计)',
|
|
|
dataIndex: 'iNatMoney',
|
|
|
- width: 120,
|
|
|
+ width: '10%',
|
|
|
className: 'replacecolor',
|
|
|
customRender: (text, record, index) => {
|
|
|
if(text!==''&&text){
|
|
|
return Number(text).toFixed(2)
|
|
|
}
|
|
|
}, },
|
|
|
- { title: '发票号', dataIndex: 'invoicenum', width: 120, className: 'replacecolor' },
|
|
|
- { title: '制单人', dataIndex: 'preparedBy', width: 120, className: 'replacecolor' }
|
|
|
+ { title: '发票号', dataIndex: 'invoicenum', width: '10%', className: 'replacecolor' },
|
|
|
+ { title: '制单人', dataIndex: 'preparedBy', width: '10%', className: 'replacecolor' }
|
|
|
],
|
|
|
costPayData: [],
|
|
|
|
|
@@ -599,6 +599,12 @@ export default {
|
|
|
all+=Number(item.transferCost)
|
|
|
}
|
|
|
})
|
|
|
+ // //表头面料成本(¥),面料成本($),合计信息-面料金额合计
|
|
|
+ // if(!this.detailsPlanNum.fabriccostIncludestax|| this.detailsPlanNum.fabriccostIncludestax=='0'|| this.detailsPlanNum.fabriccostIncludestax==''){
|
|
|
+ // this.detailsPlanNum.fabriccostIncludestax = all
|
|
|
+ // }
|
|
|
+ // this.detailsPlanNum.fabriccostIncludestax = all+Number(this.detailsPlanNum.fabriccostIncludestax)
|
|
|
+ // this.detailsPlanNum.fabriccostIncludestaxUsd = Number(this.detailsPlanNum.fabriccostIncludestax)/this.detailsPlanNum.exchangeRate
|
|
|
// this.detailsPlanNum.fabriccostIncludestax=( this.detailsPlanNum.fabriccostIncludestax==''|| !this.detailsPlanNum.fabriccostIncludestax||this.detailsPlanNum.fabriccostIncludestax=='0')?all.toFixed(2):Number( this.detailsPlanNum.fabriccostIncludestax).toFixed(2)//面料含税成本
|
|
|
this.$refs.unitTabs.ingData = oneData.syCostAllocationIngredientList
|
|
|
this.$refs.unitTabs.shipData = oneData.syCostAllocationShipdetail
|
|
@@ -669,8 +675,12 @@ export default {
|
|
|
this.detailsPlanNum.rmbExportamount = this.$refs.unitTabs.sumInfo.exportedAmountRMB //表头-外销总价(¥)
|
|
|
//调整表头格式
|
|
|
this.adjustingHeader()
|
|
|
- this.$refs.unitTabs.sumInfo.excludingTaxProcessing =e.toFixed(2)//出运不含税加工费
|
|
|
- this.detailsPlanNum.rmbProcesscost=(e==''|| !e)?'':Number(e).toFixed(2)//表头加工费(人民币)
|
|
|
+ if(Number(oneData.syCostAllocationShipdetail[0].procesUnitPriceusd)>0){
|
|
|
+ this.$refs.unitTabs.sumInfo.excludingTaxProcessing =this.$refs.unitTabs.sumInfo.shipProcesFees//出运不含税加工费
|
|
|
+ }else{
|
|
|
+ this.$refs.unitTabs.sumInfo.excludingTaxProcessing =( this.$refs.unitTabs.sumInfo.shipProcesFees/(1+(Number(this.detailsPlanNum.taxrate)/100))).toFixed(2)//出运不含税加工费
|
|
|
+ }
|
|
|
+ this.detailsPlanNum.rmbProcesscost=(e==''|| !e)?'':Number(e).toFixed(2)//表头加工费(人民币)
|
|
|
f=Number(this.$refs.unitTabs.sumInfo.ingAmount)+Number(this.$refs.unitTabs.sumInfo.shipProcesFees)
|
|
|
this.$refs.unitTabs.sumInfo.amountTotal = (Number(this.$refs.unitTabs.sumInfo.fabricAmount)+Number(this.$refs.unitTabs.sumInfo.ingAmount)+Number( this.$refs.unitTabs.sumInfo.shipProcesFees)).toFixed(2)//合计金额
|
|
|
this.pagination = {
|
|
@@ -754,7 +764,7 @@ export default {
|
|
|
// this.detailsPlanNum.outdata = ( this.detailsPlanNum.outdata==''||!this.detailsPlanNum.outdata)?0:moment( this.detailsPlanNum.outdata).format('YYYY-MM-DD')
|
|
|
this.detailsPlanNum.planQuantity=( this.detailsPlanNum.planQuantity==''|| !this.detailsPlanNum.planQuantity)?0:Number( this.detailsPlanNum.planQuantity).toFixed(0)//计划数量
|
|
|
this.detailsPlanNum.usdTotalexportprice=( this.detailsPlanNum.usdTotalexportprice==''|| !this.detailsPlanNum.usdTotalexportprice)?0:Number( this.detailsPlanNum.usdTotalexportprice).toFixed(2)//美元外销总价
|
|
|
- // this.detailsPlanNum.rmbExpense=( this.detailsPlanNum.rmbExpense==''|| !this.detailsPlanNum.rmbExpense)?0:Number( this.detailsPlanNum.rmbExpense).toFixed(2)//人民币费用支出
|
|
|
+ this.detailsPlanNum.fabriccostIncludestaxUsd=( this.detailsPlanNum.fabriccostIncludestaxUsd==''|| !this.detailsPlanNum.fabriccostIncludestaxUsd)?0:Number( this.detailsPlanNum.fabriccostIncludestaxUsd).toFixed(2)//面料成本($)
|
|
|
this.detailsPlanNum.actualShipquantity=( this.detailsPlanNum.actualShipquantity==''|| !this.detailsPlanNum.actualShipquantity)?0:Number( this.detailsPlanNum.actualShipquantity).toFixed(0)//实际出库数量
|
|
|
this.detailsPlanNum.rmbExportamount=( this.detailsPlanNum.rmbExportamount==''|| !this.detailsPlanNum.rmbExportamount)?0:Number( this.detailsPlanNum.rmbExportamount).toFixed(2)//人民币外销金额
|
|
|
this.detailsPlanNum.usdExpense=( this.detailsPlanNum.usdExpense==''|| !this.detailsPlanNum.usdExpense)?0:Number( this.detailsPlanNum.usdExpense).toFixed(2)//美元费用支出
|
|
@@ -1051,6 +1061,8 @@ export default {
|
|
|
FabInQua(data){
|
|
|
if(this.copyFabriccostIncludestax!== this.detailsPlanNum.fabriccostIncludestax){
|
|
|
this.detailsPlanNum.fabriccostIncludestax=data.toFixed(2)//面料含税成本
|
|
|
+
|
|
|
+ // this.detailsPlanNum.fabriccostIncludestax=(Number(this.copyFabriccostIncludestax)+data).toFixed(2)//面料含税成本
|
|
|
}
|
|
|
|
|
|
},
|