Skip to content

GitLab

Q
qk_admin
Commit f0100c31 authored by gaia's avatar gaia
Browse files
Options

Merge remote-tracking branch 'origin/feature/20240918_1005_091801' into release_pre_20241031155616

parents d7949416 0fff7118
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 235 deletions
src/views/shop/shopManagerList.vue
View file @ f0100c31
<template>
<div class="page_consignList">
<div class="page_orderAll">
<!-- <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleMenuSelect"> -->
<!-- <el-menu-item v-for="item in menuList" :key="item.index" :index="item.index">{{ item.title }}</el-menu-item>
</el-menu> -->
<div class="order_select">
<el-input
v-model="listQuery.userId"
......@@ -25,12 +22,6 @@
class="filter-item"
style="width: 200px;"
placeholder="请输入藏家昵称" />
<!-- <el-input
v-model="listQuery.sellerName"
clearable
class="filter-item"
style="width: 200px;"
placeholder="请输入分销商名称" /> -->
<el-button
class="filter-item"
type="primary"
......@@ -51,52 +42,11 @@
border
fit
highlight-current-row>
<!-- <el-table-column align="center" label="排行" width="100px" type="index" />-->
<el-table-column align="center" min-width="100px" prop="openShopApplyOrderId" label="申请编号" />
<!-- <el-table-column align="center" label="分销商名称" min-width="150px" prop="sellerName">
<template slot-scope="scope">
<Line2Hidden :text="scope.row.sellerName || ''" />
</template>
</el-table-column>
<el-table-column align="center" label="藏品图片" prop="homePageImage">
<template slot-scope="scope">
<img
v-if="scope.row.homePageImage && scope.row.homePageImage.url"
:src="scope.row.homePageImage.url"
width="60px"
height="60px">
</template>
</el-table-column> -->
<el-table-column align="center" min-width="100px" prop="userName" label="藏家昵称" />
<el-table-column align="center" min-width="100px" prop="userId" label="藏家ID" />
<!-- <el-table-column align="center" label="藏片件数" prop="itemNum" />
<el-table-column align="center" label="实付款" prop="amount">
<template slot-scope="scope">
<span class="tooltip-span">{{ `¥ ${scope.row.amount}` }}</span>
</template>
</el-table-column> -->
<!-- <el-table-column align="center" label="下单用户" prop="buyerName" /> -->
<el-table-column align="center" label="店铺状态" prop="stateName" />
<el-table-column align="center" label="申请时间" prop="createTime" />
<!-- <el-table-column align="center" label="收货信息" prop="receiverName" min-width="160px">
<template slot-scope="scope">
<span v-if="scope.row.receiverName">{{
scope.row.receiverName + ',' + scope.row.receiverPhone + ',' + scope.row.receiverAddress
}}</span>
</template>
</el-table-column> -->
<!-- <el-table-column align="center" label="订单状态" prop="stateName" /> -->
<!-- <el-table-column align="center" label="物流公司" prop="logisticsName">
<template slot-scope="scope">
<span class="tooltip-span">{{ `${scope.row.logisticsName || '-'}` }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="快递单号" prop="waybill">
<template slot-scope="scope">
<span class="tooltip-span">{{ `${scope.row.waybill || '-'}` }}</span>
</template>
</el-table-column> -->
<el-table-column align="center" label="操作" width="250" fixed="right">
<template slot-scope="scope">
<el-button
......@@ -126,36 +76,6 @@
:page.sync="listQuery.page"
:limit.sync="listQuery.limit"
@pagination="getList" />
<!-- <el-dialog :visible.sync="sendDialogVisible" title="发货">
<el-form
ref="sendFormRef"
:model="sendForm"
:rules="rules"
status-icon
label-position="left"
label-width="130px"
style="width: 600px; margin-left:50px;">
<el-form-item label="请输入快递单号:" prop="waybill" >
<el-select v-model="sendForm.logisticsCode" placeholder="请选择快的公司" class="filter-item" style="width: 200px;">
<el-option
v-for="item in logisticList"
:key="item.name"
:label="item.name"
:value="item.code"
size="mini" />
</el-select>
</el-form-item>
<el-form-item prop="waybill" label="快递单号:" >
<el-input v-model="sendForm.waybill" placeholder="请输入快递单号" style="width: 200px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="sendDialogVisible = false">取消</el-button>
<el-button type="primary" @click="handleShowSendDialog">确定</el-button>
</div>
</el-dialog>-->
<NoPassIdentifyDialog
:show-no-pass-identify-dialog-show="showNoPassIdentifyDialog"
:open-shop-apply-order-id="currentApplyId"
......@@ -170,7 +90,6 @@ import Line2Hidden from '@/components/line2Hidden'
import Pagination from '@/components/Pagination'
import NoPassIdentifyDialog from './components/NoPassIdentifyDialog'
import { shopManagerList, shopManagerCheck } from '@/api/business/shop'
import { requestLogisticsList, requestDelivery } from '@/api/business/order'
export default {
name: 'ShopManagerList',
......@@ -182,7 +101,6 @@ export default {
},
data() {
return {
itemKey: 0,
options: [{
value: 0,
label: '待付款'
......@@ -204,75 +122,6 @@ export default {
list: [],
showNoPassIdentifyDialog: false,
total: 0,
// 图文估价
imageValueDialogShow: false,
// 建议寄售价
identifyValueDialogShow: false,
// 货品售出
finishDialogShow: false,
// 寄售凭证
finishSettlementDialogShow: false,
// 取消
cancelConsignDialogShow: false,
// 发货
sendDialogVisible: false,
currentSaleId: '',
logisticOptions: [{
value: 1,
label: '待付款'
}, {
value: 10,
label: '待发货'
}, {
value: 20,
label: '待收货'
}, {
value: 30,
label: '售后中'
}, {
value: 80,
label: '退款受理中'
}, {
value: 100,
label: '已完成'
}, {
value: 101,
label: '已取消'
}],
menuList: [
{
title: '全部',
index: '0'
}, {
title: '待付款',
index: '1'
}, {
title: '待发货',
index: '10'
}, {
title: '待收货',
index: '20'
}, {
title: '已签收',
index: '90'
}, {
title: '已完成',
index: '100'
}, {
title: '已取消',
index: '101'
}, {
title: '售后处理中',
index: '30'
}
],
sendForm: {},
logisticList: [],
orderId: '',
rules: {
waybill: [{ required: true, message: '请输入物流单号', trigger: 'blur' }],
logisticsCode: [{ required: true, message: '请选择快递公司', trigger: 'blur' }]
},
currentApplyId: ''
}
},
......@@ -321,6 +170,7 @@ export default {
this.list = this.list.filter((item) => {
if (item.openShopApplyOrderId === applyId) {
item.state = 30
item.stateName = '审核不通过'
return item
}
return item
......@@ -328,45 +178,7 @@ export default {
}
this.showNoPassIdentifyDialog = false
},
// handleNoPass(row) {
// this.$confirm('确定不通过藏家的开店申请？', '平台开店结果', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'message'
// }).then(() => {
// const params = {
// distributionOrderId: row.distributionOrderId,
// approved: 2
// }
// exchangeApplyOrdercheck(params).then(response => {
// this.list = this.list.filter((item) => {
// if (item.distributionOrderId === row.distributionOrderId) {
// item.stateName = '已取消'
// item.state = 101
// return item
// }
// return item
// })
// this.$notify.success({
// message: '操作成功'
// })
// }).catch((e) => {
// console.log('===报错=', e)
// this.$message.error(e.data && e.data.errmsg || '请求失败， 请重试')
// })
// })
// },
/**
* 获取物流公司列表
*/
getLogisticsList() {
requestLogisticsList().then((response) => {
console.log('==response===', response)
this.logisticList = response.data.data
}).catch((err) => {
console.log('==err===', err)
})
},
resetSearchForm() {
this.listQuery = {
page: 1,
......@@ -401,44 +213,6 @@ export default {
this.listLoading = false
})
},
/**
* 展示发货弹窗
*/
handleShowSendDialog() {
this.$refs.sendFormRef.validate((valid) => {
if (valid) {
this.sendForm.distributionOrderId = this.orderId
requestDelivery(this.sendForm)
.then(response => {
this.$notify.success({
message: '发货成功'
})
this.list = this.list.filter((item) => {
if (item.distributionOrderId === this.orderId) {
item.stateName = '待收货'
item.state = 20
item.waybill = this.sendForm.waybill
this.logisticList.map((logisticItem) => {
if (logisticItem.code === this.sendForm.logisticsCode) {
item.logisticsName = logisticItem.name
}
})
this.orderId = ''
return item
}
return item
})
this.sendDialogVisible = false
})
.catch(response => {
this.$notify.error({
title: '失败',
message: response.data.errmsg
})
})
}
})
},
/**
* 详情
* @param item
......@@ -461,13 +235,6 @@ export default {
handleNoPass(item) {
this.currentApplyId = item.openShopApplyOrderId
this.showNoPassIdentifyDialog = true
},
/**
* 发货
*/
handleToSend(row) {
this.sendDialogVisible = true
this.orderId = row.distributionOrderId
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment