Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
ligaode 4 months ago
parent
commit
d20184f8c5
  1. 31
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
  2. 31
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
  3. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue
  4. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/paymentInformationAdd.vue
  5. 64
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue
  6. 105
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
  7. 29
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue
  8. 13
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue
  9. 1
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue
  10. 21
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue
  11. 29
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue
  12. 98
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue
  13. 31
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue
  14. 13
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliAdd.vue
  15. 6
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanliInfo.vue
  16. 24
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/relation/danchefanlichoose.vue

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

@ -749,7 +749,36 @@ export default {
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {}
this.formobj = {
billNo: '', //
name: '', //
deptSid: '', // sid
deptName: '', //
createTime: '', //
costRangeKey: '', // Key
costRangeValue: '', // value
isLeaderSp: '', // 10
isSales: '', //
isSettle: '', //
costTypeKey: '', // key
costTypeValue: '', // value
cost: '', //
payCompanySid: '', // sid
payCompany: '', //
busSid: '', // sid
createOrgSid: '', //
useOrgSid: '', // 使
procInstId: '', // id
taskId: '', // id
isVeh: '', // 10
paymentTotal: '', //
carTotal: '', //
carBrandSid: '', // sid
carBrandName: '', //
orgSidPath: '',
detailsList: [],
vehicleList: []
}
this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')

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

@ -306,7 +306,36 @@ export default {
this.viewState = 1
},
handleReturn() {
this.formobj = {}
this.formobj = {
billNo: '', //
name: '', //
deptSid: '', // sid
deptName: '', //
createTime: '', //
costRangeKey: '', // Key
costRangeValue: '', // value
isLeaderSp: '', // 10
isSales: '', //
isSettle: '', //
costTypeKey: '', // key
costTypeValue: '', // value
cost: '', //
payCompanySid: '', // sid
payCompany: '', //
busSid: '', // sid
createOrgSid: '', //
useOrgSid: '', // 使
procInstId: '', // id
taskId: '', // id
isVeh: '', // 10
paymentTotal: '', //
carTotal: '', //
carBrandSid: '', // sid
carBrandName: '', //
orgSidPath: '',
detailsList: [],
vehicleList: []
}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}

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

@ -277,7 +277,7 @@ export default {
const choose = this.receiveCompany_list.filter((item) => item.companyName === value)
if (choose !== null && choose.length > 0) {
this.formobj.receiveCompanySid = choose[0].sid
this.formobj.receivingAccount = choose[0].companyName
this.formobj.receivingAccount = choose[0].receivingAccount
this.formobj.bank = choose[0].bank
} else {
this.formobj.receiveCompanySid = ''

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

@ -277,7 +277,7 @@ export default {
const choose = this.receiveCompany_list.filter((item) => item.companyName === value)
if (choose !== null && choose.length > 0) {
this.formobj.receiveCompanySid = choose[0].sid
this.formobj.receivingAccount = choose[0].companyName
this.formobj.receivingAccount = choose[0].receivingAccount
this.formobj.bank = choose[0].bank
} else {
this.formobj.receiveCompanySid = ''

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

@ -11,22 +11,28 @@
<el-form-item label="分公司">
<el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请部门">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="创建人">
<el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="品牌">
<el-select v-model="listQuery.params.brandSid" placeholder="请选择" filterable clearable>
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
</el-select>
<el-form-item label="申请编号">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请名称">
<el-input v-model="listQuery.params.withApply" placeholder="" clearable/>
</el-form-item>
<el-form-item label="创建日期">
<el-form-item label="申请日期">
<el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="listQuery.params.finishTimeStart" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.finishTimeEnd" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="申请名称">
<el-input v-model="listQuery.params.withApply" placeholder="" clearable/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@ -40,31 +46,33 @@
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
<el-table-column fixed label="操作" align="center" width="180px" >
<el-table-column fixed type="selection" align="center" width="50" />
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
<el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true" @click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="状态" align="center">
<el-table-column label="状态" align="center" width="120">
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column prop="createOrgName" label="分公司" align="center" />
<el-table-column prop="brandName" label="品牌" align="center" />
<el-table-column label="名称" align="center">
<el-table-column prop="billNo" label="申请编号" align="center" width="180" />
<el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
<el-table-column prop="deptName" label="申请部门" align="center" width="120" />
<el-table-column prop="createByName" label="申请人" align="center" width="120" />
<el-table-column prop="createTime" label="申请日期" align="center" width="120" />
<el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
<el-table-column label="名称" align="center" min-width="140">
<template slot-scope="scope">
<span>{{ scope.row.withApply }}单车返利预提申请</span>
</template>
</el-table-column>
<el-table-column prop="withRebateTotal" label="预提返利" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="createTime" label="创建日期" align="center" width="120" />
<el-table-column prop="createByName" label="创建人" align="center" width="120" />
<el-table-column prop="withRebateTotal" label="预提返利" align="center" width="120" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" width="140" />
</el-table>
</div>
<div class="pages">
@ -86,7 +94,7 @@ import req from '@/api/bikerebate/bicyclerebatewithholding'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons'
import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
import bicyclerebatewithholdingAdd from './bicyclerebatewithholdingAdd'
import bicyclerebatewithholdingInfo from './bicyclerebatewithholdingInfo'
import { getStorage } from '@/utils/auth'
@ -138,14 +146,16 @@ export default {
sids: [],
FormLoading: false,
listLoading: false,
brand_list: [],
listQuery: {
params: {
useOrgName: '',
deptName: '',
createByName: '',
brandSid: '',
billNo: '',
createEndTime: '',
createStartTime: '',
finishTimeStart: '',
finishTimeEnd: '',
withApply: '',
orgPath: '',
userSid: '',
@ -201,11 +211,6 @@ export default {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.listQuery.params.createOrgSid = resp.data
brandDown({ useOrg: this.listQuery.params.createOrgSid }).then((res) => {
if (res.success) {
this.brand_list = res.data
}
})
this.getList()
}
})
@ -276,10 +281,13 @@ export default {
this.listQuery = {
params: {
useOrgName: '',
deptName: '',
createByName: '',
brandSid: '',
billNo: '',
createEndTime: '',
createStartTime: '',
finishTimeStart: '',
finishTimeEnd: '',
withApply: '',
orgPath: '',
userSid: '',

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

@ -22,21 +22,37 @@
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">品牌</div>
<el-form-item>
<el-select class="addinputInfo" :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
<el-row>
<el-col :span="16">
<div class="span-sty">申请编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="18" class="colOneStyle">
<div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button></div>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</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">{{ formobj.createOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<el-button size="mini" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button>
</div>
<el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="num" label="台数" align="center" min-width="80" />
<el-table-column prop="withRebate" label="预提返利" align="center" min-width="120" />
@ -65,7 +81,7 @@
<script>
import req from '@/api/bikerebate/bicyclerebatewithholding'
import { brandDown, fetchBySid } from '@/api/cheliang/dictcommons'
import { fetchBySid } from '@/api/cheliang/dictcommons'
import danchefanliselect from './relation/danchefanliselect'
import danchefanliAdd from './relation/danchefanliAdd'
@ -81,14 +97,16 @@ export default {
index: 0,
tableKey: 0,
viewState: 1,
dialogStatus: '',
brand_list: [],
//
formobj: {
sid: '',
withApply: '',
billNo: '',
createTime: '',
createOrgName: '',
createOrgSid: '',
deptName: '',
deptSid: '',
useOrgName: '',
useOrgSid: '',
remarks: '',
@ -112,11 +130,6 @@ export default {
this.formobj.useOrgName = res.data.name
}
})
brandDown({ useOrg: this.formobj.createOrgSid }).then((res) => {
if (res.success) {
this.brand_list = res.data
}
})
},
//
newDate() {
@ -135,19 +148,27 @@ export default {
this.init()
this.newDate()
})
this.dialogStatus = 'add'
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.createOrgSid = createOrgSid
this.formobj.useOrgSid = createOrgSid
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date()
var date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
day: nowDate.getDate()
}
this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
this.viewTitle = '【新增】预提申请'
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.dialogStatus = 'edit'
this.viewTitle = '【编辑】预提申请'
console.log('编辑回显', row.sid)
req.fetchBySid(row.sid).then((resp) => {
@ -159,22 +180,10 @@ export default {
this.formobj = row
})
},
changeBrand(value) {
const choose = this.brand_list.filter((item) => item.brandName === value)
if (choose !== null && choose.length > 0) {
this.formobj.brandSid = choose[0].sid
} else {
this.formobj.brandSid = ''
}
},
// --
handleSelect() {
if (this.formobj.brandName === '' || this.formobj.brandName === null || this.formobj.brandName === undefined) {
this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
return
}
this.viewState = 2
this.$refs['divSelect'].showData(this.formobj.scmVehRebateWiths, this.formobj.createOrgSid, this.formobj.brandSid)
this.$refs['divSelect'].showData(this.formobj.scmVehRebateWiths, this.formobj.createOrgSid)
},
// --
backData(value) {
@ -186,7 +195,7 @@ export default {
}
let v = 0
for (var j in this.formobj.scmVehRebateWiths) {
if (this.formobj.scmVehRebateWiths[j].rebateTypeValue === cval.rebateTypeValue) {
if (this.formobj.scmVehRebateWiths[j].rebateTypeValue === cval.rebateTypeValue && this.formobj.scmVehRebateWiths[j].purchaseSystemName === cval.purchaseSystemName && this.formobj.scmVehRebateWiths[j].brandName === cval.brandName) {
this.formobj.scmVehRebateWiths[j].num = parseInt(this.formobj.scmVehRebateWiths[j].num) + parseInt(1)
this.formobj.scmVehRebateWiths[j].withRebate = Math.round((parseFloat(this.formobj.scmVehRebateWiths[j].withRebate !== '' ? this.formobj.scmVehRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)) * 100) / 100
this.formobj.scmVehRebateWiths[j].expectTreatCost = Math.round((parseFloat(this.formobj.scmVehRebateWiths[j].expectTreatCost !== '' ? this.formobj.scmVehRebateWiths[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)) * 100) / 100
@ -206,6 +215,8 @@ export default {
expectSuppCost: cval.expectSuppCost,
brandName: cval.brandName,
brandSid: cval.brandSid,
purchaseSystemName: cval.purchaseSystemName,
purchaseSystemSid: cval.purchaseSystemSid,
vehRebateSids: [cval.sid],
// remarks: '',
sid: '',
@ -220,7 +231,7 @@ export default {
this.$refs['divAdd'].showInfo(row)
},
// --
backAdd(value, rebateType) {
backAdd(value, rebateType, purchaseSystemName, brandName) {
this.viewState = 1
const aa = []
if (value.length > 0) {
@ -228,7 +239,7 @@ export default {
let cval = value[i]
let v = 0
for (var j in aa) {
if (aa[j].rebateTypeValue === cval.rebateTypeValue) {
if (aa[j].rebateTypeValue === cval.rebateTypeValue && aa[j].purchaseSystemName === cval.purchaseSystemName && aa[j].brandName === cval.brandName) {
aa[j].num = parseInt(aa[j].num) + parseInt(1)
aa[j].withRebate = Math.round((parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)) * 100) / 100
aa[j].expectTreatCost = Math.round((parseFloat(aa[j].expectTreatCost !== '' ? aa[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)) * 100) / 100
@ -248,6 +259,8 @@ export default {
expectSuppCost: cval.expectSuppCost,
brandName: cval.brandName,
brandSid: cval.brandSid,
purchaseSystemName: cval.purchaseSystemName,
purchaseSystemSid: cval.purchaseSystemSid,
vehRebateSids: [cval.sid],
// remarks: '',
sid: '',
@ -256,7 +269,7 @@ export default {
}
}
for (var k = 0; k < this.formobj.scmVehRebateWiths.length; k++) {
if (this.formobj.scmVehRebateWiths[k].rebateTypeValue === rebateType) {
if (this.formobj.scmVehRebateWiths[k].rebateTypeValue === rebateType && this.formobj.scmVehRebateWiths[k].purchaseSystemName === purchaseSystemName && this.formobj.scmVehRebateWiths[k].brandName === brandName) {
this.formobj.scmVehRebateWiths[k].rebateTypeKey = aa[0].rebateTypeKey
this.formobj.scmVehRebateWiths[k].rebateTypeValue = aa[0].rebateTypeValue
this.formobj.scmVehRebateWiths[k].num = aa[0].num
@ -265,13 +278,15 @@ export default {
this.formobj.scmVehRebateWiths[k].expectSuppCost = aa[0].expectSuppCost
this.formobj.scmVehRebateWiths[k].brandName = aa[0].brandName
this.formobj.scmVehRebateWiths[k].brandSid = aa[0].brandSid
this.formobj.scmVehRebateWiths[k].purchaseSystemName = aa[0].purchaseSystemName
this.formobj.scmVehRebateWiths[k].purchaseSystemSid = aa[0].purchaseSystemSid
this.formobj.scmVehRebateWiths[k].vehRebateSids = aa[0].vehRebateSids
break
}
}
} else if (value.length === 0) {
for (var l = 0; l < this.formobj.scmVehRebateWiths.length; l++) {
if (this.formobj.scmVehRebateWiths[l].rebateTypeValue === rebateType) {
if (this.formobj.scmVehRebateWiths[l].rebateTypeValue === rebateType && this.formobj.scmVehRebateWiths[l].purchaseSystemName === purchaseSystemName && this.formobj.scmVehRebateWiths[l].brandName === brandName) {
this.formobj.scmVehRebateWiths.splice(l, 1)
break
}
@ -369,8 +384,12 @@ export default {
this.formobj = {
sid: '',
withApply: '',
billNo: '',
createTime: '',
createOrgName: '',
createOrgSid: '',
deptName: '',
deptSid: '',
useOrgName: '',
useOrgSid: '',
remarks: '',
@ -394,7 +413,6 @@ export default {
}
.colOneStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
@ -406,5 +424,12 @@ export default {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: center;
}
</style>

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

@ -22,14 +22,34 @@
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="24" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">品牌</div>
<el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
<el-row>
<el-col :span="16">
<div class="span-sty">申请编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</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">{{ formobj.createOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="num" label="台数" align="center" min-width="80" />
<el-table-column prop="withRebate" label="预提返利" align="center" min-width="120" />
@ -159,7 +179,6 @@ export default {
}
.colOneStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;

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

@ -18,6 +18,7 @@
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" />
@ -51,7 +52,9 @@ export default {
index: 0,
tableKey: 0,
viewState: 1,
rebateType: '',
rebateType: '', //
purchaseSystemName: '', //
brandName: '', //
sids: [],
//
list: [],
@ -74,6 +77,8 @@ export default {
})
this.viewTitle = '待预提单车返利明细'
this.rebateType = row.rebateTypeValue
this.purchaseSystemName = row.purchaseSystemName
this.brandName = row.brandName
console.log('编辑回显', row.sid)
req.vehRebateWithDetails(row.vehRebateSids).then((resp) => {
this.list = resp.data
@ -110,10 +115,12 @@ export default {
expectTreatCost: this.list[i].expectTreatCost,
expectSuppCost: this.list[i].expectSuppCost,
brandName: this.list[i].brandName,
brandSid: this.list[i].brandSid
brandSid: this.list[i].brandSid,
purchaseSystemName: this.list[i].purchaseSystemName,
purchaseSystemSid: this.list[i].purchaseSystemSid
})
}
this.$emit('backAdd', data_list, this.rebateType)
this.$emit('backAdd', data_list, this.rebateType, this.purchaseSystemName, this.brandName)
}
}
}

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

@ -16,6 +16,7 @@
<el-form ref="form_obj" :rules="rules" class="formadd">
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" />

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

@ -8,11 +8,17 @@
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="采购系统">
<el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="品牌">
<el-input v-model="listQuery.params.brandName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车型">
<el-input v-model="listQuery.params.vehModelName" placeholder="请输入车架号" clearable/>
<el-input v-model="listQuery.params.vehModelName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="请输入车架号" clearable/>
<el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="创建日期">
<el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
@ -42,6 +48,7 @@
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
<el-table-column prop="purchaseSystemName" 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="vinNo" label="车架号" align="center" width="150" />
@ -102,7 +109,8 @@ export default {
listQuery: {
params: {
createOrgSid: '',
brandSid: '',
purchaseSystemName: '',
brandName: '',
vehModelName: '',
vinNo: '',
rebateTypeKey: '',
@ -164,6 +172,8 @@ export default {
withRebate: element.estimateRebate,
expectTreatCost: element.expectTreatCost,
expectSuppCost: element.expectSuppCost,
purchaseSystemName: element.purchaseSystemName,
purchaseSystemSid: element.purchaseSystemSid,
brandName: element.brandName,
brandSid: element.brandSid
})
@ -185,9 +195,8 @@ export default {
}
})
},
showData(value, createOrgSid, brandSid) {
showData(value, createOrgSid) {
this.listQuery.params.createOrgSid = createOrgSid
this.listQuery.params.brandSid = brandSid
const aa = []
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
@ -211,6 +220,8 @@ export default {
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 5
this.listQuery.params.purchaseSystemName = ''
this.listQuery.params.brandName = ''
this.listQuery.params.createStartTime = ''
this.listQuery.params.createEndTime = ''
this.listQuery.params.vinNo = ''

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

@ -22,14 +22,34 @@
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="24" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">品牌</div>
<el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
<el-row>
<el-col :span="16">
<div class="span-sty">申请编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</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">{{ formobj.createOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="num" label="台数" align="center" min-width="80" />
<el-table-column prop="withRebate" label="预提返利" align="center" min-width="120" />
@ -348,7 +368,6 @@ export default {
}
.colOneStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
.rowClass {
border-top: 1px solid #E0E3EB;

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

@ -21,21 +21,37 @@
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">品牌</div>
<el-form-item>
<el-select class="addinputInfo" :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
<el-row>
<el-col :span="16">
<div class="span-sty">申请编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</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">{{ formobj.createOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="18" class="colOneStyle">
<div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button></div>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<el-button size="mini" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button>
</div>
<el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="num" label="台数" align="center" min-width="80" />
<el-table-column prop="withRebate" label="预提返利" align="center" min-width="120" />
@ -64,7 +80,6 @@
<script>
import req from '@/api/bikerebate/bicyclerebatewithholding'
import { brandDown } from '@/api/cheliang/dictcommons'
import danchefanlichoose from './relation/danchefanlichoose'
import danchefanliAdd from './relation/danchefanliAdd'
@ -80,13 +95,16 @@ export default {
index: 0,
tableKey: 0,
viewState: 1,
brand_list: [],
//
formobj: {
sid: '',
withApply: '',
billNo: '',
createTime: '',
createOrgName: '',
createOrgSid: '',
deptName: '',
deptSid: '',
useOrgName: '',
useOrgSid: '',
remarks: '',
@ -120,17 +138,9 @@ export default {
}, '*')
},
methods: {
init() {
brandDown({ useOrg: this.formobj.createOrgSid }).then((res) => {
if (res.success) {
this.brand_list = res.data
}
})
},
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
this.init()
})
this.viewTitle = '【编辑】预提申请'
console.log('编辑回显', sid)
@ -143,22 +153,10 @@ export default {
this.formobj = {}
})
},
changeBrand(value) {
const choose = this.brand_list.filter((item) => item.brandName === value)
if (choose !== null && choose.length > 0) {
this.formobj.brandSid = choose[0].sid
} else {
this.formobj.brandSid = ''
}
},
// --
handleSelect() {
if (this.formobj.brandName === '' || this.formobj.brandName === null || this.formobj.brandName === undefined) {
this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
return
}
this.viewState = 2
this.$refs['divSelect'].showData(this.formobj.scmVehRebateWiths, this.formobj.createOrgSid, this.formobj.brandSid)
this.$refs['divSelect'].showData(this.formobj.scmVehRebateWiths, this.formobj.createOrgSid)
},
// --
backData(value) {
@ -170,7 +168,7 @@ export default {
}
let v = 0
for (var j in this.formobj.scmVehRebateWiths) {
if (this.formobj.scmVehRebateWiths[j].rebateTypeValue === cval.rebateTypeValue) {
if (this.formobj.scmVehRebateWiths[j].rebateTypeValue === cval.rebateTypeValue && this.formobj.scmVehRebateWiths[j].purchaseSystemName === cval.purchaseSystemName && this.formobj.scmVehRebateWiths[j].brandName === cval.brandName) {
this.formobj.scmVehRebateWiths[j].num = parseInt(this.formobj.scmVehRebateWiths[j].num) + parseInt(1)
this.formobj.scmVehRebateWiths[j].withRebate = Math.round((parseFloat(this.formobj.scmVehRebateWiths[j].withRebate !== '' ? this.formobj.scmVehRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)) * 100) / 100
this.formobj.scmVehRebateWiths[j].expectTreatCost = Math.round((parseFloat(this.formobj.scmVehRebateWiths[j].expectTreatCost !== '' ? this.formobj.scmVehRebateWiths[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)) * 100) / 100
@ -190,8 +188,10 @@ export default {
expectSuppCost: cval.expectSuppCost,
brandName: cval.brandName,
brandSid: cval.brandSid,
purchaseSystemName: cval.purchaseSystemName,
purchaseSystemSid: cval.purchaseSystemSid,
vehRebateSids: [cval.sid],
remarks: '',
// remarks: '',
sid: '',
mainSid: ''
})
@ -204,7 +204,7 @@ export default {
this.$refs['divAdd'].showInfo(row)
},
// --
backAdd(value, rebateType) {
backAdd(value, rebateType, purchaseSystemName, brandName) {
this.viewState = 1
const aa = []
if (value.length > 0) {
@ -212,7 +212,7 @@ export default {
let cval = value[i]
let v = 0
for (var j in aa) {
if (aa[j].rebateTypeValue === cval.rebateTypeValue) {
if (aa[j].rebateTypeValue === cval.rebateTypeValue && aa[j].purchaseSystemName === cval.purchaseSystemName && aa[j].brandName === cval.brandName) {
aa[j].num = parseInt(aa[j].num) + parseInt(1)
aa[j].withRebate = Math.round((parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)) * 100) / 100
aa[j].expectTreatCost = Math.round((parseFloat(aa[j].expectTreatCost !== '' ? aa[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)) * 100) / 100
@ -232,15 +232,17 @@ export default {
expectSuppCost: cval.expectSuppCost,
brandName: cval.brandName,
brandSid: cval.brandSid,
purchaseSystemName: cval.purchaseSystemName,
purchaseSystemSid: cval.purchaseSystemSid,
vehRebateSids: [cval.sid],
remarks: '',
// remarks: '',
sid: '',
mainSid: ''
})
}
}
for (var k = 0; k < this.formobj.scmVehRebateWiths.length; k++) {
if (this.formobj.scmVehRebateWiths[k].rebateTypeValue === rebateType) {
if (this.formobj.scmVehRebateWiths[k].rebateTypeValue === rebateType && this.formobj.scmVehRebateWiths[k].purchaseSystemName === purchaseSystemName && this.formobj.scmVehRebateWiths[k].brandName === brandName) {
this.formobj.scmVehRebateWiths[k].rebateTypeKey = aa[0].rebateTypeKey
this.formobj.scmVehRebateWiths[k].rebateTypeValue = aa[0].rebateTypeValue
this.formobj.scmVehRebateWiths[k].num = aa[0].num
@ -249,19 +251,24 @@ export default {
this.formobj.scmVehRebateWiths[k].expectSuppCost = aa[0].expectSuppCost
this.formobj.scmVehRebateWiths[k].brandName = aa[0].brandName
this.formobj.scmVehRebateWiths[k].brandSid = aa[0].brandSid
this.formobj.scmVehRebateWiths[k].purchaseSystemName = aa[0].purchaseSystemName
this.formobj.scmVehRebateWiths[k].purchaseSystemSid = aa[0].purchaseSystemSid
this.formobj.scmVehRebateWiths[k].vehRebateSids = aa[0].vehRebateSids
break
}
}
} else if (value.length === 0) {
for (var l = 0; l < this.formobj.scmVehRebateWiths.length; l++) {
if (this.formobj.scmVehRebateWiths[l].rebateTypeValue === rebateType) {
if (this.formobj.scmVehRebateWiths[l].rebateTypeValue === rebateType && this.formobj.scmVehRebateWiths[l].purchaseSystemName === purchaseSystemName && this.formobj.scmVehRebateWiths[l].brandName === brandName) {
this.formobj.scmVehRebateWiths.splice(l, 1)
break
}
}
}
},
resetState() {
this.viewState = 1
},
//
getSummaries(param) {
const { columns, data } = param
@ -307,9 +314,6 @@ export default {
})
return sums
},
resetState() {
this.viewState = 1
},
save() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
@ -374,7 +378,6 @@ export default {
}
.colOneStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
@ -386,5 +389,12 @@ export default {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: center;
}
</style>

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

@ -7,6 +7,8 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small">导出</el-button>
<el-button type="primary" size="small">下载</el-button>
<el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
</div>
</div>
@ -20,14 +22,34 @@
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="24" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">品牌</div>
<el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
<el-row>
<el-col :span="16">
<div class="span-sty">申请编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</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">{{ formobj.createOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmVehRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="num" label="台数" align="center" min-width="80" />
<el-table-column prop="withRebate" label="预提返利" align="center" min-width="120" />
@ -227,7 +249,6 @@ export default {
}
.colOneStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;

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

@ -18,6 +18,7 @@
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" />
@ -51,7 +52,9 @@ export default {
index: 0,
tableKey: 0,
viewState: 1,
rebateType: '',
rebateType: '', //
purchaseSystemName: '', //
brandName: '', //
sids: [],
//
list: [],
@ -74,6 +77,8 @@ export default {
})
this.viewTitle = '待预提单车返利明细'
this.rebateType = row.rebateTypeValue
this.purchaseSystemName = row.purchaseSystemName
this.brandName = row.brandName
console.log('编辑回显', row.sid)
req.vehRebateWithDetails(row.vehRebateSids).then((resp) => {
this.list = resp.data
@ -110,10 +115,12 @@ export default {
expectTreatCost: this.list[i].expectTreatCost,
expectSuppCost: this.list[i].expectSuppCost,
brandName: this.list[i].brandName,
brandSid: this.list[i].brandSid
brandSid: this.list[i].brandSid,
purchaseSystemName: this.list[i].purchaseSystemName,
purchaseSystemSid: this.list[i].purchaseSystemSid
})
}
this.$emit('backAdd', data_list, this.rebateType)
this.$emit('backAdd', data_list, this.rebateType, this.purchaseSystemName, this.brandName)
}
}
}

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

@ -16,6 +16,7 @@
<el-form ref="form_obj" :rules="rules" class="formadd">
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" />
@ -79,10 +80,5 @@ export default {
}
</script>
<style scoped>
.titwu {
font-size: 28px;
text-align: center;
padding: 30px 0 20px 0;
}
</style>

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

@ -3,16 +3,22 @@
<!-- Start 列表页面 -->
<div>
<button-bar view-title="待预提单车返利列表" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="">
<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 ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="采购系统">
<el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="品牌">
<el-input v-model="listQuery.params.brandName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车型">
<el-input v-model="listQuery.params.vehModelName" placeholder="请输入车架号" clearable/>
<el-input v-model="listQuery.params.vehModelName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="请输入车架号" clearable/>
<el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="创建日期">
<el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
@ -42,6 +48,7 @@
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
<el-table-column prop="purchaseSystemName" 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="vinNo" label="车架号" align="center" width="150" />
@ -102,7 +109,8 @@ export default {
listQuery: {
params: {
createOrgSid: '',
brandSid: '',
purchaseSystemName: '',
brandName: '',
vehModelName: '',
vinNo: '',
rebateTypeKey: '',
@ -164,6 +172,8 @@ export default {
withRebate: element.estimateRebate,
expectTreatCost: element.expectTreatCost,
expectSuppCost: element.expectSuppCost,
purchaseSystemName: element.purchaseSystemName,
purchaseSystemSid: element.purchaseSystemSid,
brandName: element.brandName,
brandSid: element.brandSid
})
@ -175,7 +185,6 @@ export default {
getList() {
this.listLoading = true
req.pageList(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
if (response.success) {
this.list = response.data.records
@ -186,9 +195,8 @@ export default {
}
})
},
showData(value, createOrgSid, brandSid) {
showData(value, createOrgSid) {
this.listQuery.params.createOrgSid = createOrgSid
this.listQuery.params.brandSid = brandSid
const aa = []
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
@ -212,6 +220,8 @@ export default {
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 5
this.listQuery.params.purchaseSystemName = ''
this.listQuery.params.brandName = ''
this.listQuery.params.createStartTime = ''
this.listQuery.params.createEndTime = ''
this.listQuery.params.vinNo = ''

Loading…
Cancel
Save