Skip to content

C
cloud-platform-ui
Commit ebd8e868 authored by hanfeng's avatar hanfeng
Browse files
Options

Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

parents ce9f49f4 315a040b
Hide whitespace changes
Inline Side-by-side
Showing with 284 additions and 564 deletions
config/dev.env.js
View file @ ebd8e868
module.exports = { module.exports = {
NODE_ENV: '"development"', NODE_ENV: '"development"',
BASE_API: '"http://10.1.37.246:8765"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威) BASE_API: '"http://10.1.37.244:8765"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
APP_ORIGIN: '"https://wallstreetcn.com"' APP_ORIGIN: '"https://wallstreetcn.com"'
} }
package-lock.json
View file @ ebd8e868
...@@ -3978,6 +3978,7 @@ ...@@ -3978,6 +3978,7 @@
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"inherits": "~2.0.0" "inherits": "~2.0.0"
} }
...@@ -3987,6 +3988,7 @@ ...@@ -3987,6 +3988,7 @@
"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"hoek": "2.x.x" "hoek": "2.x.x"
} }
...@@ -4005,7 +4007,8 @@ ...@@ -4005,7 +4007,8 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
"integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=", "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
"dev": true "dev": true,
"optional": true
}, },
"caseless": { "caseless": {
"version": "0.12.0", "version": "0.12.0",
...@@ -4025,7 +4028,8 @@ ...@@ -4025,7 +4028,8 @@
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"dev": true "dev": true,
"optional": true
}, },
"combined-stream": { "combined-stream": {
"version": "1.0.5", "version": "1.0.5",
...@@ -4047,13 +4051,15 @@ ...@@ -4047,13 +4051,15 @@
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"dev": true "dev": true,
"optional": true
}, },
"cryptiles": { "cryptiles": {
"version": "2.0.5", "version": "2.0.5",
...@@ -4136,7 +4142,8 @@ ...@@ -4136,7 +4142,8 @@
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
"integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=", "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
"dev": true "dev": true,
"optional": true
}, },
"forever-agent": { "forever-agent": {
"version": "0.6.1", "version": "0.6.1",
...@@ -4327,6 +4334,7 @@ ...@@ -4327,6 +4334,7 @@
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "1.0.1" "number-is-nan": "1.0.1"
} }
...@@ -4342,7 +4350,8 @@ ...@@ -4342,7 +4350,8 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
"dev": true "dev": true,
"optional": true
}, },
"isstream": { "isstream": {
"version": "0.1.2", "version": "0.1.2",
...@@ -4583,7 +4592,8 @@ ...@@ -4583,7 +4592,8 @@
"version": "1.0.7", "version": "1.0.7",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
"dev": true "dev": true,
"optional": true
}, },
"punycode": { "punycode": {
"version": "1.4.1", "version": "1.4.1",
...@@ -4626,6 +4636,7 @@ ...@@ -4626,6 +4636,7 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
"integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=", "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"buffer-shims": "~1.0.0", "buffer-shims": "~1.0.0",
"core-util-is": "~1.0.0", "core-util-is": "~1.0.0",
...@@ -4680,7 +4691,8 @@ ...@@ -4680,7 +4691,8 @@
"version": "5.0.1", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
"integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=", "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
"dev": true "dev": true,
"optional": true
}, },
"semver": { "semver": {
"version": "5.3.0", "version": "5.3.0",
...@@ -4745,6 +4757,7 @@ ...@@ -4745,6 +4757,7 @@
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -4756,6 +4769,7 @@ ...@@ -4756,6 +4769,7 @@
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
"integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=", "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.0.1" "safe-buffer": "^5.0.1"
} }
...@@ -4788,6 +4802,7 @@ ...@@ -4788,6 +4802,7 @@
"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"block-stream": "*", "block-stream": "*",
"fstream": "^1.0.2", "fstream": "^1.0.2",
...@@ -4849,7 +4864,8 @@ ...@@ -4849,7 +4864,8 @@
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
"dev": true "dev": true,
"optional": true
}, },
"uuid": { "uuid": {
"version": "3.0.1", "version": "3.0.1",
......
src/api/purseManage.js
View file @ ebd8e868
...@@ -6,8 +6,44 @@ import fetch from 'utils/fetch'; ...@@ -6,8 +6,44 @@ import fetch from 'utils/fetch';
*/ */
export function incomList(query) { export function incomList(query) {
return fetch({ return fetch({
url: '/vehicle/vehicleModel/app/unauth/findVehicleModelPage', url: '/api/admin/wallet/admin/page',
method: 'post', method: 'get',
params: query
});
}
/**
* 获取收益流水列表
* @param query
*/
export function rewardList(query) {
return fetch({
url: '/api/admin/walletdetail/admin/page',
method: 'get',
params: query
});
}
/**
* 佣金比例查询
* @param query
*/
export function getrewardSetting(query) {
return fetch({
url: '/api/admin/postion/admin/postions',
method: 'get',
params: query
});
}
/**
* 佣金比例设置
* @param query
*/
export function rewardSetting(query) {
return fetch({
url: '/api/admin/postion/admin',
method: 'put',
data: query data: query
}); });
} }
src/views/baseInfo/generalSetting.vue
View file @ ebd8e868
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</div> </div>
</el-popover> </el-popover>
<el-button type="danger" size="small" v-popover:popover5>删除</el-button> <el-button type="danger" v-if="scope.row.type!=88" size="small" v-popover:popover5>删除</el-button>
<!--<el-button size="small" type="danger" @click="deleteHandler(scope.row)">删除--> <!--<el-button size="small" type="danger" @click="deleteHandler(scope.row)">删除-->
<!--</el-button>--> <!--</el-button>-->
</template> </template>
...@@ -57,6 +57,23 @@ ...@@ -57,6 +57,23 @@
<el-form-item label="标识" prop="type"> <el-form-item label="标识" prop="type">
<el-input type="number" v-model.number="dialogFrom.type" placeholder="1,2,3……"></el-input> <el-input type="number" v-model.number="dialogFrom.type" placeholder="1,2,3……"></el-input>
</el-form-item> </el-form-item>
<el-row v-if="dialogFrom.type==88">
<el-col :span="12">
<el-form-item label="提现金额" prop="amount">
<el-input v-model="dialogFrom.amount" placeholder="请输入提现金额" ></el-input>
<span style="color:#bfcbd9;">钱包余额，最低提现额度，达到此金额后才能提现</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="dialogFrom.type==88" >
<el-col :span="12">
<el-form-item label="提现手续费" prop="proceduReates">
<el-input v-model="dialogFrom.proceduReates" placeholder="请输入提现手续费" ></el-input>
<span style="color:#bfcbd9;">提现收取的手续费</span>
</el-form-item>
</el-col>
</el-row>
<el-tabs v-model="activeName2" type="card"> <el-tabs v-model="activeName2" type="card">
<el-tab-pane label="详情" name="first"> <el-tab-pane label="详情" name="first">
<!--<Editor v-if="activeName2=='first'" @input="handelContentIncrease" :value="form.content" :myQuillEditor="'myQuillEditorContent'" :activeName2="activeName2"></Editor>--> <!--<Editor v-if="activeName2=='first'" @input="handelContentIncrease" :value="form.content" :myQuillEditor="'myQuillEditorContent'" :activeName2="activeName2"></Editor>-->
...@@ -160,7 +177,9 @@ ...@@ -160,7 +177,9 @@
dialogFrom:{ dialogFrom:{
title: "", title: "",
type: undefined, type: undefined,
value:"" value:"",
amount: 100,
proceduReates:0.001
}, },
rules: { rules: {
title: { title: {
...@@ -173,6 +192,14 @@ ...@@ -173,6 +192,14 @@
required: true, required: true,
message: '请输入数字标识', message: '请输入数字标识',
}, },
proceduReates: {
required: true,
message: '请输入提现手续费',
},
amount: {
required: true,
message: '请输入最低提现金额',
}
}, },
list: null, list: null,
total: null, total: null,
...@@ -196,6 +223,7 @@ ...@@ -196,6 +223,7 @@
handleCreate() { handleCreate() {
this.cleanDialogFrom(); this.cleanDialogFrom();
this.modalTitle = '创建'; this.modalTitle = '创建';
this.activeName2 = "first";
this.dialogVisible = true; this.dialogVisible = true;
}, },
/** /**
...@@ -254,7 +282,9 @@ ...@@ -254,7 +282,9 @@
this.dialogFrom = { this.dialogFrom = {
title: "", title: "",
type: undefined, type: undefined,
value:"" value:"",
amount: 100,
proceduReates:0.001
}; };
this.activeName2 = ""; this.activeName2 = "";
}, },
...@@ -277,10 +307,17 @@ ...@@ -277,10 +307,17 @@
if (!this.$utils.isEmpty(response.data.rows) && this.$utils.isInteger(response.data.total)) { if (!this.$utils.isEmpty(response.data.rows) && this.$utils.isInteger(response.data.total)) {
response.data.rows.map(function(item){ response.data.rows.map(function(item){
item.visible2 = false; item.visible2 = false;
if(item.type == 88){
//提现规则
item.params = JSON.parse(item.params);
item.amount = item.params.amount;
item.proceduReates = item.params.proceduReates;
}
}); });
listRs = response.data.rows; listRs = response.data.rows;
totalCountRs = response.data.total; totalCountRs = response.data.total;
} }debugger
// "{"amount":"11","proceduReates":"0.02"}"
this.listLoading = false; this.listLoading = false;
this.list = listRs; this.list = listRs;
this.total = totalCountRs; this.total = totalCountRs;
...@@ -295,8 +332,17 @@ ...@@ -295,8 +332,17 @@
let params = { let params = {
title: this.dialogFrom.title, title: this.dialogFrom.title,
type: this.dialogFrom.type, type: this.dialogFrom.type,
value: this.dialogFrom.value value: this.dialogFrom.value,
}; };
if(this.dialogFrom.type == 88){
//提现规则
let p = {
amount: this.dialogFrom.amount,
proceduReates:this.dialogFrom.proceduReates
};
params.params = JSON.stringify(p);
}
addGeneral(params).then(response => { addGeneral(params).then(response => {
if (response.status === 200) { if (response.status === 200) {
this.cleanDialogFrom(); this.cleanDialogFrom();
...@@ -334,6 +380,14 @@ ...@@ -334,6 +380,14 @@
type: this.dialogFrom.type, type: this.dialogFrom.type,
value: this.dialogFrom.value value: this.dialogFrom.value
}; };
if(this.dialogFrom.type == 88){
//提现规则
let p = {
amount: this.dialogFrom.amount,
proceduReates:this.dialogFrom.proceduReates
};
params.params = JSON.stringify(p);
}
editGeneral(params).then(response => { editGeneral(params).then(response => {
if (response.status === 200) { if (response.status === 200) {
this.cleanDialogFrom(); this.cleanDialogFrom();
......
src/views/purseManage/commissionSettings.vue
View file @ ebd8e868
<template> <template>
<div class="app-container calendar-list-container" v-loading.body="showLoadingBody"> <div>
<div v-if="!oneCampsiteDialogVisible"> <el-form :model="settingList" ref="form" label-width="140px" style="margin-top: 20px;">
<div class="filter-container" ref="filter-container"> <el-row>
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px"> <el-col :span="24">
<el-row> <el-form-item label="总部股东分销提成">
<el-col :span="8"> <el-input v-model="settingList.name" placeholder="请输入总部股东分销提成" ></el-input>
<el-form-item label="名称"> <span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
<el-input v-model.number="listQuery.name" placeholder="请输入名称"></el-input> </el-form-item>
</el-form-item> </el-col>
</el-col> </el-row>
<!--<el-col :span="8">--> <el-row >
<!--<el-form-item label="时间">--> <el-col :span="24">
<!--<el-date-picker--> <el-form-item label="分部股东分销提成">
<!--v-model="listQuery.startTime"--> <el-input v-model="settingList.name" placeholder="请输入分部股东分销提成" ></el-input>
<!--type="date"--> <span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
<!--clearable--> </el-form-item>
<!--placeholder="选择日期">--> </el-col>
<!--</el-date-picker>~--> </el-row>
<!--<el-date-picker--> <el-row>
<!--v-model="listQuery.endTime"--> <el-col :span="24">
<!--type="date"--> <el-form-item label="合伙人分销提成">
<!--clearable--> <el-input v-model="form.name" placeholder="请输入合伙人分销提成" ></el-input>
<!--placeholder="选择日期">--> <span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
<!--</el-date-picker>--> </el-form-item>
<!--</el-form-item>--> </el-col>
<!--</el-col>--> </el-row>
</el-row> <el-row>
</el-form> <el-col :span="24">
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> <el-form-item label="代理人分销提成">
<el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate" <el-input v-model="form.name" placeholder="请输入代理人分销提成" ></el-input>
type="primary" icon="edit">添加 <span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
</el-button> </el-form-item>
</div> </el-col>
<el-table :key='tableKey' :data="list" border fit highlight-current-row </el-row>
style="width: 1367px;"> <el-row>
<el-table-column <el-col :span="24">
type="index" <el-form-item label="员工分销提成">
align="center" label="序号" width="65"> <el-input v-model="form.name" placeholder="请输入员工分销提成" ></el-input>
</el-table-column> <span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
<el-table-column width="200" align="center" label="名称"> </el-form-item>
<template scope="scope"> </el-col>
<img :src="scope.row.cover" style="width: 30px;"/> </el-row><el-row>
<span>{{scope.row.name}}</span> <el-col :span="24">
</template> <el-form-item label="普通用户分销提成">
</el-table-column> <el-input v-model="form.name" placeholder="请输入普通用户分销提成" ></el-input>
<span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
<el-table-column width="300" align="center" label="类型"> </el-form-item>
<template scope="scope"> </el-col>
<span>{{scope.row.storeTypeName}}</span> </el-row>
</template> </el-form>
</el-table-column> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="create()">立即提交</el-button>
<el-table-column width="200" align="center" label="热度"> <el-button @click="cancel" style="width:88px">重置</el-button>
<template scope="scope">
<span>{{scope.row.hot}}</span>
</template>
</el-table-column>
<el-table-column width="300" align="center" label="创建时间">
<template scope="scope">
<span>{{scope.row.crtTimeStr}}</span>
</template>
</el-table-column>
<el-table-column align="center" width="300" label="操作">
<template scope="scope">
<el-button size="small" type="success" @click="handleUpdate(scope.row)">编辑
</el-button>
<el-button size="small" type="primary" v-if="scope.row.saleState==2|| scope.row.saleState==0" @click="upStatus(scope.row)">上架
</el-button>
<el-button size="small" type="warn" v-if="scope.row.saleState==1" @click="upStatus(scope.row)">下架
</el-button>
<el-popover
ref="popover5"
placement="top"
width="160"
v-model="scope.row.visible2">
<p>确定删除吗？</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
<el-button type="primary" size="mini" @click="deleteHandler(scope.row)">确定</el-button>
</div>
</el-popover>
<el-button type="danger" size="small" v-popover:popover5>删除</el-button>
</template>
</el-table-column>
</el-table>
<div v-show="!listLoading" class="pagination-container">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page.sync="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import 'static/css/uploadImg.css';// 引入图片上传组件对话框
import { import {
formatDate formatDate
} from 'utils/dateFormattor'; } from 'utils/dateFormattor';
...@@ -109,17 +69,13 @@ ...@@ -109,17 +69,13 @@
timestamp2Date timestamp2Date
} from 'utils/dateUtils'; } from 'utils/dateUtils';
import rsCode from '../../utils/rsCode';
import {mapGetters} from 'vuex'; import {mapGetters} from 'vuex';
import { import {
getToken getToken
} from 'utils/auth'; } from 'utils/auth';
import { import {
getCampsiteList, getrewardSetting,rewardSetting
delCampsiteShop, } from 'api/purseManage';
saleStatus
} from 'api/campsiteManage';
import Element1 from "../admin/menu/components/element"; import Element1 from "../admin/menu/components/element";
import ElRow from "element-ui/packages/row/src/row"; import ElRow from "element-ui/packages/row/src/row";
import ElCol from "element-ui/packages/col/src/col"; import ElCol from "element-ui/packages/col/src/col";
...@@ -133,36 +89,19 @@ ...@@ -133,36 +89,19 @@
}, },
data() { data() {
return { return {
modalTitle: "创建",
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
oneCampsiteDialogVisible: false,//添加、编辑弹框
showLoadingBody: false, showLoadingBody: false,
form: {
tagNames:"",//标签
name: undefined,//旅游名称
saleCount: undefined,//销量
stock: undefined,//总数量
},
list: null,
total: null,
listLoading: true, listLoading: true,
listQuery: { form: {
page: 1,
limit: 20,
startTime: undefined,
endTime:undefined,
name: '',//关键词
}, },
inline: true, inline: true,
textMap: { tableKey: 0,
update: '编辑', settingList:[]
create: '创建'
},
tableKey: 0
} }
}, },
created() { created() {
this.getList(); this.getSetting();
}, },
computed: { computed: {
...mapGetters([ ...mapGetters([
...@@ -170,365 +109,33 @@ ...@@ -170,365 +109,33 @@
]) ])
}, },
methods: { methods: {
/** getSetting:function(){
* 添加
* */
handleCreate() {
this.resetTemp();
this.oneRow = {};
this.modalTitle = '创建';
this.oneCampsiteDialogVisible = true;
},
/**
* 操作-删除
* */
deleteHandler(row) {
delCampsiteShop(row.id).then(response => {
if (response.status === 200) {
this.$notify({
title: '成功',
message: '删除成功',
type: 'success',
duration: 2000
});
this.oneCampsiteDialogVisible = false;
this.getList();
} else {
this.$notify({
title: '删除失败',
message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！',
type: 'error',
duration: 2000
});
}
});
},
/**
* 上架、下架 参数 id status 1-上架；2-下架 post
*/
upStatus(row){
let params = {
id: row.id,
status: row.saleState==1?2:1
};
saleStatus(params).then(response => {
if (response.status === 200) {
this.$notify({
title: '成功',
message: '成功',
type: 'success',
duration: 2000
});
this.oneCampsiteDialogVisible = false;
this.getList();
} else {
this.$notify({
title: '失败',
message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！',
type: 'error',
duration: 2000
});
}
});
},
/**
* 编辑
* */
handleUpdate(row) {
this.modalTitle = '编辑';
this.oneRow = row;
this.oneCampsiteDialogVisible = true;
},
/**
* 下架
* */
undercarriageHandler(row) {
// open dialog
this.departureDialogVisible = true;
this.clearDepartureForm();
let that = this;
let selectArry = [];
this.allCompaniesArr.map(function(item){
item.value = item.name;
selectArry.push(item);
});
this.departureForm.mileage = row.mileage;
this.departureForm.expectArrivalBranchCompanyId = row.subordinateBranch;
this.departureForm.departureBranchCompanyId = row.subordinateBranch;
selectArry.map(function (iitem) {
if( row.subordinateBranch == iitem.id){
that.departureForm.departureBranchCompanyName = iitem.name;
that.departureForm.expectArrivalBranchCompanyName = iitem.name;
}
});
this.departureForm.vehicleId = row.id;
this.departureForm.numberPlate = row.numberPlate;
this.departureForm.departureDate = Date();
},
/**
* 旅游modal传递回来的数据
* */
oneCampsiteDialogEvent(e){
this.oneCampsiteDialogVisible = false;
if(!e){//关闭编辑
this.oneCampsiteDialogVisible = e;
} else if(e){
//编辑成功-重新加载列表
this.getList();
}
},
/**
* 获取旅游列表
* */
getList() {
this.listLoading = true; this.listLoading = true;
if(this.listQuery.startTime){ getrewardSetting().then(response => {
this.listQuery.startTime = this.listQuery.startTime.getTime(); this.settingList = response.data;
}
if(this.listQuery.endTime){
this.listQuery.endTime = this.listQuery.endTime.getTime();
}
getCampsiteList(this.listQuery).then(response => {
let totalCountRs = undefined;
let listRs = undefined;
if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) {
listRs = response.data.data;
totalCountRs = response.data.totalCount;
listRs.map(function(item){
item.visible2 = false;
item.crtTimeStr = timestamp2Date(item.crtTime);
if(item.storeTypeName){
item.storeTypeName = item.storeTypeName.join("|");
}
});
}
this.listLoading = false; this.listLoading = false;
this.list = listRs;
this.total = totalCountRs;
}) })
},
getAddrStr(branchCompany) {
let regions = getRegionByCodes([branchCompany.addrProvince, branchCompany.addrCity, branchCompany.addrTown]);
let address = [];
for(let i = 0; i < regions.length; i++){
address.push(regions[i].name);
}
return address.join(" ");
// return regions[0].name + ' ' + regions[1].name + ' ' + regions[2].name + ' ';
},
handleFilter() {
this.listQuery.page = 1;
this.$refs.queryForm.validate(valid => {
if (valid) {
this.getList();
} else {
return false;
}
});
},
handleSizeChange(val) {
this.listQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.listQuery.page = val;
this.getList();
},
/**
* 操作-申请预定
* */
handleApply(row) {
this.resetTemp4Apply();
let that = this;
let selectArry = [];
this.allCompaniesArr.map(function(item){
item.value = item.name;
selectArry.push(item);
});
this.form4Apply.liftCompany = row.subordinateBranch;
selectArry.map(function (iitem) {
if( row.subordinateBranch == iitem.id){
that.form4Apply.state3 = iitem.name;
}
});
this.form4Apply.vehicle = row.id;
getBookedInfoIn2Month(row.id)
.then(response => {
this.curBookedInfo3Month = response.data;
this.dialogStatus = 'apply';
this.dialogForm4ApplyVisible = true;
});
},
handleBookInfo(row) {
this.$refs.bookInfoViewer.handleBookInfo(row.id);
}, },
create(formName) { create(formName) {
const set = this.$refs; // this.$refs[formName].validate(valid => {
if(!this.form.state2 || this.form.state2 == "全部"){ // if (valid) {
this.form.subordinateBranch = undefined; // addObj(this.form).then(() => {
this.$notify({ // this.dialogFormVisible = false;
title: '失败', // this.getList();
message: '请选择分公司', // this.$notify({
type: 'warning', // title: '成功',
duration: 2000 // message: '创建成功',
}); // type: 'success',
return; // duration: 2000
} // });
set[formName].validate(valid => { // })
if (valid) { // } else {
let formTemp = this.fillDateRange2Object(this.form, 'insuranceDateRange4form', 'insuranceStartDate', 'insuranceEndDate'); // return false;
convertDate2Str(formTemp); // }
addObj(formTemp) // });
.then(response => { },
if (response.code === rsCode.RS_CODE_SUC) { cancel:function(formName){
this.dialogFormVisible = false;
this.getList();
this.$notify({
title: '成功',
message: '创建成功',
type: 'success',
duration: 2000
});
this.getList();
} else {
this.$notify({
title: '失败',
message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！',
type: 'error',
duration: 2000
});
}
});
} else {
return false;
}
});
},
cancel(formName) {
this.dialogFormVisible = false;
this.dialogForm4ApplyVisible = false;
this.$refs[formName].resetFields();
},
cancel4Apply(formName) {
this.dialogForm4ApplyVisible = false;
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
},
update(formName) {
const set = this.$refs;
if(!this.form.state2 || this.form.state2 == "全部"){
this.form.subordinateBranch = undefined;
this.$notify({
title: '失败',
message: '请选择分公司',
type: 'warning',
duration: 2000
});
return;
}
set[formName].validate(valid => {
if (valid) {
let formTemp = this.fillDateRange2Object(this.form, 'insuranceDateRange4form', 'insuranceStartDate', 'insuranceEndDate');
convertDate2Str(formTemp);
putObj(formTemp).then(response => {
if (response.code === rsCode.RS_CODE_SUC) {
this.dialogFormVisible = false;
this.getList();
this.$notify({
title: '成功',
message: '更新成功',
type: 'success',
duration: 2000
});
this.getList();
} else {
this.$notify({
title: '失败',
message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！',
type: 'error',
duration: 2000
});
}
});
} else {
return false;
}
});
},
/**
* 申请预定-确定
* @param formName
*/
apply(formName) {
if(!this.form4Apply.state3 || this.form4Apply.state3 == "全部"){
this.form4Apply.liftCompany = undefined;
this.$notify({
title: '失败',
message: '请选择提车分公司',
type: 'warning',
duration: 2000
});
return;
}
if(!this.form4Apply.state4 || this.form4Apply.state4 == "全部"){
this.form4Apply.retCompany = undefined;
this.$notify({
title: '失败',
message: '请选择还车分公司',
type: 'warning',
duration: 2000
});
return;
}
const set = this.$refs;
set[formName].validate(valid => {
if (valid) {
this.dialogFormVisible = false;
book(this.form4Apply).then(() => {
this.dialogForm4ApplyVisible = false;
this.getList();
this.$notify({
title: '成功',
message: '预定成功',
type: 'success',
duration: 2000
});
});
} else {
return false;
}
});
},
resetTemp() {
this.form = {
tagNames:"",//标签
name: undefined,//旅游名称
saleCount: undefined,//销量
stock: undefined,//总数量
};
},
resetTemp4Apply() {
this.form4Apply = {
bookStartDate: undefined,
bookEndDate: undefined,
state3: '',
state4:'',
retCompany: undefined,
vehicle: undefined,
selectedAccItem: undefined,
liftCompany: undefined,
liftAddr: undefined,
destination: undefined,
remark: undefined
};
},
resetTemp4BookInfo() {
this.form4BookInfo = {
selectedMonth: this.$utils.toDateString(newEast8Date(), 'yyyy-MM'),
vehicle: undefined
};
} }
} }
} }
......
src/views/purseManage/gainRecord.vue
View file @ ebd8e868
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model.number="listQuery.name" placeholder="请输入姓名"></el-input> <el-input v-model.number="listQuery.username" placeholder="请输入姓名"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -14,68 +14,73 @@ ...@@ -14,68 +14,73 @@
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input> <el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="流水类型" prop="type">
<el-select class="filter-item" v-model="listQuery.source" placeholder="请输入资源类型">
<el-option v-for="item in typeOptions" :key="item" :label="item.name" :value="item.val"> </el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column type="index" width="150" align="center" label="流水类型">
type="index" <template scope="scope">
align="center" label="序号" width="65"> <span v-if="scope.row.source==0">活动奖励</span>
<span v-if="scope.row.source==1">一级提成</span>
<span v-if="scope.row.source==2">会员充值</span>
<span v-if="scope.row.source==10">成功提现</span>
<span v-if="scope.row.source==11">转账</span>
<span v-if="scope.row.source==12">消费使用</span>
</template>
</el-table-column> </el-table-column>
<el-table-column width="150" align="center" label="姓名"> <el-table-column width="150" align="center" label="姓名">
<template scope="scope"> <template scope="scope">
<img :src="scope.row.cover" style="width: 30px;"/> <span>{{scope.row.username}}</span>
<span>{{scope.row.name}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="手机号"> <el-table-column width="200" align="center" label="手机号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.storeTypeName}}</span> <span>{{scope.row.phone}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="来源"> <el-table-column width="200" align="center" label="来源">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.hot}}</span> <span>{{scope.row.sourceName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="订单号"> <el-table-column width="200" align="center" label="订单号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.crtTimeStr}}</span> <span>{{scope.row.cono}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="总消费">
<template scope="scope">
<span>{{scope.row.crtTimeStr}}</span>
</template>
</el-table-column>
<el-table-column width="100" align="center" label="类型">
<template scope="scope">
<span>{{scope.row.crtTimeStr}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="状态"> <el-table-column width="100" align="center" label="订单金额">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.crtTimeStr}}</span> <span>{{scope.row.price}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="订单金额"> <el-table-column width="100" align="center" label="提成比例">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.crtTimeStr}}</span> <span>{{scope.row.extract}}%</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100" align="center" label="提成比例"> <el-table-column width="100" align="center" label="金额变动">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.crtTimeStr}}</span> <span v-if="scope.row.itype==0">+{{scope.row.amount}}</span>
<span v-if="scope.row.itype==1">-{{scope.row.amount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100" align="center" label="提成金额"> <el-table-column width="100" align="center" label="状态">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.crtTimeStr}}</span> <span v-if="scope.row.source==12">已消费</span>
<span v-if="scope.row.source==1">已到账</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="时间"> <el-table-column width="200" align="center" label="时间">
...@@ -86,7 +91,7 @@ ...@@ -86,7 +91,7 @@
</el-table> </el-table>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page.sync="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" :current-page.sync="listQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination> layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div> </div>
</div> </div>
...@@ -115,7 +120,7 @@ ...@@ -115,7 +120,7 @@
getToken getToken
} from 'utils/auth'; } from 'utils/auth';
import { import {
incomList rewardList
} from 'api/purseManage'; } from 'api/purseManage';
import Element1 from "../admin/menu/components/element"; import Element1 from "../admin/menu/components/element";
import ElRow from "element-ui/packages/row/src/row"; import ElRow from "element-ui/packages/row/src/row";
...@@ -130,6 +135,28 @@ ...@@ -130,6 +135,28 @@
}, },
data() { data() {
return { return {
typeOptions: [
{
"name":'全部',
"val":''
},
{
"name":'一级提成',
"val":'1'
},
{
"name":'活动奖励',
"val":'0'
},
{
"name":'消费使用',
"val":'12'
},
{
"name":'成功提现',
"val":'10'
}
],
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
showLoadingBody: false, showLoadingBody: false,
list: null, list: null,
...@@ -139,7 +166,8 @@ ...@@ -139,7 +166,8 @@
page: 1, page: 1,
limit: 20, limit: 20,
phone: '',//手机号 phone: '',//手机号
name: '',//姓名 username: '',//姓名
source:'',//来源
}, },
inline: true, inline: true,
tableKey: 0 tableKey: 0
...@@ -159,24 +187,14 @@ ...@@ -159,24 +187,14 @@
* */ * */
getList() { getList() {
this.listLoading = true; this.listLoading = true;
if(this.listQuery.startTime){ rewardList(this.listQuery).then(response => {
this.listQuery.startTime = this.listQuery.startTime.getTime();
}
if(this.listQuery.endTime){
this.listQuery.endTime = this.listQuery.endTime.getTime();
}
incomList(this.listQuery).then(response => {
let totalCountRs = undefined; let totalCountRs = undefined;
let listRs = undefined; let listRs = undefined;
if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) { if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) {
listRs = response.data.data; listRs = response.data.data;
totalCountRs = response.data.totalCount; totalCountRs = response.data.totalCount;
listRs.map(function(item){ listRs.map(function(item){
item.visible2 = false;
item.crtTimeStr = timestamp2Date(item.crtTime); item.crtTimeStr = timestamp2Date(item.crtTime);
if(item.storeTypeName){
item.storeTypeName = item.storeTypeName.join("|");
}
}); });
} }
this.listLoading = false; this.listLoading = false;
......
src/views/purseManage/incomeOverview.vue
View file @ ebd8e868
<template> <template>
<div class="app-container calendar-list-container" v-loading.body="showLoadingBody"> <div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
<div v-if="!oneCampsiteDialogVisible"> <div>
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px"> <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model.number="listQuery.name" placeholder="请输入姓名"></el-input> <el-input v-model="listQuery.username" placeholder="请输入姓名"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -16,62 +16,57 @@ ...@@ -16,62 +16,57 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">筛选</el-button>
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column width="150" align="center" label="姓名" type="index">
type="index"
align="center" label="序号" width="65">
</el-table-column>
<el-table-column width="150" align="center" label="姓名">
<template scope="scope"> <template scope="scope">
<img :src="scope.row.cover" style="width: 30px;"/> <span>{{scope.row.username}}</span>
<span>{{scope.row.name}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="手机号"> <el-table-column width="200" align="center" label="手机号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.storeTypeName}}</span> <span>{{scope.row.phone}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="总收益"> <el-table-column width="200" align="center" label="总收益">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.hot}}</span> <span>{{scope.row.totalAmount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="总提现"> <el-table-column width="200" align="center" label="总提现">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.crtTimeStr}}</span> <span>{{scope.row.withdrawals}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="总消费"> <el-table-column width="200" align="center" label="总消费">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.crtTimeStr}}</span> <span>{{scope.row.totalConsumption}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="提现中"> <el-table-column width="200" align="center" label="提现中">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.crtTimeStr}}</span> <span>{{scope.row.withdrawaling}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="未入账"> <el-table-column width="200" align="center" label="未入账">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.crtTimeStr}}</span> <span>{{scope.row.unbooked}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="当前余额"> <el-table-column width="200" align="center" label="当前余额">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.crtTimeStr}}</span> <span>{{scope.row.balance}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page.sync="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" :current-page.sync="listQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination> layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div> </div>
</div> </div>
...@@ -124,7 +119,7 @@ ...@@ -124,7 +119,7 @@
page: 1, page: 1,
limit: 20, limit: 20,
phone: '',//手机号 phone: '',//手机号
name: '',//姓名 username: '',//姓名
}, },
inline: true, inline: true,
tableKey: 0 tableKey: 0
...@@ -144,25 +139,19 @@ ...@@ -144,25 +139,19 @@
* */ * */
getList() { getList() {
this.listLoading = true; this.listLoading = true;
if(this.listQuery.startTime){
this.listQuery.startTime = this.listQuery.startTime.getTime();
}
if(this.listQuery.endTime){
this.listQuery.endTime = this.listQuery.endTime.getTime();
}
incomList(this.listQuery).then(response => { incomList(this.listQuery).then(response => {
let totalCountRs = undefined; let totalCountRs = undefined;
let listRs = undefined; let listRs = undefined;
if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) { if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) {
listRs = response.data.data; listRs = response.data.data;
totalCountRs = response.data.totalCount; totalCountRs = response.data.totalCount;
listRs.map(function(item){ // listRs.map(function(item){
item.visible2 = false; // item.visible2 = false;
item.crtTimeStr = timestamp2Date(item.crtTime); // item.crtTimeStr = timestamp2Date(item.crtTime);
if(item.storeTypeName){ // if(item.storeTypeName){
item.storeTypeName = item.storeTypeName.join("|"); // item.storeTypeName = item.storeTypeName.join("|");
} // }
}); // });
} }
this.listLoading = false; this.listLoading = false;
this.list = listRs; this.list = listRs;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment