Browse Source

完善专项返利预提

zhanglei
yunuo970428 7 months ago
parent
commit
d5d06c3721
  1. 59
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliAdd.vue
  2. 47
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliInfo.vue
  3. 70
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue
  4. 67
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue
  5. 179
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue
  6. 75
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue
  7. 59
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutiAdd.vue
  8. 47
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutiInfo.vue
  9. 70
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutichoose.vue
  10. 99
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue
  11. 185
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue
  12. 77
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue

59
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliAdd.vue

@ -18,31 +18,19 @@
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" 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="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectItureCost" label="其中支出费用" align="center" width="130" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
<el-table-column prop="expectSuppRemark" label="抵顶费用说明" align="center" min-width="200" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
</div>
@ -62,6 +50,8 @@ export default {
index: 0,
tableKey: 0,
rebateType: '',
purchaseSystem: '',
brandName: '',
sids: [],
//
list: [],
@ -84,20 +74,20 @@ export default {
})
this.viewTitle = '待预提专项返利明细'
this.rebateType = row.rebateTypeValue
this.purchaseSystem = row.purchaseSystemName
this.brandName = row.brandName
console.log('编辑回显', row.sid)
req.vehRebateWithDetails(row.specialRebateSids).then((resp) => {
this.list = resp.data
if (resp.success) {
this.list = resp.data
}
}).catch((e) => {
this.formobj = row
})
},
handleDelete() {
if (this.sids.length === 0) {
this.$message({
showClose: true,
type: 'error',
message: '请选择至少一条记录进行删除操作'
})
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
for (var i = 0; i < this.list.length; i++) {
@ -114,14 +104,19 @@ export default {
for (var i = 0; i < this.list.length; i++) {
data_list.push({
sid: this.list[i].sid,
purchaseSystemName: this.list[i].purchaseSystemName,
purchaseSystemSid: this.list[i].purchaseSystemSid,
rebateTypeValue: this.list[i].rebateTypeValue,
rebateTypeKey: this.list[i].rebateTypeKey,
withRebate: this.list[i].estimateRebate,
expectItureCost: this.list[i].expectItureCost,
expectTreatCost: this.list[i].expectTreatCost,
expectSuppCost: this.list[i].expectSuppCost,
brandName: this.list[i].brandName,
brandSid: this.list[i].brandSid
})
}
this.$emit('backAdd', data_list, this.rebateType)
this.$emit('backAdd', data_list, this.rebateType, this.purchaseSystem, this.brandName)
}
}
}

47
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliInfo.vue

@ -15,32 +15,20 @@
<div class="listconadd">
<el-form ref="form_obj" :rules="rules" class="formadd">
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" 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="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectItureCost" label="其中支出费用" align="center" width="130" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
<el-table-column prop="expectSuppRemark" label="抵顶费用说明" align="center" min-width="200" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
</div>
@ -73,14 +61,15 @@ export default {
this.viewTitle = '待预提专项返利明细'
console.log('编辑回显', row.sid)
req.vehRebateWithDetails(row.specialRebateSids).then((resp) => {
this.list = resp.data
if (resp.success) {
this.list = resp.data
}
}).catch((e) => {
this.formobj = row
})
},
// ===
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
handleReturn() {
//
this.list = []
this.$refs['form_obj'].resetFields()

70
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue

@ -8,10 +8,11 @@
<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-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-input v-model="listQuery.params.brandName" 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="选择日期"/>
@ -41,31 +42,16 @@
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" 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="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectCost" label="其中预计费用" align="center" width="120" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</div>
<div class="pages">
@ -81,7 +67,7 @@
import req from '@/api/specialrebate/specialrebatewithholding'
import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar'
import { brandDown, typeValues } from '@/api/cheliang/dictcommons'
import { typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'ZhuanXiangFanLiSelect',
@ -110,11 +96,11 @@ export default {
FormLoading: false,
listLoading: false,
rebateType_list: [],
brand_list: [],
listQuery: {
params: {
createOrgSid: '',
brandSid: '',
purchaseSystemName: '',
brandName: '',
rebateTypeKey: '',
rebateName: '',
createEndTime: '',
@ -138,11 +124,6 @@ export default {
this.rebateType_list = res.data
}
})
brandDown({ useOrg: this.listQuery.params.createOrgSid }).then((res) => {
if (res.success) {
this.brand_list = res.data
}
})
},
//
clicksearchShow() {
@ -174,9 +155,14 @@ export default {
row.forEach((element) => {
aa.push({
sid: element.sid,
purchaseSystemName: element.purchaseSystemName,
purchaseSystemSid: element.purchaseSystemSid,
rebateTypeValue: element.rebateTypeValue,
rebateTypeKey: element.rebateTypeKey,
withRebate: element.estimateRebate,
expectItureCost: element.expectItureCost,
expectTreatCost: element.expectTreatCost,
expectSuppCost: element.expectSuppCost,
brandName: element.brandName,
brandSid: element.brandSid
})
@ -199,9 +185,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++) {
@ -229,18 +214,15 @@ export default {
this.listQuery.params.createEndTime = ''
this.listQuery.params.rebateTypeKey = ''
this.listQuery.params.rebateName = ''
this.listQuery.params.purchaseSystemName = ''
this.listQuery.params.brandName = ''
this.getList()
},
handleConfirm() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请选择至少一条记录!',
type: 'error',
duration: 2000
})
this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
}
},
doClose() {

67
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue

@ -8,12 +8,10 @@
<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-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.createOrgName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请标题">
<el-form-item label="申请名称">
<el-input v-model="listQuery.params.withApply" clearable placeholder=""></el-input>
</el-form-item>
<el-form-item label="创建日期">
@ -21,6 +19,11 @@
<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.closeStartDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.closeEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</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>
@ -48,36 +51,14 @@
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column label="分公司" align="center">
<template slot-scope="scope">
<span>{{ scope.row.createOrgName }}</span>
</template>
</el-table-column>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withApply }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withRebateTotal }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.createByName }}</span>
</template>
</el-table-column>
<el-table-column prop="createOrgName" label="分公司" align="center" />
<el-table-column prop="withApply" label="名称" align="center" />
<el-table-column prop="withRebateTotal" label="预提返利" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="createByName" label="申请人" align="center" width="120" />
<el-table-column prop="deptName" label="申请部门" align="center" width="120" />
<el-table-column prop="createTime" label="申请日期" align="center" width="120" />
<el-table-column prop="closeDate" label="办结日期" align="center" width="120" />
</el-table>
</div>
<div class="pages">
@ -99,7 +80,7 @@ import req from '@/api/specialrebate/specialrebatewithholding'
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 specialrebatewithholdingAdd from './specialrebatewithholdingAdd'
import specialrebatewithholdingInfo from './specialrebatewithholdingInfo'
import { getStorage } from '@/utils/auth'
@ -151,14 +132,15 @@ export default {
sids: [],
FormLoading: false,
listLoading: false,
brand_list: [],
listQuery: {
params: {
createOrgSid: '',
createEndTime: '',
createStartTime: '',
closeStartDate: '',
closeEndDate: '',
withApply: '',
brandSid: '',
createOrgName: '',
orgPath: '',
userSid: '',
menuUrl: ''
@ -213,11 +195,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()
}
})
@ -290,8 +267,10 @@ export default {
createOrgSid: '',
createEndTime: '',
createStartTime: '',
closeStartDate: '',
closeEndDate: '',
withApply: '',
brandSid: '',
createOrgName: '',
orgPath: '',
userSid: '',
menuUrl: ''

179
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue

@ -7,10 +7,8 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -18,63 +16,40 @@
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>{{ formobj.withApply }}专项返利预提申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="24" class="tleftb colOneStyle">
<div><span style="font-size: 16px">金额单位</span></div>
<el-col :span="24" class="colOneStyle">
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
<el-col :span="6" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
</el-col>
<el-col :span="4" class="colOneStyle">
<el-form-item>
<el-select :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="18" class="tleftb colOneStyle">
<el-button size="small" type="primary" @click="handleSelect()">选择</el-button>
<el-col :span="18" class="colOneStyle">
<div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button></div>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmSpecialRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="台数" align="center">
<template slot-scope="scope">
<span>{{ scope.row.num }}</span>
</template>
</el-table-column>
<el-table-column prop="withRebate" label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withRebate }}</span>
</template>
</el-table-column>
<el-table-column label="明细" align="center">
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
<el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="withRebate" label="预提返利" align="center" min-width="120" />
<el-table-column prop="expectItureCost" label="其中支出费用" align="center" min-width="130" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" min-width="150" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" min-width="130" />
<el-table-column label="明细" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.remarks" clearable placeholder="" class="addinputw"></el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item>
<el-input v-model="formobj.remarks" clearable placeholder="" class="addinputw"></el-input>
</el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw"></el-input></el-form-item>
</el-col>
</el-row>
</el-form>
@ -88,7 +63,7 @@
<script>
import req from '@/api/specialrebate/specialrebatewithholding'
import { brandDown, fetchBySid } from '@/api/cheliang/dictcommons'
import { fetchBySid } from '@/api/cheliang/dictcommons'
import zhuanxiangfanliselect from './relation/zhuanxiangfanliselect'
import zhuanxiangfanliAdd from './relation/zhuanxiangfanliAdd'
@ -105,13 +80,12 @@ export default {
tableKey: 0,
viewState: 1,
dialogStatus: '',
brand_list: [],
//
formobj: {
brandName: '',
brandSid: '',
sid: '',
withApply: '',
deptName: '',
deptSid: '',
createOrgName: '',
createOrgSid: '',
useOrgName: '',
@ -137,17 +111,12 @@ export default {
this.formobj.useOrgName = res.data.name
}
})
brandDown({ useOrg: this.formobj.createOrgSid }).then((res) => {
if (res.success) {
this.brand_list = res.data
}
})
},
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() + 1 //
let month = date.getMonth() //
this.formobj.withApply = year + '年' + month + '月'
},
showAdd(createOrgSid) {
@ -158,10 +127,12 @@ export default {
})
this.dialogStatus = 'add'
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createOrgSid = createOrgSid
this.formobj.useOrgSid = createOrgSid
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)
this.viewTitle = '【新增】专项返利预提申请'
},
showEdit(row) {
@ -180,26 +151,15 @@ 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.scmSpecialRebateWiths, this.formobj.createOrgSid, this.formobj.brandSid)
this.$refs['divSelect'].showData(this.formobj.scmSpecialRebateWiths, this.formobj.createOrgSid)
},
// --
backData(value) {
this.viewState = 1
value = JSON.parse(JSON.stringify(value))
for (var i in value) {
let cval = value[i]
if (!this.formobj.scmSpecialRebateWiths || this.formobj.scmSpecialRebateWiths.length === 0) {
@ -207,9 +167,11 @@ export default {
}
let v = 0
for (var j in this.formobj.scmSpecialRebateWiths) {
if (this.formobj.scmSpecialRebateWiths[j].rebateTypeValue === cval.rebateTypeValue) {
this.formobj.scmSpecialRebateWiths[j].num = parseInt(this.formobj.scmSpecialRebateWiths[j].num) + parseInt(1)
this.formobj.scmSpecialRebateWiths[j].withRebate = parseFloat(this.formobj.scmSpecialRebateWiths[j].withRebate !== '' ? this.formobj.scmSpecialRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
if (this.formobj.scmSpecialRebateWiths[j].rebateTypeValue === cval.rebateTypeValue && this.formobj.scmSpecialRebateWiths[j].purchaseSystemName === cval.purchaseSystemName && this.formobj.scmSpecialRebateWiths[j].brandName === cval.brandName) {
this.formobj.scmSpecialRebateWiths[j].withRebate = Math.round((parseFloat(this.formobj.scmSpecialRebateWiths[j].withRebate !== '' ? this.formobj.scmSpecialRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)) * 100) / 100
this.formobj.scmSpecialRebateWiths[j].expectItureCost = Math.round((parseFloat(this.formobj.scmSpecialRebateWiths[j].expectItureCost !== '' ? this.formobj.scmSpecialRebateWiths[j].expectItureCost : 0) + parseFloat(cval.expectItureCost !== '' ? cval.expectItureCost : 0)) * 100) / 100
this.formobj.scmSpecialRebateWiths[j].expectTreatCost = Math.round((parseFloat(this.formobj.scmSpecialRebateWiths[j].expectTreatCost !== '' ? this.formobj.scmSpecialRebateWiths[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)) * 100) / 100
this.formobj.scmSpecialRebateWiths[j].expectSuppCost = Math.round((parseFloat(this.formobj.scmSpecialRebateWiths[j].expectSuppCost !== '' ? this.formobj.scmSpecialRebateWiths[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)) * 100) / 100
this.formobj.scmSpecialRebateWiths[j].specialRebateSids.push(cval.sid)
v = 1
break
@ -217,14 +179,17 @@ export default {
}
if (v === 0) {
this.formobj.scmSpecialRebateWiths.push({
purchaseSystemName: cval.purchaseSystemName,
purchaseSystemSid: cval.purchaseSystemSid,
brandName: cval.brandName,
brandSid: cval.brandSid,
rebateTypeKey: cval.rebateTypeKey,
rebateTypeValue: cval.rebateTypeValue,
num: 1,
withRebate: cval.withRebate,
brandName: cval.brandName,
brandSid: cval.brandSid,
expectItureCost: cval.expectItureCost,
expectTreatCost: cval.expectTreatCost,
expectSuppCost: cval.expectSuppCost,
specialRebateSids: [cval.sid],
// remarks: '',
sid: '',
mainSid: ''
})
@ -237,7 +202,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) {
@ -245,9 +210,11 @@ export default {
let cval = value[i]
let v = 0
for (var j in aa) {
if (aa[j].rebateTypeValue === cval.rebateTypeValue) {
aa[j].num = parseInt(aa[j].num) + parseInt(1)
aa[j].withRebate = parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
if (aa[j].rebateTypeValue === cval.rebateTypeValue && aa[j].purchaseSystemName === cval.purchaseSystemName && aa[j].brandName === cval.brandName) {
aa[j].withRebate = Math.round((parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)) * 100) / 100
aa[j].expectItureCost = Math.round((parseFloat(aa[j].expectItureCost !== '' ? aa[j].expectItureCost : 0) + parseFloat(cval.expectItureCost !== '' ? cval.expectItureCost : 0)) * 100) / 100
aa[j].expectTreatCost = Math.round((parseFloat(aa[j].expectTreatCost !== '' ? aa[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)) * 100) / 100
aa[j].expectSuppCost = Math.round((parseFloat(aa[j].expectSuppCost !== '' ? aa[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)) * 100) / 100
aa[j].specialRebateSids.push(cval.sid)
v = 1
break
@ -255,34 +222,41 @@ export default {
}
if (v === 0) {
aa.push({
purchaseSystemName: cval.purchaseSystemName,
purchaseSystemSid: cval.purchaseSystemSid,
brandName: cval.brandName,
brandSid: cval.brandSid,
rebateTypeKey: cval.rebateTypeKey,
rebateTypeValue: cval.rebateTypeValue,
num: 1,
withRebate: cval.withRebate,
brandName: cval.brandName,
brandSid: cval.brandSid,
expectItureCost: cval.expectItureCost,
expectTreatCost: cval.expectTreatCost,
expectSuppCost: cval.expectSuppCost,
specialRebateSids: [cval.sid],
// remarks: '',
sid: '',
mainSid: ''
})
}
}
for (var k = 0; k < this.formobj.scmSpecialRebateWiths.length; k++) {
if (this.formobj.scmSpecialRebateWiths[k].rebateTypeValue === rebateType) {
if (this.formobj.scmSpecialRebateWiths[k].rebateTypeValue === rebateType && this.formobj.scmSpecialRebateWiths[k].purchaseSystemName === purchaseSystemName && this.formobj.scmSpecialRebateWiths[k].brandName === brandName) {
this.formobj.scmSpecialRebateWiths[k].purchaseSystemName = aa[0].purchaseSystemName
this.formobj.scmSpecialRebateWiths[k].purchaseSystemSid = aa[0].purchaseSystemSid
this.formobj.scmSpecialRebateWiths[k].brandName = aa[0].brandName
this.formobj.scmSpecialRebateWiths[k].brandSid = aa[0].brandSid
this.formobj.scmSpecialRebateWiths[k].rebateTypeKey = aa[0].rebateTypeKey
this.formobj.scmSpecialRebateWiths[k].rebateTypeValue = aa[0].rebateTypeValue
this.formobj.scmSpecialRebateWiths[k].num = aa[0].num
this.formobj.scmSpecialRebateWiths[k].withRebate = aa[0].withRebate
this.formobj.scmSpecialRebateWiths[k].brandName = aa[0].brandName
this.formobj.scmSpecialRebateWiths[k].brandSid = aa[0].brandSid
this.formobj.scmSpecialRebateWiths[k].expectItureCost = aa[0].expectItureCost
this.formobj.scmSpecialRebateWiths[k].expectTreatCost = aa[0].expectTreatCost
this.formobj.scmSpecialRebateWiths[k].expectSuppCost = aa[0].expectSuppCost
this.formobj.scmSpecialRebateWiths[k].specialRebateSids = aa[0].specialRebateSids
break
}
}
} else if (value.length === 0) {
for (var l = 0; l < this.formobj.scmSpecialRebateWiths.length; l++) {
if (this.formobj.scmSpecialRebateWiths[l].rebateTypeValue === rebateType) {
if (this.formobj.scmSpecialRebateWiths[l].rebateTypeValue === rebateType && this.formobj.scmSpecialRebateWiths[l].purchaseSystemName === purchaseSystemName) {
this.formobj.scmSpecialRebateWiths.splice(l, 1)
break
}
@ -349,21 +323,6 @@ export default {
}, 0)
sums[index] += ''
this.formobj.withRebateTotal = sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
this.amount = sums[index] += ''
} else {
sums[index] = ''
}
}
})
return sums
@ -373,10 +332,10 @@ export default {
if (isreload === 'true') this.$emit('reloadlist')
//
this.formobj = {
brandName: '',
brandSid: '',
sid: '',
withApply: '',
deptName: '',
deptSid: '',
createOrgName: '',
createOrgSid: '',
useOrgName: '',
@ -404,4 +363,10 @@ export default {
border-right: 0px !important;
border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

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

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

59
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutiAdd.vue

@ -18,31 +18,19 @@
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" 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="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectItureCost" label="其中支出费用" align="center" width="130" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
<el-table-column prop="expectSuppRemark" label="抵顶费用说明" align="center" min-width="200" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
</div>
@ -62,6 +50,8 @@ export default {
index: 0,
tableKey: 0,
rebateType: '',
purchaseSystem: '',
brandName: '',
sids: [],
//
list: [],
@ -84,20 +74,20 @@ export default {
})
this.viewTitle = '待预提专项返利明细'
this.rebateType = row.rebateTypeValue
this.purchaseSystem = row.purchaseSystemName
this.brandName = row.brandName
console.log('编辑回显', row.sid)
req.vehRebateWithDetails(row.specialRebateSids).then((resp) => {
this.list = resp.data
if (resp.success) {
this.list = resp.data
}
}).catch((e) => {
this.formobj = row
})
},
handleDelete() {
if (this.sids.length === 0) {
this.$message({
showClose: true,
type: 'error',
message: '请选择至少一条记录进行删除操作'
})
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
for (var i = 0; i < this.list.length; i++) {
@ -114,14 +104,19 @@ export default {
for (var i = 0; i < this.list.length; i++) {
data_list.push({
sid: this.list[i].sid,
purchaseSystemName: this.list[i].purchaseSystemName,
purchaseSystemSid: this.list[i].purchaseSystemSid,
rebateTypeValue: this.list[i].rebateTypeValue,
rebateTypeKey: this.list[i].rebateTypeKey,
withRebate: this.list[i].estimateRebate,
expectItureCost: this.list[i].expectItureCost,
expectTreatCost: this.list[i].expectTreatCost,
expectSuppCost: this.list[i].expectSuppCost,
brandName: this.list[i].brandName,
brandSid: this.list[i].brandSid
})
}
this.$emit('backAdd', data_list, this.rebateType)
this.$emit('backAdd', data_list, this.rebateType, this.purchaseSystem, this.brandName)
}
}
}

47
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutiInfo.vue

@ -15,32 +15,20 @@
<div class="">
<el-form ref="form_obj" :rules="rules" class="formadd">
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" 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="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectItureCost" label="其中支出费用" align="center" width="130" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" width="150" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" width="130" />
<el-table-column prop="expectSuppRemark" label="抵顶费用说明" align="center" min-width="200" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
</div>
@ -73,14 +61,15 @@ export default {
this.viewTitle = '待预提专项返利明细'
console.log('编辑回显', row.sid)
req.vehRebateWithDetails(row.specialRebateSids).then((resp) => {
this.list = resp.data
if (resp.success) {
this.list = resp.data
}
}).catch((e) => {
this.formobj = row
})
},
// ===
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
handleReturn() {
//
this.list = []
this.$refs['form_obj'].resetFields()

70
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutichoose.vue

@ -8,10 +8,11 @@
<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-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-input v-model="listQuery.params.brandName" 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="选择日期"/>
@ -41,31 +42,16 @@
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" 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="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
<el-table-column prop="expectCost" label="其中预计费用" align="center" width="120" />
<el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</div>
<div class="pages">
@ -81,7 +67,7 @@
import req from '@/api/specialrebate/specialrebatewithholding'
import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar'
import { brandDown, typeValues } from '@/api/cheliang/dictcommons'
import { typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'ZhuanXiangFanLiYuTiChoose',
@ -110,11 +96,11 @@ export default {
FormLoading: false,
listLoading: false,
rebateType_list: [],
brand_list: [],
listQuery: {
params: {
createOrgSid: '',
brandSid: '',
purchaseSystemName: '',
brandName: '',
rebateTypeKey: '',
rebateName: '',
createEndTime: '',
@ -138,11 +124,6 @@ export default {
this.rebateType_list = res.data
}
})
brandDown({ useOrg: this.listQuery.params.createOrgSid }).then((res) => {
if (res.success) {
this.brand_list = res.data
}
})
},
//
clicksearchShow() {
@ -174,9 +155,14 @@ export default {
row.forEach((element) => {
aa.push({
sid: element.sid,
purchaseSystemName: element.purchaseSystemName,
purchaseSystemSid: element.purchaseSystemSid,
rebateTypeValue: element.rebateTypeValue,
rebateTypeKey: element.rebateTypeKey,
withRebate: element.estimateRebate,
expectItureCost: element.expectItureCost,
expectTreatCost: element.expectTreatCost,
expectSuppCost: element.expectSuppCost,
brandName: element.brandName,
brandSid: element.brandSid
})
@ -199,9 +185,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++) {
@ -229,18 +214,15 @@ export default {
this.listQuery.params.createEndTime = ''
this.listQuery.params.rebateTypeKey = ''
this.listQuery.params.rebateName = ''
this.listQuery.params.purchaseSystemName = ''
this.listQuery.params.brandName = ''
this.getList()
},
handleConfirm() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请选择至少一条记录!',
type: 'error',
duration: 2000
})
this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
}
},
doClose() {

99
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue

@ -16,58 +16,36 @@
<!--Start 新增修改部分-->
<div class="">
<div class="titwu"><span>{{ formobj.withApply }}专项返利预提申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="24" class="tleftb colOneStyle">
<div><span style="font-size: 16px">金额单位</span></div>
<el-col :span="24" class="colOneStyle">
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
</el-col>
<el-col :span="22" class="colOneStyle">
<el-form-item>
<span>{{ formobj.brandName }}</span>
</el-form-item>
<el-col :span="24" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmSpecialRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="台数" align="center">
<template slot-scope="scope">
<span>{{ scope.row.num }}</span>
</template>
</el-table-column>
<el-table-column prop="withRebate" label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withRebate }}</span>
</template>
</el-table-column>
<el-table-column label="明细" align="center">
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="withRebate" label="预提返利" align="center" min-width="120" />
<el-table-column prop="expectItureCost" label="其中支出费用" align="center" min-width="130" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" min-width="150" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" min-width="130" />
<el-table-column label="明细" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.remarks }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item>
<span>{{ formobj.remarks }}</span>
</el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
@ -80,14 +58,14 @@
<el-form class="formaddcopy02" >
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="24">
<div class="span-sty spanTwoWidth"><span>当前环节:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
<div class="span-sty"><span>当前环节:</span></div>
<el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-row :class="{ rowClass:!currentLink }">
<el-col :span="24">
<div class="span-sty spanTwoWidth"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputOne" clearable ></el-input></el-form-item>
<div class="span-sty"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputInfo addinputw" clearable ></el-input></el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
@ -175,7 +153,7 @@ export default {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '预提申请详情'
this.viewTitle = '专项返利预提申请详情'
console.log('编辑回显', sid)
req.fetchBySid(sid).then((resp) => {
if (resp.success) {
@ -333,26 +311,10 @@ export default {
}
}, 0)
sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
this.amount = sums[index] += ''
} else {
sums[index] = ''
}
}
})
return sums
},
}
}
}
</script>
@ -362,12 +324,6 @@ export default {
text-align: center;
padding: 30px 0 20px 0;
}
.spanTwoWidth {
width: 150px !important;
}
.addinputOne {
margin-left: 140px !important;
}
.rowStyle {
border-left: 0px;
}
@ -375,5 +331,14 @@ export default {
border-right: 0px !important;
border-bottom: 0px !important;
}
.rowClass {
border-top: 1px solid #E0E3EB;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

185
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue

@ -7,73 +7,48 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
</div>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="">
<div class="titwu"><span>{{ formobj.withApply }}专项返利预提申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="24" class="tleftb colOneStyle">
<div><span style="font-size: 16px">金额单位</span></div>
<el-col :span="24" class="colOneStyle">
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
<el-col :span="6" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
</el-col>
<el-col :span="4" class="colOneStyle">
<el-form-item>
<el-select :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="18" class="tleftb colOneStyle">
<el-button size="small" type="primary" @click="handleSelect()">选择</el-button>
<el-col :span="18" class="colOneStyle">
<div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button></div>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmSpecialRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="台数" align="center">
<template slot-scope="scope">
<span>{{ scope.row.num }}</span>
</template>
</el-table-column>
<el-table-column prop="withRebate" label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withRebate }}</span>
</template>
</el-table-column>
<el-table-column label="明细" align="center">
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
<el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="withRebate" label="预提返利" align="center" min-width="120" />
<el-table-column prop="expectItureCost" label="其中支出费用" align="center" min-width="130" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" min-width="150" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" min-width="130" />
<el-table-column label="明细" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.remarks" clearable placeholder="" class="addinputw"></el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item>
<el-input v-model="formobj.remarks" clearable placeholder="" class="addinputw"></el-input>
</el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw"></el-input></el-form-item>
</el-col>
</el-row>
</el-form>
@ -87,7 +62,6 @@
<script>
import req from '@/api/specialrebate/specialrebatewithholding'
import { brandDown, fetchBySid } from '@/api/cheliang/dictcommons'
import zhuanxiangfanliyutichoose from './relation/zhuanxiangfanliyutichoose'
import zhuanxiangfanliyutiAdd from './relation/zhuanxiangfanliyutiAdd'
@ -104,13 +78,12 @@ export default {
tableKey: 0,
viewState: 1,
dialogStatus: '',
brand_list: [],
//
formobj: {
brandName: '',
brandSid: '',
sid: '',
withApply: '',
deptName: '',
deptSid: '',
createOrgName: '',
createOrgSid: '',
useOrgName: '',
@ -146,26 +119,6 @@ export default {
}, '*')
},
methods: {
init() {
fetchBySid(this.formobj.createOrgSid).then((res) => {
if (res.success) {
this.formobj.createOrgName = res.data.name
this.formobj.useOrgName = res.data.name
}
})
brandDown({ useOrg: this.formobj.createOrgSid }).then((res) => {
if (res.success) {
this.brand_list = res.data
}
})
},
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() + 1 //
this.formobj.withApply = year + '年' + month + '月'
},
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
@ -182,26 +135,15 @@ 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.scmSpecialRebateWiths, this.formobj.createOrgSid, this.formobj.brandSid)
this.$refs['divSelect'].showData(this.formobj.scmSpecialRebateWiths, this.formobj.createOrgSid)
},
// --
backData(value) {
this.viewState = 1
value = JSON.parse(JSON.stringify(value))
for (var i in value) {
let cval = value[i]
if (!this.formobj.scmSpecialRebateWiths || this.formobj.scmSpecialRebateWiths.length === 0) {
@ -209,9 +151,11 @@ export default {
}
let v = 0
for (var j in this.formobj.scmSpecialRebateWiths) {
if (this.formobj.scmSpecialRebateWiths[j].rebateTypeValue === cval.rebateTypeValue) {
this.formobj.scmSpecialRebateWiths[j].num = parseInt(this.formobj.scmSpecialRebateWiths[j].num) + parseInt(1)
this.formobj.scmSpecialRebateWiths[j].withRebate = parseFloat(this.formobj.scmSpecialRebateWiths[j].withRebate !== '' ? this.formobj.scmSpecialRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
if (this.formobj.scmSpecialRebateWiths[j].rebateTypeValue === cval.rebateTypeValue && this.formobj.scmSpecialRebateWiths[j].purchaseSystemName === cval.purchaseSystemName && this.formobj.scmSpecialRebateWiths[j].brandName === cval.brandName) {
this.formobj.scmSpecialRebateWiths[j].withRebate = Math.round((parseFloat(this.formobj.scmSpecialRebateWiths[j].withRebate !== '' ? this.formobj.scmSpecialRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)) * 100) / 100
this.formobj.scmSpecialRebateWiths[j].expectItureCost = Math.round((parseFloat(this.formobj.scmSpecialRebateWiths[j].expectItureCost !== '' ? this.formobj.scmSpecialRebateWiths[j].expectItureCost : 0) + parseFloat(cval.expectItureCost !== '' ? cval.expectItureCost : 0)) * 100) / 100
this.formobj.scmSpecialRebateWiths[j].expectTreatCost = Math.round((parseFloat(this.formobj.scmSpecialRebateWiths[j].expectTreatCost !== '' ? this.formobj.scmSpecialRebateWiths[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)) * 100) / 100
this.formobj.scmSpecialRebateWiths[j].expectSuppCost = Math.round((parseFloat(this.formobj.scmSpecialRebateWiths[j].expectSuppCost !== '' ? this.formobj.scmSpecialRebateWiths[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)) * 100) / 100
this.formobj.scmSpecialRebateWiths[j].specialRebateSids.push(cval.sid)
v = 1
break
@ -219,14 +163,17 @@ export default {
}
if (v === 0) {
this.formobj.scmSpecialRebateWiths.push({
purchaseSystemName: cval.purchaseSystemName,
purchaseSystemSid: cval.purchaseSystemSid,
brandName: cval.brandName,
brandSid: cval.brandSid,
rebateTypeKey: cval.rebateTypeKey,
rebateTypeValue: cval.rebateTypeValue,
num: 1,
withRebate: cval.withRebate,
brandName: cval.brandName,
brandSid: cval.brandSid,
expectItureCost: cval.expectItureCost,
expectTreatCost: cval.expectTreatCost,
expectSuppCost: cval.expectSuppCost,
specialRebateSids: [cval.sid],
// remarks: '',
sid: '',
mainSid: ''
})
@ -239,7 +186,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) {
@ -247,9 +194,11 @@ export default {
let cval = value[i]
let v = 0
for (var j in aa) {
if (aa[j].rebateTypeValue === cval.rebateTypeValue) {
aa[j].num = parseInt(aa[j].num) + parseInt(1)
aa[j].withRebate = parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
if (aa[j].rebateTypeValue === cval.rebateTypeValue && aa[j].purchaseSystemName === cval.purchaseSystemName && aa[j].brandName === cval.brandName) {
aa[j].withRebate = Math.round((parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)) * 100) / 100
aa[j].expectItureCost = Math.round((parseFloat(aa[j].expectItureCost !== '' ? aa[j].expectItureCost : 0) + parseFloat(cval.expectItureCost !== '' ? cval.expectItureCost : 0)) * 100) / 100
aa[j].expectTreatCost = Math.round((parseFloat(aa[j].expectTreatCost !== '' ? aa[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)) * 100) / 100
aa[j].expectSuppCost = Math.round((parseFloat(aa[j].expectSuppCost !== '' ? aa[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)) * 100) / 100
aa[j].specialRebateSids.push(cval.sid)
v = 1
break
@ -257,34 +206,41 @@ export default {
}
if (v === 0) {
aa.push({
purchaseSystemName: cval.purchaseSystemName,
purchaseSystemSid: cval.purchaseSystemSid,
brandName: cval.brandName,
brandSid: cval.brandSid,
rebateTypeKey: cval.rebateTypeKey,
rebateTypeValue: cval.rebateTypeValue,
num: 1,
withRebate: cval.withRebate,
brandName: cval.brandName,
brandSid: cval.brandSid,
expectItureCost: cval.expectItureCost,
expectTreatCost: cval.expectTreatCost,
expectSuppCost: cval.expectSuppCost,
specialRebateSids: [cval.sid],
// remarks: '',
sid: '',
mainSid: ''
})
}
}
for (var k = 0; k < this.formobj.scmSpecialRebateWiths.length; k++) {
if (this.formobj.scmSpecialRebateWiths[k].rebateTypeValue === rebateType) {
if (this.formobj.scmSpecialRebateWiths[k].rebateTypeValue === rebateType && this.formobj.scmSpecialRebateWiths[k].purchaseSystemName === purchaseSystemName && this.formobj.scmSpecialRebateWiths[k].brandName === brandName) {
this.formobj.scmSpecialRebateWiths[k].purchaseSystemName = aa[0].purchaseSystemName
this.formobj.scmSpecialRebateWiths[k].purchaseSystemSid = aa[0].purchaseSystemSid
this.formobj.scmSpecialRebateWiths[k].brandName = aa[0].brandName
this.formobj.scmSpecialRebateWiths[k].brandSid = aa[0].brandSid
this.formobj.scmSpecialRebateWiths[k].rebateTypeKey = aa[0].rebateTypeKey
this.formobj.scmSpecialRebateWiths[k].rebateTypeValue = aa[0].rebateTypeValue
this.formobj.scmSpecialRebateWiths[k].num = aa[0].num
this.formobj.scmSpecialRebateWiths[k].withRebate = aa[0].withRebate
this.formobj.scmSpecialRebateWiths[k].brandName = aa[0].brandName
this.formobj.scmSpecialRebateWiths[k].brandSid = aa[0].brandSid
this.formobj.scmSpecialRebateWiths[k].expectItureCost = aa[0].expectItureCost
this.formobj.scmSpecialRebateWiths[k].expectTreatCost = aa[0].expectTreatCost
this.formobj.scmSpecialRebateWiths[k].expectSuppCost = aa[0].expectSuppCost
this.formobj.scmSpecialRebateWiths[k].specialRebateSids = aa[0].specialRebateSids
break
}
}
} else if (value.length === 0) {
for (var l = 0; l < this.formobj.scmSpecialRebateWiths.length; l++) {
if (this.formobj.scmSpecialRebateWiths[l].rebateTypeValue === rebateType) {
if (this.formobj.scmSpecialRebateWiths[l].rebateTypeValue === rebateType && this.formobj.scmSpecialRebateWiths[l].purchaseSystemName === purchaseSystemName) {
this.formobj.scmSpecialRebateWiths.splice(l, 1)
break
}
@ -365,25 +321,10 @@ export default {
}, 0)
sums[index] += ''
this.formobj.withRebateTotal = sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
this.amount = sums[index] += ''
} else {
sums[index] = ''
}
}
})
return sums
},
}
}
}
</script>
@ -400,4 +341,10 @@ export default {
border-right: 0px !important;
border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

77
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue

@ -14,58 +14,36 @@
<!--Start 新增修改部分-->
<div class="">
<div class="titwu"><span>{{ formobj.withApply }}专项返利预提申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="24" class="tleftb colOneStyle">
<div><span style="font-size: 16px">金额单位</span></div>
<el-col :span="24" class="colOneStyle">
<div style="text-align: right;font-weight: bold">金额单位</div>
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
</el-col>
<el-col :span="22" class="colOneStyle">
<el-form-item>
<span>{{ formobj.brandName }}</span>
</el-form-item>
<el-col :span="24" class="colOneStyle">
<div class="span-sty" style="border-right: 0px !important;">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmSpecialRebateWiths" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="台数" align="center">
<template slot-scope="scope">
<span>{{ scope.row.num }}</span>
</template>
</el-table-column>
<el-table-column prop="withRebate" label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withRebate }}</span>
</template>
</el-table-column>
<el-table-column label="明细" align="center">
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="withRebate" label="预提返利" align="center" min-width="120" />
<el-table-column prop="expectItureCost" label="其中支出费用" align="center" min-width="130" />
<el-table-column prop="expectTreatCost" label="其中待支付费用" align="center" min-width="150" />
<el-table-column prop="expectSuppCost" label="其中抵顶费用" align="center" min-width="130" />
<el-table-column label="明细" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.remarks }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item>
<span>{{ formobj.remarks }}</span>
</el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
@ -138,7 +116,7 @@ export default {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '预提申请详情'
this.viewTitle = '专项返利预提申请详情'
console.log('编辑回显', sid)
req.fetchBySid(sid).then((resp) => {
if (resp.success) {
@ -175,21 +153,6 @@ export default {
}
}, 0)
sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
this.amount = sums[index] += ''
} else {
sums[index] = ''
}
}
})
return sums
@ -247,5 +210,11 @@ export default {
border-right: 0px !important;
border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

Loading…
Cancel
Save