3
0
Fork 0

Compare commits

...

7 Commits

17 changed files with 1651 additions and 696 deletions

View File

@ -9,56 +9,56 @@ import request from '@/utils/request'
export function findAll() { export function findAll() {
return request({ return request({
url: '/sale/manage/specsType/find-all', url: '/sale/manage/specsType/find-all',
method: 'get', method: 'get'
}) })
} }
// 查询所有规格jxc // 查询所有规格jxc
export function findAllJxc() { export function findAllJxc() {
return request({ return request({
url: 'scm/manage/product-bas/find-all', url: 'scm/manage/product-bas/find-all',
method: 'get', method: 'get'
}) })
} }
// 产品属性枚举 // 产品属性枚举
export function productType() { export function productType() {
return request({ return request({
url: '/system/pub/enums/get-product-attr-type', url: '/system/pub/enums/get-product-attr-type',
method: 'get', method: 'get'
}) })
} }
// 发货类型 // 发货类型
export function getShipping() { export function getShipping() {
return request({ return request({
url: '/system/pub/enums/get-shipping-channel', url: '/system/pub/enums/get-shipping-channel',
method: 'get', method: 'get'
}) })
} }
// 单位 // 单位
export function getUnit() { export function getUnit() {
return request({ return request({
url: '/system/pub/enums/get-unit', url: '/system/pub/enums/get-unit',
method: 'get', method: 'get'
}) })
} }
// 销售模式 // 销售模式
export function saleModel() { export function saleModel() {
return request({ return request({
url: 'system/pub/enums/sale-model', url: 'system/pub/enums/sale-model',
method: 'get', method: 'get'
}) })
} }
// 所属分类 // 所属分类
export function classifyAll() { export function classifyAll() {
return request({ return request({
url: '/sale/manage/classify/find-all', url: '/sale/manage/classify/find-all',
method: 'get', method: 'get'
}) })
} }
// 运输方式 // 运输方式
export function transportType() { export function transportType() {
return request({ return request({
url: '/system/pub/enums/manager-transport-type', url: '/system/pub/enums/manager-transport-type',
method: 'get', method: 'get'
}) })
} }
// 产品新增 // 产品新增
@ -129,14 +129,14 @@ export function productListJxc(params) {
export function productDel(id) { export function productDel(id) {
return request({ return request({
url: '/sale/manage/product/' + id, url: '/sale/manage/product/' + id,
method: 'delete', method: 'delete'
}) })
} }
// 删除产品jxc // 删除产品jxc
export function productDelJxc(id) { export function productDelJxc(id) {
return request({ return request({
url: 'scm/manage/product-bas/' + id, url: 'scm/manage/product-bas/' + id,
method: 'delete', method: 'delete'
}) })
} }
// 产品详情 // 产品详情
@ -215,7 +215,7 @@ export function classifyUpdate(data) {
export function classifyDel(id) { export function classifyDel(id) {
return request({ return request({
url: '/sale/manage/classify/' + id, url: '/sale/manage/classify/' + id,
method: 'delete', method: 'delete'
}) })
} }
// 规格类型列表 // 规格类型列表
@ -254,7 +254,7 @@ export function specsTypeUpdate(data) {
export function specsTypeDel(id) { export function specsTypeDel(id) {
return request({ return request({
url: '/sale/manage/specsType/' + id, url: '/sale/manage/specsType/' + id,
method: 'delete', method: 'delete'
}) })
} }
// 导出产品分类 // 导出产品分类
@ -285,7 +285,7 @@ export function areaClassIfyList(params) {
export function areaClassifyDel(id) { export function areaClassifyDel(id) {
return request({ return request({
url: '/sale/manage/area-classify/' + id, url: '/sale/manage/area-classify/' + id,
method: 'delete', method: 'delete'
}) })
} }
@ -325,7 +325,7 @@ export function getAreaClassify(params) {
export function getEWaresPermissionTypeList() { export function getEWaresPermissionTypeList() {
return request({ return request({
url: '/system/pub/enums/getEWaresPermissionTypeList', url: '/system/pub/enums/getEWaresPermissionTypeList',
method: 'get', method: 'get'
}) })
} }
// 根据id查询商品规格 // 根据id查询商品规格
@ -364,14 +364,14 @@ export function get_hierarchy_list(params) {
export function presale_status() { export function presale_status() {
return request({ return request({
url: '/system/pub/enums/presale-status', url: '/system/pub/enums/presale-status',
method: 'get', method: 'get'
}) })
} }
// 查询供应方式 // 查询供应方式
export function supply_way() { export function supply_way() {
return request({ return request({
url: '/system/pub/enums/supply-way', url: '/system/pub/enums/supply-way',
method: 'get', method: 'get'
}) })
} }
// 标签分类 // 标签分类
@ -431,7 +431,7 @@ export function waresList(params) {
export function waresDel(id) { export function waresDel(id) {
return request({ return request({
url: '/sale/manage/wares/' + id, url: '/sale/manage/wares/' + id,
method: 'delete', method: 'delete'
}) })
} }
// 商品新增 // 商品新增
@ -467,22 +467,7 @@ export function waresMove(params) {
params params
}) })
} }
// 商品置顶
export function waresTop(params) {
return request({
url: '/sale/manage/wares/floating-roof',
method: 'get',
params
})
}
// 商品置底
export function waresBottom(params) {
return request({
url: '/sale/manage/wares/botton-up',
method: 'get',
params
})
}
// 邮费模板列表 // 邮费模板列表
export function postageList(params) { export function postageList(params) {
return request({ return request({
@ -496,7 +481,7 @@ export function postageList(params) {
export function postageDel(id) { export function postageDel(id) {
return request({ return request({
url: '/sale/manage/postage/' + id, url: '/sale/manage/postage/' + id,
method: 'delete', method: 'delete'
}) })
} }
// 计费方式 // 计费方式
@ -527,7 +512,7 @@ export function findAllArea(params) {
export function orderType() { export function orderType() {
return request({ return request({
url: '/system/pub/enums/special-area', url: '/system/pub/enums/special-area',
method: 'get', method: 'get'
}) })
} }
@ -615,7 +600,7 @@ export function unitDetail(params) {
export function unitDel(id) { export function unitDel(id) {
return request({ return request({
url: '/sale/manage/unit/' + id, url: '/sale/manage/unit/' + id,
method: 'delete', method: 'delete'
}) })
} }
@ -741,14 +726,7 @@ export function productFind(params) {
params params
}) })
} }
// 产品基本信息1
export function productFind1(params) {
return request({
url: 'scm/manage/product-bas/find-by-bas-all',
method: 'get',
params
})
}
// 供应商商品列表 // 供应商商品列表
export function thProductList(params) { export function thProductList(params) {
return request({ return request({
@ -773,6 +751,15 @@ export function specialPostage(params) {
params params
}) })
} }
// getMaxSortNum
export function getMaxSortNum(params) {
return request({
url: 'sale/manage/wares/getMaxSortNum',
method: 'get',
params
})
}
// 产品生成 // 产品生成
export function generateProduct(params) { export function generateProduct(params) {
return request({ return request({
@ -789,3 +776,20 @@ export function get_sort(params) {
params params
}) })
} }
export function resetInventoryUse(data) {
return request({
url: 'sale/manage/wares/resetInventoryUse',
method: 'post',
data
})
}
export function getOutOfStockProduct(params) {
return request({
url: 'sale/manage/wares/list-no-sale',
method: 'get',
params
})
}

View File

@ -0,0 +1,8 @@
import request from '@/utils/request'
export function getSystemSourceList() {
return request({
url: '/system//pub/enums/product-source',
method: 'get'
})
}

View File

@ -0,0 +1,17 @@
import request from '@/utils/request'
export function getOrderSyncFailList(params) {
return request({
url: '/sale/manage/order-sync/list',
method: 'get',
params
})
}
export function updateOrderSyncStatus(data) {
return request({
url: '/sale/manage/order-sync/updateStatus',
method: 'post',
data
})
}

View File

@ -0,0 +1,48 @@
import request from '@/utils/request'
export function getProductList(params) {
return request({
url: '/sale/manage/all-product/list',
method: 'get',
params
})
}
export function addProductInfo(params) {
return request({
url: '/sale/manage/all-product/save',
method: 'post',
data: params
})
}
export function updateProductInfo(params) {
return request({
url: '/sale/manage/all-product/update',
method: 'post',
data: params
})
}
export function deleteProduct(id) {
return request({
url: `/sale/manage/all-product/${id}`,
method: 'delete'
})
}
export function updateProductInventory(params) {
return request({
url: '/sale/manage/all-product/change-inventory',
method: 'post',
data: params
})
}
export function getProductDetailsList(params) {
return request({
url: '/sale/manage/all-product-detail/list',
method: 'get',
params
})
}

View File

@ -41,6 +41,13 @@
>订单抵扣</el-button >订单抵扣</el-button
> --> > -->
</div> </div>
<el-alert
style="width: fit-content"
:closable="false"
title="默认显示【在售】商品订单,如需查询【预售】【缺货】商品,请使用【非在售商品】进行追加查询"
type="error"
show-icon
/>
</div> </div>
<el-table <el-table
:data="tableData" :data="tableData"
@ -184,11 +191,7 @@
prop="preSaleStatusVal" prop="preSaleStatusVal"
:label="'预售状态'" :label="'预售状态'"
/> />
<el-table-column
align="center"
prop="originalOrderCode"
:label="'原单号'"
/>
<el-table-column <el-table-column
min-width="100px" min-width="100px"
align="center" align="center"
@ -801,12 +804,13 @@ export default {
}) })
} else if (index == 0) { } else if (index == 0) {
this.$confirm('是否确定进行全部合单操作?').then((_) => { this.$confirm('是否确定进行全部合单操作?').then((_) => {
del const params = {
.deliverUnhandeldMerge( ...this.params,
Object.assign({}, this.params, { pkWaresList: this.params.pkWaresList ? this.params.pkWaresList.split(',') : [],
mergeType: this.hdform.mergeType mergeType: this.hdform.mergeType
}) }
) del
.deliverUnhandeldMerge(params)
.then((res) => { .then((res) => {
this.$message({ this.$message({
message: res.msg, message: res.msg,

View File

@ -2065,17 +2065,23 @@ export const constantRoutes = [
] ]
}, },
{ {
path: 'memberRetailRegion', path: 'memberRetailRegionConfig',
name: 'memberRetailRegion', name: 'memberRetailRegionConfig',
meta: { title: i18n.t('会员区域配置') }, meta: { title: i18n.t('会员区域管理') },
component: ParentView, component: ParentView,
redirect: 'memberRetailRegion/index', redirect: 'memberRetailRegionConfig/memberRetailRegion',
children: [ children: [
{ {
path: 'memberRetailRegion', path: 'memberRetailRegion',
name: 'memberRetailRegion', name: 'memberRetailRegion',
component: () => import('@/views/configManage/memberRetailRegion/index'), component: () => import('@/views/configManage/memberRetailRegion/index'),
meta: { title: i18n.t('会员区域配置') } meta: { title: i18n.t('会员区域信息') }
},
{
path: 'distributionCenter',
name: 'DistributionCenter',
component: () => import('@/views/configManage/memberRetailRegion/DistributionCenter'),
meta: { title: i18n.t('配送中心管理') }
} }
] ]
@ -4036,17 +4042,28 @@ export const constantRoutes = [
} }
] ]
}, },
// { {
// path: 'external-link', path: '/whole-network',
// component: Layout, name: 'WholeNetwork',
// children: [ component: Layout,
// { meta: { title: '全网管理', icon: 'info', icon1: 'infoSel' },
// path: 'https://panjiachen.github.io/vue-element-admin-site/#/', children: [
// meta: { title: 'External Link', icon: 'link' }
// }
// ]
// },
{
path: 'productManageSummary',
name: 'WholeNetworkProductManageSummary',
component: () => import('@/views/wholeNetwork/productManage/summary'),
meta: { title: '全网产品统计' }
},
{
path: 'orderSyncFail',
name: 'WholeNetworkOrderSyncFail',
component: () => import('@/views/wholeNetwork/orderSyncFail/index'),
meta: { title: '同步失败订单' }
}
]
},
// 404 page must be placed at the end !!! // 404 page must be placed at the end !!!
{ path: '*', redirect: '/404', hidden: true }, { path: '*', redirect: '/404', hidden: true },
{ {

View File

@ -0,0 +1,761 @@
<template>
<div class="page">
<topBar v-if="topList.length > 0" :top-list="topList" :moren="moren" />
<div class="thetopbox">
<el-form ref="form" :model="queryParams" label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item :label="'会员编号'" prop="memberCode">
<el-input
v-model="queryParams.memberCode"
clearable
:placeholder="'请输入'"
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('是否生效')" prop="status">
<el-select
v-model="queryParams.effective"
clearable
placeholder=""
>
<el-option label="是" value="0" />
<el-option label="否" value="1" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="签呈来源">
<el-select
v-model="queryParams.source"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in sourceList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('收益区域')" prop="accountStatus">
<el-cascader
v-model="address"
clearable
:options="areaData"
:placeholder="'请选择省市区'"
:props="regionParams"
@change="flChange"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('创建时间')" prop="creationTime">
<el-date-picker
v-model="modifiedTime"
value-format="yyyy-MM-dd"
type="datetimerange"
range-separator=""
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
@change="changeTime"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('修改时间')" prop="creationTime">
<el-date-picker
v-model="modifiedTime1"
value-format="yyyy-MM-dd"
type="datetimerange"
range-separator=""
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
@change="changeTime1"
/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item :label="$t('生效结束时间')" prop="creationTime">
<el-date-picker
v-model="effectiveTime"
:picker-options="pickerOptions"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator=""
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="changeTime2"
/>
</el-form-item>
</el-col> -->
<el-col :span="4">
<div class="searchbox">
<el-button class="my_search" @click="research()">
{{ '搜索' }}</el-button>
<el-button class="my_reset" @click="reChongzhi">
{{ '重置' }}</el-button>
</div>
</el-col>
</el-row>
</el-form>
</div>
<div class="main">
<div class="maintop">
<div class="mainbtn">
<el-button
v-hasButtons="['DistributionCenterAdd']"
size="small"
style="background-color: #48b2fd"
class="thebtn1"
@click="addRules"
>{{ '添加' }}</el-button>
<el-button
v-hasButtons="['DistributionCenterExport']"
size="small"
class="thebtn2"
@click="handleExport"
>
{{ '导出' }}</el-button>
</div>
</div>
<div class="maintable">
<el-table
v-loading="loading"
:data="tableData"
height="730px"
style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" />
<el-table-column
align="center"
prop="memberCode"
:label="$t('会员编号')"
/>
<el-table-column
align="center"
prop="memberName"
:label="$t('会员姓名')"
/>
<el-table-column
align="center"
prop="gradeName"
:label="$t('等级')"
/>
<el-table-column
align="center"
prop="provinceVal"
width="160"
:label="$t('区域')"
>
<template slot-scope="scope">
{{ scope.row.provinceVal }}{{ scope.row.cityVal
}}{{ scope.row.countyVal }}
</template>
</el-table-column>
<el-table-column
align="center"
prop="effective"
:label="$t('是否生效')"
>
<template slot-scope="scope">
<span v-if="scope.row.effective == 0"></span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column
align="center"
prop="sourceVal"
:label="$t('来源')"
/>
<el-table-column
align="center"
prop="creationTime"
:label="$t('创建时间')"
width="160"
/>
<el-table-column
align="center"
prop="modifiedTime"
:label="$t('修改时间')"
width="160"
/>
<!-- <el-table-column
align="center"
prop="effectiveEndDate"
:label="$t('生效结束时间')"
/> -->
<el-table-column align="center" :label="'操作'" width="150">
<template slot-scope="scope">
<el-button
v-has-buttons="['DistributionCenterUpdate']"
class="colors"
type="text"
size="small"
style="color: #ffad41"
@click.native.prevent="updateShow(scope.row)"
>
{{ $t("修改") }}
</el-button>
<el-button
v-has-buttons="['DistributionCenterDel']"
class="colors"
type="text"
size="small"
style="color: #c73030"
@click.native.prevent="delRole(scope.row)"
>
{{ '删除' }}
</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
<el-dialog
:title="title"
:visible.sync="ruleShow"
width="50%"
center
:close-on-click-modal="false"
:before-close="handleClose"
>
<el-form ref="forms" :rules="rules" :model="table" label-width="100px">
<el-form-item :label="$t('会员编号')" prop="memberCode">
<el-input
v-model="table.memberCode"
style="width: 460px"
clearable
:disabled="types == 2 ? true : false"
:placeholder="'请输入'"
@input="getmemberinfo"
/>
</el-form-item>
<el-form-item :label="$t('收益区域')" prop="addressd">
<el-cascader
v-model="table.addressd"
:disabled="areaDataFilter.length === 0"
style="width: 460px"
:options="areaDataFilter"
:placeholder="'请选择省市区'"
:props="regionParams"
@change="flChange1"
/>
</el-form-item>
<!-- <el-form-item :label="$t('生效结束时间')" prop="addressd">
<el-date-picker
v-model="table.effectiveEndDate"
:picker-options="pickerOptions"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
@change="changeTime3"
/>
</el-form-item> -->
<div style="padding-top: 30px; display: flex; justify-content: center">
<el-button
type="text"
size="small"
class="button-style"
@click="handleClose"
>
{{ '取消' }}</el-button>
<el-button
v-preventReClick="3000"
type="text"
size="small"
class="button-style"
style="margin-left: 40px; background-color: #c8161d"
@click="submitBtn()"
>
{{ '确认' }}
</el-button>
</div>
</el-form>
</el-dialog>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="research"
/>
</div>
</template>
<script>
import topBar from '@/components/topBar'
import * as con from '@/api/configManage.js'
import * as api from '@/api/manage.js'
import { Message } from 'element-ui'
import { areaList } from '@/api/site'
export default {
name: 'DistributionCenter',
components: {
topBar
},
data() {
return {
modifiedTime: [],
modifiedTime1: [],
effectiveTime: [],
sourceList: [],
regionParams: {
label: 'name',
value: 'id',
children: 'children',
expandTrigger: 'hover'
},
title: '添加',
forms: '',
pickerOptions: {
disabledDate(time) {
const now = new Date()
now.setHours(0, 0, 0, 0) // Reset to start of today
return time.getTime() < now.getTime() // Disable only dates before today
}
},
rules: {
memberCode: [
{ required: true, message: '请选择发布位置', trigger: 'blur' }
]
},
table: {
memberCode: '',
pkMember: '',
addressd: ['', '', ''],
effectiveEndDate: ''
},
ruleShow: false,
moren: 'distributionCenter',
topList: [
{
name: '配送中心管理',
path: 'distributionCenter'
}
],
defaultParams: {
label: 'label',
value: 'value',
children: 'enumList'
},
multipleSelection: [],
queryParams: {
pageNum: 1,
pageSize: 50,
effective: '0'
},
gradeRangList: [],
awardsList: [],
statusList: [
{ name: '立即发送', id: '1' },
{ name: '定时发送', id: '2' }
],
statusList1: [
{ name: '未发送', id: '0' },
{ name: '已发送', id: '1' }
],
menuOptions: [],
loading: false,
tableData: [],
total: 0,
types: '',
formId: '',
getPostionList: [],
address: '',
areaData: [],
pkIds: '',
memberInfo: {}
}
},
computed: {
areaDataFilter() {
if (!this.memberInfo || Object.keys(this.memberInfo).length === 0 || ![80].includes(this.memberInfo.pkSettleGradeValue)) {
return []
}
return this.areaData
// const list = this.areaData.map(item => {
// const province = item
// let city = null
// if (province.children && province.children.length > 0) {
// city = province.children.map(child => {
// return {
// ...child,
// children: null
// }
// })
// }
// return {
// ...province,
// children: city
// }
// })
// return list
}
},
created() {
this.research()
this.getsignSource()
this.getAllArea()
},
methods: {
handleExport() {
this.$confirm('是否确认导出所有数据项?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then((_) => {
this.download(
'/member/manage/cu-member-retail-region/export',
{ ...this.queryParams, businessType: 2 },
`${this.$t('配送中心配置')}${new Date().getTime()}.xlsx`
)
})
},
getmemberinfo(member) {
con.getQueryMemberInfo({ memberCode: member }).then((res) => {
if (res.code === 200) {
this.table.pkMember = res.data.pkId
this.memberInfo = res.data
} else {
this.memberInfo = {}
}
})
},
getAllArea() {
areaList().then((res) => {
this.areaData = res.data
})
},
flChange(value) {
this.queryParams.county = ''
this.queryParams.province = ''
this.queryParams.city = ''
this.queryParams.province = value[0]
this.queryParams.city = value[1]
this.queryParams.county = value[2]
},
flChange1(value) {
this.table.county = ''
this.table.province = ''
this.table.city = ''
this.table.province = value[0]
this.table.city = value[1]
this.table.county = value[2]
},
getsignSource() {
api.noticeWebsiteType().then((res) => {
this.sourceList = res.data
})
},
addRules() {
this.types = 1
this.ruleShow = true
this.title = '添加'
},
submitBtn() {
//
this.ruleSubmit()
},
updateShow(item) {
this.getmemberinfo(item.memberCode)
this.types = 2
this.title = '修改'
this.table = item
let arr = [item.province + '', item.city + '']
if (item.county && item.county !== -1) {
arr.push(item.county + '')
}
arr = arr.filter((item) => item != '')
this.$set(this.table, 'addressd', arr)
this.$forceUpdate()
console.log(this.table.addressd, 'table')
this.pkIds = item.pkId
this.ruleShow = true
},
delRole(item) {
this.$confirm(this.$t('确认要删除该配置吗?'), '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
con.delRetailRegion(item.pkId).then((res) => {
if (res.code === 200) {
Message({
message: res.msg,
type: 'success'
})
this.research()
} else {
Message({
message: res.msg,
type: 'error'
})
}
})
})
},
ruleSubmit() {
const datas = {}
const that = this
this.$refs['forms'].validate((valid) => {
if (!valid) {
return false
} else {
if (this.types === 1) {
datas.pkMember = this.table.pkMember
datas.province = this.table.addressd[0]
datas.city = this.table.addressd[1]
datas.county = this.table.addressd[2]
datas.effectiveEndDate = this.table.effectiveEndDate
con.retailRegionAdd(datas).then((res) => {
if (res.code === 200) {
Message({
message: res.msg,
type: 'success'
})
that.ruleShow = false
that.table = {
pkMember: '',
addressd: ['', '', '']
}
that.research()
}
})
}
if (this.types === 2) {
datas.pkMember = this.table.pkMember
datas.pkId = this.pkIds
datas.province = this.table.addressd[0]
datas.city = this.table.addressd[1]
datas.county = this.table.addressd[2]
datas.effectiveEndDate = this.table.effectiveEndDate
con.retailRegionUpdate(datas).then((res) => {
if (res.code === 200) {
Message({
message: res.msg,
type: 'success'
})
that.ruleShow = false
that.table = {
pkMember: '',
addressd: ['', '', '']
}
that.research()
}
})
}
}
})
},
statusChange(value) {
if (this.table.status.length > 1) {
this.table.status.splice(0, 1)
}
},
handleClose() {
this.ruleShow = false
this.table = {
pkMember: '',
addressd: ['', '', '']
}
},
changeTime(value) {
this.queryParams.startDate = value[0] ? value[0] : ''
this.queryParams.endDate = value[1] ? value[1] : ''
},
changeTime1(value) {
this.queryParams.startDateModify = value[0] ? value[0] : ''
this.queryParams.endDateModify = value[1] ? value[1] : ''
},
changeTime2(value) {
this.queryParams.effectiveStaDateStr = value[0] ? value[0] : ''
this.queryParams.effectiveEndDateStr = value[1] ? value[1] : ''
},
changeTime3(value) {
this.table.effectiveEndDate = value
},
research() {
this.loading = true
con.getRetailRegionList({
...this.queryParams,
businessType: 2 // 1 2
}).then((res) => {
this.tableData = res.rows
this.total = res.total
this.loading = false
})
},
reChongzhi() {
this.queryParams = {
pageNum: 1,
pageSize: 50
}
this.modifiedTime = []
this.modifiedTime1 = []
this.effectiveTime = []
this.address = []
this.research()
},
handleSelectionChange(val) {
this.multipleSelection = val
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) {
return 'warning-row'
} else if (rowIndex % 2 == 0) {
return 'success-row'
}
return ''
}
}
}
</script>
<style lang="scss" scoped>
::v-deep .el-upload--picture-card {
min-width: 80px !important;
min-height: 80px !important;
border: 1px solid #ccc;
border-radius: 4px;
}
::v-deep .el-select {
width: 100%;
}
::v-deep .el-range-editor.el-input__inner {
width: 100%;
}
::v-deep .colors {
padding: 5px !important;
}
::v-deep .banner .el-form-item__error {
left: 100px;
margin-top: 10px;
}
.avatar-uploader {
width: 68px !important;
height: 68px !important;
}
::v-deep .input-s .el-input {
//width:637px;
}
.button-style {
width: 209px;
height: 48px;
background: #cccccc;
border-radius: 5px 5px 5px 5px;
opacity: 1;
line-height: 48px;
padding: 0 !important;
color: #fff;
font-size: 18px;
}
::v-deep .el-dialog__title {
font-weight: bold;
}
::v-deep .el-dialog__header {
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
}
.button-s {
padding: 0 2px !important;
}
::v-deep .el-button {
padding: 10px 20px;
}
::v-deep .el-date-editor .el-range__close-icon {
margin-top: -10px;
}
::v-deep .el-date-editor .el-range-separator {
margin-top: -10px;
}
::v-deep .el-date-editor .el-range__icon {
margin-top: -10px;
}
::v-deep .el-input__inner {
//height:28px;
//line-height: 28px;
}
::v-deep .el-form-item {
margin-bottom: 15px;
}
::v-deep .el-form-item__label {
color: #333;
font-weight: inherit;
}
::v-deep .el-row {
//margin-top: 20px;
}
::v-deep .el-table .warning-row {
background: #f9f9f9;
}
::v-deep .el-table .success-row {
background: #ffffff;
}
::v-deep .el-table thead {
color: #000000;
}
.thebtn2 {
color: #ffffff;
background: #ffad41;
}
.openClose {
margin-top: 10px;
margin-right: 10px;
color: #666666;
text-align: center;
}
.page {
padding: 20px;
background: #f9f9f9;
font-size: 14px;
.thetopbox {
background: #ffffff;
border-radius: 8px;
padding-bottom: 10px;
.searchbox {
display: flex;
align-items: center;
.searchtitle {
margin-right: 10px;
}
.searchbtn {
background: #08143f;
color: #ffffff;
}
}
}
.main {
//margin-top: 20px;
background: #f9f9f9;
//border-radius: 8px;
//box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
.maintop {
display: flex;
padding: 0px 0;
justify-content: space-between;
align-items: center;
.mainbtn {
.thebtn1 {
color: #ffffff;
background: #3181e5;
width: 68px;
//height: 32px;
}
}
}
}
}
</style>

View File

@ -108,13 +108,6 @@
<div class="main"> <div class="main">
<div class="maintop"> <div class="maintop">
<div class="mainbtn"> <div class="mainbtn">
<el-button
v-hasButtons="['memberRetailRegionAdd']"
size="small"
style="background-color: #48b2fd"
class="thebtn1"
@click="addRules"
>{{ '添加' }}</el-button>
<el-button <el-button
v-hasButtons="['memberRetailRegionExport']" v-hasButtons="['memberRetailRegionExport']"
size="small" size="small"
@ -132,7 +125,6 @@
style="width: 100%" style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }" :header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
:span-method="objectSpanMethod"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
@ -189,98 +181,9 @@
:label="$t('修改时间')" :label="$t('修改时间')"
width="160" width="160"
/> />
<!-- <el-table-column
align="center"
prop="effectiveEndDate"
:label="$t('生效结束时间')"
/> -->
<el-table-column align="center" :label="'操作'" width="150">
<template slot-scope="scope">
<el-button
v-has-buttons="['memberRetailRegionUpdate']"
class="colors"
type="text"
size="small"
style="color: #ffad41"
@click.native.prevent="updateShow(scope.row)"
>
{{ $t("修改") }}
</el-button>
<el-button
v-has-buttons="['memberRetailRegionDel']"
class="colors"
type="text"
size="small"
style="color: #c73030"
@click.native.prevent="delRole(scope.row)"
>
{{ '删除' }}
</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
<el-dialog
:title="title"
:visible.sync="ruleShow"
width="50%"
center
:close-on-click-modal="false"
:before-close="handleClose"
>
<el-form ref="forms" :rules="rules" :model="table" label-width="100px">
<el-form-item :label="$t('会员编号')" prop="memberCode">
<el-input
v-model="table.memberCode"
style="width: 460px"
clearable
:disabled="types == 2 ? true : false"
:placeholder="'请输入'"
@input="getmemberinfo"
/>
</el-form-item>
<el-form-item :label="$t('收益区域')" prop="addressd">
<el-cascader
v-model="table.addressd"
:disabled="areaDataFilter.length === 0"
style="width: 460px"
:options="areaDataFilter"
:placeholder="'请选择省市区'"
:props="regionParams"
@change="flChange1"
/>
</el-form-item>
<!-- <el-form-item :label="$t('生效结束时间')" prop="addressd">
<el-date-picker
v-model="table.effectiveEndDate"
:picker-options="pickerOptions"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
@change="changeTime3"
/>
</el-form-item> -->
<div style="padding-top: 30px; display: flex; justify-content: center">
<el-button
type="text"
size="small"
class="button-style"
@click="handleClose"
>
{{ '取消' }}</el-button>
<el-button
v-preventReClick="3000"
type="text"
size="small"
class="button-style"
style="margin-left: 40px; background-color: #c8161d"
@click="submitBtn()"
>
{{ '确认' }}
</el-button>
</div>
</el-form>
</el-dialog>
<pagination <pagination
v-show="total > 0" v-show="total > 0"
:total="total" :total="total"
@ -293,19 +196,13 @@
<script> <script>
import topBar from '@/components/topBar' import topBar from '@/components/topBar'
import { getbdmenuList, getPubenumsList } from '@/api/system'
import { getgradeRanglist, getAwardsListChiose } from '@/api/level'
import * as con from '@/api/configManage.js' import * as con from '@/api/configManage.js'
import * as api from '@/api/manage.js' import * as api from '@/api/manage.js'
import { Message } from 'element-ui'
import { deleteAgreement } from '@/api/configManage'
import ImageUpload from '@/components/ImageUpload'
import { areaList } from '@/api/site' import { areaList } from '@/api/site'
export default { export default {
name: 'Qxpz', name: 'MemberRetailRegion',
components: { components: {
topBar, topBar
ImageUpload
}, },
data() { data() {
return { return {
@ -343,7 +240,7 @@ export default {
moren: 'memberRetailRegion', moren: 'memberRetailRegion',
topList: [ topList: [
{ {
name: this.$t('收益区域配置'), name: '会员区域信息',
path: 'memberRetailRegion' path: 'memberRetailRegion'
} }
], ],
@ -387,28 +284,25 @@ export default {
if (!this.memberInfo || Object.keys(this.memberInfo).length === 0 || ![60, 70, 80].includes(this.memberInfo.pkSettleGradeValue)) { if (!this.memberInfo || Object.keys(this.memberInfo).length === 0 || ![60, 70, 80].includes(this.memberInfo.pkSettleGradeValue)) {
return [] return []
} }
console.log(this.memberInfo.pkSettleGradeValue, 'memberInfo')
if ([60, 70].includes(this.memberInfo.pkSettleGradeValue)) {
return this.areaData return this.areaData
}
const list = this.areaData.map(item => { // const list = this.areaData.map(item => {
const province = item // const province = item
let city = null // let city = null
if (province.children && province.children.length > 0) { // if (province.children && province.children.length > 0) {
city = province.children.map(child => { // city = province.children.map(child => {
return { // return {
...child, // ...child,
children: null // children: null
} // }
}) // })
} // }
return { // return {
...province, // ...province,
children: city // children: city
} // }
}) // })
return list // return list
} }
}, },
created() { created() {
@ -425,8 +319,8 @@ export default {
}).then((_) => { }).then((_) => {
this.download( this.download(
'/member/manage/cu-member-retail-region/export', '/member/manage/cu-member-retail-region/export',
{ ...this.queryParams }, { ...this.queryParams, businessType: 1 },
`${this.$t('会员收益区域配置')}}${new Date().getTime()}.xlsx` `${this.$t('会员区域信息')}${new Date().getTime()}.xlsx`
) )
}) })
}, },
@ -454,136 +348,13 @@ export default {
this.queryParams.city = value[1] this.queryParams.city = value[1]
this.queryParams.county = value[2] this.queryParams.county = value[2]
}, },
flChange1(value) {
this.table.county = ''
this.table.province = ''
this.table.city = ''
this.table.province = value[0]
this.table.city = value[1]
this.table.county = value[2]
},
getsignSource() { getsignSource() {
api.noticeWebsiteType().then((res) => { api.noticeWebsiteType().then((res) => {
this.sourceList = res.data this.sourceList = res.data
}) })
}, },
addRules() {
this.types = 1
this.ruleShow = true
this.title = '添加'
},
submitBtn() {
//
this.ruleSubmit()
},
updateShow(item) {
this.getmemberinfo(item.memberCode)
this.types = 2
this.title = '修改'
this.table = item
let arr = [item.province + '', item.city + '']
if (item.county && item.county !== -1) {
arr.push(item.county + '')
}
arr = arr.filter((item) => item != '')
this.$set(this.table, 'addressd', arr)
this.$forceUpdate()
console.log(this.table.addressd, 'table')
this.pkIds = item.pkId
this.ruleShow = true
},
delRole(item) {
this.$confirm(this.$t('确认要删除该配置吗?'), '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
con.delRetailRegion(item.pkId).then((res) => {
if (res.code === 200) {
Message({
message: res.msg,
type: 'success'
})
this.research()
} else {
Message({
message: res.msg,
type: 'error'
})
}
})
})
},
ruleSubmit() {
const datas = {}
const that = this
this.$refs['forms'].validate((valid) => {
if (!valid) {
return false
} else {
if (this.types === 1) {
datas.pkMember = this.table.pkMember
datas.province = this.table.addressd[0]
datas.city = this.table.addressd[1]
datas.county = this.table.addressd[2]
datas.effectiveEndDate = this.table.effectiveEndDate
con.retailRegionAdd(datas).then((res) => {
if (res.code === 200) {
Message({
message: res.msg,
type: 'success'
})
that.ruleShow = false
that.table = {
pkMember: '',
addressd: ['', '', '']
}
that.research()
}
})
}
if (this.types === 2) {
datas.pkMember = this.table.pkMember
datas.pkId = this.pkIds
datas.province = this.table.addressd[0]
datas.city = this.table.addressd[1]
datas.county = this.table.addressd[2]
datas.effectiveEndDate = this.table.effectiveEndDate
con.retailRegionUpdate(datas).then((res) => {
if (res.code === 200) {
Message({
message: res.msg,
type: 'success'
})
that.ruleShow = false
that.table = {
pkMember: '',
addressd: ['', '', '']
}
that.research()
}
})
}
}
})
},
statusChange(value) {
if (this.table.status.length > 1) {
this.table.status.splice(0, 1)
}
},
handleClose() {
this.ruleShow = false
this.table = {
pkMember: '',
addressd: ['', '', '']
}
},
changeBox(row) {
console.error(row)
},
addFrom() {},
addRule() {},
changeTime(value) { changeTime(value) {
this.queryParams.startDate = value[0] ? value[0] : '' this.queryParams.startDate = value[0] ? value[0] : ''
this.queryParams.endDate = value[1] ? value[1] : '' this.queryParams.endDate = value[1] ? value[1] : ''
@ -596,51 +367,13 @@ export default {
this.queryParams.effectiveStaDateStr = value[0] ? value[0] : '' this.queryParams.effectiveStaDateStr = value[0] ? value[0] : ''
this.queryParams.effectiveEndDateStr = value[1] ? value[1] : '' this.queryParams.effectiveEndDateStr = value[1] ? value[1] : ''
}, },
changeTime3(value) {
this.table.effectiveEndDate = value
},
disabledDates(time) {
const now = new Date() //
const currentDateTime = new Date(
now.getFullYear(),
now.getMonth(),
now.getDate(),
now.getHours(),
now.getMinutes(),
now.getSeconds()
)
return time.getTime() < currentDateTime.getTime() //
},
handleChangeMunu(value) {
console.log('🌈', value[value.length - 1])
this.queryParams.menuId = value[value.length - 1]
},
//
getPubenumsList() {
getPubenumsList().then((res) => {
this.menuOptions = res.data
})
},
//
getgradeRanglist() {
getgradeRanglist().then((res) => {
this.gradeRangList = res.data
})
},
//
getAwardsListChiose() {
getAwardsListChiose().then((res) => {
this.awardsList = res.rows
})
},
research() { research() {
// //
// if ("" != this.queryParams.creationTime) {
// this.queryParams.creationTimeStart = this.queryParams.creationTime[0];
// this.queryParams.creationTimeEnd = this.queryParams.creationTime[1];
// }
this.loading = true this.loading = true
con.getRetailRegionList(this.queryParams).then((res) => { con.getRetailRegionList({
...this.queryParams,
businessType: 1 // 1 2
}).then((res) => {
this.tableData = res.rows this.tableData = res.rows
this.total = res.total this.total = res.total
this.loading = false this.loading = false
@ -661,21 +394,6 @@ export default {
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val this.multipleSelection = val
}, },
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
// if (columnIndex === 0) {
// if (rowIndex % 2 === 0) {
// return {
// rowspan: 2,
// colspan: 1,
// };
// } else {
// return {
// rowspan: 0,
// colspan: 0,
// };
// }
// }
},
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) { if (rowIndex % 2 == 1) {
return 'warning-row' return 'warning-row'

View File

@ -509,6 +509,17 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<template v-if="form.specialArea === 43">
<el-col :span="8">
<el-form-item required prop="areaIncome" label="配送收益">
<el-input
v-model="form.areaIncome"
clearable
:placeholder="'请输入'"
/>
</el-form-item>
</el-col>
</template>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -867,7 +878,6 @@ export default {
bzList: [], bzList: [],
pkGuaranteeLabel: [], pkGuaranteeLabel: [],
specialArea: '', specialArea: '',
// areaIncome: 0,
checkList: [], checkList: [],
waresMemberAuthorizeList: [], waresMemberAuthorizeList: [],
waresAuthorityList: [ waresAuthorityList: [
@ -876,7 +886,8 @@ export default {
memberCode: '' memberCode: ''
} }
], ],
waresSpecsPackList: [{ key: '', value: '' }] waresSpecsPackList: [{ key: '', value: '' }],
areaIncome: 0.5
}, },
moren: '/goodsManage/goodsRelease/jcsz', moren: '/goodsManage/goodsRelease/jcsz',
tabActive: 0, tabActive: 0,
@ -1068,6 +1079,20 @@ export default {
], ],
afterGuarantee: [ afterGuarantee: [
{ required: true, message: '请输入售后保障', trigger: 'blur' } { required: true, message: '请输入售后保障', trigger: 'blur' }
],
areaIncome: [
{ required: true, message: '请输入配送收益', trigger: 'blur' },
{ validator: (rule, value, callback) => {
if (value === '') {
callback(new Error('请输入配送收益'))
return
}
if (value < 0) {
callback(new Error('配送收益不能小于0'))
return
}
callback()
}, trigger: 'change' }
] ]
}, },
pkId: '', pkId: '',

View File

@ -447,6 +447,18 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<template v-if="form.specialArea === 43">
<el-col :span="8">
<el-form-item required prop="areaIncome" label="配送收益">
<el-input
v-model="form.areaIncome"
clearable
:placeholder="'请输入'"
/>
</el-form-item>
</el-col>
</template>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -765,7 +777,6 @@ export default {
sptw: '', sptw: '',
ysList: [], ysList: [],
bzList: [], bzList: [],
// areaIncome: 0,
pkGuaranteeLabel: [], pkGuaranteeLabel: [],
specialArea: '', specialArea: '',
checkList: [], checkList: [],
@ -776,7 +787,8 @@ export default {
memberCode: '' memberCode: ''
} }
], ],
waresSpecsPackList: [{ key: '', value: '' }] waresSpecsPackList: [{ key: '', value: '' }],
areaIncome: 0.5
}, },
moren: '/goodsManage/goodsRelease/jcsz', moren: '/goodsManage/goodsRelease/jcsz',
tabActive: 0, tabActive: 0,
@ -971,6 +983,20 @@ export default {
], ],
afterGuarantee: [ afterGuarantee: [
{ required: true, message: '请输入售后保障', trigger: 'blur' } { required: true, message: '请输入售后保障', trigger: 'blur' }
],
areaIncome: [
{ required: true, message: '请输入配送收益', trigger: 'blur' },
{ validator: (rule, value, callback) => {
if (value === '') {
callback(new Error('请输入配送收益'))
return
}
if (value < 0) {
callback(new Error('配送收益不能小于0'))
return
}
callback()
}, trigger: 'change' }
] ]
}, },
yesNo: [], yesNo: [],

