Skip to content

J
jiedao-app-operator-master
Commit ee8648e6 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 60fc51b2 f79cee34
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1180 additions and 1033 deletions
src/api/ecw/memberManagement.js
View file @ ee8648e6
import request from "@/utils/request";
//操作积分
import request from '@/utils/request'
// 操作积分
export function operateMemberScore(data) {
return request({
url: "/member/user-score/operate",
method: "post",
data: data,
});
url: '/member/user-score/operate',
method: 'post',
data: data
})
}
//积分记录分页
// 积分记录分页
export function queryMemberScoreRecord(data) {
return request({
url: "/member/user-score-log/page",
method: "post",
data: data,
});
url: '/member/user-score-log/page',
method: 'post',
data: data
})
}
//兑换记录分页
// 兑换记录分页
export function queryMemberExchangeRecord(data) {
return request({
url: "/reward/redeem/record/page",
method: "post",
data: data,
});
url: '/reward/redeem/record/page',
method: 'post',
data: data
})
}
//批量核销按钮
// 批量核销按钮
export function batchVerifyAPI(data) {
return request({
url: "/reward/redeem/record/batch/verify",
method: "post",
data: data,
});
url: '/reward/redeem/record/batch/verify',
method: 'post',
data: data
})
}
//兑换记录导出
// 兑换记录导出
export function batchRecordExport(data) {
return request({
url: "/reward/redeem/record/export",
method: "post",
data: data,
});
url: '/reward/redeem/record/export',
method: 'post',
data: data
})
}
//兑换记录导入
// 兑换记录导入
export function batchRecordImport(data) {
return request({
url: "/reward/redeem/record/import",
method: "post",
data: data,
});
url: '/reward/redeem/record/import',
method: 'post',
data: data
})
}
//兑换记录导入模板下载
// 兑换记录导入模板下载
export function batchRecordImportTemplate() {
return request({
url: "/reward/redeem/record/import/template",
method: "post",
responseType: "blob",
});
url: '/reward/redeem/record/import/template',
method: 'post',
responseType: 'blob'
})
}
//撤销 操作
// 撤销 操作
export function rewardCancelQuery(data) {
return request({
url: "/reward/redeem/record/cancel",
method: "post",
data: data,
});
url: '/reward/redeem/record/cancel',
method: 'post',
data: data
})
}
//获取记录详情
// 获取记录详情
export function getRewardDetailQuery(data) {
return request({
url: "/reward/redeem/record/detail",
method: "post",
data: data,
});
url: '/reward/redeem/record/detail',
method: 'post',
data: data
})
}
//更新兑换记录
// 更新兑换记录
export function updatedRewardsDetails(data) {
return request({
url: "/reward/redeem/record/update",
method: "post",
data: data,
});
url: '/reward/redeem/record/update',
method: 'post',
data: data
})
}
//核销回退
// 核销回退
export function verifyRollback(data) {
return request({
url: "/reward/redeem/record/verify-back",
method: "post",
data: data,
});
url: '/reward/redeem/record/verify-back',
method: 'post',
data: data
})
}
//核销 操作
// 核销 操作
export function verifyRedeem(data) {
return request({
url: "/reward/redeem/record/verify",
method: "post",
data: data,
});
url: '/reward/redeem/record/verify',
method: 'post',
data: data
})
}
//获取积分规则记录
// 获取积分规则记录
export function getScoreRecordList(data) {
return request({
url: "/member/score-rule/page",
method: "post",
url: '/member/score-rule/page',
method: 'post',
params: {
page: data.page,
rows: data.rows,
rows: data.rows
},
data,
});
data
})
}
//会员积分等级列表
// 会员积分等级列表
export function getMemberLevelList(data) {
return request({
url: "/member/user-level/page",
method: "post",
data,
});
url: '/member/user-level/page',
method: 'post',
data
})
}
//新增会员等级设置
// 新增会员等级设置
export function addNewMemberLevel(data) {
return request({
url: "/member/user-level/add",
method: "post",
data,
});
url: '/member/user-level/add',
method: 'post',
data
})
}
//删除会员等级
// 删除会员等级
export function delMemberLevel(data) {
return request({
url: "/member/user-level/delete",
method: "post",
data,
});
url: '/member/user-level/delete',
method: 'post',
data
})
}
//edit member level
// edit member level
export function editMemberLevel(data) {
return request({
url: "/member/user-level/update",
method: "post",
data,
});
url: '/member/user-level/update',
method: 'post',
data
})
}
//获得目的国、目的城市、目的仓列表
// 获得目的国、目的城市、目的仓列表
export function getRegionTreeList() {
return request({
url: "/member/score-rule/warehouse-tree-region-list",
method: "get",
});
url: '/member/score-rule/warehouse-tree-region-list',
method: 'get'
})
}
//获取渠道列表
// 获取渠道列表
export function getChannelList() {
return request({
url: "/ecw/channel/list-all-simple",
method: "get",
});
url: '/ecw/channel/list-all-simple',
method: 'get'
})
}
//积分规则创建
// 积分规则创建
export function createIntegralRule(data) {
return request({
url: "/member/score-rule/create",
method: "post",
data,
});
url: '/member/score-rule/create',
method: 'post',
data
})
}
//启用关闭 积分规则
// 启用关闭 积分规则
export function integralRuleStatus(data) {
return request({
url: "/member/score-rule/status",
method: "post",
data,
});
url: '/member/score-rule/status',
method: 'post',
data
})
}
//复制积分规则
// 复制积分规则
export function integralRuleCopy(data) {
return request({
url: "/member/score-rule/copy",
method: "post",
data,
});
url: '/member/score-rule/copy',
method: 'post',
data
})
}
//延期积分规则
// 延期积分规则
export function integralRuleDelay(data) {
return request({
url: "/member/score-rule/delay",
method: "post",
data,
});
url: '/member/score-rule/delay',
method: 'post',
data
})
}
//删除积分规则
// 删除积分规则
export function integralRuleDelete(data) {
return request({
url: "/member/score-rule/delete",
method: "post",
data,
});
url: '/member/score-rule/delete',
method: 'post',
data
})
}
//获取积分规则详情
// 获取积分规则详情
export function integralRuleDetails(data) {
return request({
url: "/member/score-rule/get",
method: "post",
data,
});
url: '/member/score-rule/get',
method: 'post',
data
})
}
//编辑积分规则
// 编辑积分规则
export function integralRuleUpdated(data) {
return request({
url: "/member/score-rule/update",
method: "post",
data,
});
url: '/member/score-rule/update',
method: 'post',
data
})
}
// 获取会员功能开关
export function switchRuleGet() {
return request({
url: '/member/score-rule/switch/get',
method: 'get'
})
}
// 设置会员工能开关
export function switchRuleSet(data) {
return request({
url: '/member/score-rule/switch/set',
method: 'post',
data
})
}
src/components/ProductsSelector/index.vue
View file @ ee8648e6
......@@ -9,7 +9,7 @@
<el-select v-model="queryParams.attrId" :placeholder="$t('选择属性')" style="width:120px" clearable @change="getList" :disabled="loading">
<el-option v-for="item in attrList" :key="item.id" :label="item.attrName" :value="item.id" />
</el-select>
<el-input v-model="queryParams.titleZh" :placeholder="$t('产品关键字')" style="width:120px" clearable :disabled="loading"/>
<el-input v-model="queryParams.titleZh" :placeholder="$t('产品关键字')" style="width:120px" clearable onkeyup="this.value=this.value.replace(/\s+/g, '')" :disabled="loading"/>
<el-button type="primary" @click="reLoad" :loading="loading">{{$t('搜索')}}</el-button>
<div style="height: 36px; display: flex; align-items: center">
......@@ -34,7 +34,7 @@
<el-select v-model="selectedFilterParams.attrId" :placeholder="$t('选择属性')" style="width:120px" clearable :disabled="loading">
<el-option v-for="item in attrList" :key="item.id" :label="item.attrName" :value="item.id" />
</el-select>
<el-input v-model="selectedFilterParams.titleZh" :placeholder="$t('产品关键字')" style="width:120px" clearable :disabled="loading"/>
<el-input v-model="selectedFilterParams.titleZh" :placeholder="$t('产品关键字')" style="width:120px" clearable onkeyup="this.value=this.value.replace(/\s+/g, '')" :disabled="loading"/>
<!--<el-button type="primary" @click="reLoad" :loading="loading">{{$t('搜索')}}</el-button>-->
<div class="flex">
......
src/components/RoutersSelector/index.vue
View file @ ee8648e6
This diff is collapsed.
src/i18n/languages/en_US.json
View file @ ee8648e6
......@@ -4689,6 +4689,7 @@
"发货评估": "Delivery evaluation",
"财务资料": "Finance Information",
"特殊设置": "Special setting",
"已卸柜/已到仓时间": "Unloaded/arrived Time"
"已卸柜/已到仓时间": "Unloaded/arrived Time",
"开启会员积分系统":"Enable member points system",
"是否确认{val}会员积分系统":"Confirm whether to {val} the member points system"
}
src/utils/request.js
View file @ ee8648e6
......@@ -19,7 +19,7 @@ const service = axios.create({
(localStorage.VUE_APP_BASE_API || process.env.VUE_APP_BASE_API) +
"/admin-api/", // 此处的 /admin-api/ 地址，原因是后端的基础路径为 /admin-api/
// 超时
timeout: 1000 * 30,
timeout: 1000 * 60,
});
// 如果是生产环境则打印提示
......
src/views/ecw/customer/query.vue
View file @ ee8648e6
This diff is collapsed.
src/views/ecw/giftManagement/index.vue
View file @ ee8648e6
This diff is collapsed.
src/views/ecw/order/index.vue
View file @ ee8648e6
......@@ -13,6 +13,7 @@
:placeholder="$t('请输入订单号、唛头、提单号')"
clearable
@keyup.enter.native="handleQuery"
onkeyup="this.value=this.value.replace(/\s+/g, '')"
>
<template slot="prepend">
<dict-selector
......@@ -34,7 +35,7 @@
:placeholder="$t('发货人')"
clearable
@keyup.enter.native="handleQuery"
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
onkeyup="this.value=this.value.replace(/\s+/g, '')"
/>
</el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeKey">
......@@ -43,7 +44,7 @@
:placeholder="$t('收货人')"
clearable
@keyup.enter.native="handleQuery"
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
onkeyup="this.value=this.value.replace(/\s+/g, '')"
/>
</el-form-item>
<el-form-item label="">
......@@ -213,7 +214,8 @@
<el-form-item :label="$t('订单状态')" prop="status">
<dict-selector
:type="DICT_TYPE.ORDER_STATUS"
v-model="queryParams.status"
multiple
v-model="queryParams.statusList"
@keyup.enter.native="handleQuery"
:filter="statusDictFilter"
clearable
......@@ -261,7 +263,7 @@
:placeholder="$t('快递单号')"
clearable
@keyup.enter.native="handleQuery"
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
onkeyup="this.value=this.value.replace(/\s+/g, '')"
/>
</el-form-item>
<el-form-item :label="$t('外部仓')" prop="number">
......@@ -281,7 +283,7 @@
<dict-selector
:type="DICT_TYPE.ORDER_ABNORMAL_STATE"
multiple
v-model="queryParams.abnormalState"
v-model="queryParams.abnormalStateList"
@keyup.enter.native="handleQuery"
clearable
@change="handleQuery"
......@@ -291,7 +293,7 @@
<dict-selector
:type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE"
multiple
v-model="queryParams.auditType"
v-model="queryParams.auditTypeList"
@keyup.enter.native="handleQuery"
clearable
@change="handleQuery"
......@@ -1675,16 +1677,16 @@ export default {
}
//目的国
if (this.destCountryId != null && this.destCountryId != "") {
queryParams.destCountryId = this.destCountryId;
queryParams.destCountryIds = this.destCountryId;
}
if (this.objectiveId != null && this.objectiveId != "") {
//目的城市
queryParams.objectiveId = this.objectiveId;
queryParams.objectiveIds = this.objectiveId;
}
if (this.destWarehouseId != null && this.destWarehouseId != "") {
//目的仓
queryParams.destWarehouseId = this.destWarehouseId;
queryParams.destWarehouseIds = this.destWarehouseId;
}
return queryParams;
......
src/views/ecw/productPrice/blacklist.vue
View file @ ee8648e6
......@@ -4,15 +4,15 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item :label="$t('商品编码')" prop="productCode">
<el-input v-model="queryParams.productCode" :placeholder="$t('请输入商品编码')" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.productCode" :placeholder="$t('请输入商品编码')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
</el-form-item>
<el-form-item :label="$t('海关编码')" prop="customsCode">
<el-input v-model="queryParams.customsCode" :placeholder="$t('请输入海关编码')" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.customsCode" :placeholder="$t('请输入海关编码')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
</el-form-item>
<el-form-item :label="$t('商品名称')" prop="titleZh">
<el-input v-model="queryParams.titleZh" :placeholder="$t('请输入商品名称')" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.titleZh" :placeholder="$t('请输入商品名称')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
</el-form-item>
<el-form-item :label="$t('商品类型')" prop="typeId">
......
src/views/ecw/productPrice/index.vue
View file @ ee8648e6
......@@ -25,6 +25,7 @@
:placeholder="$t('请输入中英文名称、商品编码、海关编码')"
clearable
@keyup.enter.native="handleQuery"
onkeyup="this.value=this.value.replace(/\s+/g, '')"
>
<template #prepend>
<el-select v-model="queryParams.searchType" style="width: 100px">
......
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