提交 fdadc602 authored 作者: huaxinzhu's avatar huaxinzhu

云仓2.2部分

上级 660f2894
......@@ -227,9 +227,9 @@
}
}
};
xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境
// xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境
// xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发
// xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
xhttp.send();
}
</script>
......
import request from '@/utils/request'
// 查询bankcard列表
// export function listBankcard(query) {
// return request({
// url: '/system/bankcard/list',
// method: 'get',
// params: query
// })
// }
// 查询银行名称列表
// export function listBankname(query) {
// return request({
// url: '/system/bankcard/getBankList',
// method: 'get',
// params: query
// })
// }
// 查询bankcard详细
// export function getBankcard (id) {
// return request({
// url: '/system/bankcard/edit?id='+id,
// method: 'get'
// })
// }
// 修改bankcard
// export function updateBankcard(data) {
// return request({
// url: '/system/bankcard/edit',
// method: 'post',
// data: data
// })
// }
// 删除bankcard
// export function delBankcard(ids) {
// return request({
// url: '/system/bankcard/delete',
// method: 'delete',
// data:{id:ids}
// })
// }
// 我的资产 页面 所有数据
export function getMyAssetListData(data) {
return request({
......@@ -53,6 +9,15 @@ export function getMyAssetListData(data) {
})
}
// 获取 提现等权限 getPurviewData
export function getPurviewData(query) {
return request({
url: '/local/getOrganization',
method: 'get',
params: query
})
}
// 获取 主体信息
export function getOrganizationData(query) {
return request({
......
......@@ -3,8 +3,8 @@ import request from '@/utils/request'
// 获取渠道id
export function indexInfo(params) {
return request({
url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
// url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
// url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
// url: 'http://newsys.jxhh.com/api/v1/oem/webSite/domainChannel',
method: 'get',
params
......@@ -13,8 +13,8 @@ export function indexInfo(params) {
// 获取所有域名
export function getdomain(params) {
return request({
url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
// url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
// url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
// url: 'http://newsys.jxhh.com/api/v1/oem/channel/domainFront',
method: 'get',
params
......@@ -23,8 +23,8 @@ export function getdomain(params) {
// 获取官网设置接口
export function webSite(params) {
return request({
url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
// url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
// url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
// url: 'http://newsys.jxhh.com/api/v1/oem/common/counsel',
method: 'get',
params
......@@ -34,8 +34,8 @@ export function webSite(params) {
// 云仓所有列表——Banner和域名/产品和服务/供应商入驻
export function getallCloudList(params) {
return request({
url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
// url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
// url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
// url: 'http://newsys.jxhh.com/api/v1/oem/front/CloudList',
method: 'get',
params
......@@ -44,8 +44,8 @@ export function getallCloudList(params) {
//获取sso域名
export function getssoUrl(data) {
return request({
url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
// url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
// url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
// url: 'http://newsys.jxhh.com/api/v1/oem/webSite/ssoChannel',
method: 'get',
params: data
......
......@@ -32,8 +32,9 @@
</dl>
</div>
</div>
<div class="row-flex-center">
<el-button type="primary" size="small" style="padding: 10px 30px; margin: 20px 0 40px;" @click="handleWithdraw">提 现</el-button>
<div class="row-flex-center" style="margin: 0 0 20px;">
<el-button :disabled="isAllowWithdraw" type="primary" size="small" style="padding: 10px 30px; margin: 20px 0;" @click="handleWithdraw">提 现</el-button>
<span v-if="isAllowWithdraw" class="spe-tip"><i class="el-icon-warning h-warning"></i>温馨提示:您的账户被禁止提现,请联系工作人员</span>
</div>
<!-- 账号管理 -->
......@@ -67,10 +68,6 @@
</div>
</div>
<!-- <div class="row-flex-center">-->
<!-- <el-button type="primary" size="small" style="padding: 10px 30px; margin: 20px 40px 40px 0;">编 辑</el-button>-->
<!-- <el-button type="primary" size="small" style="padding: 10px 30px; margin: 20px 0 40px;">删 除</el-button>-->
<!-- </div>-->
</el-card>
<!-- 添加、编辑 银行卡 信息 -->
......@@ -129,7 +126,7 @@
</template>
<script>
import { getMyAssetListData,getOrganizationData, getBankDetailsData,getBankcardListData, addBankcardData,editBankcardData ,delBankcardData } from '@/api/module/bankcard'
import { getPurviewData,getMyAssetListData,getOrganizationData, getBankDetailsData,getBankcardListData, addBankcardData,editBankcardData ,delBankcardData } from '@/api/module/bankcard'
export default {
name: "Index",
data() {
......@@ -138,6 +135,7 @@
currentBalance: 0,
withdrawalBalance: 0,
withdrawalProgress: 0,
isAllowWithdraw: false, // 能否操作提现,sys可设置
bankcardList: [],
addBankcardInfoDialog: false,
bankcardTitle: '',
......@@ -165,8 +163,18 @@
this.getBankcardList()
/** 获取主体信息 */
this.getOrganization();
/** 获取 提现等操作权限 */
this.getPurview();
},
methods: {
/** 获取 提现等操作权限 */
getPurview() {
getPurviewData().then(res=> {
if (res.code == 1) {
//this.isAllowWithdraw = res.data.is_allow_withdraw;
}
});
},
/** 我的资产 所有数据 */
getMyAssetList() {
getMyAssetListData( {seller_id:this.seller_id} ).then(res=> {
......@@ -446,12 +454,22 @@
left: calc(50% - 26px);
}
.spe-tip {
font-size: 12px;
color: #909399;
padding: 0 0 0 10px;
}
.h-warning:before {
color: #e3c300;
padding: 0 3px;
}
/* el-card title hxz 样式统一 end */
.row-flex-center {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
text-align: center;
}
.row-flex-space-around {
......@@ -493,15 +511,6 @@
box-shadow :0 2px 10px 0 rgba(0,0,0,0.05);
}
/*.card-con:hover {*/
/* box-shadow :0 2px 10px 0 rgba(0,0,0,0.1);*/
/*}*/
/* 点击效果 */
.checked-bankcard {
}
.card-name {
height: 60px;
line-height: 60px;
......
<template>
<div class="app-container">
<el-card class="box-card">
<el-card class="box-card goods-manage-card">
<div slot="header" class="clearfix">
<el-radio-group v-model="radiomodel" class="radiomodels" @change="radiomodelbtn">
<el-radio-button :label="1">上架销售中({{onsale_count}}</el-radio-button>
......@@ -23,7 +23,6 @@
<el-option label="全部" value="5" v-if='radiomodel==3'></el-option>
<el-option label="审核中" value="1" v-if='radiomodel==3'></el-option>
<el-option label="审核拒绝" value="2" v-if='radiomodel==3'></el-option>
</el-select>
</el-form-item>
<el-form-item label="发布时间">
......@@ -101,15 +100,24 @@
@click="handledelsale('9','return','all')"
>批量还原
</el-button>
<el-button
v-if='radiomodel==3'
:disabled="multiple"
style="float:right;margin-left: 20px;align-items:normal"
type="primary"
size="mini"
@click="handleCancelUpale"
>批量取消申请上架
</el-button>
</div>
</el-col>
</el-row>
</el-form>
<el-table v-loading="loading" :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="freightList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="商品主图" width="95" align="center">
<template slot-scope="scope">
<img :src="scope.row.default_image" alt="" style="width:80px;height:80px;">
<img :src="scope.row.default_image" alt="" style="width:60px;height:60px;">
</template>
</el-table-column>
<el-table-column label="商品编号" align="center" prop="goods_id"/>
......@@ -135,6 +143,7 @@
</template>
</el-table-column>
<el-table-column label="发布时间" align="center" :formatter="formatTime" prop="add_time"/>
<el-table-column label="审核说明" align="center" prop="shsm" width="240px"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<div v-if='radiomodel==3&&scope.row.up_onsale===1'>
......@@ -248,8 +257,8 @@
price_min: '',
price_max: ''
},
fullHeight: 0,
tableHeight: 0,
// fullHeight: 0,
// tableHeight: 0,
// 遮罩层
loading: false,
// 选中数组
......@@ -302,17 +311,17 @@
this.radiomodel = Number(this.$route.query.goodsStatus);
}
this.getList();
this.$nextTick(() => {
let headerHeight = document.getElementsByClassName('queryFormInline')[0].clientHeight
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight - headerHeight
})
// this.$nextTick(() => {
// let headerHeight = document.getElementsByClassName('queryFormInline')[0].clientHeight
// this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight - headerHeight
// })
},
watch: {
fullHeight(val) {
let headerHeight = document.getElementsByClassName('queryFormInline')[0].clientHeight
let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - formHeight - 40 - headerHeight
}
// fullHeight(val) {
// let headerHeight = document.getElementsByClassName('queryFormInline')[0].clientHeight
// let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
// this.tableHeight = val - formHeight - 40 - headerHeight
// }
},
methods: {
handledelgrain(row, isall) { //彻底删除
......@@ -434,7 +443,6 @@
// 下架/申请上架
handleUpsale(row, status, isall) { //上下架
//debugger
//console.log(442,row);
let good_id, is_onsale, title, message
if (isall == 'one') {
......@@ -495,6 +503,23 @@
});
},
/** 批量取消申请上架 */
handleCancelUpale() {
// id组成的数组 this.ids
this.$confirm('是否批量取消所选中的商品的上架申请', '批量取消申请上架', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
center: true
}).then(async() => {
let res = ''//await fn(re)
if (res.code == 1) {
this.$message({type:'success',message:'批量取消成功'});
} else {
this.$message({type:'success',message: res.message ? res.message : 0});
}
}).catch(() => {});
},
// 取消上架申请
handleCancelUpsale(row) {
let id = {
......@@ -617,7 +642,7 @@
}
if (this.formInline.uptime && this.formInline.uptime.length == 2) {
data['start_time'] = this.formInline.uptime[0] / 1000
data['end_time'] = this.formInline.uptime[1] / 1000
data['end_time'] = this.formInline.uptime[1] / 1000 + 86399
}
if (this.formInline.price_min && this.formInline.price_max) {
data['price_min'] = this.formInline.price_min
......@@ -663,6 +688,15 @@
};
</script>
<style scoped lang="scss" type="text/stylus">
.app-container {
width: 100%;
height: 100%;
}
.goods-manage-card >>> .el-card__body {
height: calc(100% - 61px);
overflow-y : auto;
}
.freightTemplate-add {
/deep/ .el-dialog {
height: 80%;
......
......@@ -32,82 +32,6 @@
</div>
</div>
<div class="form-box">
<!--<<<<<<< HEAD-->
<!-- <el-form class="form-params" ref="form" :model="form" label-width="85px">-->
<!-- <el-row type="flex" class="row-bg" justify="space-around">-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="总订单号:">-->
<!-- <el-input size="mini" v-model="form.order_sn" placeholder="请输入总订单号"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="商品名称:">-->
<!-- <el-input size="mini" v-model="form.goods_name" placeholder="请输入商品名称"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="收货人:">-->
<!-- <el-input size="mini" v-model="form.real_name" placeholder="请输入收货人"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row type="flex" class="row-bg" justify="space-around">-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="联系电话:">-->
<!-- <el-input size="mini" v-model="form.Tel" placeholder="请输入联系电话"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6" v-show="activeName == 'first' || activeName == 'fourth' ">-->
<!-- <el-form-item label="下单时间:">-->
<!-- <el-date-picker-->
<!-- size="mini"-->
<!-- v-model="form.dateTime"-->
<!-- type="daterange"-->
<!-- align="left"-->
<!-- unaLink-panels-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- ></el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6" v-show="activeName == 'second' ">-->
<!-- <el-form-item label="发货时间:">-->
<!-- <el-date-picker-->
<!-- size="mini"-->
<!-- v-model="form.sendTime"-->
<!-- type="daterange"-->
<!-- align="left"-->
<!-- unaLink-panels-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- ></el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6" v-show="activeName == 'third' ">-->
<!-- <el-form-item label="完成时间:">-->
<!-- <el-date-picker-->
<!-- size="mini"-->
<!-- v-model="form.finishTime"-->
<!-- type="daterange"-->
<!-- align="left"-->
<!-- unaLink-panels-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- ></el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-button size="mini" type="primary" icon="el-icon-search" style="margin-left: 20px;"-->
<!-- @click="search">搜索-->
<!-- </el-button>-->
<!-- <el-button size="mini" icon="el-icon-refresh" @click="resetBtn(true)">重置</el-button>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!--=======-->
<el-form class="form-params" ref="form" :model="form" label-width="120px" :inline="true" size="small">
<el-form-item label="总订单号:">
<el-input style="width:220px;" v-model="form.order_sn" placeholder="请输入总订单号"/>
......@@ -133,6 +57,14 @@
</el-select>
</el-form-item>
<el-form-item label="是否售后:" prop="shzt" v-show="activeName == 'fourth' ">
<el-select v-model="form.shzt" placeholder="请选择售后状态" style="width:150px;">
<el-option label="全部" value="-1"></el-option>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="下单时间:" v-show="activeName == 'first' || activeName == 'fourth' ">
<el-date-picker
style="width:280px;"
......@@ -175,7 +107,6 @@
<el-button size="mini" icon="el-icon-refresh" @click="resetBtn(true)">重置</el-button>
</el-form-item>
<!--&gt;>>>>>> dev_hxz-->
</el-form>
</div>
<!-- 表头 -->
......@@ -191,8 +122,9 @@
<el-table-column label="规格/数量/金额" align="center" ></el-table-column>
<el-table-column label="下单/发货/完成时间" align="center" width="180" ></el-table-column>
<el-table-column label="运费" align="center" width="100" ></el-table-column>
<el-table-column label="收货人" align="center" width="180" ></el-table-column>
<el-table-column label="联系电话" align="center" width="180"></el-table-column>
<el-table-column label="收货人" align="center" width="120" ></el-table-column>
<el-table-column label="联系电话" align="center" width="120"></el-table-column>
<el-table-column label="售后状态" align="center" width="180"></el-table-column>
<el-table-column label="物流信息" align="center" width="120"></el-table-column>
<el-table-column label="操作" align="center" width="120"></el-table-column>
</el-table>
......@@ -247,16 +179,21 @@
{{ item.order.dispatch_price / 100 }}
</template>
</el-table-column>
<el-table-column prop="phone" width="180" label="收货人" align="center">
<el-table-column prop="phone" width="120" label="收货人" align="center">
<template slot-scope="scope">
{{ item.order.real_name }}
</template>
</el-table-column>
<el-table-column prop="mobile" label="联系电话" width="180" align="center">
<el-table-column prop="mobile" label="联系电话" width="120" align="center">
<template slot-scope="scope">
{{ item.order.mobile }}
</template>
</el-table-column>
<el-table-column prop="shzt" label="售后状态" width="180" align="center">
<template slot-scope="scope">
{{ 售后状态 }}
</template>
</el-table-column>
<el-table-column prop="物流信息" label="物流信息" width="120" align="center">
<template slot-scope="scope">
<el-button type="text" @click="handleExpressInfo(scope.row)">查看物流</el-button>
......@@ -332,12 +269,14 @@
</div>
<div class="delivery-tips-con">
<p style="text-align: center">常见问题</p>
<p>1、批量发货规则</p>
<p>必须正确填写了“快递公司 快递单号”才会导入并更改订单状态为已发货!</p>
<p>2、如何获取一个批量发货的excel文件?</p>
<p>在商户后台左侧菜单的 “订单中心” 》“订单列表”里面可以将订单导出为Excel格式的文件,您可以在这里自由导出订单</p>
<p>3、导出excel文件后,批量发货需要输入什么信息?</p>
<p>在我们的导出的excel文件中,打开里面有“快递单号 快递公司”。 您可以在将正确的快递发货单号,快递公司填入对应的列里面,和对应的订单号一对应。然后保存提交,就可以用于批量发货了</p>
<p>1、批量发货流程</p>
<p>【导出订单数据】按钮,获取待发货订单数据表</p>
<p>打开导出的待发货订单数据表,填写【快递公司】和【快递单号】信息</p>
<p>点击【上传批量发货Excel表单】按钮,选择填写完成的待发货订单数据表并上传,点击【确定】按钮即可完成批量发货</p>
<p>2、注意事项</p>
<p>表格的其它信息请勿做修改,否则会导致批量发货不成功</p>
<p>常用快递公司名称(按此名称填写)</p>
<p>【顺丰快递】【天天快递】【韵达快递】【圆通快递】【中通快递】【中国邮政】</p>
</div>
<span slot="footer" class="dialog-footer">
......@@ -363,6 +302,20 @@
<div v-if="activities.length == 0">暂无物流信息</div>
</div>
</el-dialog>
<!-- 批量发货 展示失败数据-->
<el-dialog title="批量发货提醒" width="60%" class="" :visible.sync="dialogDeliveryInfor" >
<div class="">
<p>部分订单发货失败,失败订单信息如下表所示</p>
<el-table :data="failDeliveryList">
</el-table>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="cancelDeliveryInfor">取 消</el-button>
<el-button type="primary" @click="subDelivery">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
......@@ -399,6 +352,7 @@
dateTime: [],
finishTime: [],
sendTime: [],
shzt: ''
},
goodsStatus: 1,
tableDataList: [], // 后台返回所有数据
......@@ -418,6 +372,9 @@
// 查看物流窗口
dialogExpress: false,
activities: [],
// 批量发货 失败数据展示 窗口
dialogDeliveryInfor: false,
failDeliveryList: [], // 批量发货 失败table数据
}
},
watch: {
......@@ -466,7 +423,7 @@
},
/** 表格合并 列单元格 */
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex > 2 && columnIndex != 6) { // 用于设置要合并开始的列号
if (columnIndex > 2 && columnIndex != 6 && columnIndex != 7) { // 用于设置要合并开始的列号
if (rowIndex === 0) { // 用于设置合并开始的行号
return {
rowspan: 100,     // 合并的行数
......@@ -549,7 +506,8 @@
dateTime: [],
finishTime: [],
sendTime: [],
settlement_status: ''
settlement_status: '',
shzt: ''
}
this.currentPage = 1
this.pageSize = 20
......@@ -631,6 +589,9 @@
if(this.form.Tel != '') {
params['mobile'] = this.form.Tel
}
if(this.form.shzt == '0' || this.form.shzt == '1') {
params['shzt'] = this.form.shzt
}
if (this.form.settlement_status == '0' || this.form.settlement_status == '1') {
params['settlement_status'] = this.form.settlement_status
......@@ -690,8 +651,6 @@
delete params.limit;
delete params.seller_id;
delete params.status;
//console.log("导出待发货订单,入参:",params);
exportUnSendOrderGoodsData(params).then(res=> {
if (res.code === 1) {
const aLink = document.createElement('a');
......@@ -701,6 +660,7 @@
document.body.appendChild(aLink);
aLink.click();
document.body.removeChild(aLink);
this.$message({type:'success',message: '导出成功,注意下载表格'});
}else {
this.$message({type:'error',message: res.message ? res.message: '导出失败'});
}
......@@ -792,7 +752,7 @@
this.excelList = [];
//console.log(88,this.excelList);
},
// 提交导入数据
/** 提交导入数据 */
subDelivery() {
if (this.excelList.length === 0) {
this.$message({type: 'warning', message: '请先上传填写好的表格数据'});
......@@ -816,6 +776,16 @@
this.$message({type: 'error', message: '部分订单未填写物流公司或物流单号,请完善后再上传'});
}
},
/** 关闭 发货失败 数据展示 */
cancelDeliveryInfor() {
this.dialogDeliveryInfor = false;
},
/** 导出 发货失败的数据 */
exportFailDeliverList() {
this.failDeliveryList = [];
},
/** 查看物流信息 */
handleExpressInfo(row) {
// 如果 商品订单没有发货,则不用请求了
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论