Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
ligaode 4 months ago
parent
commit
3099e05826
  1. 2
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue
  2. 8
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue
  3. 42
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
  4. 42
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
  5. 42
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
  6. 40
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
  7. 42
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue

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

@ -7,7 +7,7 @@
<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 ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
</el-form-item>

8
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue

@ -13,7 +13,7 @@
<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.useOrgName" placeholder="" clearable/>
<el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请部门">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
@ -65,7 +65,7 @@
</template>
</el-table-column>
<el-table-column prop="billNo" label="申请编号" align="center" width="180" />
<el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
<el-table-column prop="createOrgName" 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" />
@ -149,7 +149,7 @@ export default {
listLoading: false,
listQuery: {
params: {
useOrgName: '',
createOrgName: '',
deptName: '',
createByName: '',
billNo: '',
@ -274,7 +274,7 @@ export default {
handleReset() {
this.listQuery = {
params: {
useOrgName: '',
createOrgName: '',
deptName: '',
createByName: '',
billNo: '',

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

@ -49,16 +49,16 @@
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" 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" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="num" label="数量" align="center" min-width="100" />
<el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
<el-table-column prop="money" label="其中费用" align="center" min-width="120" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
</template>
@ -69,17 +69,17 @@
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" 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="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
<el-table-column prop="num" label="预提数量" align="center" min-width="120" />
<el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
<el-table-column prop="money" label="其中费用" align="center" min-width="120" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
</template>
</el-table-column>

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

@ -46,36 +46,36 @@
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" 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" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="num" label="数量" align="center" min-width="100" />
<el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
<el-table-column prop="money" label="其中费用" align="center" min-width="120" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
</template>
</el-table-column>
</el-table>
<div class="title">本月上传返利核对情况(按预提年月统计)</div>
<el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
<el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" 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" min-width="120" />
<el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
<el-table-column prop="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
<el-table-column prop="num" label="预提数量" align="center" min-width="120" />
<el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
<el-table-column prop="money" label="其中费用" align="center" min-width="120" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
</template>

42
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue

@ -46,36 +46,36 @@
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" 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" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="num" label="数量" align="center" min-width="100" />
<el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
<el-table-column prop="money" label="其中费用" align="center" min-width="120" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
</template>
</el-table-column>
</el-table>
<div class="title">本月上传返利核对情况(按预提年月统计)</div>
<el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
<el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" 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" min-width="120" />
<el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
<el-table-column prop="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
<el-table-column prop="num" label="预提数量" align="center" min-width="120" />
<el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
<el-table-column prop="money" label="其中费用" align="center" min-width="120" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
</template>

40
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue

@ -48,16 +48,16 @@
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" 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" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="num" label="数量" align="center" min-width="100" />
<el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
<el-table-column prop="money" label="其中费用" align="center" min-width="120" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
</template>
@ -68,16 +68,16 @@
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" 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="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
<el-table-column prop="num" label="预提数量" align="center" min-width="120" />
<el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
<el-table-column prop="money" label="其中费用" align="center" min-width="120" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
</template>

42
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue

@ -44,36 +44,36 @@
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" 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" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
<el-table-column prop="num" label="数量" align="center" min-width="100" />
<el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
<el-table-column prop="money" label="其中费用" align="center" min-width="120" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
</template>
</el-table-column>
</el-table>
<div class="title">本月上传返利核对情况(按预提年月统计)</div>
<el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
<el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" 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" min-width="120" />
<el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
<el-table-column prop="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="withRebate" label="预提金额" align="center" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
<el-table-column prop="money" label="其中费用" align="center" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
<el-table-column label="明细" align="center">
<el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
<el-table-column prop="num" label="预提数量" align="center" min-width="120" />
<el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
<el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
<el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
<el-table-column prop="money" label="其中费用" align="center" min-width="120" />
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
</template>

Loading…
Cancel
Save