朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 232981e4b29c7f33e543a4654784d5f60519c822 1 个父辈 1a5f03e2

update:计费管理界面升级优化 

update:http post 新增参数para用以传递url get参数,para负责get,data负责传递实体类
内嵌 并排对比
正在显示 4 个修改的文件 包含 121 行增加 和 33 行删除
... ... @@ -37,7 +37,7 @@ module.exports = {
}
},
'/api':{
target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http
target: 'http://192.168.1.63:12343',//设置你调用的接口域名和端口号 别忘了加http
// target: 'http://192.168.1.189:12343',//设置你调用的接口域名和端口号 别忘了加http
// target: 'http://localhost:12343',//设置你调用的接口域名和端口号 别忘了加http
changeOrigin: true,
... ...
... ... @@ -5,7 +5,9 @@ let baseUrl = 'wlpt-custom-service-charge/bill'
//折扣配置
export const list = params => { return http.get(`${baseUrl}/list`, params); };
export const list = (data,params) => {
return http.post(`${baseUrl}/list`,data, params);
};
export const save = params => { return http.post(`${baseUrl}/save`, params); };
export const edit = params => { return http.put(`${baseUrl}/edit`, params); };
export const remove = params => { return http.delByParam(`${baseUrl}/remove`, params); };
... ...
... ... @@ -2,11 +2,12 @@ import axios from 'axios'
import qs from 'qs'
export default {
post(url, data) {
post(url, data,params) {
return axios({
method: 'POST', // 请求协议
url: url, // 请求的地址
data: data, // post 请求的数据
params: params,
timeout: 30000, // 超时时间, 单位毫秒
headers: {
'Content-Type': 'application/json;charset=UTF-8',
... ...
... ... @@ -2,35 +2,72 @@
<el-row>
<el-card style="background-color: #F5F7FA">
<!-- 搜索区域-->
<el-row class="toolbar">
<!-- <el-col :span="5">-->
<!-- <el-input v-model="queryInfo.companyId" prefix-icon="el-icon-search" size="small" style="width: 240px"-->
<!-- placeholder="公司ID" clearable>-->
<!-- <template slot="prepend">公司ID</template>-->
<!-- </el-input>-->
<!-- </el-col>-->
<!-- <el-col :span="5">-->
<!-- <el-input v-model="queryInfo.busnessType" prefix-icon="el-icon-search" size="small" style="width: 240px"-->
<!-- placeholder="业务类型" clearable>-->
<!-- <template slot="prepend">业务类型</template>-->
<!-- </el-input>-->
<!-- </el-col>-->
<!-- <el-col :span="5">-->
<!-- <div class="my-text-area">-->
<!-- <div class="el-input-group__prepend prepand">生效状态</div>-->
<!-- <el-select v-model="queryInfo.state" placeholder="生效状态" size="small" style="width: 140px">-->
<!-- <el-option label="生效" value="Y"></el-option>-->
<!-- <el-option label="失效" value="N"></el-option>-->
<!-- </el-select>-->
<!-- </div>-->
<!-- </el-col>-->
<el-col :span="5">
<el-button type="primary" icon="el-icon-search" size="small" @click="getList()">
<el-row class="toolbar" style ="height:110px;">
<el-row>
<el-col :span="6">
<el-input v-model="queryModel.billOwnerCompanyCode" prefix-icon="el-icon-search" style="width: 240px"
placeholder="客户简码如:BD" clearable>
<template slot="prepend">公司简码</template>
</el-input>
</el-col>
<el-col :span="6">
<el-input v-model="queryModel.billBusinessName" prefix-icon="el-icon-search" style="width: 240px"
placeholder="业务名称" clearable>
<template slot="prepend">业务名称</template>
</el-input>
</el-col>
<el-col :span="6">
<el-input v-model="queryModel.billType" prefix-icon="el-icon-search" style="width: 240px"
placeholder="业务类型" clearable>
<template slot="prepend">业务类型</template>
</el-input>
</el-col>
<el-col :span="6">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">账单状态</div>
<el-select v-model="queryModel.billState" placeholder="账单状态" style="width: 140px" clearable>
<el-option label="未结算" value="000"></el-option>
<el-option label="已结算" value="001"></el-option>
<el-option label="作废" value="111"></el-option>
</el-select>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-input v-model="queryModel.billWaybiilno" prefix-icon="el-icon-search" style="width: 240px"
placeholder="单证号" clearable>
<template slot="prepend">单证号码</template>
</el-input>
</el-col>
<el-col :span="12">
<div class="my-text-area">
<div class="el-input-group__prepend prepand">计费时间</div>
<el-date-picker
v-model="queryDateSearch"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
@blur="datePickerBlur"
:picker-options="pickerOptions">
</el-date-picker>
</div>
</el-col>
<el-col :span="6">
<el-button type="primary" icon="el-icon-search" @click="getList()">
查询
</el-button>
<!-- <el-button type="success" icon="el-icon-edit" size="small" @click="applyAdd()">新增</el-button>-->
<!-- <el-button type="success" icon="el-icon-edit" size="small" @click="applyAdd()">新增</el-button>-->
</el-col>
</el-row>
</el-row>
<!-- 列表区域-->
<el-row>
<template>
... ... @@ -112,6 +149,11 @@
width="160">
</el-table-column>
<el-table-column
prop="billCreatTime"
label="计费时间"
width="160">
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="160">
... ... @@ -127,8 +169,8 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="queryInfo.limitSize"
:page-size="queryInfo.pageSize"
:current-page="queryInfo.pageSize"
:page-size="queryInfo.limitSize"
:page-sizes="[10, 50, 100, 500]"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
... ... @@ -262,11 +304,21 @@
// companyId:'',
// busnessType:'',
// state:'',
// 当前页数
limitSize: 10,
// 每页大小
limitSize: 10,
// 当前页数
pageSize: 1,
},
queryModel:{
billState:'',
billType:'',
billBusinessName:'',
billOwnerCompanyCode:'',
billCreatTimeStart:undefined,
billCreatTimeEnd:undefined,
billWaybiilno:''
},
queryDateSearch:[],
total: 0,
tableData:[],
dialogMap: {
... ... @@ -289,6 +341,33 @@
billCurrency: '',
billSource:'',
},
pickerOptions: {
shortcuts: [{
text: '最近一周',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近一个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近三个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
}
}]
},
formLabelWidth: '120px',
rules: {
companyId: [
... ... @@ -315,9 +394,15 @@
this.queryInfo.pageSize = val
this.getList()
},
datePickerBlur(){
if (this.queryDateSearch && this.queryDateSearch.length>0){
this.queryModel.billCreatTimeStart = this.queryDateSearch[0]
this.queryModel.billCreatTimeEnd = this.queryDateSearch[1]
}
},
getList() {
const _this = this
list(this.queryInfo).then((response) => {
list(this.queryModel,this.queryInfo).then((response) => {
const res = response.data
console.log(response.data)
if (res.code !== '200') {
... ...