yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

完善单车返利管理、专项返利管理、单车返利待核对、专项返利待核对--分页列表增加查询条件

master
yunuo970428 3 months ago
parent
b58fd8423c
commit
c02050eb36
4 changed files with 287 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
  2. 74
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
  3. 71
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
  4. 74
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue

72
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
View File

@ -29,6 +29,17 @@
<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.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="预提年月">
<el-date-picker v-model="listQuery.params.withholdingDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="上传日期">
<el-date-picker v-model="listQuery.params.uploadStartDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.uploadEndDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="返利类型">
<el-input v-model="listQuery.params.rebateTypeValue" placeholder="" clearable/>
</el-form-item>
@ -40,6 +51,31 @@
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="上传状态">
<el-select v-model="listQuery.params.uploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in uploadState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否调整">
<el-select v-model="listQuery.params.isAdjustment" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否上传完成">
<el-select v-model="listQuery.params.isUploadFinish" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="一次核对状态">
<el-select v-model="listQuery.params.onceCheckState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="二次上传状态">
<el-select v-model="listQuery.params.secondUploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</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>
@ -431,6 +467,26 @@ export default {
dictValue: '是'
}
],
uploadState_list: [
{
dictKey: '1',
dictValue: '已上传'
},
{
dictKey: '0',
dictValue: '未上传'
}
],
whether_list: [
{
dictKey: '1',
dictValue: '是'
},
{
dictKey: '0',
dictValue: '否'
}
],
listLoading: false,
listQuery: {
params: {
@ -444,6 +500,14 @@ export default {
state: '',
createEndTime: '',
createStartTime: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
@ -584,6 +648,14 @@ export default {
state: '',
createEndTime: '',
createStartTime: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''

74
anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
View File

@ -28,6 +28,17 @@
<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.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="预提年月">
<el-date-picker v-model="listQuery.params.withholdingDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="上传日期">
<el-date-picker v-model="listQuery.params.uploadStartDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.uploadEndDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="返利类型">
<el-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -36,11 +47,36 @@
<el-form-item label="返利名称">
<el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="状态">
<el-form-item label="流程状态">
<el-select v-model="listQuery.params.state" placeholder="请选择" filterable clearable>
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="上传状态">
<el-select v-model="listQuery.params.uploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in uploadState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否调整">
<el-select v-model="listQuery.params.isAdjustment" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否上传完成">
<el-select v-model="listQuery.params.isUploadFinish" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="一次核对状态">
<el-select v-model="listQuery.params.onceCheckState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="二次上传状态">
<el-select v-model="listQuery.params.secondUploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</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>
@ -238,6 +274,26 @@ export default {
FormLoading: false,
listLoading: false,
rebateType_list: [],
uploadState_list: [
{
dictKey: '1',
dictValue: '已上传'
},
{
dictKey: '0',
dictValue: '未上传'
}
],
whether_list: [
{
dictKey: '1',
dictValue: '是'
},
{
dictKey: '0',
dictValue: '否'
}
],
state_list: [
{
dictKey: '0',
@ -272,6 +328,14 @@ export default {
vinNo: '',
vehModelName: '',
brandName: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
@ -399,6 +463,14 @@ export default {
vinNo: '',
vehModelName: '',
brandName: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''

71
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
View File

@ -34,9 +34,40 @@
<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.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="预提年月">
<el-date-picker v-model="listQuery.params.withholdingDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="上传日期">
<el-date-picker v-model="listQuery.params.uploadStartDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.uploadEndDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="上传状态">
<el-select v-model="listQuery.params.uploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in uploadState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否调整">
<el-select v-model="listQuery.params.isAdjustment" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否上传完成">
<el-select v-model="listQuery.params.isUploadFinish" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="一次核对状态">
<el-select v-model="listQuery.params.onceCheckState" placeholder="请选择" filterable clearable>
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="二次上传状态">
<el-select v-model="listQuery.params.secondUploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-form>
@ -83,7 +114,7 @@
<el-table-column prop="money" label="上传" align="center" width="100" />
</el-table-column>
<el-table-column label="日期" align="center">
<el-table-column prop="createTime" label="创建日期" align="center" width="95" />
<el-table-column prop="createTime" label="创建" align="center" width="95" />
<el-table-column prop="withholdingDate" label="预提" align="center" width="95" />
<el-table-column prop="uploadDate" label="上传" align="center" width="95" />
<el-table-column prop="secondaryUploadDate" label="二次上传" align="center" width="95" />
@ -410,6 +441,26 @@ export default {
sids: [],
FormLoading: false,
rebateType_list: [],
uploadState_list: [
{
dictKey: '1',
dictValue: '已上传'
},
{
dictKey: '0',
dictValue: '未上传'
}
],
whether_list: [
{
dictKey: '1',
dictValue: '是'
},
{
dictKey: '0',
dictValue: '否'
}
],
state_list: [
{
dictKey: '0',
@ -436,6 +487,14 @@ export default {
onceCheckState: '',
createEndTime: '',
createStartTime: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
@ -583,6 +642,14 @@ export default {
onceCheckState: '',
createEndTime: '',
createStartTime: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''

74
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
View File

@ -22,6 +22,17 @@
<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.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="预提年月">
<el-date-picker v-model="listQuery.params.withholdingDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="上传日期">
<el-date-picker v-model="listQuery.params.uploadStartDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.uploadEndDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="返利类型">
<el-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -30,11 +41,36 @@
<el-form-item label="返利名称">
<el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="状态">
<el-form-item label="流程状态">
<el-select v-model="listQuery.params.state" placeholder="请选择" filterable clearable>
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="上传状态">
<el-select v-model="listQuery.params.uploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in uploadState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否调整">
<el-select v-model="listQuery.params.isAdjustment" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否上传完成">
<el-select v-model="listQuery.params.isUploadFinish" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="一次核对状态">
<el-select v-model="listQuery.params.onceCheckState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="二次上传状态">
<el-select v-model="listQuery.params.secondUploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</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>
@ -213,6 +249,26 @@ export default {
FormLoading: false,
listLoading: false,
rebateType_list: [],
uploadState_list: [
{
dictKey: '1',
dictValue: '已上传'
},
{
dictKey: '0',
dictValue: '未上传'
}
],
whether_list: [
{
dictKey: '1',
dictValue: '是'
},
{
dictKey: '0',
dictValue: '否'
}
],
state_list: [
{
dictKey: '0',
@ -254,6 +310,14 @@ export default {
createOrgName: '',
purchaseSystemName: '',
brandName: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
@ -385,6 +449,14 @@ export default {
createOrgName: '',
purchaseSystemName: '',
brandName: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''

Write Preview
Loading…
Cancel
Save