Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 9 months ago
parent
commit
f559458434
  1. 31
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue
  2. 101
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
  3. 75
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue
  4. 71
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue
  5. 69
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue
  6. 73
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue
  7. 75
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue
  8. 101
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue
  9. 75
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue
  10. 71
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliAdd.vue
  11. 69
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliInfo.vue
  12. 72
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue

31
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue

@ -45,36 +45,17 @@
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column label="分公司" align="center">
<template slot-scope="scope">
<span>{{ scope.row.createOrgName }}</span>
</template>
</el-table-column>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column prop="createOrgName" label="分公司" align="center" />
<el-table-column prop="brandName" label="品牌" align="center" />
<el-table-column label="名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withApply }}单车返利预提申请</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withRebateTotal }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.createByName }}</span>
</template>
</el-table-column>
<el-table-column prop="withRebateTotal" label="预提返利" align="center" />
<el-table-column prop="expectCost" label="其中预提费用" align="center" />
<el-table-column prop="createTime" label="创建日期" align="center" width="120" />
<el-table-column prop="createByName" label="创建人" align="center" width="120" />
</el-table>
</div>
<div class="pages">

101
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue

@ -7,10 +7,8 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -18,63 +16,47 @@
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="24" class="tleftb colOneStyle">
<div><span style="font-size: 16px">金额单位</span></div>
<el-col :span="24" class="colOneStyle">
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
</el-col>
<el-col :span="4" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">品牌</div>
<el-form-item>
<el-select :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
<el-select class="addinputInfo" :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="18" class="tleftb colOneStyle">
<el-button size="small" type="primary" @click="handleSelect()">选择</el-button>
<el-col :span="18" class="colOneStyle">
<div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button></div>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="返利类型" align="center">
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="num" label="台数" align="center" width="80" />
<el-table-column prop="withRebate" label="预提返利" align="center" width="120" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
<el-table-column label="明细" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="台数" align="center">
<template slot-scope="scope">
<span>{{ scope.row.num }}</span>
</template>
</el-table-column>
<el-table-column prop="withRebate" label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withRebate }}</span>
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="明细" align="center">
<el-table-column label="备注" align="center" min-width="200">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
<el-input v-model="scope.row.remarks" clearable placeholder=""></el-input>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.remarks" clearable placeholder="" class="addinputw"></el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item>
<el-input v-model="formobj.remarks" clearable placeholder="" class="addinputw"></el-input>
</el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw"></el-input></el-form-item>
</el-col>
</el-row>
</el-form>
@ -208,6 +190,8 @@ export default {
if (this.formobj.scmVehRebateWiths[j].rebateTypeValue === cval.rebateTypeValue) {
this.formobj.scmVehRebateWiths[j].num = parseInt(this.formobj.scmVehRebateWiths[j].num) + parseInt(1)
this.formobj.scmVehRebateWiths[j].withRebate = parseFloat(this.formobj.scmVehRebateWiths[j].withRebate !== '' ? this.formobj.scmVehRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
this.formobj.scmVehRebateWiths[j].expectTreatCost = parseFloat(this.formobj.scmVehRebateWiths[j].expectTreatCost !== '' ? this.formobj.scmVehRebateWiths[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)
this.formobj.scmVehRebateWiths[j].expectSuppCost = parseFloat(this.formobj.scmVehRebateWiths[j].expectSuppCost !== '' ? this.formobj.scmVehRebateWiths[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)
this.formobj.scmVehRebateWiths[j].vehRebateSids.push(cval.sid)
v = 1
break
@ -219,10 +203,12 @@ export default {
rebateTypeValue: cval.rebateTypeValue,
num: 1,
withRebate: cval.withRebate,
expectTreatCost: cval.expectTreatCost,
expectSuppCost: cval.expectSuppCost,
brandName: cval.brandName,
brandSid: cval.brandSid,
vehRebateSids: [cval.sid],
// remarks: '',
remarks: '',
sid: '',
mainSid: ''
})
@ -246,6 +232,8 @@ export default {
if (aa[j].rebateTypeValue === cval.rebateTypeValue) {
aa[j].num = parseInt(aa[j].num) + parseInt(1)
aa[j].withRebate = parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
aa[j].expectTreatCost = parseFloat(aa[j].expectTreatCost !== '' ? aa[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)
aa[j].expectSuppCost = parseFloat(aa[j].expectSuppCost !== '' ? aa[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)
aa[j].vehRebateSids.push(cval.sid)
v = 1
break
@ -257,10 +245,12 @@ export default {
rebateTypeValue: cval.rebateTypeValue,
num: 1,
withRebate: cval.withRebate,
expectTreatCost: cval.expectTreatCost,
expectSuppCost: cval.expectSuppCost,
brandName: cval.brandName,
brandSid: cval.brandSid,
vehRebateSids: [cval.sid],
// remarks: '',
remarks: '',
sid: '',
mainSid: ''
})
@ -272,6 +262,8 @@ export default {
this.formobj.scmVehRebateWiths[k].rebateTypeValue = aa[0].rebateTypeValue
this.formobj.scmVehRebateWiths[k].num = aa[0].num
this.formobj.scmVehRebateWiths[k].withRebate = aa[0].withRebate
this.formobj.scmVehRebateWiths[k].expectTreatCost = aa[0].expectTreatCost
this.formobj.scmVehRebateWiths[k].expectSuppCost = aa[0].expectSuppCost
this.formobj.scmVehRebateWiths[k].brandName = aa[0].brandName
this.formobj.scmVehRebateWiths[k].brandSid = aa[0].brandSid
this.formobj.scmVehRebateWiths[k].vehRebateSids = aa[0].vehRebateSids
@ -347,21 +339,6 @@ export default {
}, 0)
sums[index] += ''
this.formobj.withRebateTotal = sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
this.amount = sums[index] += ''
} else {
sums[index] = ''
}
}
})
return sums
@ -400,5 +377,15 @@ export default {
border-right: 0px !important;
border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
</style>

75
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue

@ -14,58 +14,36 @@
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="24" class="tleftb colOneStyle">
<div><span style="font-size: 16px">金额单位</span></div>
<el-col :span="24" class="colOneStyle">
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
</el-col>
<el-col :span="22" class="colOneStyle">
<el-form-item>
<span>{{ formobj.brandName }}</span>
</el-form-item>
<el-col :span="24" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">品牌</div>
<el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="台数" align="center">
<template slot-scope="scope">
<span>{{ scope.row.num }}</span>
</template>
</el-table-column>
<el-table-column prop="withRebate" label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withRebate }}</span>
</template>
</el-table-column>
<el-table-column label="明细" align="center">
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="num" label="台数" align="center" width="80" />
<el-table-column prop="withRebate" label="预提返利" align="center" width="120" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
<el-table-column label="明细" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.remarks }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item>
<span>{{ formobj.remarks }}</span>
</el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
@ -139,21 +117,6 @@ export default {
}
}, 0)
sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
this.amount = sums[index] += ''
} else {
sums[index] = ''
}
}
})
return sums
@ -177,5 +140,11 @@ export default {
border-right: 0px !important;
border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

71
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue

@ -18,61 +18,20 @@
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vehModelName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="厂家结算价" align="center">
<template slot-scope="scope">
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="其中运费" align="center">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center">
<template slot-scope="scope">
<span>{{ scope.row.calculationStandard }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="所属年月" align="center">
<template slot-scope="scope">
<span>{{ scope.row.palceGenDate }}</span>
</template>
</el-table-column>
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="130" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" label="创建日期" align="center" width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="140" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="140" />
<el-table-column prop="expectSuppRemark" label="抵顶费用说明" align="center" min-width="200" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
</el-table>
</el-form>
</div>
@ -148,6 +107,8 @@ export default {
rebateTypeValue: this.list[i].rebateTypeValue,
rebateTypeKey: this.list[i].rebateTypeKey,
withRebate: this.list[i].estimateRebate,
expectTreatCost: this.list[i].expectTreatCost,
expectSuppCost: this.list[i].expectSuppCost,
brandName: this.list[i].brandName,
brandSid: this.list[i].brandSid
})

69
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue

@ -16,61 +16,20 @@
<el-form ref="form_obj" :rules="rules" class="formadd">
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center" width="220">
<template slot-scope="scope">
<span>{{ scope.row.vehModelName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="厂家结算价" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="其中运费" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.calculationStandard }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="所属年月" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.palceGenDate }}</span>
</template>
</el-table-column>
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="130" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" label="创建日期" align="center" width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="140" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="140" />
<el-table-column prop="expectSuppRemark" label="抵顶费用说明" align="center" min-width="200" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
</el-table>
</el-form>
</div>

73
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue

@ -42,61 +42,19 @@
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
<el-table-column label="品牌" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vehModelName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="厂家结算价" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="其中运费" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.calculationStandard }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="所属年月" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.palceGenDate }}</span>
</template>
</el-table-column>
<el-table-column prop="brandName" label="品牌" align="center" width="140" />
<el-table-column prop="vehModelName" label="车型" align="center" width="200" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" label="创建日期" align="center" width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
<el-table-column prop="calculationStandard" label="计算标准" align="center" width="100" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectCost" label="其中预计费用" align="center" width="120" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</div>
<div class="pages">
@ -204,6 +162,8 @@ export default {
rebateTypeValue: element.rebateTypeValue,
rebateTypeKey: element.rebateTypeKey,
withRebate: element.estimateRebate,
expectTreatCost: element.expectTreatCost,
expectSuppCost: element.expectSuppCost,
brandName: element.brandName,
brandSid: element.brandSid
})
@ -215,9 +175,8 @@ export default {
getList() {
this.listLoading = true
req.pageList(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
if (response.success && response.data && response.data.total > 0) {
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {

75
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue

@ -16,58 +16,36 @@
<!--Start 新增修改部分-->
<div class="">
<div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="24" class="tleftb colOneStyle">
<div><span style="font-size: 16px">金额单位</span></div>
<el-col :span="24" class="colOneStyle">
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
</el-col>
<el-col :span="22" class="colOneStyle">
<el-form-item>
<span>{{ formobj.brandName }}</span>
</el-form-item>
<el-col :span="24" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">品牌</div>
<el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="台数" align="center">
<template slot-scope="scope">
<span>{{ scope.row.num }}</span>
</template>
</el-table-column>
<el-table-column prop="withRebate" label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withRebate }}</span>
</template>
</el-table-column>
<el-table-column label="明细" align="center">
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="num" label="台数" align="center" width="80" />
<el-table-column prop="withRebate" label="预提返利" align="center" width="120" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
<el-table-column label="明细" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.remarks }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item>
<span>{{ formobj.remarks }}</span>
</el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
@ -333,21 +311,6 @@ export default {
}
}, 0)
sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
this.amount = sums[index] += ''
} else {
sums[index] = ''
}
}
})
return sums
@ -371,5 +334,11 @@ export default {
.rowClass {
border-top: 1px solid #E0E3EB;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

101
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue

@ -7,73 +7,55 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
</div>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="">
<div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="24" class="tleftb colOneStyle">
<div><span style="font-size: 16px">金额单位</span></div>
<el-col :span="24" class="colOneStyle">
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
</el-col>
<el-col :span="4" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">品牌</div>
<el-form-item>
<el-select disabled v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
<el-select class="addinputInfo" :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="18" class="tleftb colOneStyle">
<el-button size="small" type="primary" @click="handleSelect()">选择</el-button>
<el-col :span="18" class="colOneStyle">
<div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button></div>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="返利类型" align="center">
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="num" label="台数" align="center" width="80" />
<el-table-column prop="withRebate" label="预提返利" align="center" width="120" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
<el-table-column label="明细" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="台数" align="center">
<template slot-scope="scope">
<span>{{ scope.row.num }}</span>
</template>
</el-table-column>
<el-table-column prop="withRebate" label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withRebate }}</span>
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="明细" align="center">
<el-table-column label="备注" align="center" min-width="200">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
<el-input v-model="scope.row.remarks" clearable placeholder=""></el-input>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.remarks" clearable placeholder="" class="addinputw"></el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item>
<el-input v-model="formobj.remarks" clearable placeholder="" class="addinputw"></el-input>
</el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw"></el-input></el-form-item>
</el-col>
</el-row>
</el-form>
@ -196,6 +178,8 @@ export default {
if (this.formobj.scmVehRebateWiths[j].rebateTypeValue === cval.rebateTypeValue) {
this.formobj.scmVehRebateWiths[j].num = parseInt(this.formobj.scmVehRebateWiths[j].num) + parseInt(1)
this.formobj.scmVehRebateWiths[j].withRebate = parseFloat(this.formobj.scmVehRebateWiths[j].withRebate !== '' ? this.formobj.scmVehRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
this.formobj.scmVehRebateWiths[j].expectTreatCost = parseFloat(this.formobj.scmVehRebateWiths[j].expectTreatCost !== '' ? this.formobj.scmVehRebateWiths[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)
this.formobj.scmVehRebateWiths[j].expectSuppCost = parseFloat(this.formobj.scmVehRebateWiths[j].expectSuppCost !== '' ? this.formobj.scmVehRebateWiths[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)
this.formobj.scmVehRebateWiths[j].vehRebateSids.push(cval.sid)
v = 1
break
@ -207,10 +191,12 @@ export default {
rebateTypeValue: cval.rebateTypeValue,
num: 1,
withRebate: cval.withRebate,
expectTreatCost: cval.expectTreatCost,
expectSuppCost: cval.expectSuppCost,
brandName: cval.brandName,
brandSid: cval.brandSid,
vehRebateSids: [cval.sid],
// remarks: '',
remarks: '',
sid: '',
mainSid: ''
})
@ -234,6 +220,8 @@ export default {
if (aa[j].rebateTypeValue === cval.rebateTypeValue) {
aa[j].num = parseInt(aa[j].num) + parseInt(1)
aa[j].withRebate = parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
aa[j].expectTreatCost = parseFloat(aa[j].expectTreatCost !== '' ? aa[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)
aa[j].expectSuppCost = parseFloat(aa[j].expectSuppCost !== '' ? aa[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)
aa[j].vehRebateSids.push(cval.sid)
v = 1
break
@ -245,10 +233,12 @@ export default {
rebateTypeValue: cval.rebateTypeValue,
num: 1,
withRebate: cval.withRebate,
expectTreatCost: cval.expectTreatCost,
expectSuppCost: cval.expectSuppCost,
brandName: cval.brandName,
brandSid: cval.brandSid,
vehRebateSids: [cval.sid],
// remarks: '',
remarks: '',
sid: '',
mainSid: ''
})
@ -260,6 +250,8 @@ export default {
this.formobj.scmVehRebateWiths[k].rebateTypeValue = aa[0].rebateTypeValue
this.formobj.scmVehRebateWiths[k].num = aa[0].num
this.formobj.scmVehRebateWiths[k].withRebate = aa[0].withRebate
this.formobj.scmVehRebateWiths[k].expectTreatCost = aa[0].expectTreatCost
this.formobj.scmVehRebateWiths[k].expectSuppCost = aa[0].expectSuppCost
this.formobj.scmVehRebateWiths[k].brandName = aa[0].brandName
this.formobj.scmVehRebateWiths[k].brandSid = aa[0].brandSid
this.formobj.scmVehRebateWiths[k].vehRebateSids = aa[0].vehRebateSids
@ -296,21 +288,6 @@ export default {
}, 0)
sums[index] += ''
this.formobj.withRebateTotal = sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
this.amount = sums[index] += ''
} else {
sums[index] = ''
}
}
})
return sums
@ -384,5 +361,15 @@ export default {
border-right: 0px !important;
border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
</style>

75
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue

@ -14,58 +14,36 @@
<!--Start 新增修改部分-->
<div class="">
<div class="titwu"><span>{{ formobj.withApply }}单车返利预提申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="24" class="tleftb colOneStyle">
<div><span style="font-size: 16px">金额单位</span></div>
<el-col :span="24" class="colOneStyle">
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
</el-col>
<el-col :span="22" class="colOneStyle">
<el-form-item>
<span>{{ formobj.brandName }}</span>
</el-form-item>
<el-col :span="24" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">品牌</div>
<el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="台数" align="center">
<template slot-scope="scope">
<span>{{ scope.row.num }}</span>
</template>
</el-table-column>
<el-table-column prop="withRebate" label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withRebate }}</span>
</template>
</el-table-column>
<el-table-column label="明细" align="center">
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="num" label="台数" align="center" width="80" />
<el-table-column prop="withRebate" label="预提返利" align="center" width="120" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
<el-table-column label="明细" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.remarks }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item>
<span>{{ formobj.remarks }}</span>
</el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
@ -212,21 +190,6 @@ export default {
}
}, 0)
sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
this.amount = sums[index] += ''
} else {
sums[index] = ''
}
}
})
return sums
@ -247,5 +210,11 @@ export default {
border-right: 0px !important;
border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

71
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliAdd.vue

@ -18,61 +18,20 @@
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vehModelName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="厂家结算价" align="center">
<template slot-scope="scope">
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="其中运费" align="center">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center">
<template slot-scope="scope">
<span>{{ scope.row.calculationStandard }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="所属年月" align="center">
<template slot-scope="scope">
<span>{{ scope.row.palceGenDate }}</span>
</template>
</el-table-column>
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="130" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" label="创建日期" align="center" width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="140" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="140" />
<el-table-column prop="expectSuppRemark" label="抵顶费用说明" align="center" min-width="200" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
</el-table>
</el-form>
</div>
@ -148,6 +107,8 @@ export default {
rebateTypeValue: this.list[i].rebateTypeValue,
rebateTypeKey: this.list[i].rebateTypeKey,
withRebate: this.list[i].estimateRebate,
expectTreatCost: this.list[i].expectTreatCost,
expectSuppCost: this.list[i].expectSuppCost,
brandName: this.list[i].brandName,
brandSid: this.list[i].brandSid
})

69
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliInfo.vue

@ -16,61 +16,20 @@
<el-form ref="form_obj" :rules="rules" class="formadd">
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center" width="220">
<template slot-scope="scope">
<span>{{ scope.row.vehModelName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="厂家结算价" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="其中运费" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.calculationStandard }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="所属年月" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.palceGenDate }}</span>
</template>
</el-table-column>
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="130" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" label="创建日期" align="center" width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="140" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="140" />
<el-table-column prop="expectSuppRemark" label="抵顶费用说明" align="center" min-width="200" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
</el-table>
</el-form>
</div>

72
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue

@ -42,61 +42,19 @@
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
<el-table-column label="品牌" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vehModelName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="厂家结算价" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="其中运费" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.calculationStandard }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="所属年月" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.palceGenDate }}</span>
</template>
</el-table-column>
<el-table-column prop="brandName" label="品牌" align="center" width="140" />
<el-table-column prop="vehModelName" label="车型" align="center" width="200" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" label="创建日期" align="center" width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
<el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
<el-table-column prop="calculationStandard" label="计算标准" align="center" width="100" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectCost" label="其中预计费用" align="center" width="120" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</div>
<div class="pages">
@ -204,6 +162,8 @@ export default {
rebateTypeValue: element.rebateTypeValue,
rebateTypeKey: element.rebateTypeKey,
withRebate: element.estimateRebate,
expectTreatCost: element.expectTreatCost,
expectSuppCost: element.expectSuppCost,
brandName: element.brandName,
brandSid: element.brandSid
})
@ -217,7 +177,7 @@ export default {
req.pageList(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
if (response.success && response.data && response.data.total > 0) {
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {

Loading…
Cancel
Save