View File

@ -108,31 +108,6 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item :label="'详细地址'" prop="accountStatus">
<el-cascader
v-model="address"
class="area"
:options="areaData"
:placeholder="'请选择省市区'"
:props="regionParams"
@change="flChange"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="lefts" prop="parMemberCode">
<el-input
v-model="queryParams.address"
clearable
placeholder=""
/>
</el-form-item>
</el-col>
</el-row>
<el-collapse-transition>
<div v-show="isActive">
<el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'性别'" prop="isMakerSpace"> <el-form-item :label="'性别'" prop="isMakerSpace">
<el-select <el-select
@ -149,33 +124,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> </el-row>
<el-form-item :label="'银行名称'" prop="isMakerSpace"> <el-collapse-transition>
<el-input <div v-show="isActive">
v-model="queryParams.bankName" <el-row>
clearable
placeholder=""
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'支行名称'" prop="parMemberCode">
<el-input
v-model="queryParams.subBankName"
clearable
placeholder=""
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'银行卡号'" prop="parMemberCode">
<el-input
v-model="queryParams.cardNumber"
clearable
placeholder=""
/>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'认证日期'" prop="code"> <el-form-item :label="'认证日期'" prop="code">
@ -504,66 +456,13 @@ export default {
checked: true, checked: true,
prop: 'idCardBack' prop: 'idCardBack'
}, },
{
id: 9,
text: '省',
checked: true,
prop: 'provinceName'
},
{
id: 10,
text: '市',
checked: true,
prop: 'cityName'
},
{
id: 11,
text: '区/县',
checked: true,
prop: 'countyName'
},
{ {
id: 12, id: 12,
text: '详细地址', text: '详细地址',
checked: true, checked: true,
prop: 'address' prop: 'address'
},
{
id: 13,
text: '银行名称',
checked: true,
prop: 'bankName'
},
{
id: 14,
text: '支行名称',
checked: true,
prop: 'subBankName'
},
{
id: 15,
text: '开户姓名',
checked: true,
prop: 'accountName'
},
{
id: 16,
text: '预留电话',
checked: true,
prop: 'reservedPhone'
},
{
id: 17,
text: '银行卡号',
checked: true,
prop: 'cardNumber'
},
{
id: 18,
text: '邮箱地址',
checked: true,
prop: 'email'
} }
], ],
moren: 'RealInfo', moren: 'RealInfo',
topList: [ topList: [

View File

@ -0,0 +1,243 @@
<template>
<el-dialog
title="选择非在售商品"
:visible.sync="dialogVisible"
:close-on-click-modal="false"
width="1000px"
top="50px"
center
class="out-of-stock-dialog"
:before-close="handleClose"
>
<div class="cpHeight">
<el-form ref="form" :model="queryParams" label-width="90px">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="商品编号" prop="waresCode">
<el-input v-model="form.waresCode" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="商品名称" prop="waresName">
<el-input v-model="form.waresName" clearable />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="商品状态" prop="preSaleStatus">
<el-select
v-model="form.preSaleStatus"
clearable
>
<el-option
v-for="item in presaleList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="2">
<el-button type="primary" @click="getDataList">搜索</el-button>
</el-col>
</el-row>
</el-form>
<div style="margin-bottom: 10px">
<el-tag v-for="item in selection" :key="item.pkId" effect="plain" size="small" closable class="tag-item" type="info" @close="removeSelectedHandle(item)">
{{ item.waresName }} ({{ item.waresCode }})
</el-tag>
</div>
<el-table
ref="tableRef"
:data="dialogList"
style="width: 100%"
row-key="pkId"
:header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName"
@selection-change="selectionChangeHandle"
>
<el-table-column
type="selection"
:reserve-selection="true"
width="55"
/>
<el-table-column align="center" prop="cover1" :label="'产品主图'">
<template slot-scope="scope">
<img style="width: 40px; height: 40px" :src="scope.row.cover1" alt="">
</template>
</el-table-column>
<el-table-column
align="center"
prop="waresName"
label="商品名称"
/>
<el-table-column
align="center"
prop="waresCode"
label="商品编号"
/>
<el-table-column
align="center"
prop="specialAreaVal"
label="所属专区"
/>
<el-table-column
align="center"
prop="preSaleStatusVal"
label="预售状态"
/>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getDataList"
/>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose">{{ '取消' }}</el-button>
<el-button type="primary" @click="onSubmit('form')">{{
'确认'
}}</el-button>
</span>
</el-dialog>
</template>
<script>
import * as api from '@/api/product.js'
export default {
name: 'OutOfStockProductList',
props: {
visible: {
type: Boolean,
default: false
},
selected: {
type: Array,
default: () => []
}
},
data() {
return {
dialogList: [],
presaleList: [],
total: 0,
selection: [],
queryParams: {
pageNum: 1,
pageSize: 10
},
form: {
productName: '',
productCode: '',
preSaleStatus: ''
}
}
},
computed: {
dialogVisible: {
get() {
return this.visible
},
set(val) {
this.$emit('update:visible', val)
}
}
},
created() {
this.selection = [...this.selected]
this.getPreSaleStatus()
},
mounted() {
this.getList()
},
methods: {
getPreSaleStatus() {
api.presale_status().then((res) => {
this.presaleList = res.data
})
},
removeSelectedHandle(product) {
const tempIdx = this.selection.findIndex((item) => item.pkId === product.pkId)
if (~tempIdx) {
this.$refs.tableRef.toggleRowSelection(this.selection[tempIdx], false)
this.selection.splice(tempIdx, 1)
}
},
getList() {
api.getOutOfStockProduct(this.queryParams).then(
(res) => {
res.rows.forEach((item) => {
item.quantity = 1
item.isGift = 0
})
this.dialogList = res.rows
this.total = res.total
this.updateTableSelection()
}
)
},
updateTableSelection() {
this.$nextTick(() => {
if (this.selection.length) {
this.selection.forEach((item) => {
const row = this.dialogList.find((row) => row.pkId === item.pkId)
if (row) {
this.$refs.tableRef.toggleRowSelection(row, true)
this.$refs.tableRef.doLayout()
}
})
}
})
},
handleClose() {
this.dialogVisible = false
},
getDataList() {
this.queryParams.pageNum = 1
api.getOutOfStockProduct({
...this.queryParams,
...this.form
}).then((res) => {
res.rows.forEach((item) => {
item.quantity = 1
item.isGift = 0
})
this.dialogList = res.rows
this.total = res.total
this.updateTableSelection()
})
},
selectionChangeHandle(rows) {
this.selection = rows
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) {
return 'warning-row'
} else if (rowIndex % 2 == 0) {
return 'success-row'
}
return ''
},
onSubmit() {
this.$emit('submit', this.selection)
this.dialogVisible = false
}
}
}
</script>
<style lang="scss" scoped>
.cpHeight {
height: 500px;
overflow-y: auto;
}
.out-of-stock-dialog {
::v-deep .el-dialog__body {
padding-bottom: 0 !important;
}
}
</style>

View File

@ -6,7 +6,7 @@
:moren="moren" :moren="moren"
/> />
<div class="thetopbox"> <div class="thetopbox">
<el-form ref="form" :model="queryParams" label-width="80px"> <el-form ref="form" :model="queryParams" label-width="90px">
<template v-if="activeName == 0"> <template v-if="activeName == 0">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
@ -64,22 +64,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4">
<el-form-item :label="'预售状态'" prop="preSaleStatus">
<el-select
v-model="queryParams.preSaleStatus"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="(item, index) in presaleStatusList"
:key="index"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'发货方式'" prop="deliveryWay"> <el-form-item :label="'发货方式'" prop="deliveryWay">
<el-select <el-select
@ -282,7 +267,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('选择产品')" prop="productIdList"> <el-form-item :label="$t('非在售商品')" prop="pkWaresList">
<el-input <el-input
v-model="productLists" v-model="productLists"
clearable clearable
@ -315,11 +300,6 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item :label="'原单号'" prop="code">
<el-input
v-model="queryParams.originalOrderCode"
/> </el-form-item></el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'创建日期'" prop="code"> <el-form-item :label="'创建日期'" prop="code">
<el-date-picker <el-date-picker
@ -1205,74 +1185,14 @@
<el-tab-pane v-if="menu3" name="2" :label="'立即发货'"> <el-tab-pane v-if="menu3" name="2" :label="'立即发货'">
<nowdelivery ref="nowdelivery" :params="queryParams" /> <nowdelivery ref="nowdelivery" :params="queryParams" />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<el-dialog <OutOfStockProductList
:title="'添加'" v-if="dialogVisible"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:close-on-click-modal="false" :selected="selectedProductList"
width="45%" @submit="handleSubmit"
center
:before-close="handleClose"
>
<div class="cpHeight">
<el-input
v-model="select.productName"
:placeholder="'请输入'"
prefix-icon="el-icon-search"
@keyup.enter.native="getDataList"
/> />
<div style="height: 10px" />
<el-table
ref="lessonTableRef"
:data="dialogList"
style="width: 100%"
:row-key="
(row) => {
return row.pkProduct;
}
"
:header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName"
@selection-change="dialogChange"
>
<el-table-column
type="selection"
:reserve-selection="true"
width="55"
/>
<el-table-column align="center" prop="cover" :label="'产品主图'">
<template slot-scope="scope">
<img class="bgImg" :src="scope.row.cover" alt="">
</template>
</el-table-column>
<el-table-column
align="center"
prop="productName"
:label="'产品名称'"
/>
<el-table-column
align="center"
prop="productCode"
:label="'产品编号'"
/>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getDataList"
/>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose">{{ '取消' }}</el-button>
<el-button type="primary" @click="onSubmit('form')">{{
'确认'
}}</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
@ -1286,14 +1206,16 @@ import nowdelivery from '@/components/Delivery/nowdelivery.vue'
import * as del from '@/api/delivery.js' import * as del from '@/api/delivery.js'
import { getvertexValue } from '@/api/member' import { getvertexValue } from '@/api/member'
import { getRouters } from '@/api/settle' import { getRouters } from '@/api/settle'
import { productList } from '@/api/product' import OutOfStockProductList from './components/OutOfStockProductList.vue'
export default { export default {
name: 'Fhqd', name: 'Fhqd',
components: { components: {
topBar, topBar,
unhandeled, unhandeled,
yihandeled, yihandeled,
nowdelivery nowdelivery,
OutOfStockProductList
}, },
data() { data() {
return { return {
@ -1309,7 +1231,7 @@ export default {
dialogList: [], dialogList: [],
lsArr: [], lsArr: [],
tableData: [], tableData: [],
productLists: [], productLists: '',
systemAllList: [ systemAllList: [
{ {
label: '是', label: '是',
@ -1368,7 +1290,7 @@ export default {
payTime: [], payTime: [],
printTime: [], // 2 printTime: [], // 2
deliverTime: [], // 2 deliverTime: [], // 2
productIdList: [], pkWaresList: [],
systemAll: 0 systemAll: 0
}, },
isActive: true, isActive: true,
@ -1385,7 +1307,8 @@ export default {
menu2: false, menu2: false,
menu3: false, menu3: false,
menu4: false, menu4: false,
vertexList: [] // vertexList: [], //
selectedProductList: []
} }
}, },
created() { created() {
@ -1395,84 +1318,15 @@ export default {
}, },
methods: { methods: {
clearProduct() { clearProduct() {
this.tableData = [] this.selectedProductList = []
this.lsArr = [] this.queryParams.pkWaresList = []
this.queryParams.productIdList = [] this.productLists = ''
this.productLists = []
}, },
openDig() { openDig() {
this.select = {}
productList(Object.assign({ isPutOn: 0 }, this.queryParams)).then(
(res) => {
res.rows.forEach((item) => {
item.quantity = 1
item.pkProduct = item.pkProduct
item.isGift = 0
})
this.dialogList = res.rows
this.total = res.total
}
)
this.dialogVisible = true this.dialogVisible = true
this.select = {}
}, },
handleClose() {
this.dialogVisible = false
},
getDataList() {
productList(
Object.assign({ isPutOn: 0 }, this.queryParams, this.select)
).then((res) => {
res.rows.forEach((item) => {
item.quantity = 1
item.pkProduct = item.pkProduct
item.isGift = 0
})
this.dialogList = res.rows
this.total = res.total
})
},
dialogChange(val) {
this.lsArr = val
},
onSubmit() {
// this.tableData = []
this.lsArr.forEach((item) => {
this.tableData.push(item)
})
// this.tableData = this.clearArr(this.tableData)
this.dialogVisible = false
this.dialogList.forEach((row) => {
this.$refs.lessonTableRef.toggleRowSelection(row, false)
})
//
const arr = this.tableData
let isTrue = false
for (var i = 0; i < arr.length; i++) {
//
for (var j = i + 1; j < arr.length; j++) {
//
if (arr[i].productCode == arr[j].productCode) {
if (arr[i].isGift == arr[j].isGift) {
isTrue = true
}
}
}
}
if (isTrue) {
this.$message.error('请勿选择重复的商品')
this.tableData = []
this.lsArr = []
this.queryParams.productIdList = []
this.productLists = []
return
}
this.queryParams.productIdList = []
this.productLists = []
this.tableData.forEach((item) => {
this.queryParams.productIdList.push(item.pkId)
this.productLists.push(item.productName)
})
},
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) { if (rowIndex % 2 == 1) {
return 'warning-row' return 'warning-row'
@ -1614,17 +1468,23 @@ export default {
}, },
// //
reChongzhi() { reChongzhi() {
this.selectedProductList = []
this.queryParams = { this.queryParams = {
pageNum: 1, pageNum: 1,
pageSize: 500, pageSize: 500,
orderStatus: 1 orderStatus: 1
} }
this.productLists = [] this.productLists = ''
this.getSearch() this.getSearch()
}, },
// //
changeActive() { changeActive() {
this.isActive = !this.isActive this.isActive = !this.isActive
},
handleSubmit(products) {
this.selectedProductList = [...products]
this.queryParams.pkWaresList = products.map((item) => item.pkId).join(',')
this.productLists = products.map((item) => item.waresName).join(',')
} }
} }
} }

View File

@ -105,14 +105,6 @@
</el-form> </el-form>
<div class="maintop"> <div class="maintop">
<div class="mainbtn"> <div class="mainbtn">
<el-button
v-hasButtons="['BonusDetailImport']"
size="small"
style="background-color: #ff6723"
class="thebtn2"
>
{{ '导入' }}
</el-button>
<el-button <el-button
v-hasButtons="['BonusDetailExport']" v-hasButtons="['BonusDetailExport']"
size="small" size="small"
@ -184,23 +176,30 @@
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="retailRangeIncomeOri" prop="retailRangeIncome"
width="130" width="130"
:label="$t('直推级差收益') + `(${isLocalSymbol()})`" :label="$t('直推级差收益')"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="repurRangeIncomeOri" prop="repurRangeIncome"
width="130" width="130"
:label="$t('复购级差收益') + `(${isLocalSymbol()})`" :label="$t('复购级差收益')"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="realIncomeTotalOri" prop="retailAreaIncome"
width="130"
:label="$t('复购配送收益')"
:formatter="stateFormat" :formatter="stateFormat"
:label="'实发收益总计' + `(${isLocalSymbol()})`" />
<el-table-column
align="center"
prop="realIncomeTotal"
:formatter="stateFormat"
:label="'实发收益总计'"
/> />
</el-table> </el-table>
</div> </div>

View File

@ -158,21 +158,26 @@
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="retailRangeIncomeOri" prop="retailRangeIncome"
:label="$t('直推级差收益') + `(${isLocalSymbol()})`" :label="$t('直推级差收益')"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="repurRangeIncomeOri" prop="repurRangeIncome"
:label="$t('复购级差收益') + `(${isLocalSymbol()})`" :label="$t('复购级差收益')"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="realIncomeTotalOri" prop="retailAreaIncome"
:label="$t('实发收益总计') + `(${isLocalSymbol()})`" :label="$t('复购配送收益')"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="realIncomeTotal"
:label="$t('实发收益总计')"
:formatter="stateFormat" :formatter="stateFormat"
/> />

View File

@ -0,0 +1,306 @@
<template>
<div class="page">
<topBar
v-if="topList.length > 0"
:top-list="topList"
:moren="defaultSelected"
/>
<div class="thetopbox">
<el-form label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item label="订单号" prop="orderCode">
<el-input v-model="select.orderCode" clearable />
</el-form-item>
</el-col>
<!-- <el-col :span="4">
<el-form-item label="产品名称" prop="productName">
<el-input v-model="select.productName" clearable />
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="时间范围" prop="timeRange">
<el-date-picker
v-model="timeRange"
value-format="yyyy-MM-dd"
type="daterange"
clearable
:range-separator="'至'"
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
@change="timeRangeHandleChange"
/>
</el-form-item>
</el-col>
<el-col :span="4">
<div class="searchbox">
<el-button
class="my_search"
@click="
() => {
getSearch();
resetPageNum();
}
"
>
{{ '搜索' }}</el-button>
<el-button class="my_reset" @click="resetHandle">
{{ '重置' }}</el-button>
</div>
</el-col>
</el-row>
</el-form>
</div>
<div class="main">
<div class="maintop" />
<div class="maintable">
<el-table
v-loading="loading"
:data="tableData"
height="700px"
style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }"
@selection-change="handleSelectionChange"
>
<el-table-column
align="center"
prop="orderCode"
label="订单号"
width="180px"
/>
<el-table-column
align="center"
prop="orderProductDetail"
label="产品明细列表"
>
<template slot-scope="scope">
<div v-for="item in scope.row.orderProductDetail" :key="item.pkId">
<span style="font-size: 12px;">仓储编号{{ item.wmsCode }} </span>
<span style="margin-left: 8px; font-size: 12px;">变动数量{{ item.changeNum }}</span>
</div>
</template>
</el-table-column>
<el-table-column
align="center"
prop="statusVal"
label="同步状态"
width="80px"
/>
<el-table-column
align="center"
prop="creationTime"
label="创建时间"
width="170px"
/>
<el-table-column
align="center"
prop="colsele"
label="操作"
width="100px"
>
<template slot-scope="scope">
<el-button
v-if="scope.row.status === 1"
v-hasButtons="['WholeNetworkOrderSyncFailUpdate']"
type="text"
size="small"
style="color: #48b2fd; padding: 0"
@click="handleProcessed(scope.row)"
>
手动处理
</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getSearch"
/>
</div>
</template>
<script>
import { getOrderSyncFailList, updateOrderSyncStatus } from '@/api/wholeNetwork/orderSync'
import topBar from '@/components/topBar'
const initSearch = {
ordeCode: ''
}
export default {
name: 'WholeNetworkOrderSyncFail',
components: {
topBar
},
data() {
return {
defaultSelected: 'orderSyncFail',
topList: [
{
name: '同步失败订单',
path: 'orderSyncFail'
}
],
tableData: [],
loading: false,
queryParams: {
pageNum: 1,
pageSize: 50
},
timeRange: [
],
select: {
...initSearch
},
total: 0,
multipleSelection: [],
updateDialogVisible: false,
isEdit: false,
productInfo: {
remark: ''
},
updateInventoryVisible: false,
inventoryInfo: {
inventory: ''
}
}
},
created() {
this.getSearch()
},
methods: {
handleProcessed({ pkId }) {
this.$confirm('是否确认手动处理该订单?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then((_) => {
updateOrderSyncStatus({ pkId, status: 0 }).then((res) => {
if (res.code === 200) {
this.$message.success('手动处理成功')
this.getSearch()
}
})
})
},
handleSelectionChange(val) {
this.multipleSelection = val
},
timeRangeHandleChange(timeRange) {
this.queryParams.startDate = timeRange?.[0] || null
this.queryParams.endDate = timeRange?.[1] || null
},
resetHandle() {
this.queryParams = {
pageNum: 1,
pageSize: 50
}
this.timeRange = []
this.select = {
...initSearch
}
this.getSearch()
},
getSearch() {
this.loading = true
const params = {
...this.queryParams,
...this.select
}
getOrderSyncFailList(params).then((res) => {
this.loading = false
if (res.code === 200) {
this.tableData = res.rows
this.total = res.total
}
})
},
resetPageNum() {
this.queryParams.pageNum = 1
}
}
}
</script>
<style lang="scss" scoped>
::v-deep .el-image-viewer__close {
right: 500px;
}
::v-deep .dizhi .el-cascader {
width: 100%;
}
::v-deep .el-range-editor.el-input__inner {
width: 100%;
}
::v-deep .el-table thead {
color: #000000;
}
::v-deep .el-table .warning-row {
background: #f9f9f9;
}
.page {
padding: 10px 20px;
background: #f9f9f9;
font-size: 14px;
.thetopbox {
padding: 15px 20px 15px 0;
background: #ffffff;
border-radius: 8px;
.searchbox {
display: flex;
align-items: center;
margin-left: 40px;
}
.searchtitle {
margin-right: 10px;
}
.searchbtn {
background: #08143f;
color: #ffffff;
}
}
.main {
//margin-top: 20px;
background: #f9f9f9;
//border-radius: 8px;
//box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
.maintop {
display: flex;
// padding: 10px 0;
justify-content: space-between;
align-items: center;
.mainbtn {
.thebtn1 {
color: #ffffff;
background: #ffad41;
width: 68px;
height: 32px;
}
.thebtn2 {
color: #ffffff;
background: #009b58;
width: 68px;
height: 32px;
}
.thebtn3 {
color: #ffffff;
background: #c8161d;
width: 68px;
height: 32px;
}
}
}
}
}
</style>

View File

@ -0,0 +1,15 @@
<template>
<div>
<el-empty description="开发中..." />
</div>
</template>
<script>
export default {
name: 'WholeNetworkProductManageSummary'
}
</script>
<style>
</style>