angelo
/
web-retail-admin
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of 47.94.45.65:angelo/web-retail-admin into base-online

This commit is contained in:
woody 2025-07-22 09:42:20 +08:00
parent 24ca54c3ef fcb527e472
commit cd21b7923c
8 changed files with 397 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/api/product.js
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'
}) })
} }
// 商品新增 // 商品新增
@ -496,7 +496,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 +527,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'
}) })
} }
@ -555,7 +555,7 @@ export function postageDetail(params) {
params params
}) })
} }
//获取产品编号 // 获取产品编号
export function getProductCode(params) { export function getProductCode(params) {
return request({ return request({
url: '/sale/manage/product/create-product-code', url: '/sale/manage/product/create-product-code',
@ -563,7 +563,7 @@ export function getProductCode(params) {
params params
}) })
} }
//获取产品编号 // 获取产品编号
export function getWaresCode(params) { export function getWaresCode(params) {
return request({ return request({
url: '/sale/manage/wares/create-wares-code', url: '/sale/manage/wares/create-wares-code',
@ -571,7 +571,7 @@ export function getWaresCode(params) {
params params
}) })
} }
//获取最大排序 // 获取最大排序
export function getMaxSort(params) { export function getMaxSort(params) {
return request({ return request({
url: '/sale/manage/product/get-max-sort', url: '/sale/manage/product/get-max-sort',
@ -579,7 +579,7 @@ export function getMaxSort(params) {
params params
}) })
} }
//单位列表 // 单位列表
export function unitList(params) { export function unitList(params) {
return request({ return request({
url: '/sale/manage/unit/list', url: '/sale/manage/unit/list',
@ -587,7 +587,7 @@ export function unitList(params) {
params params
}) })
} }
//单位新增 // 单位新增
export function unitSave(data) { export function unitSave(data) {
return request({ return request({
url: '/sale/manage/unit/save', url: '/sale/manage/unit/save',
@ -595,7 +595,7 @@ export function unitSave(data) {
data data
}) })
} }
//单位编辑 // 单位编辑
export function unitUpdate(data) { export function unitUpdate(data) {
return request({ return request({
url: '/sale/manage/unit/update', url: '/sale/manage/unit/update',
@ -603,7 +603,7 @@ export function unitUpdate(data) {
data data
}) })
} }
//单位详情 // 单位详情
export function unitDetail(params) { export function unitDetail(params) {
return request({ return request({
url: '/sale/manage/unit/detail', url: '/sale/manage/unit/detail',
@ -615,11 +615,11 @@ 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'
}) })
} }
//单位data // 单位data
export function unitAll(params) { export function unitAll(params) {
return request({ return request({
url: '/sale/manage/unit/find-all', url: '/sale/manage/unit/find-all',
@ -741,14 +741,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 +766,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({

38
src/views/configManage/systemconfiguration/index.vue
View File

@ -220,6 +220,11 @@
<el-input v-model="formd.sort" clearable /> <el-input v-model="formd.sort" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item label="分享图片">
<imageUpload v-model="formd.sharePosterImage" />
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -236,6 +241,7 @@
<script> <script>
import topBar from '@/components/topBar/checked.vue' import topBar from '@/components/topBar/checked.vue'
import ImageUpload from '@/components/ImageUpload'
import { import {
getvertexList, getvertexList,
deleteVertex, deleteVertex,
@ -249,10 +255,13 @@ import {
import { updateVertexs } from '@/api/settle' import { updateVertexs } from '@/api/settle'
import { getRouters } from '@/api/settle' import { getRouters } from '@/api/settle'
import { topList } from './mixins' import { topList } from './mixins'
import { getToken } from '@/utils/auth'
export default { export default {
name: 'Txpz', name: 'Txpz',
components: { components: {
topBar topBar,
ImageUpload
}, },
data() { data() {
return { return {
@ -260,7 +269,8 @@ export default {
vertexName: '', // 体系名称 vertexName: '', // 体系名称
// memberCode: "", //体系编号 // memberCode: "", //体系编号
memberCode: '', // 体系编号 memberCode: '', // 体系编号
regionVertexPkId: '' // 区域分组 regionVertexPkId: '', // 区域分组
sharePosterImage: '' // 分享图片
}, },
moren: 'txpz', moren: 'txpz',
topList: topList, topList: topList,
@ -291,7 +301,12 @@ export default {
] ]
}, },
vertexList: [], vertexList: [],
groupList: [] groupList: [],
uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload',
fileList: [],
headers: {
Authorization: getToken()
}
} }
}, },
created() { created() {
@ -301,6 +316,23 @@ export default {
this.getUserRoute() this.getUserRoute()
}, },
methods: { methods: {
handleUploadSuccess(res) {
if (res.code === 200) {
this.fileList.push(res.data)
} else {
this.$message({
type: 'error',
message: '上传失败'
})
}
},
removeFile(file, fileList) {
this.fileList.forEach((item, index) => {
if (file.uid === item.uid) {
this.fileList.splice(index, 1)
}
})
},
getUserRoute() { getUserRoute() {
getRouters().then((res) => { getRouters().then((res) => {
console.log(res.data, 'res.data', this.topList) console.log(res.data, 'res.data', this.topList)

470
src/views/financial/onlinePayDetails/index.vue
View File

@ -6,228 +6,300 @@
--> -->
<template> <template>
<div class="page"> <div class="page">
<topBar v-if="topList.length > 0" <topBar
:topList="topList" v-if="topList.length > 0"
:moren="moren"></topBar> :top-list="topList"
:moren="moren"
/>
<div class="main"> <div class="main">
<el-form ref="select" <el-form
:model="select" ref="select"
style="background-color: #fff" :model="select"
label-width="100px"> style="background-color: #fff"
label-width="100px"
>
<el-row> <el-row>
<!-- 一层 --> <!-- 一层 -->
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'会员编号'"> <el-form-item :label="'会员编号'">
<el-input clearable <el-input
v-model="select.memberCode"></el-input> v-model="select.memberCode"
clearable
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'会员姓名'"> <el-form-item :label="'会员姓名'">
<el-input clearable <el-input
v-model="select.memberName"></el-input> v-model="select.memberName"
clearable
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'交易金额'"> <el-form-item :label="'交易金额'">
<el-input clearable <el-input
v-model="select.businessMoney"></el-input> v-model="select.businessMoney"
clearable
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'交易类型'"> <el-form-item :label="'交易类型'">
<el-select clearable <el-select
:placeholder="'请选择'" v-model="select.businessType"
v-model="select.businessType"> clearable
<el-option v-for="item in tradeTypeList" :placeholder="'请选择'"
:key="item.value" >
:label="item.label" <el-option
:value="item.value"></el-option> v-for="item in tradeTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="订单类型">
<el-select
v-model="select.orderType"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in orderTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'支付渠道'"> <el-form-item :label="'支付渠道'">
<el-select clearable <el-select
:placeholder="'请选择'" v-model="select.payChannel"
v-model="select.payChannel"> clearable
<el-option v-for="item in channelList" :placeholder="'请选择'"
:key="item.value" >
:label="item.label" <el-option
:value="item.value"></el-option> v-for="item in channelList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'支付方式'"> <el-form-item :label="'支付方式'">
<el-select clearable <el-select
:placeholder="'请选择'" v-model="select.payType"
v-model="select.payType"> clearable
<el-option v-for="item in peyTypeList" :placeholder="'请选择'"
:key="item.value" >
:label="item.label" <el-option
:value="item.value"></el-option> v-for="item in peyTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'支付状态'"> <el-form-item :label="'支付状态'">
<el-select clearable <el-select
:placeholder="'请选择'" v-model="select.payStatus"
v-model="select.payStatus"> clearable
<el-option v-for="item in statusList" :placeholder="'请选择'"
:key="item.value" >
:label="item.label" <el-option
:value="item.value"></el-option> v-for="item in statusList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'单据编号'"> <el-form-item :label="'单据编号'">
<el-input clearable <el-input
v-model="select.businessCode"></el-input> v-model="select.businessCode"
clearable
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'下单日期'"> <el-form-item :label="'下单日期'">
<el-date-picker v-model="select.creationTime" <el-date-picker
value-format="yyyy-MM-dd" v-model="select.creationTime"
type="daterange" value-format="yyyy-MM-dd"
:range-separator="'至'" type="daterange"
:start-placeholder="'开始日期'" :range-separator="'至'"
:end-placeholder="'结束日期'"> :start-placeholder="'开始日期'"
</el-date-picker> :end-placeholder="'结束日期'"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'支付日期'"> <el-form-item :label="'支付日期'">
<el-date-picker v-model="select.payTime" <el-date-picker
@change="changeTime1" v-model="select.payTime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" type="daterange"
:range-separator="'至'" :range-separator="'至'"
:start-placeholder="'开始日期'" :start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"> :end-placeholder="'结束日期'"
</el-date-picker> @change="changeTime1"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-button class="my_search" <el-button
style="margin-left: 30px" class="my_search"
@click="getDataList"> {{ '搜索' }}</el-button> style="margin-left: 30px"
@click="getDataList"
> {{ '搜索' }}</el-button>
<el-button class="my_reset" @click="reset"> {{ '重置' }}</el-button> <el-button class="my_reset" @click="reset"> {{ '重置' }}</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="maintop"> <div class="maintop">
<div class="mainbtn"> <div class="mainbtn">
<el-button size="small" <el-button
@click="handleExport" v-has-buttons="['OnlinePayDetailsExport']"
v-has-buttons="['OnlinePayDetailsExport']" size="small"
class="thebtn2"> {{ '导出' }}</el-button> class="thebtn2"
@click="handleExport"
> {{ '导出' }}</el-button>
</div> </div>
</div> </div>
<div class="maintable"> <div class="maintable">
<el-table :data="tableData" <el-table
height="640px" :data="tableData"
style="width: 100%" height="640px"
:header-cell-style="{ background: '#EEEEEE' }" style="width: 100%"
:row-class-name="tableRowClassName" :header-cell-style="{ background: '#EEEEEE' }"
@selection-change="handleSelectionChange"> :row-class-name="tableRowClassName"
<el-table-column type="selection" @selection-change="handleSelectionChange"
width="55"> </el-table-column> >
<!-- <el-table-column align="center"--> <el-table-column
<!-- prop="title"--> type="selection"
<!-- :label="'国家'">--> width="55"
<!-- <template slot-scope="scope">--> />
<!-- <div class="tem">--> <!-- <el-table-column align="center"-->
<!-- <img :src="scope.row.pkCountryIcon"--> <!-- prop="title"-->
<!-- alt="" />--> <!-- :label="'国家'">-->
<!-- &lt;!&ndash; <div>{{ scope.row.pkCountryName }}</div> &ndash;&gt;--> <!-- <template slot-scope="scope">-->
<!-- </div>--> <!-- <div class="tem">-->
<!-- </template>--> <!-- <img :src="scope.row.pkCountryIcon"-->
<!-- </el-table-column>--> <!-- alt="" />-->
<el-table-column align="center" <!-- &lt;!&ndash; <div>{{ scope.row.pkCountryName }}</div> &ndash;&gt;-->
prop="memberCode" <!-- </div>-->
:label="'会员编号'" <!-- </template>-->
width="140"> <!-- </el-table-column>-->
</el-table-column> <el-table-column
<el-table-column align="center" align="center"
prop="memberName" prop="memberCode"
:label="'会员姓名'"> :label="'会员编号'"
</el-table-column> width="140"
<el-table-column align="center" />
prop="phone" <el-table-column
label="联系方式" align="center"
width="140"> prop="memberName"
</el-table-column> :label="'会员姓名'"
<el-table-column align="center" />
prop="businessTypeVal" <el-table-column
:label="'交易类型'"> align="center"
</el-table-column> prop="phone"
<el-table-column align="center" label="联系方式"
prop="businessMoney" width="140"
:formatter="stateFormat" />
:label="'交易金额'+`(${isLocalSymbol()})`" <el-table-column
width="150"> align="center"
</el-table-column> prop="businessTypeVal"
<el-table-column align="center" :label="'交易类型'"
prop="payMoney" />
:formatter="stateFormat" <el-table-column
label="实际支付金额(¥)" align="center"
width="150"> prop="orderTypeVal"
</el-table-column> label="订单类型"
<!-- <el-table-column align="center" />
prop="payMoney" <el-table-column
:formatter="stateFormat" align="center"
:label="'交易金额'+`(${isLocals()})`" width="150"> prop="businessMoney"
</el-table-column> :formatter="stateFormat"
<el-table-column align="center" :label="'交易金额'"
:formatter="stateFormat" width="150"
prop="settleTradeBalance" />
label="实际支付金额($)" width="150"> <el-table-column
</el-table-column> align="center"
<el-table-column align="center" prop="payMoney"
prop="exchangeRate" :formatter="stateFormat"
:label="'汇率'"> label="实际支付金额"
</el-table-column> --> width="150"
/>
<el-table-column align="center" <el-table-column
prop="payChannelVal" align="center"
:label="'支付渠道'"> prop="payChannelVal"
</el-table-column> :label="'支付渠道'"
<el-table-column align="center" />
prop="payTypeVal" <el-table-column
:label="'支付方式'"> align="center"
</el-table-column> prop="payTypeVal"
<el-table-column align="center" :label="'支付方式'"
prop="payStatusVal" />
:label="'支付状态'"> <el-table-column
</el-table-column> align="center"
<el-table-column align="center" prop="payStatusVal"
prop="creationTime" :label="'支付状态'"
:label="'下单日期'" />
width="180"> <el-table-column
</el-table-column> align="center"
<el-table-column align="center" prop="creationTime"
prop="payTime" :label="'下单日期'"
:label="'支付日期'" width="180"
width="180"> />
</el-table-column> <el-table-column
<el-table-column align="center" align="center"
prop="businessCode" prop="payTime"
min-width="180px" :label="'支付日期'"
:label="'单据编号'"> width="180"
</el-table-column> />
<el-table-column align="center" <el-table-column
prop="time" align="center"
:label="'操作'" prop="businessCode"
fixed="right"> :label="'单据编号'"
/>
<el-table-column
align="center"
prop="mainAccountMoney"
label="主账户金额"
width="150"
/>
<el-table-column
align="center"
prop="subAccountMoney"
label="子账户金额"
width="150"
/>
<el-table-column
align="center"
prop="time"
:label="'操作'"
fixed="right"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="toFixed(scope.row.pkId)" <el-button
style="color: #ffad41" style="color: #ffad41"
type="text" type="text"
size="small"> size="small"
@click="toFixed(scope.row.pkId)"
>
{{ '导出' }} {{ '导出' }}
</el-button> </el-button>
</template> </template>
@ -235,11 +307,13 @@
</el-table> </el-table>
</div> </div>
</div> </div>
<pagination v-show="total>0" <pagination
:total="total" v-show="total>0"
:page.sync="queryParams.pageNum" :total="total"
:limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum"
@pagination="getDataList" /> :limit.sync="queryParams.pageSize"
@pagination="getDataList"
/>
</div> </div>
</template> </template>
@ -251,25 +325,27 @@ import { userCountryList } from '@/api/user'
export default { export default {
name: 'Bzpz', name: 'Bzpz',
components: { components: {
topBar, topBar
}, },
filters: { filters: {
isAgree(val) { isAgree(val) {
if (!val) { if (!val) {
return '允许'; return '允许'
} else { } else {
return '禁止'; return '禁止'
} }
}, }
}, },
data() { data() {
return { return {
creationTime: [], creationTime: [],
select: {}, select: {
orderType: ''
},
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50
}, },
total: 0, total: 0,
dialogVisible: false, dialogVisible: false,
@ -280,26 +356,48 @@ export default {
peyTypeList: [ peyTypeList: [
{ {
value: '1', value: '1',
label: '支付宝', label: '支付宝'
}, },
{ {
value: '2', value: '2',
label: '微信', label: '微信'
}, },
{ {
value: '3', value: '3',
label: '银行卡', label: '银行卡'
}
],
orderTypeList: [
{
value: '-1',
label: '充值订单'
}, },
{
value: '1',
label: '注册订单'
},
{
value: '2',
label: '升级订单'
},
{
value: '3',
label: '复购订单'
},
{
value: '10',
label: '重消订单'
}
], ],
tradeTypeList: [], tradeTypeList: [],
moren: 'onlinePayDetails', moren: 'onlinePayDetails',
topList: [ topList: [
{ {
name: '在线支付明细', name: '在线支付明细',
path: 'onlinePayDetails', path: 'onlinePayDetails'
}, }
], ],
countryList: [], countryList: []
} }
}, },
mounted() { mounted() {
@ -329,7 +427,7 @@ export default {
// this.select.startDate = val[0] // this.select.startDate = val[0]
// this.select.endDate = val[1] // this.select.endDate = val[1]
}, },
reset(){ reset() {
this.select = {} this.select = {}
this.getDataList() this.getDataList()
}, },
@ -359,10 +457,10 @@ export default {
handleSelectionChange(val) {}, handleSelectionChange(val) {},
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.$confirm( '是否确认导出所有数据项?', '警告', { this.$confirm('是否确认导出所有数据项?', '警告', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning'
}).then((_) => { }).then((_) => {
this.download( this.download(
'/pay/manage/online-payment/export', '/pay/manage/online-payment/export',
@ -378,8 +476,8 @@ export default {
return 'success-row' return 'success-row'
} }
return '' return ''
}, }
}, }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

18
src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
View File

@ -335,15 +335,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="商品排序" prop="sortStatus"> <el-form-item label="商品排序" prop="sort">
<el-select v-model="form.sortStatus" clearable> <el-input-number
<el-option v-model="form.sort"
v-for="item in sortList" style="width: 100%"
:key="item.value" clearable
:label="item.label" :placeholder="'请输入'"
:value="item.value" :max="99999"
/> :controls="false"
</el-select> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">

7
src/views/goodsManage/goodsList/index.vue
View File

@ -287,6 +287,7 @@
:label="'排序'" :label="'排序'"
> >
</el-table-column> --> </el-table-column> -->
<el-table-column align="center" prop="cover" :label="'商品主图'"> <el-table-column align="center" prop="cover" :label="'商品主图'">
<template slot-scope="scope"> <template slot-scope="scope">
<img class="bgImg" :src="scope.row.cover" alt=""> <img class="bgImg" :src="scope.row.cover" alt="">
@ -588,6 +589,12 @@
width="120" width="120"
label="下架时间" label="下架时间"
/> />
<el-table-column
align="center"
prop="sort"
width="120"
label="商品排序"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="time" prop="time"

22
src/views/goodsManage/goodsRelease/jcsz.vue
View File

@ -297,15 +297,23 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="商品排序" prop="sortStatus"> <el-form-item label="商品排序" prop="sort">
<el-select v-model="form.sortStatus" clearable> <!-- <el-select v-model="form.sortStatus" clearable>
<el-option <el-option
v-for="item in sortList" v-for="item in sortList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
/> />
</el-select> </el-select> -->
<el-input-number
v-model="form.sort"
style="width: 100%"
clearable
:placeholder="'请输入'"
:max="99999"
:controls="false"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -1026,9 +1034,17 @@ export default {
// 获取极差列表 // 获取极差列表
this.getRangeList() this.getRangeList()
this.getMaxSortNum()
}, },
methods: { methods: {
isLocals, isLocals,
getMaxSortNum() {
api.getMaxSortNum().then((res) => {
if (res.code === 200) {
this.$set(this.form, 'sort', res.data)
}
})
},
getOther() { getOther() {
api.get_sort().then((res) => { api.get_sort().then((res) => {
this.sortList = res.data this.sortList = res.data

74
src/views/goodsManage/productRelease/jcsz.vue
View File

@ -366,70 +366,7 @@
{{ '确认' }}</el-button> {{ '确认' }}</el-button>
</div> </div>
</div> </div>
<!-- 产品弹框 -->
<el-dialog
:title="'添加'"
:visible.sync="dialogVisible"
:close-on-click-modal="false"
width="50%"
center
:before-close="handleClose1"
>
<div class="cpHeight">
<el-row>
<el-col :span="22">
<el-input
v-model="select.query"
clearable
:placeholder="'请输入'"
prefix-icon="el-icon-search"
@keyup.enter.native="getProduct"
/>
</el-col>
<el-col :span="2">
<el-button type="primary" size="small" @click="getProduct">
{{ '搜索' }}</el-button>
</el-col>
</el-row>
<div style="height: 10px" />
<el-table
ref="multipleTable"
:data="productList"
height="500px"
style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName"
@select-all="onSelectAll"
@select="selected"
>
<el-table-column type="selection" width="55" />
<el-table-column
align="center"
prop="productName"
:label="'产品名称'"
/>
<el-table-column
align="center"
prop="productCode"
:label="'产品编号'"
/>
<el-table-column align="center" prop="unitStr" :label="'单位'" />
</el-table>
</div>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getProduct"
/>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose1">{{ '取消' }}</el-button>
<el-button type="primary" @click="sureProduct">{{
'确认'
}}</el-button>
</span>
</el-dialog>
<!-- 规格 --> <!-- 规格 -->
<el-dialog <el-dialog
:title="'添加'" :title="'添加'"
@ -659,7 +596,7 @@ export default {
// 获取排序 // 获取排序
this.getSort() this.getSort()
// 获取产品 // 获取产品
this.getProduct() // this.getProduct()
}, },
methods: { methods: {
sureProduct() { sureProduct() {
@ -682,12 +619,7 @@ export default {
opProduct() { opProduct() {
this.dialogVisible = true this.dialogVisible = true
}, },
getProduct() {
api.productFind1(Object.assign({}, this.queryParams, this.select)).then((res) => {
this.productList = res.rows
this.total = res.total
})
},
getRepurchaseType() { getRepurchaseType() {
api.repurchaseType().then((res) => { api.repurchaseType().then((res) => {
this.repurchaseTypeList = res.data this.repurchaseTypeList = res.data

76
src/views/goodsManage/productRelease/productDetail.vue
View File

@ -519,70 +519,7 @@
> {{ '确认' }}</el-button> > {{ '确认' }}</el-button>
</div> </div>
</div> </div>
<!-- 产品弹框 -->
<el-dialog
:title="'添加'"
:visible.sync="dialogVisible"
:close-on-click-modal="false"
width="50%"
center
:before-close="handleClose1"
>
<div class="cpHeight">
<el-row>
<el-col :span="22">
<el-input
v-model="select.query"
clearable
:placeholder="'请输入'"
prefix-icon="el-icon-search"
@keyup.enter.native="getProduct"
/>
</el-col>
<el-col :span="2">
<el-button type="primary" size="small" @click="getProduct">
{{ '搜索' }}</el-button>
</el-col>
</el-row>
<div style="height: 10px" />
<el-table
ref="multipleTable"
:data="productList"
height="500px"
style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName"
@select-all="onSelectAll"
@select="selected"
>
<el-table-column type="selection" width="55" />
<el-table-column
align="center"
prop="productName"
:label="'产品名称'"
/>
<el-table-column
align="center"
prop="productCode"
:label="'产品编号'"
/>
<el-table-column align="center" prop="unitStr" :label="'单位'" />
</el-table>
</div>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getProduct"
/>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose1">{{ '取消' }}</el-button>
<el-button type="primary" @click="sureProduct">{{
'确认'
}}</el-button>
</span>
</el-dialog>
<!-- 规格 --> <!-- 规格 -->
<el-dialog <el-dialog
:title="'添加'" :title="'添加'"
@ -824,7 +761,6 @@ export default {
this.getTransportType() this.getTransportType()
// 复购类型 // 复购类型
this.getRepurchaseType() this.getRepurchaseType()
this.getProduct()
}, },
methods: { methods: {
sureProduct() { sureProduct() {
@ -844,15 +780,7 @@ export default {
handleClose1() { handleClose1() {
this.dialogVisible = false this.dialogVisible = false
}, },
opProduct() {
this.dialogVisible = true
},
getProduct() {
api.productFind1(Object.assign({}, this.queryParams, this.select)).then((res) => {
this.productList = res.rows
this.total = res.total
})
},
getRepurchaseType() { getRepurchaseType() {
api.repurchaseType().then((res) => { api.repurchaseType().then((res) => {
this.repurchaseTypeList = res.data this.repurchaseTypeList = res.data