Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 4 months ago
parent
commit
71f072d333
  1. 8
      anrui-buscenter/anrui-buscenter-ui/src/api/vehicleBusinessFileManagement/vehicleBusinessFileManagement.js
  2. 322
      anrui-buscenter/anrui-buscenter-ui/src/views/vehicleBusinessFileManagement/vehicleBusinessFileManagement.vue
  3. 184
      anrui-buscenter/anrui-buscenter-ui/src/views/vehicleBusinessFileManagement/vehicleBusinessFileManagementInfo.vue
  4. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/relation/vehicleSelect.vue
  5. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/xiaoshouzhengceDaiBanInfo.vue
  6. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/xiaoshouzhengceEdit.vue
  7. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/xiaoshouzhengceYiBanInfo.vue
  8. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/printContract.vue
  9. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/relation/vehicleselect.vue
  10. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue
  11. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceInfo.vue
  12. 4
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
  13. 18
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
  14. 8
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
  15. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/vehcile.vue
  16. 8
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue
  17. 18
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
  18. 8
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue
  19. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/vehcile.vue
  20. 19
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
  21. 7
      anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
  22. 7
      anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatewithholding.js
  23. 7
      anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js
  24. 7
      anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatewithholding.js
  25. 33
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
  26. 35
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
  27. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
  28. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue
  29. 22
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue
  30. 3
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue
  31. 29
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue
  32. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue
  33. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue
  34. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue
  35. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
  36. 6
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
  37. 4
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue
  38. 2
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue
  39. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
  40. 4
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
  41. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
  42. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhangchaxun/chaliangtaizhangselect.vue
  43. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
  44. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue
  45. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojiaInfo.vue
  46. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue
  47. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/yibaojiaguanli/yibaojia.vue
  48. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/yibaojiaguanli/yibaojiaInfo.vue
  49. 4
      anrui-scm/anrui-scm-ui/src/views/guache/guacheguanli/guacheAdd.vue
  50. 2
      anrui-scm/anrui-scm-ui/src/views/guache/guacheguanli/guacheInfo.vue
  51. 2
      anrui-scm/anrui-scm-ui/src/views/guache/guacheguanli/guacheguanli.vue
  52. 4
      anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangAdd.vue
  53. 2
      anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangInfo.vue
  54. 2
      anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangguanli.vue
  55. 4
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue
  56. 2
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuInfo.vue
  57. 2
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotAdd.vue
  58. 2
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotInfo.vue
  59. 4
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotByVehicleAdd.vue
  60. 2
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/relation/collectionrebateallotSelectVehicle.vue
  61. 4
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue
  62. 2
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementInfo.vue
  63. 2
      anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtaizhangselect.vue
  64. 2
      anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaAdd.vue
  65. 2
      anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaInfo.vue
  66. 2
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
  67. 2
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
  68. 2
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
  69. 2
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhangtaizhangInfo.vue
  70. 4
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue
  71. 2
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangguanli.vue
  72. 19
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue
  73. 1
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue
  74. 31
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
  75. 33
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
  76. 2
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue
  77. 2
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedByDisNum.vue
  78. 29
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue
  79. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/relation/xuanzecheliang.vue
  80. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiAdd.vue
  81. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiInfo.vue
  82. 2
      anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue
  83. 2
      anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue
  84. 2
      anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue
  85. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/relation/xuanzecheliang.vue
  86. 6
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue
  87. 33
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
  88. 35
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
  89. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicycleInfo.vue
  90. 20
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue
  91. 3
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue
  92. 29
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue
  93. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliAdd.vue
  94. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliInfo.vue
  95. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue
  96. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliguanliInfo.vue
  97. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiAdd.vue
  98. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiInfo.vue
  99. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
  100. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

8
anrui-buscenter/anrui-buscenter-ui/src/api/vehicleBusinessFileManagement/vehicleBusinessFileManagement.js

@ -4,7 +4,7 @@ export default {
// 查询分页列表 // 查询分页列表
listPage: function(params) { listPage: function(params) {
return request({ return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default", // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/buscenter/v1/vehicleBusinessFileManagement/listPage', url: '/buscenter/v1/vehicleBusinessFileManagement/listPage',
method: 'post', method: 'post',
data: params, data: params,
@ -14,10 +14,10 @@ export default {
}) })
}, },
init: function(data) { init(data) {
return request({ return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default", // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/buscenter/v1/vehicleBusinessFileManagement/gteInitBySid/' + data, url: '/buscenter/v1/vehicleBusinessFileManagement/getInitBySid/' + data,
method: 'get', method: 'get',
}) })
}, },

322
anrui-buscenter/anrui-buscenter-ui/src/views/vehicleBusinessFileManagement/vehicleBusinessFileManagement.vue

@ -0,0 +1,322 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="车辆业务档案" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">
{{ searchxianshitit }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="queryParams.params.orgName" placeholder="" clearable />
</el-form-item>
<el-form-item label="销售部门">
<el-input v-model="queryParams.params.sellDept" placeholder="" clearable />
</el-form-item>
<el-form-item label="销售专员">
<el-input v-model="queryParams.params.staffName" placeholder="" clearable />
</el-form-item>
<el-form-item label="销售订单编号">
<el-input v-model="queryParams.params.saleOrderNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="买卖合同编号">
<el-input v-model="queryParams.params.contractNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="付款方式">
<el-select v-model="queryParams.params.payType" placeholder="请选择">
<el-option v-for="(item,i) in payTypeList" :key="i" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="业务类型">
<el-select v-model="queryParams.params.businessType" placeholder="请选择">
<el-option v-for="(item,i) in busTypeList" :key="i" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="queryParams.params.customerName" placeholder="" clearable />
</el-form-item>
<el-form-item label="客户电话">
<el-input v-model="queryParams.params.customerPhone" placeholder="" clearable />
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="queryParams.params.vinNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="车型">
<el-input v-model="queryParams.params.modelName" placeholder="" clearable />
</el-form-item>
<el-form-item label="开票单位">
<el-input v-model="queryParams.params.invoiceTitle" placeholder="" clearable />
</el-form-item>
<el-form-item label="开票类型">
<el-select v-model="queryParams.params.invoiceType" placeholder="请选择">
<el-option v-for="(item,i) in invoiceTypeList" :key="i" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="出库日期">
<el-date-picker v-model="queryParams.params.deliveryStartData" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.deliveryEndData" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="业务状态">
<el-select v-model="queryParams.params.businessStatus" placeholder="请选择">
<el-option v-for="(item,i) in businessStatusList" :key="i" :label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="欠款金额 > ">
<el-input v-model="queryParams.params.arrearsMoney" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
<!-- Start 项目列表头部 -->
<div class="listtop">
<div class="tit">车辆业务档案列表</div>
</div>
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="80">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="vinNo" label="车架号" align="center" width="120" />
<el-table-column prop="modelName" label="车型" align="center" width="220" />
<el-table-column label="销售订单编号" align="center" width="180">
<template slot-scope="scope">
<span class="bluezi" @click="handleCheck(scope.row)">{{scope.row.saleOrderNo}}</span>
</template>
</el-table-column>
<el-table-column prop="contractNo" label="买卖合同编号" align="center" width="130" />
<el-table-column prop="payType" label="付款方式" align="center" width="150" />
<el-table-column prop="businessType" label="业务类型" align="center" width="100" />
<el-table-column prop="customerName" label="客户名称" align="center" width="100" />
<el-table-column prop="customerName" label="客户电话" align="center" width="120" />
<el-table-column prop="salePrice" label="销售合同价" align="center" width="120" />
<el-table-column prop="invoiceTitle" label="开票单位" align="center" width="220" />
<el-table-column prop="invoiceType" label="开票类型" align="center" width="120" />
<el-table-column prop="outBoundDate" label="出库日期" align="center" width="100" />
<el-table-column prop="paymentAmount" label="交款金额" align="center" width="100" />
<el-table-column prop="arrearsMoney" label="欠款金额" align="center" width="100" />
<el-table-column prop="businessStatus" label="业务状态" align="center" width="100" />
<el-table-column prop="orgName" label="分公司" align="center" width="150" />
<el-table-column prop="sellDept" label="销售部门" align="center" width="220" />
<el-table-column prop="staffName" label="销售专员" align="center" width="100" />
</el-table>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div>
</div>
</div>
<!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 -->
<divInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" @reloadlist="loadList" />
<dingdanInfo v-show="viewState == 5" ref="dingdanInfo" @doback="resetState" @reloadlist="loadList" />
</div>
</template>
<script>
import req from '@/api/vehicleBusinessFileManagement/vehicleBusinessFileManagement.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divInfo from './vehicleBusinessFileManagementInfo.vue'
import dingdanInfo from '@/components/publicPage/dingdanInfo'
import {
typeValues,
getTypeValueList
} from '@/api/dictcommons/dictcommons'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divInfo,
dingdanInfo
},
data() {
return {
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
"deptName": "",
"createByName": "",
"billNo": "",
"createStartTime": "",
"createEndTime": "",
"finishStartTime": "",
"finishEndTime": "",
"sourceBillNo": "",
"userSid": "",
"orgPath": "",
"menuUrl": "",
"warehouseTypeKey": "01"
}
},
sids: [],
selectionList: [],
busTypeList: [],
payTypeList: [],
invoiceTypeList: [],
businessStatusList: [],
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.loadList()
typeValues({
type: 'wms_busType'
}).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
})
},
methods: {
handleCheck(row) {
this.viewState = 5
this.$refs['dingdanInfo'].showInfo({
sid: row.saleOrderSid
})
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
switch (btnKey) {
// case 'doDel':
// this.doDel()
// break
// case 'toAdd':
// this.toAdd()
// break
case 'doClose':
this.doClose()
break
default:
break
}
},
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
} else {
// resp.code
this.dataList = []
this.queryParams.total = 0
}
}).catch(() => {
this.tableLoading = false
})
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
dosearch() {
this.queryParams.current = 1
this.loadList()
},
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
"deptName": "",
"createByName": "",
"billNo": "",
"createStartTime": "",
"createEndTime": "",
"finishStartTime": "",
"finishEndTime": "",
"sourceBillNo": "",
"userSid": "",
"orgPath": "",
"menuUrl": "",
"warehouseTypeKey": "01"
}
}
this.loadList()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
resetState() {
this.viewState = 1
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row)
}
}
}
</script>
<style scoped>
</style>

184
anrui-buscenter/anrui-buscenter-ui/src/views/vehicleBusinessFileManagement/vehicleBusinessFileManagementInfo.vue

@ -1,8 +1,188 @@
<template> <template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<!-- 标题 -->
<div>车辆业务档案详情</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">销售订单号</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.saleOrderNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">买卖合同号</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.contractNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.businessType }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.orgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">销售部门</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.sellDept }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">销售专员</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.staffName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">车架号</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.vinNo }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">车型</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.modelName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">销售合同价</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.salePrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.invoiceTitle }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开票类型</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.invoiceType }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">客户名称</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.customerPhone }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">客户电话</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.customerPhone }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">身份证号码</div>
<el-form-item><span class="addinputInfo">{{ saleOrderInfo.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>销售订单附件</div>
</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="文件名称" prop="goodsSpuName" align="center" />
<el-table-column label="上传日期" prop="goodsSkuCode" align="center" />
<el-table-column label="上传人" prop="goodsSkuCode" align="center" />
</el-table>
</el-form>
</div>
</div>
</div>
</template> </template>
<script> <script>
import req from '@/api/vehicleBusinessFileManagement/vehicleBusinessFileManagement.js'
export default {
components: {},
data() {
return {
viewState: 1,
listLoading: false,
submitdisabled: false,
formobj: {},
saleOrderInfo: {}
}
},
methods: {
indexMethod(index) {
return index + 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.$emit('doback')
},
showInfo(row) {
var params = {
sid: row.sid
}
this.saleOrderInfo = row
console.log('projectDailySave--e:', row)
req.init(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
this.formobj = {}
})
},
showEdit(row) {
},
resetState() {
this.viewState = 1
},
}
}
</script> </script>
<style scoped>
.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);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
<style> .titleOne {
</style> padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

2
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/relation/vehicleSelect.vue

@ -101,7 +101,7 @@
<span>{{ scope.row.locationName }}</span> <span>{{ scope.row.locationName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center"> <el-table-column label="车辆入库价" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.manufactorSettlementPrice }}</span> <span>{{ scope.row.manufactorSettlementPrice }}</span>
</template> </template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/xiaoshouzhengceDaiBanInfo.vue

@ -104,7 +104,7 @@
<span>{{ scope.row.settlementStatusValue }}</span> <span>{{ scope.row.settlementStatusValue }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center" width="150"> <el-table-column label="车辆入库价" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.manufactorSettlementPrice }}</span> <span>{{ scope.row.manufactorSettlementPrice }}</span>
</template> </template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/xiaoshouzhengceEdit.vue

@ -125,7 +125,7 @@
<span>{{ scope.row.settlementStatusValue }}</span> <span>{{ scope.row.settlementStatusValue }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center" width="150"> <el-table-column label="车辆入库价" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.manufactorSettlementPrice }}</span> <span>{{ scope.row.manufactorSettlementPrice }}</span>
</template> </template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/xiaoshouzhengceYiBanInfo.vue

@ -102,7 +102,7 @@
<span>{{ scope.row.settlementStatusValue }}</span> <span>{{ scope.row.settlementStatusValue }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center" width="150"> <el-table-column label="车辆入库价" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.manufactorSettlementPrice }}</span> <span>{{ scope.row.manufactorSettlementPrice }}</span>
</template> </template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/printContract.vue

@ -40,7 +40,7 @@
<!-- </el-row>--> <!-- </el-row>-->
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="6" class="tleftb">--> <!-- <el-col :span="6" class="tleftb">-->
<!-- <span>厂家结算(万元)</span>--> <!-- <span>车辆入库(万元)</span>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item>--> <!-- <el-form-item>-->

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/relation/vehicleselect.vue

@ -116,7 +116,7 @@
<span>{{ scope.row.locationName }}</span> <span>{{ scope.row.locationName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center"> <el-table-column label="车辆入库价" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.manufactorSettlementPrice }}</span> <span>{{ scope.row.manufactorSettlementPrice }}</span>
</template> </template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue

@ -126,7 +126,7 @@
<span>{{ scope.row.settlementStatusValue }}</span> <span>{{ scope.row.settlementStatusValue }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center" width="150"> <el-table-column label="车辆入库价" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.manufactorSettlementPrice }}</span> <span>{{ scope.row.manufactorSettlementPrice }}</span>
</template> </template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceInfo.vue

@ -102,7 +102,7 @@
<span>{{ scope.row.settlementStatusValue }}</span> <span>{{ scope.row.settlementStatusValue }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center" width="150"> <el-table-column label="车辆入库价" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.manufactorSettlementPrice }}</span> <span>{{ scope.row.manufactorSettlementPrice }}</span>
</template> </template>

4
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue

@ -520,7 +520,7 @@ export default {
req.listPage(this.listQuery).then((response) => { req.listPage(this.listQuery).then((response) => {
console.log('列表查询结果:', response) console.log('列表查询结果:', response)
this.listLoading = false this.listLoading = false
if (response.success && response.data && response.data.total > 0) { if (response.success) {
this.list = response.data.records this.list = response.data.records
this.listQuery.total = response.data.total this.listQuery.total = response.data.total
} else { } else {
@ -651,7 +651,7 @@ export default {
this.formobj.receiveBank = row.receiveBank this.formobj.receiveBank = row.receiveBank
this.formobj.payCode = row.payCode this.formobj.payCode = row.payCode
this.formobj.payWayValue = row.payWayValue this.formobj.payWayValue = row.payWayValue
this.formobj.payWayKey = row.payWayKey this.changePayWay(row.payWayValue)
const aa = [] const aa = []
aa.push(row.sid) aa.push(row.sid)
this.sids = aa this.sids = aa

18
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@ -77,13 +77,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="icon">*</span>是否事业部领导审批</div> <div v-if="formobj.isVeh == '0'">
<el-form-item prop="isLeaderSp"> <div class="span-sty"><span class="icon">*</span>是否事业部领导审批</div>
<el-radio-group class="addinputInfo" v-model="formobj.isLeaderSp"> <el-form-item prop="isLeaderSp">
<el-radio label="1"></el-radio> <el-radio-group class="addinputInfo" v-model="formobj.isLeaderSp">
<el-radio label="0"></el-radio> <el-radio label="1"></el-radio>
</el-radio-group> <el-radio label="0"></el-radio>
</el-form-item> </el-radio-group>
</el-form-item>
</div>
</el-col> </el-col>
</el-row> </el-row>
<div class="title titleOne"> <div class="title titleOne">
@ -182,7 +184,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="insideCode" label="内部编码" align="center" width="120" /> <el-table-column prop="insideCode" label="内部编码" align="center" width="120" />
<el-table-column prop="money" label="厂家结算价" align="center" width="130" /> <el-table-column prop="money" label="车辆入库价" align="center" width="130" />
<el-table-column label="合同/销售订单编号" align="center" width="180"> <el-table-column label="合同/销售订单编号" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span> <span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span>

8
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue

@ -52,8 +52,10 @@
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">是否事业部领导审批</div> <div v-if="formobj.isVeh == '0'">
<el-form-item><span class="addinputInfo">{{ formobj.isLeaderSp == '1' ? '是' : '否' }}</span></el-form-item> <div class="span-sty">是否事业部领导审批</div>
<el-form-item><span class="addinputInfo">{{ formobj.isLeaderSp == '1' ? '是' : '否' }}</span></el-form-item>
</div>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">付款明细</div> <div class="title">付款明细</div>
@ -103,7 +105,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="insideCode" label="内部编码" align="center" width="120" /> <el-table-column prop="insideCode" label="内部编码" align="center" width="120" />
<el-table-column prop="money" label="厂家结算价" align="center" width="130" /> <el-table-column prop="money" label="车辆入库价" align="center" width="130" />
<el-table-column label="合同/销售订单编号" align="center" width="180"> <el-table-column label="合同/销售订单编号" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span> <span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span>

2
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/vehcile.vue

@ -107,7 +107,7 @@
<span>{{ scope.row.location }}</span> <span>{{ scope.row.location }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center"> <el-table-column label="车辆入库价" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.money }}</span> <span>{{ scope.row.money }}</span>
</template> </template>

8
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue

@ -54,8 +54,10 @@
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">是否事业部领导审批</div> <div v-if="formobj.isVeh == '0'">
<el-form-item><span class="addinputInfo">{{ formobj.isLeaderSp == '1' ? '是' : '否' }}</span></el-form-item> <div class="span-sty">是否事业部领导审批</div>
<el-form-item><span class="addinputInfo">{{ formobj.isLeaderSp == '1' ? '是' : '否' }}</span></el-form-item>
</div>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">付款明细</div> <div class="title">付款明细</div>
@ -105,7 +107,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="insideCode" label="内部编码" align="center" width="120" /> <el-table-column prop="insideCode" label="内部编码" align="center" width="120" />
<el-table-column prop="money" label="厂家结算价" align="center" width="130" /> <el-table-column prop="money" label="车辆入库价" align="center" width="130" />
<el-table-column label="合同/销售订单编号" align="center" width="180"> <el-table-column label="合同/销售订单编号" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span> <span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span>

18
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue

@ -76,13 +76,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="icon">*</span>是否事业部领导审批</div> <div v-if="formobj.isVeh == '0'">
<el-form-item prop="isLeaderSp"> <div class="span-sty"><span class="icon">*</span>是否事业部领导审批</div>
<el-radio-group class="addinputInfo" v-model="formobj.isLeaderSp"> <el-form-item prop="isLeaderSp">
<el-radio label="1"></el-radio> <el-radio-group class="addinputInfo" v-model="formobj.isLeaderSp">
<el-radio label="0"></el-radio> <el-radio label="1"></el-radio>
</el-radio-group> <el-radio label="0"></el-radio>
</el-form-item> </el-radio-group>
</el-form-item>
</div>
</el-col> </el-col>
</el-row> </el-row>
<div class="title titleOne"> <div class="title titleOne">
@ -181,7 +183,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="insideCode" label="内部编码" align="center" width="120" /> <el-table-column prop="insideCode" label="内部编码" align="center" width="120" />
<el-table-column prop="money" label="厂家结算价" align="center" width="130" /> <el-table-column prop="money" label="车辆入库价" align="center" width="130" />
<el-table-column label="合同/销售订单编号" align="center" width="180"> <el-table-column label="合同/销售订单编号" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span> <span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span>

8
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue

@ -52,8 +52,10 @@
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">是否事业部领导审批</div> <div v-if="formobj.isVeh == '0'">
<el-form-item><span class="addinputInfo">{{ formobj.isLeaderSp == '1' ? '是' : '否' }}</span></el-form-item> <div class="span-sty">是否事业部领导审批</div>
<el-form-item><span class="addinputInfo">{{ formobj.isLeaderSp == '1' ? '是' : '否' }}</span></el-form-item>
</div>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">付款明细</div> <div class="title">付款明细</div>
@ -103,7 +105,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="insideCode" label="内部编码" align="center" width="120" /> <el-table-column prop="insideCode" label="内部编码" align="center" width="120" />
<el-table-column prop="money" label="厂家结算价" align="center" width="130" /> <el-table-column prop="money" label="车辆入库价" align="center" width="130" />
<el-table-column label="合同/销售订单编号" align="center" width="180"> <el-table-column label="合同/销售订单编号" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span> <span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span>

2
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/vehcile.vue

@ -107,7 +107,7 @@
<span>{{ scope.row.location }}</span> <span>{{ scope.row.location }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center"> <el-table-column label="车辆入库价" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.money }}</span> <span>{{ scope.row.money }}</span>
</template> </template>

19
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrdersVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrdersVo;
import com.yxt.anrui.buscenter.api.bussalesorder.OrderSolutionVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
@ -2535,6 +2534,24 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
SolutionssVo solutionssVo = new SolutionssVo(); SolutionssVo solutionssVo = new SolutionssVo();
BeanUtil.copyProperties(query, solutionssVo); BeanUtil.copyProperties(query, solutionssVo);
solutionssVo.setBusSid(query.getSaleOrderSid()); solutionssVo.setBusSid(query.getSaleOrderSid());
//三方金融时贴息抵车款小于等于厂家贴息
String saleOrderSid = query.getSaleOrderSid();
BusSalesOrder order = busSalesOrderFeign.fetchBySid(saleOrderSid).getData();
if (null != order) {
if (order.getFinancePlanValue().equals("三方金融")) {
BigDecimal cjtx = BigDecimal.ZERO;//厂家贴息
BigDecimal txdck = BigDecimal.ZERO;//贴息抵车款
if (StringUtils.isNotBlank(query.getFactoryDiscount())) {
cjtx = new BigDecimal(query.getFactoryDiscount());
}
if (StringUtils.isNotBlank(query.getDiscountCar())) {
txdck = new BigDecimal(query.getDiscountCar());
}
if (txdck.compareTo(cjtx) > 0) {
return rb.setMsg("贴息抵车款应小于等于厂家贴息");
}
}
}
if (query.isShowMore()) { if (query.isShowMore()) {
if (query.isPremiumCb()) { if (query.isPremiumCb()) {
//保险 //保险

7
anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js

@ -98,6 +98,13 @@ export default {
method: 'get' method: 'get'
}) })
}, },
createPdf: function(data) {
return request({
url: '/scm/v1/scmvehrebatecheckapply/createPdf',
method: 'post',
params: data
})
},
// 提交流程 // 提交流程
submitVehicleApply: function(params) { submitVehicleApply: function(params) {
return request({ return request({

7
anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatewithholding.js

@ -51,6 +51,13 @@ export default {
method: 'get' method: 'get'
}) })
}, },
createPdf: function(data) {
return request({
url: '/scm/v1/scmvehrebatewithapply/createPdf',
method: 'post',
params: data
})
},
// 提交流程 // 提交流程
submitVehicleApply: function(params) { submitVehicleApply: function(params) {
return request({ return request({

7
anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js

@ -98,6 +98,13 @@ export default {
method: 'get' method: 'get'
}) })
}, },
createPdf: function(data) {
return request({
url: '/scm/v1/scmspecialrebatecheckapply/createPdf ',
method: 'post',
params: data
})
},
// 提交流程 // 提交流程
submitVehicleApply: function(params) { submitVehicleApply: function(params) {
return request({ return request({

7
anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatewithholding.js

@ -51,6 +51,13 @@ export default {
method: 'get' method: 'get'
}) })
}, },
createPdf: function(data) {
return request({
url: '/scm/v1/scmspecialrebatewithapply/createPdf',
method: 'post',
params: data
})
},
// 提交流程 // 提交流程
submitVehicleApply: function(params) { submitVehicleApply: function(params) {
return request({ return request({

33
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue

@ -59,8 +59,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" /> <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" /> <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100"> <el-table-column label="明细" align="center" min-width="100">
<template> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button> <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -79,8 +79,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" /> <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" /> <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100"> <el-table-column label="明细" align="center" min-width="100">
<template> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button> <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -299,24 +299,27 @@ export default {
dataDelete(index) { dataDelete(index) {
this.formobj.baseVehinstallModpricedetails.splice(index, 1) this.formobj.baseVehinstallModpricedetails.splice(index, 1)
}, },
handleLook() { handleLook(row) {
this.viewState = 3 this.viewState = 3
this.$refs['divAdd'].showInfo(this.formobj.sid, this.formobj.scmVehrebateCheckapplydetailList) this.$refs['divAdd'].showInfo(row.vehRebateSids)
}, },
backAdd(val) { backAdd(val) {
this.viewState = 1 this.viewState = 1
// //
this.formobj.scmWhenVehrebateCheckapplydetailDetails = [] this.formobj.scmWhenVehrebateCheckapplydetailDetails = []
this.formobj.scmLastVehrebateCheckapplydetailDetails = [] this.formobj.scmLastVehrebateCheckapplydetailDetails = []
this.formobj.scmVehrebateCheckapplydetailList = []
var list = JSON.parse(JSON.stringify(val)) var list = JSON.parse(JSON.stringify(val))
// //
list.forEach((e) => { for (var n = 0; n < list.length; n++) {
this.formobj.scmVehrebateCheckapplydetailList.push(e) for (var m = 0; m < this.formobj.scmVehrebateCheckapplydetailList.length; m++) {
}) if (list[n] === this.formobj.scmVehrebateCheckapplydetailList[m].sid) {
this.formobj.scmVehrebateCheckapplydetailList.splice(this.formobj.scmVehrebateCheckapplydetailList[m], 1)
}
}
}
// (1. 2.) // (1. 2.)
// //
list.forEach((e) => { this.formobj.scmVehrebateCheckapplydetailList.forEach((e) => {
let v = 0 let v = 0
for (var i in this.formobj.scmWhenVehrebateCheckapplydetailDetails) { for (var i in this.formobj.scmWhenVehrebateCheckapplydetailDetails) {
if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].brandName === e.brandName) { if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].brandName === e.brandName) {
@ -358,7 +361,7 @@ export default {
}) })
let k = 0 let k = 0
// //
list.forEach((s) => { this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => {
for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) { for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) { if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1) this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)
@ -446,13 +449,13 @@ export default {
return return
} }
const values = data.map(item => Number(item[column.property])) const values = data.map(item => Number(item[column.property]))
if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue') { if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue' && column.property !== undefined) {
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else { } else {
return prev return Math.round((parseFloat(prev)) * 100) / 100
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''

35
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue

@ -8,7 +8,7 @@
<!--start 添加修改按钮--> <!--start 添加修改按钮-->
<div> <div>
<el-button type="primary" size="small">导出</el-button> <el-button type="primary" size="small">导出</el-button>
<el-button type="primary" size="small">下载</el-button> <el-button type="primary" size="small" @click="download">下载</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
</div> </div>
@ -98,6 +98,7 @@
<script> <script>
import req from '@/api/bikerebate/bicyclerebatecheck' import req from '@/api/bikerebate/bicyclerebatecheck'
import bicyclerebatetobecheckedInfo from './relation/bicyclerebatetobecheckedInfo' import bicyclerebatetobecheckedInfo from './relation/bicyclerebatetobecheckedInfo'
import { getStorage } from '@/utils/auth'
export default { export default {
name: 'BicycleRebateCheckInfo', name: 'BicycleRebateCheckInfo',
@ -169,13 +170,13 @@ export default {
return return
} }
const values = data.map(item => Number(item[column.property])) const values = data.map(item => Number(item[column.property]))
if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue') { if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue' && column.property !== undefined) {
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else { } else {
return prev return Math.round((parseFloat(prev)) * 100) / 100
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''
@ -183,6 +184,32 @@ export default {
}) })
return sums return sums
}, },
download() {
req.createPdf({ vehCheckSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
if (resp.success && resp.data !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data + '&outFileName=' + '单车返利核对明细', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '单车返利核对明细.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
}
})
},
// === // ===
handleReturn() { handleReturn() {
// //

2
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue

@ -77,7 +77,7 @@
<el-table-column prop="brandName" label="品牌" align="center" width="120" /> <el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="200" /> <el-table-column prop="vehModelName" label="车型" align="center" min-width="200" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" /> <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140" /> <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="140" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" /> <el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" label="创建日期" align="center" width="120" /> <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" /> <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />

2
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue

@ -42,7 +42,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">厂家结算</div> <div class="span-sty">车辆入库</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufactorSettlementPrice }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.manufactorSettlementPrice }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">

22
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue

@ -55,6 +55,7 @@
</template> </template>
<script> <script>
import req from '@/api/bikerebate/bicyclerebatewithholding'
import bicyclerebatemanagementInfo from '../../bikerebatemanagement/bicyclerebatemanagementInfo' import bicyclerebatemanagementInfo from '../../bikerebatemanagement/bicyclerebatemanagementInfo'
export default { export default {
@ -72,8 +73,7 @@ export default {
// //
list: [], list: [],
scmVehrebateCheckapplydetailList: [], scmVehrebateCheckapplydetailList: [],
rules: {}, rules: {}
submitdisabled: false
} }
}, },
methods: { methods: {
@ -85,33 +85,31 @@ export default {
this.sids = aa this.sids = aa
console.log('sids', this.sids) console.log('sids', this.sids)
}, },
showInfo(sid, value) { showInfo(vehRebateSids) {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
this.scmVehrebateCheckapplydetailList = JSON.parse(JSON.stringify(value))
this.viewTitle = '单车返利核对审核申请明细' this.viewTitle = '单车返利核对审核申请明细'
this.list = this.scmVehrebateCheckapplydetailList vehRebateSids = JSON.parse(JSON.stringify(vehRebateSids))
req.vehRebateWithDetails(vehRebateSids).then((resp) => {
this.list = resp.data
})
}, },
handleDelete() { handleDelete() {
if (this.sids.length === 0) { if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' }) this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return return
} }
const aa = []
for (var i = 0; i < this.list.length; i++) { for (var i = 0; i < this.list.length; i++) {
for (var j = 0; j < this.sids.length; j++) { for (var j = 0; j < this.sids.length; j++) {
if (this.list[i].sid === this.sids[j]) { if (this.list[i].sid === this.sids[j]) {
aa.push(this.list[i].sid)
this.list.splice(i, 1) this.list.splice(i, 1)
} }
} }
} }
for (var l = 0; l < this.scmVehrebateCheckapplydetailList.length; l++) { this.scmVehrebateCheckapplydetailList = aa
for (var p = 0; p < this.sids.length; p++) {
if (this.scmVehrebateCheckapplydetailList[l].sid === this.sids[p]) {
this.scmVehrebateCheckapplydetailList.splice(l, 1)
}
}
}
}, },
handleLook(row) { handleLook(row) {
this.viewState = 2 this.viewState = 2

3
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/yiheduidanchefanli.vue

@ -15,7 +15,7 @@
<el-table-column prop="brandName" label="品牌" align="center" width="120" /> <el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="200" /> <el-table-column prop="vehModelName" label="车型" align="center" min-width="200" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" /> <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140" /> <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="140" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" /> <el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" 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="rebateTypeValue" label="返利类型" align="center" width="120" />
@ -159,6 +159,7 @@ export default {
} }
} }
this.listQuery.params.sidList = aa this.listQuery.params.sidList = aa
this.listQuery.current = 1
this.getList() this.getList()
}, },
// //

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

@ -8,7 +8,7 @@
<!--start 添加修改按钮--> <!--start 添加修改按钮-->
<div> <div>
<el-button type="primary" size="small">导出</el-button> <el-button type="primary" size="small">导出</el-button>
<el-button type="primary" size="small">下载</el-button> <el-button type="primary" size="small" @click="download">下载</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
</div> </div>
@ -78,6 +78,7 @@
<script> <script>
import req from '@/api/bikerebate/bicyclerebatewithholding' import req from '@/api/bikerebate/bicyclerebatewithholding'
import danchefanliInfo from './relation/danchefanliInfo' import danchefanliInfo from './relation/danchefanliInfo'
import { getStorage } from '@/utils/auth'
export default { export default {
name: 'BicycleRebateWithholdingInfo', name: 'BicycleRebateWithholdingInfo',
@ -162,6 +163,32 @@ export default {
}) })
return sums return sums
}, },
download() {
req.createPdf({ vehWithSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
if (resp.success && resp.data !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data + '&outFileName=' + '单车返利预提明细', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '单车返利预提明细.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
}
})
},
// === // ===
handleReturn(isreload) { handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')

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

@ -22,7 +22,7 @@
<el-table-column prop="brandName" label="品牌" align="center" width="120" /> <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="vehModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" /> <el-table-column prop="vinNo" label="车架号" align="center" width="140" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="130" /> <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="130" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" /> <el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" 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="rebateTypeValue" label="返利类型" align="center" width="120" />

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

@ -20,7 +20,7 @@
<el-table-column prop="brandName" label="品牌" align="center" width="120" /> <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="vehModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" /> <el-table-column prop="vinNo" label="车架号" align="center" width="140" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="130" /> <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="130" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" /> <el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" 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="rebateTypeValue" label="返利类型" align="center" width="120" />

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

@ -52,7 +52,7 @@
<el-table-column prop="brandName" label="品牌" align="center" width="140" /> <el-table-column prop="brandName" label="品牌" align="center" width="140" />
<el-table-column prop="vehModelName" label="车型" align="center" width="200" /> <el-table-column prop="vehModelName" label="车型" align="center" width="200" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" /> <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140" /> <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="140" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" /> <el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" 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="rebateTypeValue" label="返利类型" align="center" width="120" />

2
anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue

@ -79,7 +79,7 @@
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" /> <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="vehModelName" label="车型" align="center" width="200" /> <el-table-column prop="vehModelName" label="车型" align="center" width="200" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" /> <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140" /> <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="140" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" /> <el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" label="创建日期" align="center" width="120" /> <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="150" /> <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="150" />

6
anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue

@ -70,7 +70,7 @@
<el-table-column prop="brandName" label="品牌" align="center" width="120" /> <el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" /> <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" /> <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140"/> <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="140"/>
<el-table-column prop="freight" label="其中运费" align="center" width="130" /> <el-table-column prop="freight" label="其中运费" align="center" width="130" />
<el-table-column prop="topAmount" label="上装" align="center" width="120" /> <el-table-column prop="topAmount" label="上装" align="center" width="120" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" /> <el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
@ -238,10 +238,10 @@ export default {
// //
if (this.formobj.calculationModeKey === '001') { if (this.formobj.calculationModeKey === '001') {
if (e.brandName === '陕汽') { if (e.brandName === '陕汽') {
// = - - * / 100 // = - - * / 100
e.estimateRebate = Math.round(((parseFloat(e.manufactorSettlementPrice !== '' ? e.manufactorSettlementPrice : 0) - parseFloat(e.freight !== '' ? e.freight : 0) - parseFloat(e.topAmount !== '' ? e.topAmount : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100 e.estimateRebate = Math.round(((parseFloat(e.manufactorSettlementPrice !== '' ? e.manufactorSettlementPrice : 0) - parseFloat(e.freight !== '' ? e.freight : 0) - parseFloat(e.topAmount !== '' ? e.topAmount : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
} else { } else {
// = - * / 100 // = - * / 100
e.estimateRebate = Math.round(((parseFloat(e.manufactorSettlementPrice !== '' ? e.manufactorSettlementPrice : 0) - parseFloat(e.freight !== '' ? e.freight : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100 e.estimateRebate = Math.round(((parseFloat(e.manufactorSettlementPrice !== '' ? e.manufactorSettlementPrice : 0) - parseFloat(e.freight !== '' ? e.freight : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
} }
} else if (this.formobj.calculationModeKey === '002') { } else if (this.formobj.calculationModeKey === '002') {

4
anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue

@ -55,7 +55,7 @@
<div class="title">车辆信息({{ formobj.vinNo }} {{ formobj.purchaseSystemName }} {{ formobj.brandName }})</div> <div class="title">车辆信息({{ formobj.vinNo }} {{ formobj.purchaseSystemName }} {{ formobj.brandName }})</div>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">厂家结算</div> <div class="span-sty">车辆入库</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufactorSettlementPrice }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.manufactorSettlementPrice }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -141,7 +141,7 @@ export default {
estimateRebateSum() { estimateRebateSum() {
let estimateRebate = '0' let estimateRebate = '0'
if (this.formobj.calculationModeKey === '001') { if (this.formobj.calculationModeKey === '001') {
// = - * / 100 // = - * / 100
estimateRebate = Math.round(((parseFloat(this.formobj.manufactorSettlementPrice !== '' ? this.formobj.manufactorSettlementPrice : 0) - parseFloat(this.formobj.freight !== '' ? this.formobj.freight : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100 estimateRebate = Math.round(((parseFloat(this.formobj.manufactorSettlementPrice !== '' ? this.formobj.manufactorSettlementPrice : 0) - parseFloat(this.formobj.freight !== '' ? this.formobj.freight : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
} else if (this.formobj.calculationModeKey === '002') { } else if (this.formobj.calculationModeKey === '002') {
// = // =

2
anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue

@ -41,7 +41,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">厂家结算</div> <div class="span-sty">车辆入库</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufactorSettlementPrice }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.manufactorSettlementPrice }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">

2
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@ -319,7 +319,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="manufSaleAccessName" width="140" label="厂家销售通路" align="center"/> <el-table-column prop="manufSaleAccessName" width="140" label="厂家销售通路" align="center"/>
<el-table-column prop="contractPrice" width="180" label="厂家合同价(含运费)" align="center"/> <el-table-column prop="contractPrice" width="180" label="厂家合同价(含运费)" align="center"/>
<el-table-column prop="costPrice" width="180" label="厂家结算价(含运费)" align="center"/> <el-table-column prop="costPrice" width="180" label="车辆入库价(含运费)" align="center"/>
<el-table-column prop="freight" width="130" label="运费" align="center"/> <el-table-column prop="freight" width="130" label="运费" align="center"/>
<el-table-column prop="guidedPrice" width="180" label="全款销售指导价" align="center"/> <el-table-column prop="guidedPrice" width="180" label="全款销售指导价" align="center"/>
<el-table-column prop="manufactorSettlementPrice" width="180" label="贷款销售指导价" align="center"/> <el-table-column prop="manufactorSettlementPrice" width="180" label="贷款销售指导价" align="center"/>

4
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

@ -180,7 +180,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="costPrice"> <el-form-item prop="costPrice">
<span slot="label">厂家结算(含运费)</span> <span slot="label">车辆入库(含运费)</span>
<el-input v-model="temp.costPrice" maxlength="125" placeholder="" @keyup.native="temp.costPrice = oninput(temp.costPrice,2)" class="addinputw" clearable/> <el-input v-model="temp.costPrice" maxlength="125" placeholder="" @keyup.native="temp.costPrice = oninput(temp.costPrice,2)" class="addinputw" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -400,7 +400,7 @@ export default {
locationName: [{ required: true, message: '存放地点不能为空', trigger: 'change' }], locationName: [{ required: true, message: '存放地点不能为空', trigger: 'change' }],
manufSaleAccessName: [{ required: true, message: '厂家回款通路不能为空', trigger: 'change' }], manufSaleAccessName: [{ required: true, message: '厂家回款通路不能为空', trigger: 'change' }],
contractPrice: [{ required: true, message: '厂家合同价(含运费)不能为空', trigger: 'blur' }], contractPrice: [{ required: true, message: '厂家合同价(含运费)不能为空', trigger: 'blur' }],
costPrice: [{ required: true, message: '厂家结算价(含运费)不能为空', trigger: 'blur' }], costPrice: [{ required: true, message: '车辆入库价(含运费)不能为空', trigger: 'blur' }],
freight: [{ required: true, message: '运费不能为空', trigger: 'blur' }], freight: [{ required: true, message: '运费不能为空', trigger: 'blur' }],
settlementStatusValue: [{ required: true, message: '买断状态不能为空', trigger: 'change' }], settlementStatusValue: [{ required: true, message: '买断状态不能为空', trigger: 'change' }],
isProblemVeh: [{ required: true, message: '是否为问题车辆不能为空', trigger: 'change' }], isProblemVeh: [{ required: true, message: '是否为问题车辆不能为空', trigger: 'change' }],

2
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue

@ -155,7 +155,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item> <el-form-item>
<span slot="label">厂家结算(含运费)</span> <span slot="label">车辆入库(含运费)</span>
<span>{{ temp.costPrice }}</span> <span>{{ temp.costPrice }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>

2
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhangchaxun/chaliangtaizhangselect.vue

@ -312,7 +312,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="manufSaleAccessName" width="140" label="厂家销售通路" align="center"/> <el-table-column prop="manufSaleAccessName" width="140" label="厂家销售通路" align="center"/>
<el-table-column prop="contractPrice" width="180" label="厂家合同价(含运费)" align="center"/> <el-table-column prop="contractPrice" width="180" label="厂家合同价(含运费)" align="center"/>
<el-table-column prop="costPrice" width="180" label="厂家结算价(含运费)" align="center"/> <el-table-column prop="costPrice" width="180" label="车辆入库价(含运费)" align="center"/>
<el-table-column prop="freight" width="130" label="运费" align="center"/> <el-table-column prop="freight" width="130" label="运费" align="center"/>
<el-table-column prop="settlementStatus" width="110" label="买断状态" align="center"> <el-table-column prop="settlementStatus" width="110" label="买断状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">

2
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue

@ -258,7 +258,7 @@ export default {
sid: '', // sid sid: '', // sid
modelSid: '', // sid modelSid: '', // sid
configurationItemsSid: '', // sid configurationItemsSid: '', // sid
manufactorSettlementPrice: '', // manufactorSettlementPrice: '', //
salesReferencePrice: '', // salesReferencePrice: '', //
guidedPrice: '', // guidedPrice: '', //
priceValidity: '', // priceValidity: '', //

2
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue

@ -82,7 +82,7 @@ export default {
temp: { temp: {
sid: '', // sid sid: '', // sid
vehicleAlias: '', // ( 1) vehicleAlias: '', // ( 1)
manufactorSettlementPrice: '', // manufactorSettlementPrice: '', //
guidedPrice: '', // guidedPrice: '', //
insideCode: '' insideCode: ''
}, },

2
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojiaInfo.vue

@ -212,7 +212,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算(万元)</span></div> <div class="span-sty spanOneWidth"><span>车辆入库(万元)</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.costPrice }}</span></el-form-item> <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.costPrice }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">

2
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue

@ -320,7 +320,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算(万元)</span></div> <div class="span-sty spanOneWidth"><span>车辆入库(万元)</span></div>
<el-form-item> <el-form-item>
<el-input v-model="formobj.costPrice" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputInfo addinputwOne" style="width: 30% !important;" clearable placeholder=""></el-input> <el-input v-model="formobj.costPrice" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputInfo addinputwOne" style="width: 30% !important;" clearable placeholder=""></el-input>
</el-form-item> </el-form-item>

2
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/yibaojiaguanli/yibaojia.vue

@ -63,7 +63,7 @@
<span>{{ scope.row.specialInstructions }}</span> <span>{{ scope.row.specialInstructions }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价(万元)" align="center"> <el-table-column label="车辆入库价(万元)" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span> <span>{{ scope.row.costPrice }}</span>
</template> </template>

2
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/yibaojiaguanli/yibaojiaInfo.vue

@ -68,7 +68,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算(万元)</span></div> <div class="span-sty spanOneWidth"><span>车辆入库(万元)</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.costPrice }}</span></el-form-item> <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.costPrice }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">

4
anrui-scm/anrui-scm-ui/src/views/guache/guacheguanli/guacheAdd.vue

@ -68,11 +68,11 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<el-form-item><span slot="label">厂家结算</span></el-form-item> <el-form-item><span slot="label">车辆入库</span></el-form-item>
</el-col> </el-col>
<el-col :span="20" class="trightb"> <el-col :span="20" class="trightb">
<el-form-item prop="settlementPrice"> <el-form-item prop="settlementPrice">
<el-input v-model="formobj.settlementPrice" placeholder="厂家结算价" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable /> <el-input v-model="formobj.settlementPrice" placeholder="车辆入库价" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

2
anrui-scm/anrui-scm-ui/src/views/guache/guacheguanli/guacheInfo.vue

@ -31,7 +31,7 @@
<el-col :span="20" class="tleftb">{{ formobj.otherConfig }}</el-col> <el-col :span="20" class="tleftb">{{ formobj.otherConfig }}</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="trightb">厂家结算</el-col> <el-col :span="4" class="trightb">车辆入库</el-col>
<el-col :span="20" class="tleftb">{{formobj.settlementPrice}}</el-col> <el-col :span="20" class="tleftb">{{formobj.settlementPrice}}</el-col>
</el-row> </el-row>
<el-row> <el-row>

2
anrui-scm/anrui-scm-ui/src/views/guache/guacheguanli/guacheguanli.vue

@ -62,7 +62,7 @@
<el-table-column prop="brandName" label="车辆品牌" align="center" /> <el-table-column prop="brandName" label="车辆品牌" align="center" />
<el-table-column prop="model" label="车型型号" align="center" /> <el-table-column prop="model" label="车型型号" align="center" />
<el-table-column prop="settlement" label="厂商名称" align="center" /> <el-table-column prop="settlement" label="厂商名称" align="center" />
<el-table-column prop="settlementPrice" label="厂家结算价" align="center"/> <el-table-column prop="settlementPrice" label="车辆入库价" align="center"/>
<el-table-column prop="guidePrice" label="销售指导价" align="center"/> <el-table-column prop="guidePrice" label="销售指导价" align="center"/>
<el-table-column prop="otherConfig" label="更多配置" align="center" /> <el-table-column prop="otherConfig" label="更多配置" align="center" />
</el-table> </el-table>

4
anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangAdd.vue

@ -254,7 +254,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span><span class="icon">*</span>厂家结算()</span> <span><span class="icon">*</span>车辆入库()</span>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="settlementPrice"><el-input v-model="formobj.settlementPrice" clearable placeholder="" @keyup.native="UpNumber" class="addinputw"></el-input></el-form-item> <el-form-item prop="settlementPrice"><el-input v-model="formobj.settlementPrice" clearable placeholder="" @keyup.native="UpNumber" class="addinputw"></el-input></el-form-item>
@ -382,7 +382,7 @@ export default {
rules: { rules: {
zcvinNo: [{ required: true, message: '主车车架号不能为空', trigger: 'change' }], zcvinNo: [{ required: true, message: '主车车架号不能为空', trigger: 'change' }],
vinNo: [{ required: true, message: '挂车车架号不能为空', trigger: 'blur' }], vinNo: [{ required: true, message: '挂车车架号不能为空', trigger: 'blur' }],
settlementPrice: [{ required: true, message: '厂家结算价不能为空', trigger: 'blur' }], settlementPrice: [{ required: true, message: '车辆入库价不能为空', trigger: 'blur' }],
dealPrice: [{ required: true, message: '成交价不能为空', trigger: 'blur' }], dealPrice: [{ required: true, message: '成交价不能为空', trigger: 'blur' }],
}, },
submitdisabled: false submitdisabled: false

2
anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangInfo.vue

@ -267,7 +267,7 @@
<el-form-item><span>{{ formobj.stockStateValue }}</span></el-form-item> <el-form-item><span>{{ formobj.stockStateValue }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span>厂家结算()</span> <span>车辆入库()</span>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item><span>{{ formobj.settlementPrice }}</span></el-form-item> <el-form-item><span>{{ formobj.settlementPrice }}</span></el-form-item>

2
anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangguanli.vue

@ -56,7 +56,7 @@
<el-table-column prop="vinNo" label="车架号" align="center" width="180"/> <el-table-column prop="vinNo" label="车架号" align="center" width="180"/>
<el-table-column prop="trailerModel" label="车型信息" align="center" width="400"/> <el-table-column prop="trailerModel" label="车型信息" align="center" width="400"/>
<el-table-column prop="guidePrice" label="销售指导价" align="center" width="130"/> <el-table-column prop="guidePrice" label="销售指导价" align="center" width="130"/>
<el-table-column prop="settlementPrice" label="厂家结算价" align="center" width="130"/> <el-table-column prop="settlementPrice" label="车辆入库价" align="center" width="130"/>
<el-table-column prop="dealPrice" label="成交价" align="center" width="130"/> <el-table-column prop="dealPrice" label="成交价" align="center" width="130"/>
<el-table-column prop="stockStateValue" label="库存状态" align="center" width="120"/> <el-table-column prop="stockStateValue" label="库存状态" align="center" width="120"/>
<el-table-column prop="warehousingDate" label="入库日期" align="center" width="120"/> <el-table-column prop="warehousingDate" label="入库日期" align="center" width="120"/>

4
anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue

@ -54,7 +54,7 @@
<span>{{ scope.row.vinNo }}</span> <span>{{ scope.row.vinNo }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center"> <el-table-column label="车辆入库价" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span> <span>{{ scope.row.costPrice }}</span>
</template> </template>
@ -251,7 +251,7 @@ export default {
confirm(row) { confirm(row) {
console.log(row, 9999) console.log(row, 9999)
if (row.refundMoney !== row.costPrice.toString() && row.manDeduRemarks === '') { if (row.refundMoney !== row.costPrice.toString() && row.manDeduRemarks === '') {
this.$message({ showClose: true, type: 'error', message: '因厂家结算价与退款金额不一致,请填写厂家扣款说明' }) this.$message({ showClose: true, type: 'error', message: '因车辆入库价与退款金额不一致,请填写厂家扣款说明' })
return return
} }
req.confirm(row).then((res) => { req.confirm(row).then((res) => {

2
anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuInfo.vue

@ -45,7 +45,7 @@
<span>{{ scope.row.vinNo }}</span> <span>{{ scope.row.vinNo }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center"> <el-table-column label="车辆入库价" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span> <span>{{ scope.row.costPrice }}</span>
</template> </template>

2
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotAdd.vue

@ -70,7 +70,7 @@
<el-table-column width="80" label="序号" type="index" :index="index + 1" align="center"/> <el-table-column width="80" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="carModelName" label="车型" align="center" min-width="150" /> <el-table-column prop="carModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="120" /> <el-table-column prop="vinNo" label="车架号" align="center" width="120" />
<el-table-column prop="costPrice" label="厂家结算价" align="center" width="130" /> <el-table-column prop="costPrice" label="车辆入库价" align="center" width="130" />
<el-table-column prop="priceDate" label="入库日期" align="center" width="120" /> <el-table-column prop="priceDate" label="入库日期" align="center" width="120" />
<el-table-column prop="salesDate" label="销售日期" align="center" width="120" /> <el-table-column prop="salesDate" label="销售日期" align="center" width="120" />
<el-table-column prop="solidDate" label="买断日期" align="center" width="120" /> <el-table-column prop="solidDate" label="买断日期" align="center" width="120" />

2
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/fenpeishenhe/collectionrebateallotInfo.vue

@ -67,7 +67,7 @@
<el-table-column width="80" label="序号" type="index" :index="index + 1" align="center"/> <el-table-column width="80" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="carModelName" label="车型" align="center" min-width="150" /> <el-table-column prop="carModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="120" /> <el-table-column prop="vinNo" label="车架号" align="center" width="120" />
<el-table-column prop="costPrice" label="厂家结算价" align="center" width="130" /> <el-table-column prop="costPrice" label="车辆入库价" align="center" width="130" />
<el-table-column prop="priceDate" label="入库日期" align="center" width="120" /> <el-table-column prop="priceDate" label="入库日期" align="center" width="120" />
<el-table-column prop="salesDate" label="销售日期" align="center" width="120" /> <el-table-column prop="salesDate" label="销售日期" align="center" width="120" />
<el-table-column prop="solidDate" label="买断日期" align="center" width="120" /> <el-table-column prop="solidDate" label="买断日期" align="center" width="120" />

4
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotByVehicleAdd.vue

@ -87,7 +87,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="carModelName" label="车型" align="center" min-width="150" /> <el-table-column prop="carModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="120" /> <el-table-column prop="vinNo" label="车架号" align="center" width="120" />
<el-table-column prop="costPrice" label="厂家结算价" align="center" width="130" /> <el-table-column prop="costPrice" label="车辆入库价" align="center" width="130" />
<el-table-column prop="priceDate" label="入库日期" align="center" width="120" /> <el-table-column prop="priceDate" label="入库日期" align="center" width="120" />
<el-table-column prop="salesDate" label="销售日期" align="center" width="120" /> <el-table-column prop="salesDate" label="销售日期" align="center" width="120" />
<el-table-column prop="solidDate" label="买断日期" align="center" width="120" /> <el-table-column prop="solidDate" label="买断日期" align="center" width="120" />
@ -154,7 +154,7 @@ export default {
let shareRebate = '0' let shareRebate = '0'
if (this.formobj.scmCollectionRebateVehs.length > 0) { if (this.formobj.scmCollectionRebateVehs.length > 0) {
this.formobj.scmCollectionRebateVehs.forEach((e) => { this.formobj.scmCollectionRebateVehs.forEach((e) => {
// = / // = /
e.distributionCollectionRebate = Math.round((parseFloat(e.costPrice !== '' ? e.costPrice : 0) * (parseFloat(this.formobj.shareProportion !== '' ? this.formobj.shareProportion : 0) / 100)) * 100) / 100 e.distributionCollectionRebate = Math.round((parseFloat(e.costPrice !== '' ? e.costPrice : 0) * (parseFloat(this.formobj.shareProportion !== '' ? this.formobj.shareProportion : 0) / 100)) * 100) / 100
// = // =
shareRebate = Math.round((parseFloat(shareRebate) + parseFloat(e.distributionCollectionRebate)) * 100) / 100 shareRebate = Math.round((parseFloat(shareRebate) + parseFloat(e.distributionCollectionRebate)) * 100) / 100

2
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/relation/collectionrebateallotSelectVehicle.vue

@ -50,7 +50,7 @@
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="vehicleAlias" label="车型" align="center" min-width="150" /> <el-table-column prop="vehicleAlias" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="120" /> <el-table-column prop="vinNo" label="车架号" align="center" width="120" />
<el-table-column prop="guidedPrice" label="厂家结算价" align="center" width="130" /> <el-table-column prop="guidedPrice" label="车辆入库价" align="center" width="130" />
<el-table-column prop="priceDate" label="入库日期" align="center" width="120" /> <el-table-column prop="priceDate" label="入库日期" align="center" width="120" />
<el-table-column prop="salesDate" label="销售日期" align="center" width="120" /> <el-table-column prop="salesDate" label="销售日期" align="center" width="120" />
<el-table-column prop="solidDate" label="买断日期" align="center" width="120" /> <el-table-column prop="solidDate" label="买断日期" align="center" width="120" />

4
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue

@ -123,7 +123,7 @@
<el-table-column prop="vinNo" label="车架号" align="center" /> <el-table-column prop="vinNo" label="车架号" align="center" />
<el-table-column prop="freight" label="运费" align="center" /> <el-table-column prop="freight" label="运费" align="center" />
<el-table-column prop="topAmount" label="上装金额" align="center" /> <el-table-column prop="topAmount" label="上装金额" align="center" />
<el-table-column prop="costPrice" label="厂家结算价" align="center" /> <el-table-column prop="costPrice" label="车辆入库价" align="center" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" /> <el-table-column prop="estimateRebate" label="预计返利" align="center" />
</el-table> </el-table>
</el-form> </el-form>
@ -247,7 +247,7 @@ export default {
this.formobj = resp.data this.formobj = resp.data
if (this.formobj.scmCollectionRebateVehs.length !== 0) { if (this.formobj.scmCollectionRebateVehs.length !== 0) {
for (var i = 0; i < this.formobj.scmCollectionRebateVehs.length; i++) { for (var i = 0; i < this.formobj.scmCollectionRebateVehs.length; i++) {
// -- // --
this.aggregate = Math.round((parseFloat(this.aggregate !== '' ? this.aggregate : 0) + parseFloat(this.formobj.scmCollectionRebateVehs[i].costPrice)) * 100) / 100 this.aggregate = Math.round((parseFloat(this.aggregate !== '' ? this.aggregate : 0) + parseFloat(this.formobj.scmCollectionRebateVehs[i].costPrice)) * 100) / 100
} }
} }

2
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementInfo.vue

@ -122,7 +122,7 @@
<el-table-column prop="vinNo" label="车架号" align="center" /> <el-table-column prop="vinNo" label="车架号" align="center" />
<el-table-column prop="freight" label="运费" align="center" /> <el-table-column prop="freight" label="运费" align="center" />
<el-table-column prop="topAmount" label="上装金额" align="center" /> <el-table-column prop="topAmount" label="上装金额" align="center" />
<el-table-column prop="costPrice" label="厂家结算价" align="center" /> <el-table-column prop="costPrice" label="车辆入库价" align="center" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" /> <el-table-column prop="estimateRebate" label="预计返利" align="center" />
</el-table> </el-table>
</el-form> </el-form>

2
anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtaizhangselect.vue

@ -85,7 +85,7 @@
<el-table-column prop="vehicleStateValue" label="库存状态" align="center" width="100"/> <el-table-column prop="vehicleStateValue" label="库存状态" align="center" width="100"/>
<el-table-column prop="priceDate" label="入库日期" align="center" width="100"/> <el-table-column prop="priceDate" label="入库日期" align="center" width="100"/>
<el-table-column prop="salesDate" label="出库日期" align="center" width="100"/> <el-table-column prop="salesDate" label="出库日期" align="center" width="100"/>
<el-table-column prop="costPrice" label="厂家结算价" align="center" width="120"/> <el-table-column prop="costPrice" label="车辆入库价" align="center" width="120"/>
<el-table-column prop="guidePrice" label="销售指导价" align="center" width="120"/> <el-table-column prop="guidePrice" label="销售指导价" align="center" width="120"/>
</el-table> </el-table>
</div> </div>

2
anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaAdd.vue

@ -86,7 +86,7 @@
<span>{{ scope.row.vehGuidedPrice }}</span> <span>{{ scope.row.vehGuidedPrice }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center" width="120"> <el-table-column label="车辆入库价" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span> <span>{{ scope.row.costPrice }}</span>
</template> </template>

2
anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtiaojiaInfo.vue

@ -73,7 +73,7 @@
<span>{{ scope.row.vehGuidedPrice }}</span> <span>{{ scope.row.vehGuidedPrice }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center" width="120"> <el-table-column label="车辆入库价" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span> <span>{{ scope.row.costPrice }}</span>
</template> </template>

2
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@ -184,7 +184,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty spanOneWidth"><span>厂家结算</span></div> <div class="span-sty spanOneWidth"><span>车辆入库</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ inputMoneyCount() }}</span></el-form-item> <el-form-item><span class="addinputInfo addinputwOne">{{ inputMoneyCount() }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>

2
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue

@ -187,7 +187,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty spanOneWidth"><span>厂家结算</span></div> <div class="span-sty spanOneWidth"><span>车辆入库</span></div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.costPrice }}</span></el-form-item> <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.costPrice }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>

2
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue

@ -67,7 +67,7 @@
<el-table-column prop="vehicleNum" fit label="台数" align="center" width="60"/> <el-table-column prop="vehicleNum" fit label="台数" align="center" width="60"/>
<el-table-column prop="contractPrice" fit label="厂家合同价" align="center" width="130"/> <el-table-column prop="contractPrice" fit label="厂家合同价" align="center" width="130"/>
<el-table-column prop="moneyCount" fit label="政策金额合计" align="center" width="130"/> <el-table-column prop="moneyCount" fit label="政策金额合计" align="center" width="130"/>
<el-table-column prop="costPrice" fit label="厂家结算价" align="center" width="130"/> <el-table-column prop="costPrice" fit label="车辆入库价" align="center" width="130"/>
<el-table-column prop="departureDate" fit label="发车日期" align="center" width="100"/> <el-table-column prop="departureDate" fit label="发车日期" align="center" width="100"/>
</el-table> </el-table>
</div> </div>

2
anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhangtaizhangInfo.vue

@ -119,7 +119,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算()</span></div> <div class="span-sty spanOneWidth"><span>车辆入库()</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.costPrice }}</span></el-form-item> <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.costPrice }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">

4
anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue

@ -134,7 +134,7 @@
<div class="headline">上装价格信息</div> <div class="headline">上装价格信息</div>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span><span class="icon">*</span>厂家结算()</span></div> <div class="span-sty spanOneWidth"><span><span class="icon">*</span>车辆入库()</span></div>
<el-form-item><el-input v-model="formobj.costPrice" class="addinputw addinputwTwo" @keyup.native="formobj.costPrice = oninput(formobj.costPrice,2)" placeholder="" clearable></el-input></el-form-item> <el-form-item><el-input v-model="formobj.costPrice" class="addinputw addinputwTwo" @keyup.native="formobj.costPrice = oninput(formobj.costPrice,2)" placeholder="" clearable></el-input></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -306,7 +306,7 @@ export default {
return return
} }
if (this.formobj.costPrice === '') { if (this.formobj.costPrice === '') {
this.$message({ showClose: true, type: 'error', message: '厂家结算价不能为空' }) this.$message({ showClose: true, type: 'error', message: '车辆入库价不能为空' })
return return
} }
if (this.formobj.guidePrice === '') { if (this.formobj.guidePrice === '') {

2
anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangguanli.vue

@ -88,7 +88,7 @@
<el-table-column prop="vehicleStateValue" label="库存状态" align="center" width="100"/> <el-table-column prop="vehicleStateValue" label="库存状态" align="center" width="100"/>
<el-table-column prop="priceDate" label="入库日期" align="center" width="100"/> <el-table-column prop="priceDate" label="入库日期" align="center" width="100"/>
<el-table-column prop="salesDate" label="出库日期" align="center" width="100"/> <el-table-column prop="salesDate" label="出库日期" align="center" width="100"/>
<el-table-column prop="costPrice" label="厂家结算价" align="center" width="120"/> <el-table-column prop="costPrice" label="车辆入库价" align="center" width="120"/>
<el-table-column prop="guidePrice" label="销售指导价" align="center" width="120"/> <el-table-column prop="guidePrice" label="销售指导价" align="center" width="120"/>
</el-table> </el-table>
</div> </div>

19
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue

@ -52,6 +52,7 @@
</template> </template>
<script> <script>
import req from '@/api/specialrebate/specialrebatewithholding'
import specialrebatemanagementInfo from '../../specialrebatemanagement/specialrebatemanagementInfo' import specialrebatemanagementInfo from '../../specialrebatemanagement/specialrebatemanagementInfo'
export default { export default {
@ -82,33 +83,31 @@ export default {
this.sids = aa this.sids = aa
console.log('sids', this.sids) console.log('sids', this.sids)
}, },
showInfo(sid, value) { showInfo(specialRebateSids) {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
this.scmSpecialrebateCheckapplydetailDetails = JSON.parse(JSON.stringify(value))
this.viewTitle = '专项返利核对审核申请明细' this.viewTitle = '专项返利核对审核申请明细'
this.list = this.scmSpecialrebateCheckapplydetailDetails specialRebateSids = JSON.parse(JSON.stringify(specialRebateSids))
req.vehRebateWithDetails(specialRebateSids).then((resp) => {
this.list = resp.data
})
}, },
handleDelete() { handleDelete() {
if (this.sids.length === 0) { if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' }) this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return return
} }
const aa = []
for (var i = 0; i < this.list.length; i++) { for (var i = 0; i < this.list.length; i++) {
for (var j = 0; j < this.sids.length; j++) { for (var j = 0; j < this.sids.length; j++) {
if (this.list[i].sid === this.sids[j]) { if (this.list[i].sid === this.sids[j]) {
aa.push(this.list[i].sid)
this.list.splice(i, 1) this.list.splice(i, 1)
} }
} }
} }
for (var l = 0; l < this.scmSpecialrebateCheckapplydetailDetails.length; l++) { this.scmSpecialrebateCheckapplydetailDetails = aa
for (var p = 0; p < this.sids.length; p++) {
if (this.scmSpecialrebateCheckapplydetailDetails[l].sid === this.sids[p]) {
this.scmSpecialrebateCheckapplydetailDetails.splice(l, 1)
}
}
}
}, },
handleLook(row) { handleLook(row) {
this.viewState = 2 this.viewState = 2

1
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue

@ -155,6 +155,7 @@ export default {
} }
} }
} }
this.listQuery.current = 1
this.listQuery.params.sidList = aa this.listQuery.params.sidList = aa
this.getList() this.getList()
}, },

31
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue

@ -59,8 +59,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" /> <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" /> <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100"> <el-table-column label="明细" align="center" min-width="100">
<template> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button> <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -79,8 +79,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" /> <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" /> <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100"> <el-table-column label="明细" align="center" min-width="100">
<template> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button> <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -298,24 +298,27 @@ export default {
dataDelete(index) { dataDelete(index) {
this.formobj.baseVehinstallModpricedetails.splice(index, 1) this.formobj.baseVehinstallModpricedetails.splice(index, 1)
}, },
handleLook() { handleLook(row) {
this.viewState = 3 this.viewState = 3
this.$refs['divAdd'].showInfo(this.formobj.sid, this.formobj.scmSpecialrebateCheckapplydetailDetails) this.$refs['divAdd'].showInfo(row.specialRebateSids)
}, },
backAdd(val) { backAdd(val) {
this.viewState = 1 this.viewState = 1
// //
this.formobj.scmWhenSpecialrebateCheckapplydetailDetails = [] this.formobj.scmWhenSpecialrebateCheckapplydetailDetails = []
this.formobj.scmLastSpecialrebateCheckapplydetailDetails = [] this.formobj.scmLastSpecialrebateCheckapplydetailDetails = []
this.formobj.scmSpecialrebateCheckapplydetailDetails = []
var list = JSON.parse(JSON.stringify(val)) var list = JSON.parse(JSON.stringify(val))
// //
list.forEach((e) => { for (var n = 0; n < list.length; n++) {
this.formobj.scmSpecialrebateCheckapplydetailDetails.push(e) for (var m = 0; m < this.formobj.scmSpecialrebateCheckapplydetailDetails.length; m++) {
}) if (list[n] === this.formobj.scmSpecialrebateCheckapplydetailDetails[m].sid) {
this.formobj.scmSpecialrebateCheckapplydetailDetails.splice(this.formobj.scmSpecialrebateCheckapplydetailDetails[m], 1)
}
}
}
// (1. 2.) // (1. 2.)
// //
list.forEach((e) => { this.formobj.scmSpecialrebateCheckapplydetailDetails.forEach((e) => {
let v = 0 let v = 0
for (var i in this.formobj.scmWhenSpecialrebateCheckapplydetailDetails) { for (var i in this.formobj.scmWhenSpecialrebateCheckapplydetailDetails) {
if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) { if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
@ -357,7 +360,7 @@ export default {
}) })
let k = 0 let k = 0
// //
list.forEach((s) => { this.formobj.scmSpecialrebateCheckapplydetailDetails.forEach((s) => {
for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) { for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) { if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1) this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
@ -445,7 +448,7 @@ export default {
return return
} }
const values = data.map(item => Number(item[column.property])) const values = data.map(item => Number(item[column.property]))
if (!values.every(value => isNaN(value))) { if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue' && column.property !== undefined) {
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
@ -455,8 +458,6 @@ export default {
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''
} else {
sums[index] = ''
} }
}) })
return sums return sums

33
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue

@ -8,7 +8,7 @@
<!--start 添加修改按钮--> <!--start 添加修改按钮-->
<div> <div>
<el-button type="primary" size="small">导出</el-button> <el-button type="primary" size="small">导出</el-button>
<el-button type="primary" size="small">下载</el-button> <el-button type="primary" size="small" @click="download">下载</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
</div> </div>
@ -98,6 +98,7 @@
<script> <script>
import req from '@/api/specialrebate/specialrebatecheck' import req from '@/api/specialrebate/specialrebatecheck'
import specialrebatetobecheckedInfo from './relation/specialrebatetobecheckedInfo' import specialrebatetobecheckedInfo from './relation/specialrebatetobecheckedInfo'
import { getStorage } from '@/utils/auth'
export default { export default {
name: 'SpecialRebateCheckInfo', name: 'SpecialRebateCheckInfo',
@ -168,7 +169,7 @@ export default {
return return
} }
const values = data.map(item => Number(item[column.property])) const values = data.map(item => Number(item[column.property]))
if (!values.every(value => isNaN(value))) { if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue' && column.property !== undefined) {
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
@ -178,12 +179,36 @@ export default {
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''
} else {
sums[index] = ''
} }
}) })
return sums return sums
}, },
download() {
req.createPdf({ specialCheckSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
if (resp.success && resp.data !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data + '&outFileName=' + '专项返利核对明细', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '专项返利核对明细.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
}
})
},
// === // ===
handleReturn() { handleReturn() {
// //

2
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue

@ -53,7 +53,7 @@
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/> <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="modelName" label="车型" align="center" min-width="150" /> <el-table-column prop="modelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" /> <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="costPrice" label="厂家结算价" align="center" width="140" /> <el-table-column prop="costPrice" label="车辆入库价" align="center" width="140" />
<el-table-column prop="priceDate" label="入库日期" align="center" width="120" /> <el-table-column prop="priceDate" label="入库日期" align="center" width="120" />
<el-table-column prop="salesDate" label="销售日期" align="center" width="120" /> <el-table-column prop="salesDate" label="销售日期" align="center" width="120" />
<el-table-column prop="solidDate" label="买断日期" align="center" width="120" /> <el-table-column prop="solidDate" label="买断日期" align="center" width="120" />

2
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedByDisNum.vue

@ -18,7 +18,7 @@
<el-table-column width="80px" label="序号" type="index" :index="index + 1" align="center"/> <el-table-column width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="modelName" label="车型" align="center" min-width="150" /> <el-table-column prop="modelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" /> <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="costPrice" label="厂家结算价" align="center" width="140" /> <el-table-column prop="costPrice" label="车辆入库价" align="center" width="140" />
<el-table-column prop="priceDate" label="入库日期" align="center" width="120" /> <el-table-column prop="priceDate" label="入库日期" align="center" width="120" />
<el-table-column prop="salesDate" label="销售日期" align="center" width="120" /> <el-table-column prop="salesDate" label="销售日期" align="center" width="120" />
<el-table-column prop="solidDate" label="买断日期" align="center" width="120" /> <el-table-column prop="solidDate" label="买断日期" align="center" width="120" />

29
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue

@ -8,7 +8,7 @@
<!--start 添加修改按钮--> <!--start 添加修改按钮-->
<div> <div>
<el-button type="primary" size="small">导出</el-button> <el-button type="primary" size="small">导出</el-button>
<el-button type="primary" size="small">下载</el-button> <el-button type="primary" size="small" @click="download">下载</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
</div> </div>
@ -78,6 +78,7 @@
<script> <script>
import req from '@/api/specialrebate/specialrebatewithholding' import req from '@/api/specialrebate/specialrebatewithholding'
import zhuanxiangfanliInfo from './relation/zhuanxiangfanliInfo' import zhuanxiangfanliInfo from './relation/zhuanxiangfanliInfo'
import { getStorage } from '@/utils/auth'
export default { export default {
name: 'ZhuanXiangFanLiYuTiInfo', name: 'ZhuanXiangFanLiYuTiInfo',
@ -190,6 +191,32 @@ export default {
}) })
return sums return sums
}, },
download() {
req.createPdf({ specialWithSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
if (resp.success && resp.data !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data + '&outFileName=' + '专项返利预提明细', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '专项返利预提明细.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
}
})
},
// === // ===
handleReturn() { handleReturn() {
// //

2
anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/relation/xuanzecheliang.vue

@ -74,7 +74,7 @@
<span>{{ scope.row.location }}</span> <span>{{ scope.row.location }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价(元)" align="center"> <el-table-column label="车辆入库价(元)" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span> <span>{{ scope.row.guidedPrice }}</span>
</template> </template>

2
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiAdd.vue

@ -90,7 +90,7 @@
</div> </div>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算()</span></div> <div class="span-sty spanOneWidth"><span>车辆入库()</span></div>
<el-form-item prop="installNameValue"><el-input v-model="formobj.costPrice" placeholder="" clearable class="addinputw addinputwOne"></el-input></el-form-item> <el-form-item prop="installNameValue"><el-input v-model="formobj.costPrice" placeholder="" clearable class="addinputw addinputwOne"></el-input></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">

2
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiInfo.vue

@ -89,7 +89,7 @@
</div> </div>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算()</span></div> <div class="span-sty spanOneWidth"><span>车辆入库()</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.costPrice }}</span></el-form-item> <el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.costPrice }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">

2
anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue

@ -137,7 +137,7 @@
<span>{{ scope.row.insideCode }}<span>({{ scope.row.vehicleNum }})</span></span> <span>{{ scope.row.insideCode }}<span>({{ scope.row.vehicleNum }})</span></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center" width="150"> <el-table-column label="车辆入库价" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.inboundPrice }}</span> <span>{{ scope.row.inboundPrice }}</span>
</template> </template>

2
anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue

@ -115,7 +115,7 @@
<span>{{ scope.row.insideCode }}<span>({{ scope.row.vehicleNum }})</span></span> <span>{{ scope.row.insideCode }}<span>({{ scope.row.vehicleNum }})</span></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价" align="center" width="150"> <el-table-column label="车辆入库价" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.inboundPrice }}</span> <span>{{ scope.row.inboundPrice }}</span>
</template> </template>

2
anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue

@ -74,7 +74,7 @@
<span>{{ scope.row.location }}</span> <span>{{ scope.row.location }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价(元)" align="center"> <el-table-column label="车辆入库价(元)" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span> <span>{{ scope.row.guidedPrice }}</span>
</template> </template>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/relation/xuanzecheliang.vue

@ -74,7 +74,7 @@
<span>{{ scope.row.location }}</span> <span>{{ scope.row.location }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家结算价(元)" align="center"> <el-table-column label="车辆入库价(元)" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span> <span>{{ scope.row.guidedPrice }}</span>
</template> </template>

6
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue

@ -240,13 +240,13 @@ export default {
return return
} }
const values = data.map(item => Number(item[column.property])) const values = data.map(item => Number(item[column.property]))
if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue') { if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue' && column.property !== undefined) {
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else { } else {
return prev return Math.round((parseFloat(prev)) * 100) / 100
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''

33
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue

@ -58,8 +58,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" /> <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" /> <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100"> <el-table-column label="明细" align="center" min-width="100">
<template> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button> <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -78,8 +78,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" /> <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" /> <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100"> <el-table-column label="明细" align="center" min-width="100">
<template> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button> <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -274,24 +274,27 @@ export default {
dataDelete(index) { dataDelete(index) {
this.formobj.baseVehinstallModpricedetails.splice(index, 1) this.formobj.baseVehinstallModpricedetails.splice(index, 1)
}, },
handleLook() { handleLook(row) {
this.viewState = 3 this.viewState = 3
this.$refs['divAdd'].showInfo(this.formobj.sid, this.formobj.scmVehrebateCheckapplydetailList) this.$refs['divAdd'].showInfo(row.vehRebateSids)
}, },
backAdd(val) { backAdd(val) {
this.viewState = 1 this.viewState = 1
// //
this.formobj.scmWhenVehrebateCheckapplydetailDetails = [] this.formobj.scmWhenVehrebateCheckapplydetailDetails = []
this.formobj.scmLastVehrebateCheckapplydetailDetails = [] this.formobj.scmLastVehrebateCheckapplydetailDetails = []
this.formobj.scmVehrebateCheckapplydetailList = []
var list = JSON.parse(JSON.stringify(val)) var list = JSON.parse(JSON.stringify(val))
// //
list.forEach((e) => { for (var n = 0; n < list.length; n++) {
this.formobj.scmVehrebateCheckapplydetailList.push(e) for (var m = 0; m < this.formobj.scmVehrebateCheckapplydetailList.length; m++) {
}) if (list[n] === this.formobj.scmVehrebateCheckapplydetailList[m].sid) {
this.formobj.scmVehrebateCheckapplydetailList.splice(this.formobj.scmVehrebateCheckapplydetailList[m], 1)
}
}
}
// (1. 2.) // (1. 2.)
// //
list.forEach((e) => { this.formobj.scmVehrebateCheckapplydetailList.forEach((e) => {
let v = 0 let v = 0
for (var i in this.formobj.scmWhenVehrebateCheckapplydetailDetails) { for (var i in this.formobj.scmWhenVehrebateCheckapplydetailDetails) {
if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].brandName === e.brandName) { if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].brandName === e.brandName) {
@ -333,7 +336,7 @@ export default {
}) })
let k = 0 let k = 0
// //
list.forEach((s) => { this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => {
for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) { for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) { if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1) this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)
@ -384,13 +387,13 @@ export default {
return return
} }
const values = data.map(item => Number(item[column.property])) const values = data.map(item => Number(item[column.property]))
if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue') { if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue' && column.property !== undefined) {
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else { } else {
return prev return Math.round((parseFloat(prev)) * 100) / 100
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''

35
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue

@ -8,7 +8,7 @@
<!--start 添加修改按钮--> <!--start 添加修改按钮-->
<div> <div>
<el-button type="primary" size="small">导出</el-button> <el-button type="primary" size="small">导出</el-button>
<el-button type="primary" size="small">下载</el-button> <el-button type="primary" size="small" @click="download">下载</el-button>
<el-button type="danger" size="small" @click="openRevoke()">撤回</el-button> <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
</div> </div>
</div> </div>
@ -98,6 +98,7 @@
<script> <script>
import req from '@/api/bikerebate/bicyclerebatecheck' import req from '@/api/bikerebate/bicyclerebatecheck'
import bicyclerebatetobecheckedInfo from './relation/bicyclerebatetobecheckedInfo' import bicyclerebatetobecheckedInfo from './relation/bicyclerebatetobecheckedInfo'
import { getStorage } from '@/utils/auth'
export default { export default {
name: 'DanCheFanLiHeDuiYiBanInfo', name: 'DanCheFanLiHeDuiYiBanInfo',
@ -205,13 +206,13 @@ export default {
return return
} }
const values = data.map(item => Number(item[column.property])) const values = data.map(item => Number(item[column.property]))
if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue') { if (column.property !== 'purchaseSystemName' && column.property !== 'brandName' && column.property !== 'rebateTypeValue' && column.property !== undefined) {
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else { } else {
return prev return Math.round((parseFloat(prev)) * 100) / 100
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''
@ -219,6 +220,32 @@ export default {
}) })
return sums return sums
}, },
download() {
req.createPdf({ vehCheckSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
if (resp.success && resp.data !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data + '&outFileName=' + '单车返利核对明细', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '单车返利核对明细.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
}
})
},
/** 确认撤回任务 */ /** 确认撤回任务 */
openRevoke() { openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', { this.$confirm('是否确认执行撤回操作', '提示', {

2
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicycleInfo.vue

@ -41,7 +41,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">厂家结算</div> <div class="span-sty">车辆入库</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufactorSettlementPrice }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.manufactorSettlementPrice }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">

20
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue

@ -55,6 +55,7 @@
</template> </template>
<script> <script>
import req from '@/api/bikerebate/bicyclerebatewithholding'
import bicyclerebatemanagementInfo from './bicycleInfo' import bicyclerebatemanagementInfo from './bicycleInfo'
export default { export default {
@ -72,8 +73,7 @@ export default {
// //
list: [], list: [],
scmVehrebateCheckapplydetailList: [], scmVehrebateCheckapplydetailList: [],
rules: {}, rules: {}
submitdisabled: false
} }
}, },
methods: { methods: {
@ -89,29 +89,27 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
this.scmVehrebateCheckapplydetailList = JSON.parse(JSON.stringify(value))
this.viewTitle = '单车返利核对审核申请明细' this.viewTitle = '单车返利核对审核申请明细'
this.list = this.scmVehrebateCheckapplydetailList vehRebateSids = JSON.parse(JSON.stringify(vehRebateSids))
req.vehRebateWithDetails(vehRebateSids).then((resp) => {
this.list = resp.data
})
}, },
handleDelete() { handleDelete() {
if (this.sids.length === 0) { if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' }) this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return return
} }
const aa = []
for (var i = 0; i < this.list.length; i++) { for (var i = 0; i < this.list.length; i++) {
for (var j = 0; j < this.sids.length; j++) { for (var j = 0; j < this.sids.length; j++) {
if (this.list[i].sid === this.sids[j]) { if (this.list[i].sid === this.sids[j]) {
aa.push(this.list[i].sid)
this.list.splice(i, 1) this.list.splice(i, 1)
} }
} }
} }
for (var l = 0; l < this.scmVehrebateCheckapplydetailList.length; l++) { this.scmVehrebateCheckapplydetailList = aa
for (var p = 0; p < this.sids.length; p++) {
if (this.scmVehrebateCheckapplydetailList[l].sid === this.sids[p]) {
this.scmVehrebateCheckapplydetailList.splice(l, 1)
}
}
}
}, },
handleLook(row) { handleLook(row) {
this.viewState = 2 this.viewState = 2

3
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue

@ -15,7 +15,7 @@
<el-table-column prop="brandName" label="品牌" align="center" width="120" /> <el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="200" /> <el-table-column prop="vehModelName" label="车型" align="center" min-width="200" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" /> <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140" /> <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="140" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" /> <el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" 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="rebateTypeValue" label="返利类型" align="center" width="120" />
@ -158,6 +158,7 @@ export default {
} }
} }
} }
this.listQuery.current = 1
this.listQuery.params.sidList = aa this.listQuery.params.sidList = aa
this.getList() this.getList()
}, },

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

@ -8,7 +8,7 @@
<!--start 添加修改按钮--> <!--start 添加修改按钮-->
<div> <div>
<el-button type="primary" size="small">导出</el-button> <el-button type="primary" size="small">导出</el-button>
<el-button type="primary" size="small">下载</el-button> <el-button type="primary" size="small" @click="download">下载</el-button>
<el-button type="danger" size="small" @click="openRevoke()">撤回</el-button> <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
</div> </div>
</div> </div>
@ -78,6 +78,7 @@
<script> <script>
import req from '@/api/bikerebate/bicyclerebatewithholding' import req from '@/api/bikerebate/bicyclerebatewithholding'
import danchefanliInfo from './relation/danchefanliInfo' import danchefanliInfo from './relation/danchefanliInfo'
import { getStorage } from '@/utils/auth'
export default { export default {
name: 'DanCheFanLiYuTiYiBanInfo', name: 'DanCheFanLiYuTiYiBanInfo',
@ -154,6 +155,32 @@ export default {
resetState() { resetState() {
this.viewState = 1 this.viewState = 1
}, },
download() {
req.createPdf({ vehWithSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
if (resp.success && resp.data !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data + '&outFileName=' + '单车返利预提明细', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '单车返利预提明细.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
}
})
},
/** 确认撤回任务 */ /** 确认撤回任务 */
openRevoke() { openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', { this.$confirm('是否确认执行撤回操作', '提示', {

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

@ -22,7 +22,7 @@
<el-table-column prop="brandName" label="品牌" align="center" width="120" /> <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="vehModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" /> <el-table-column prop="vinNo" label="车架号" align="center" width="140" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="130" /> <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="130" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" /> <el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" 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="rebateTypeValue" label="返利类型" align="center" width="120" />

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

@ -20,7 +20,7 @@
<el-table-column prop="brandName" label="品牌" align="center" width="120" /> <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="vehModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" /> <el-table-column prop="vinNo" label="车架号" align="center" width="140" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="130" /> <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="130" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" /> <el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" 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="rebateTypeValue" label="返利类型" align="center" width="120" />

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

@ -52,7 +52,7 @@
<el-table-column prop="brandName" label="品牌" align="center" width="140" /> <el-table-column prop="brandName" label="品牌" align="center" width="140" />
<el-table-column prop="vehModelName" label="车型" align="center" width="200" /> <el-table-column prop="vehModelName" label="车型" align="center" width="200" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" /> <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="manufactorSettlementPrice" label="厂家结算价" align="center" width="140" /> <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="140" />
<el-table-column prop="freight" label="其中运费" align="center" width="120" /> <el-table-column prop="freight" label="其中运费" align="center" width="120" />
<el-table-column prop="createTime" 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="rebateTypeValue" label="返利类型" align="center" width="120" />

2
anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliguanliInfo.vue

@ -122,7 +122,7 @@
<el-table-column prop="vinNo" label="车架号" align="center" /> <el-table-column prop="vinNo" label="车架号" align="center" />
<el-table-column prop="freight" label="运费" align="center" /> <el-table-column prop="freight" label="运费" align="center" />
<el-table-column prop="topAmount" label="上装金额" align="center" /> <el-table-column prop="topAmount" label="上装金额" align="center" />
<el-table-column prop="costPrice" label="厂家结算价" align="center" /> <el-table-column prop="costPrice" label="车辆入库价" align="center" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" /> <el-table-column prop="estimateRebate" label="预计返利" align="center" />
</el-table> </el-table>
</el-form> </el-form>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiAdd.vue

@ -90,7 +90,7 @@
</div> </div>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算()</span></div> <div class="span-sty spanOneWidth"><span>车辆入库()</span></div>
<el-form-item prop="installNameValue"><el-input v-model="formobj.costPrice" placeholder="" clearable class="addinputw addinputwOne"></el-input></el-form-item> <el-form-item prop="installNameValue"><el-input v-model="formobj.costPrice" placeholder="" clearable class="addinputw addinputwOne"></el-input></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">

2
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiInfo.vue

@ -89,7 +89,7 @@
</div> </div>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算()</span></div> <div class="span-sty spanOneWidth"><span>车辆入库()</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.costPrice }}</span></el-form-item> <el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.costPrice }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">

2
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue

@ -189,7 +189,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty spanOneWidth"><span>厂家结算</span></div> <div class="span-sty spanOneWidth"><span>车辆入库</span></div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.costPrice }}</span></el-form-item> <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.costPrice }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@ -183,7 +183,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty spanOneWidth"><span>厂家结算</span></div> <div class="span-sty spanOneWidth"><span>车辆入库</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ inputMoneyCount() }}</span></el-form-item> <el-form-item><span class="addinputInfo addinputwOne">{{ inputMoneyCount() }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save