qichexitong/car-admin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.28(添加时间筛选

Browse Source
This commit is contained in:
Hong
2024-06-28 16:38:00 +08:00
parent 96aa2ae25a
commit e8642e44b0
6 changed files with 127 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/divide/commission_order/index.vue
View File

@@ -18,6 +18,12 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="参与时间" prop="time1" class="lang">
<el-date-picker v-model="time1" type="datetimerange" start-placeholder="开始日期"
end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" @change="timeChange">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="queryListFn"
>搜索
@@ -107,6 +113,8 @@ export default {
components: { },
data() {
return {
//参与时间
time1:[],
//导入类型
expType:1,
//导入弹出层
@@ -143,6 +151,15 @@ export default {
},
methods: {
//时间
timeChange(e) {
console.log(e);
if(e){
this.tableFrom.dateLimit=e.join(',')
}
this.tableFrom.page = 1;
this.carListFn();
},
//搜索
queryListFn(){
this.tableFrom.page = 1;

4
src/views/divide/divide_list/creatMerchant.vue
View File

@@ -8,10 +8,10 @@
</el-alert>
</el-form-item> -->
<el-form-item label="平台全称" prop="name" class="lang">
<el-input v-model.trim="dataForm.name" placeholder="请输入平台全称" />
<el-input v-model.trim="dataForm.abbreviation" placeholder="请输入平台全称" />
</el-form-item>
<el-form-item label="平台简称" prop="abbreviation" class="lang">
<el-input v-model.trim="dataForm.abbreviation" placeholder="请输入平台简称" />
<el-input v-model.trim="dataForm.name" placeholder="请输入平台简称" />
</el-form-item>
<el-form-item label="平台编码" prop="platformSn" class="lang">
<el-input v-model.trim="dataForm.platformSn" placeholder="请输入平台编码" />

74
src/views/divide/divide_list/index.vue
View File

@@ -11,6 +11,17 @@
<el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="carListFn(1)" />
</el-input>
</el-form-item>
<el-form-item label="合作时间" prop="time1" class="lang">
<el-date-picker v-model="time1" type="datetimerange" start-placeholder="开始日期"
end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" @change="timeChange">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="queryListFn"
>搜索
</el-button>
</el-form-item>
</el-form>
</div>
<el-button type="primary" @click="onAdd">添加合作平台</el-button>
@@ -27,25 +38,23 @@
</el-table-column>
<el-table-column prop="way" label="分佣方案" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.way==0?'按比例':'按单量' }}
{{ scope.row.way == 0 ? '按比例' : '按单量' }}
</template>
</el-table-column>
<el-table-column prop="way" label="分佣方式" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if=" scope.row.way==0">{{ scope.row.ratio }}</span>
<span v-else>{{ scope.row.eachMoney }}/单</span>
<span v-if="scope.row.way == 0">{{ scope.row.ratio }}</span>
<span v-else>{{ scope.row.eachMoney }}/单</span>
</template>
</el-table-column>
<el-table-column prop="contract" label="合同链接" show-overflow-tooltip></el-table-column>
<el-table-column prop="link" label="注册" show-overflow-tooltip></el-table-column>
<el-table-column prop="status" label="返佣城市" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.province }} {{ scope.row.city }}
</template>
</el-table-column>
<el-table-column prop="startTime" label="合作时间" show-overflow-tooltip></el-table-column>
<el-table-column prop="contract" label="合同链接" show-overflow-tooltip></el-table-column>
<el-table-column prop="link" label="注册" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="ratio" label="分佣比例" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="status" label="返佣城市" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.province }} {{ scope.row.city }}
</template>
</el-table-column>
<!-- <el-table-column prop="addressDetail" label="详细地址" show-overflow-tooltip></el-table-column> -->
<el-table-column label="操作" min-width="110" fixed="right" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" @click="onEdit(scope.row)" class="mr10">修改</el-button>
@@ -59,17 +68,19 @@
@size-change="handleSizeChange" @current-change="pageChange" />
</div>
</el-card>
<CreatMerchant ref="creatMerchants" :formData="formData" :title="title" ></CreatMerchant>
<CreatMerchant ref="creatMerchants" :formData="formData" :title="title"></CreatMerchant>
</div>
</template>
<script>
import { platformPageListApi,platformAdd,platformUpdate ,platformDelete,platformDetail} from "@/api/divide.js"
import { platformPageListApi, platformAdd, platformUpdate, platformDelete, platformDetail } from "@/api/divide.js"
import CreatMerchant from './creatMerchant';
export default {
name: 'carBrand',
components: { CreatMerchant },
data() {
return {
//时间
time1:[],
title: '添加',
activeName: '0',
loading: false,
@@ -80,6 +91,7 @@ export default {
name: '',
isCompleted: undefined,
carNo: '',
time1: []
},
modelForm: {
page: 1,
@@ -121,11 +133,25 @@ export default {
this.carListFn();
},
methods: {
//搜索
queryListFn(){
this.tableFrom.page = 1;
this.carListFn();
},
//时间
timeChange(e) {
console.log(e);
if(e){
this.tableFrom.dateLimit=e.join(',')
}
this.tableFrom.page = 1;
this.carListFn();
},
//重置表单
resettingFn() {
this.formData = { };
this.formData = {};
},
//分页
pageChange(page) {
this.tableFrom.page = page;
@@ -145,7 +171,7 @@ export default {
},
// 删除
onDel(row) {
this.$modalSure('是否删除当前数据?').then(() => {
platformDelete(row.id).then(() => {
this.$message.success('删除成功');
@@ -155,25 +181,25 @@ export default {
},
/* 编辑 */
onEdit(row) {
this.title = '修改分佣平台';
this.title = '修改分佣平台';
// this.formData = row;
this.$refs.creatMerchants.dialogVisible=true
this.$refs.creatMerchants.dialogVisible = true
this.onInfo(row.id)
},
// 详情
onInfo(id) {
// 详情
onInfo(id) {
this.loadingFrom = true;
platformDetail(id).then((res) => {
console.log(res);
res.way = String(res.way)
res.time1=[res.startTime,res.settlementTime]
res.selectedOptions=[res.province,res.city]
res.time1 = [res.startTime, res.settlementTime]
res.selectedOptions = [res.province, res.city]
this.formData = res;
});
},
// 添加
onAdd() {
this.$refs.creatMerchants.dialogVisible=true
this.$refs.creatMerchants.dialogVisible = true
this.title = '添加分佣平台';
this.resettingFn();
},

25
src/views/divide/divide_user_list/index.vue
View File

@@ -18,12 +18,21 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="参与时间" prop="time1" class="lang">
<el-date-picker v-model="time1" type="datetimerange" start-placeholder="开始日期"
end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" @change="timeChange">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="queryListFn"
>搜索
</el-button>
</el-form-item>
<el-form-item>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="carExportFn"
v-hasPermi="['system:shop:export']">导出
v-hasPermi="['system:shop:export']">导出司机编号
</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini"
@click="carExpListOpen = true;expType=1">导入司机编号</el-button>
@@ -176,7 +185,9 @@ export default {
name: '',
},
tableData: [],
options: []
options: [],
//参与时间
time1:[]
};
},
computed: {},
@@ -190,6 +201,16 @@ export default {
},
methods: {
//时间
timeChange(e) {
console.log(e);
if(e){
this.tableFrom.dateLimit=e.join(',')
}
this.tableFrom.page = 1;
this.carListFn();
},
//平台远程搜索
remoteMethod(query) {
if (query !== '') {
platformPageListApi({

19
src/views/divide/login_failed/index.vue
View File

@@ -18,6 +18,12 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="参与时间" prop="time1" class="lang">
<el-date-picker v-model="time1" type="datetimerange" start-placeholder="开始日期"
end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" @change="timeChange">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="queryListFn"
>搜索
@@ -70,13 +76,15 @@
</template>
<script>
// import { platformAdd,platformUpdate ,platformDelete,platformDetail} from "@/api/divide.js"
import { platformPageListApi, userFailList, platformAdd, platformUpdate, platformDelete, platformDetail, exportUserError, carExportUnregistered, carExportError, excelUserSn, carGetImportRate,excelUserCondition,conditionRate ,ExportRefError} from "@/api/divide.js"
import { platformPageListApi, userFailList, platformDetail, exportUserError,} from "@/api/divide.js"
// import CreatMerchant from './creatMerchant';
export default {
name: 'carBrand',
// components: { CreatMerchant },
data() {
return {
//参与时间
time1:[],
//导入类型
expType:1,
//导入弹出层
@@ -113,6 +121,15 @@ export default {
},
methods: {
//时间
timeChange(e) {
console.log(e);
if(e){
this.tableFrom.dateLimit=e.join(',')
}
this.tableFrom.page = 1;
this.carListFn();
},
remoteMethod(query) {
if (query !== '') {
platformPageListApi({

18
src/views/divide/user_statistics/index.vue
View File

@@ -11,6 +11,12 @@
<el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="carListFn(1)" />
</el-input>
</el-form-item>
<el-form-item label="创建时间" prop="time1" class="lang">
<el-date-picker v-model="time1" type="datetimerange" start-placeholder="开始日期"
end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" @change="timeChange">
</el-date-picker>
</el-form-item>
</el-form>
</div>
</div>
@@ -49,6 +55,8 @@ export default {
name: 'carBrand',
data() {
return {
//创建时间
time1:[],
listLoading:false,
tableFrom: {
page: 1,
@@ -67,7 +75,15 @@ export default {
this.carListFn();
},
methods: {
//时间
timeChange(e) {
console.log(e);
if(e){
this.tableFrom.dateLimit=e.join(',')
}
this.tableFrom.page = 1;
this.carListFn();
},
//重置表单
resettingFn() {
this.formData = {};