huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增发货处理页面

This commit is contained in:
Richie 2025-06-01 14:38:22 +08:00
parent a38ee90027
commit 5202f57986
4 changed files with 1351 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

395
vue/src/views/shipping/shipment/assigned_list.vue Normal file
View File

@ -0,0 +1,395 @@
<template>
<div class="app-container">
<el-form :model="printParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单号" prop="orderNum">
<el-input
v-model="queryParams.orderNum"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="店铺" prop="shopId">
<el-select v-model="queryParams.shopId" placeholder="请选择店铺" @change="handleQuery">
<el-option
v-for="item in shopList"
:key="item.id"
:label="item.name"
:value="item.id">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 3">拼多多</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 5">微信小店</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 9">其他渠道</span>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="供应商" prop="shipSupplierId">-->
<!-- <el-select clearable-->
<!-- v-model="queryParams.shipSupplierId"-->
<!-- filterable-->
<!-- placeholder="请输入供应商名称">-->
<!-- <el-option-->
<!-- v-for="item in supplierList"-->
<!-- :key="item.id"-->
<!-- :label="item.name"-->
<!-- :value="item.id">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- :disabled="single"-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleShip"-->
<!-- >填写供应商发货物流</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type=""-->
<!-- plain-->
<!-- :disabled="single"-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="allocateShipmentToSupplier"-->
<!-- >分配给供应商发货</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="ID" align="center" prop="id" />-->
<el-table-column label="订单号" align="left" prop="orderNum" width="200">
<template slot-scope="scope">
<span>{{scope.row.orderNum}}</span>
<br/>
<el-tag type="info">{{ shopList.find(x=>x.id == scope.row.shopId) ? shopList.find(x=>x.id == scope.row.shopId).name : '' }}</el-tag>
</template>
</el-table-column>
<el-table-column label="商品" width="400">
<template slot-scope="scope">
<el-row v-for="item in scope.row.itemList" :key="item.id" :gutter="20">
<div style="float: left;display: flex;align-items: center;" >
<image-preview :src="item.goodsImg" :width="40" :height="40"/>
<div style="margin-left:10px">
<div>{{item.goodsTitle}}</div>
<div>
<div>
{{ getSkuValues(item.goodsSpec)}}
数量：<el-tag size="small">x {{item.quantity}}</el-tag>
</div>
</div>
</div>
</div>
</el-row>
</template>
</el-table-column>
<el-table-column label="订单金额" align="center" prop="orderAmount" :formatter="amountFormatter"/>
<el-table-column label="下单时间" align="center" prop="orderCreateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderTime) }}</span>
</template>
</el-table-column>
<el-table-column label="收件人" prop="receiverName" width="200px">
<template slot-scope="scope">
{{scope.row.receiverName}}&nbsp;
{{scope.row.receiverMobile}} <br />
{{scope.row.province}} {{scope.row.city}} {{scope.row.town}} <br />
</template>
</el-table-column>
<el-table-column label="订单备注" align="center" >
<template slot-scope="scope">
<div style="color: #ed5565">{{scope.row.remark}}</div>
<div style="color: #ed5565">{{scope.row.buyerMemo}}</div>
<div style="color: #ed5565">{{scope.row.sellerMemo}}</div>
</template>
</el-table-column>
<el-table-column label="发货状态" align="center" prop="shipStatus" >
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.shipStatus === 0" style="margin-bottom: 6px;">待发货</el-tag>
<el-tag type="success" v-if="scope.row.shipStatus === 1" style="margin-bottom: 6px;">已分配发货</el-tag>
<el-tag type="success" v-if="scope.row.shipStatus === 2" style="margin-bottom: 6px;">已发货</el-tag>
<br />
<!-- 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 -->
<el-tag v-if="scope.row.shipper == 0" type="info">自己发货</el-tag>
<el-tag v-if="scope.row.shipper == 1" type="info">联合发货</el-tag>
<el-tag v-if="scope.row.shipper == 2" type="info">供应商发货</el-tag>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 打包发货对话框 -->
<el-dialog title="打包发货" :visible.sync="shipOpen" width="1100px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" >
<el-descriptions title="订单信息">
<el-descriptions-item label="ID">{{form.id}}</el-descriptions-item>
<el-descriptions-item label="订单号">{{form.orderNum}}</el-descriptions-item>
<el-descriptions-item label="店铺">
{{ shopList.find(x=>x.id == form.shopId)?shopList.find(x=>x.id == form.shopId).name:'' }}
<el-tag size="small" v-if="form.shopType === 5">微信小店</el-tag>
</el-descriptions-item>
<el-descriptions-item label="买家留言">
{{form.buyerMemo}}
</el-descriptions-item>
<el-descriptions-item label="备注">
{{form.remark}}
</el-descriptions-item>
<el-descriptions-item label="创建时间">
{{ parseTime(form.createTime) }}
</el-descriptions-item>
<el-descriptions-item label="订单状态">
<el-tag v-if="form.orderStatus === 1" style="margin-bottom: 6px;">待发货</el-tag>
<el-tag v-if="form.orderStatus === 2" style="margin-bottom: 6px;">已发货</el-tag>
<el-tag v-if="form.orderStatus === 3" style="margin-bottom: 6px;">已签收</el-tag>
</el-descriptions-item>
<el-descriptions-item label="退款状态">
<el-tag v-if="form.refundStatus === 1">无售后或售后关闭</el-tag>
<el-tag v-if="form.refundStatus === 2">售后处理中</el-tag>
<el-tag v-if="form.refundStatus === 3">退款中</el-tag>
<el-tag v-if="form.refundStatus === 4">退款成功</el-tag>
</el-descriptions-item>
<el-descriptions-item label="">
<!-- <el-tag v-if="form.shipType === 1" type="danger">供应商代发</el-tag>-->
<!-- <el-tag v-if="form.shipType === 0" type="danger">仓库发货</el-tag>-->
</el-descriptions-item>
<el-descriptions-item label="收件人姓名">{{form.receiverName}}</el-descriptions-item>
<el-descriptions-item label="收件人手机号">{{form.receiverMobile}}</el-descriptions-item>
<el-descriptions-item label="省市区">{{form.province}}{{form.city}}{{form.town}}</el-descriptions-item>
<el-descriptions-item label="详细地址">{{form.address}}</el-descriptions-item>
</el-descriptions>
<el-divider content-position="center">商品明细</el-divider>
<el-table :data="form.itemList" style="margin-bottom: 10px;">
<!-- <el-table-column type="selection" width="50" align="center" /> -->
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="商品图片" prop="goodsImg" width="80">
<template slot-scope="scope">
<el-image style="width: 70px; height: 70px" :src="scope.row.goodsImg"></el-image>
</template>
</el-table-column>
<el-table-column label="商品标题" prop="goodsTitle" ></el-table-column>
<el-table-column label="SKU" prop="goodsSpec" width="150"></el-table-column>
<el-table-column label="sku编码" prop="skuNum"></el-table-column>
<!-- <el-table-column label="单价" prop="goodsPrice"></el-table-column>-->
<el-table-column label="数量" prop="quantity"></el-table-column>
<!-- <el-table-column label="商品金额" prop="itemAmount"></el-table-column> -->
</el-table>
<el-form-item label="包裹尺寸" prop="height">
<el-input type="number" v-model.number="form.length" placeholder="长mm" style="width:90px" /> x
<el-input type="number" v-model.number="form.width" placeholder="宽mm" style="width:90px" /> x
<el-input type="number" v-model.number="form.height" placeholder="高mm" style="width:90px" />
</el-form-item>
<el-form-item label="包裹重量" prop="weight">
<el-input type="number" v-model.number="form.weight" placeholder="请输入包裹重量（单位g）" style="width:300px" />
</el-form-item>
<el-row>
<el-col>
<el-form-item label="物流公司" prop="shippingCompany">
<!-- <el-input v-model="form.shippingCompany" placeholder="请输入物流公司" style="width:300px" />-->
<el-select v-model="form.shippingCompany" filterable r placeholder="选择快递公司" style="width:300px">
<el-option v-for="item in logisticsList" :key="item.id" :label="item.name" :value="item.id">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px" >{{item.number}}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="物流单号" prop="shippingNumber">
<el-input v-model="form.shippingNumber" placeholder="请输入物流单号" style="width:300px" />
</el-form-item>
<el-form-item label="物流费用" prop="shippingCost">
<el-input v-model="form.shippingCost" placeholder="请输入物流费用" style="width:300px" />
</el-form-item>
<el-form-item label="发货人" prop="shippingMan">
<el-input v-model="form.shippingMan" placeholder="请输入发货人" style="width:300px" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitShipForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import {
getOrder,
manualShipmentOrder,
allocateShipmentOrder,
assignedShipmentList
} from "@/api/order/order";
import {listLogisticsStatus} from "@/api/api/logistics";
import {listShop} from "@/api/shop/shop";
import {amountFormatter, parseTime} from "@/utils/zhijian";
export default {
name: "ShipmentAssigned",
data() {
return {
// 遮罩层
loading: true,
getCodeOpen: false,
// 选中数组
ids: [],
shopList: [],
orderList: [],
logisticsList: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
shipOpen: false,
allocateShipmentOpen: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
shopType:null,
shopId:null,
},
// 打印参数
printParams: {
deliver: null,
printer: null
},
// 表单参数
form: {
weight:0.0
},
printerList: [],
deliverList: [],
// 表单校验
rules: {
height: [{ required: true, message: '不能为空' }],
weight: [{ required: true, message: '不能为空' }],
shippingNumber: [{ required: true, message: '不能为空' }],
shippingCompany: [{ required: true, message: '不能为空' }],
shippingCost: [{ required: true, message: '不能为空' }],
// shippingMan: [{ required: true, message: '不能为空' }],
receiverName: [{ required: true, message: '不能为空' }],
receiverMobile: [{ required: true, message: '不能为空' }],
address: [{ required: true, message: '不能为空' }],
}
};
},
created() {
listShop().then(response => {
this.shopList = response.rows;
this.getList();
});
},
methods: {
amountFormatter,
parseTime,
getSkuValues(spec){
try {
// 解析 JSON，返回一个数组
const parsedSpec = JSON.parse(spec) || [];
// 使用 map 提取所有 value，使用 join() 用逗号连接
return parsedSpec.map(item => item.attr_value).join(', ') || '';
} catch (error) {
return spec; // 如果 JSON 解析出错，返回空字符串
}
},
/** 查询列表 */
getList() {
this.loading = true;
assignedShipmentList(this.queryParams).then(response => {
this.orderList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
// 取消按钮
cancel() {
this.open = false;
this.allocateShipmentOpen = false;
this.shipOpen = false;
this.getCodeOpen = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
erpSkuId: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 手动发货表单
submitShipForm(){
this.$refs["form"].validate(valid => {
if (valid) {
}
})
},
}
};
</script>

45
vue/src/views/shipping/shipment/index.vue Normal file
View File

@ -0,0 +1,45 @@
<template>
<div class="app-container">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="待发货" name="waitShip">
<shipment-wait></shipment-wait>
</el-tab-pane>
<el-tab-pane label="已发货" name="shipped" lazy>
<shipment-shipped></shipment-shipped>
</el-tab-pane>
<el-tab-pane label="已分配供应商发货" name="assigned" lazy>
<shipment-assigned></shipment-assigned>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import ShipmentWait from "@/views/shipping/shipment/wait_ship.vue";
import ShipmentShipped from "@/views/shipping/shipment/shipped_list.vue";
import ShipmentAssigned from "@/views/shipping/shipment/assigned_list.vue";
export default {
name: "Shipment",
components:{ShipmentWait,ShipmentShipped,ShipmentAssigned},
data() {
return {
activeName: 'waitShip'
};
},
created() {
},
mounted() {
},
methods: {
handleClick(tab, event) {
console.log(tab, event);
}
}
};
</script>

330
vue/src/views/shipping/shipment/shipped_list.vue Normal file
View File

@ -0,0 +1,330 @@
<template>
<div class="app-container">
<el-form :model="printParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单号" prop="orderNum">
<el-input
v-model="queryParams.orderNum"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="店铺" prop="shopId">
<el-select v-model="queryParams.shopId" placeholder="请选择店铺" @change="handleQuery">
<el-option
v-for="item in shopList"
:key="item.id"
:label="item.name"
:value="item.id">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 3">拼多多</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 5">微信小店</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 9">其他渠道</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
<el-form-item>
<el-select v-model="printParams.printer" placeholder="请选择打印机" clearable>
<el-option
v-for="item in printerList"
:key="item.name"
:label="item.name"
:value="item.name">
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-time"
size="mini"
:disabled="single"
@click="handleGetEwaybillCode"
>修改发货单号</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="ID" align="center" prop="id" />-->
<el-table-column label="订单号" align="left" prop="orderNum" width="200">
<template slot-scope="scope">
<span>{{scope.row.orderNum}}</span>
<el-tag>{{ parseTime(scope.row.orderTime) }}</el-tag>
</template>
</el-table-column>
<el-table-column label="商品" width="400">
<template slot-scope="scope">
<el-row v-for="item in scope.row.itemList" :key="item.id" :gutter="20">
<div style="float: left;display: flex;align-items: center;" >
<image-preview :src="item.goodsImg" :width="40" :height="40"/>
<div style="margin-left:10px">
<div>{{item.goodsTitle}}</div>
<div>
<div>
{{ getSkuValues(item.goodsSpec)}}
数量：<el-tag size="small">x {{item.quantity}}</el-tag>
</div>
</div>
</div>
</div>
</el-row>
</template>
</el-table-column>
<!-- <el-table-column label="下单时间" align="center" prop="orderCreateTime" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.orderTime) }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="订单备注" align="center" >
<template slot-scope="scope">
<div style="color: #ed5565">{{scope.row.remark}}</div>
<div style="color: #ed5565">{{scope.row.buyerMemo}}</div>
<div style="color: #ed5565">{{scope.row.sellerMemo}}</div>
</template>
</el-table-column>
<el-table-column label="收件人" prop="receiverName" width="200px">
<template slot-scope="scope">
{{scope.row.receiverName}}&nbsp;
{{scope.row.receiverMobile}} <br />
{{scope.row.province}} {{scope.row.city}} {{scope.row.town}} <br />
</template>
</el-table-column>
<el-table-column label="快递信息" align="left" prop="waybillCode" >
<template slot-scope="scope">
<el-row v-for="item in scope.row.shipmentList" :key="item.id" :gutter="20">
<div style="color: #1c84c6">{{item.shipCompany}}</div>
<div style="color: #1c84c6">{{ item.shipCode}}</div>
<div>{{ item.shipTime}}</div>
</el-row>
</template>
</el-table-column>
<el-table-column label="发货方式" align="center" prop="waybillCompany" >
<template slot-scope="scope">
<el-tag v-if="scope.row.shipper==0&&scope.row.shipType==1" size="small">电子面单发货</el-tag>
<el-tag v-if="scope.row.shipper==0&&scope.row.shipType==2" size="small">手动发货</el-tag>
<el-tag v-if="scope.row.shipper==1" size="small">供应商发货</el-tag>
</template>
</el-table-column>
<el-table-column label="订单金额" align="center" prop="orderAmount" :formatter="amountFormatter"/>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 取号 -->
<el-dialog title="取号" :visible.sync="getCodeOpen" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="电子面单账户" prop="accountId">
<el-select v-model="form.accountId" placeholder="请选择电子面单账户" clearable>
<el-option
v-for="item in deliverList"
:key="item.id"
:label="item.deliveryId"
:value="item.id">
<span style="float: left">{{ item.deliveryId }}</span>
<span style="float: right; color: #8492a6; font-size: 13px" >{{item.siteName}}:{{item.available}}</span>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="getCodeOpenForm">取号并发货</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import {
selfShippedList
} from "@/api/order/order";
import {listShop} from "@/api/shop/shop";
import {parseTime,amountFormatter} from "@/utils/zhijian";
export default {
name: "ShipmentShipped",
data() {
return {
// 遮罩层
loading: true,
getCodeOpen: false,
// 选中数组
ids: [],
shopList: [],
orderList: [],
logisticsList: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
shipOpen: false,
allocateShipmentOpen: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
shopId:null,
shipType:2
},
// 打印参数
printParams: {
deliver: null,
printer: null
},
// 表单参数
form: {
weight:0.0
},
printerList: [],
deliverList: [],
// 表单校验
rules: {
height: [{ required: true, message: '不能为空' }],
weight: [{ required: true, message: '不能为空' }],
shippingNumber: [{ required: true, message: '不能为空' }],
shippingCompany: [{ required: true, message: '不能为空' }],
shippingCost: [{ required: true, message: '不能为空' }],
// shippingMan: [{ required: true, message: '不能为空' }],
receiverName: [{ required: true, message: '不能为空' }],
receiverMobile: [{ required: true, message: '不能为空' }],
address: [{ required: true, message: '不能为空' }],
}
};
},
created() {
listShop({}).then(response => {
this.shopList = response.rows;
// if (this.shopList && this.shopList.length > 0) {
// this.queryParams.shopId = this.shopList[0].id
// }
this.getList();
});
},
methods: {
amountFormatter,
parseTime,
getSkuValues(spec){
try {
// 解析 JSON，返回一个数组
const parsedSpec = JSON.parse(spec) || [];
// 使用 map 提取所有 value，使用 join() 用逗号连接
return parsedSpec.map(item => item.attr_value).join(', ') || '';
} catch (error) {
return spec; // 如果 JSON 解析出错，返回空字符串
}
},
/** 查询列表 */
getList() {
this.loading = true;
selfShippedList(this.queryParams).then(response => {
this.orderList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
// 取号弹窗
handleGetEwaybillCode() {
const ids = this.ids;
if (ids) {
this.getCodeOpen = true
} else {
this.$modal.msgError("请选择订单")
}
},
/** 取号提交按钮 */
getCodeOpenForm() {
this.$refs["form"].validate(valid => {
if (valid) {
const ids = this.ids;
console.log('=========3333========', ids)
if (ids) {
console.log('===请求参数=====', {shopId: this.queryParams.shopId, ids: ids, accountId: this.form.accountId})
getWaybillCodeAndSend({
shopId: this.queryParams.shopId,
ids: ids,
accountId: this.form.accountId
}).then(response => {
this.$modal.msgSuccess("取号成功")
this.getList()
this.getCodeOpen = false
});
} else {
this.$modal.msgError("请选择订单")
}
}
});
},
// 取消按钮
cancel() {
this.open = false;
this.allocateShipmentOpen = false;
this.shipOpen = false;
this.getCodeOpen = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
erpSkuId: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
}
};
</script>

581
vue/src/views/shipping/shipment/wait_ship.vue Normal file
View File

@ -0,0 +1,581 @@
<template>
<div class="app-container">
<el-form :model="printParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单号" prop="orderNum">
<el-input
v-model="queryParams.orderNum"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="店铺" prop="shopId">
<el-select v-model="queryParams.shopId" placeholder="请选择店铺" @change="handleQuery">
<el-option
v-for="item in shopList"
:key="item.id"
:label="item.name"
:value="item.id">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 3">拼多多</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 5">微信小店</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 9">其他渠道</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
:disabled="single"
icon="el-icon-download"
size="mini"
@click="handleShip"
>手动发货</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type=""
plain
:disabled="single"
icon="el-icon-download"
size="mini"
@click="allocateShipmentToSupplier"
>分配给供应商发货</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="ID" align="center" prop="id" />-->
<el-table-column label="订单号" align="left" prop="orderNum" width="200">
<template slot-scope="scope">
<span>{{scope.row.orderNum}}</span>
<br/>
<el-tag type="info">{{ shopList.find(x=>x.id == scope.row.shopId) ? shopList.find(x=>x.id == scope.row.shopId).name : '' }}</el-tag>
</template>
</el-table-column>
<el-table-column label="商品明细" align="center" width="900px" >
<template slot="header">
<table>
<th>
<td width="50px">图片</td>
<td width="250px" align="left">标题</td>
<td width="150" align="left">SKU名</td>
<td width="200" align="left">Sku编码</td>
<td width="150" align="left">系统SkuId</td>
<td width="50" align="left">数量</td>
</th>
</table>
</template>
<template slot-scope="scope" >
<el-table :data="scope.row.itemList" :show-header="false" :cell-style="{border:0 + 'px' }" :row-style="{border:0 + 'px' }" >
<el-table-column label="商品图片" width="50px">
<template slot-scope="scope">
<!-- <el-image style="width: 40px; height: 40px;" :src="scope.row.goodsImg" :preview-src-list="[scope.row.goodsImg]"></el-image>-->
<image-preview :src="scope.row.goodsImg" :width="40" :height="40"/>
</template>
</el-table-column>
<el-table-column label="商品名" align="left" width="250px" prop="goodsTitle" >
<template slot-scope="scope">
{{scope.row.goodsTitle}}
<!-- <el-tag size="small" v-if="scope.row.refundStatus === 1">无售后或售后关闭</el-tag>-->
<el-tag size="small" v-if="scope.row.refundStatus === 2">售后处理中</el-tag>
<el-tag size="small" v-if="scope.row.refundStatus === 3">退款中</el-tag>
<el-tag size="small" v-if="scope.row.refundStatus === 4">退款成功</el-tag>
<el-tag size="small" v-if="scope.row.refundStatus === 11">已取消</el-tag>
</template>
</el-table-column>
<el-table-column label="SKU名" align="left" prop="goodsSpec" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ getSkuValues(scope.row.goodsSpec)}}
</template>
</el-table-column>
<el-table-column label="Sku编码" align="left" prop="skuNum" width="200"/>
<el-table-column label="系统SkuId" align="left" prop="erpSkuId" width="150"/>
<el-table-column label="商品数量" align="center" prop="quantity" width="50px">
<template slot-scope="scope">
<el-tag size="small" type="danger">{{scope.row.quantity}}</el-tag>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column label="订单金额" align="center" prop="orderAmount" :formatter="amountFormatter"/>
<el-table-column label="下单时间" align="center" prop="orderCreateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderTime) }}</span>
</template>
</el-table-column>
<el-table-column label="收件人" prop="receiverName" width="200px">
<template slot-scope="scope">
{{scope.row.receiverName}}&nbsp;
{{scope.row.receiverMobile}} <br />
{{scope.row.province}} {{scope.row.city}} {{scope.row.town}} <br />
</template>
</el-table-column>
<el-table-column label="订单备注" align="center" >
<template slot-scope="scope">
<div style="color: #ed5565">{{scope.row.remark}}</div>
<div style="color: #ed5565">{{scope.row.buyerMemo}}</div>
<div style="color: #ed5565">{{scope.row.sellerMemo}}</div>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 取号 -->
<el-dialog title="取号" :visible.sync="getCodeOpen" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="电子面单账户" prop="accountId">
<el-select v-model="form.accountId" placeholder="请选择电子面单账户" clearable>
<el-option
v-for="item in deliverList"
:key="item.id"
:label="item.deliveryId"
:value="item.id">
<span style="float: left">{{ item.deliveryId }}</span>
<span style="float: right; color: #8492a6; font-size: 13px" >{{item.siteName}}:{{item.available}}</span>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="getCodeOpenForm">取号并发货</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 打包发货对话框 -->
<el-dialog title="打包发货" :visible.sync="shipOpen" width="1100px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" >
<el-descriptions title="订单信息">
<el-descriptions-item label="ID">{{form.id}}</el-descriptions-item>
<el-descriptions-item label="订单号">{{form.orderNum}}</el-descriptions-item>
<el-descriptions-item label="店铺">
{{ shopList.find(x=>x.id == form.shopId)?shopList.find(x=>x.id == form.shopId).name:'' }}
<el-tag size="small" v-if="form.shopType === 5">微信小店</el-tag>
</el-descriptions-item>
<el-descriptions-item label="买家留言">
{{form.buyerMemo}}
</el-descriptions-item>
<el-descriptions-item label="备注">
{{form.remark}}
</el-descriptions-item>
<el-descriptions-item label="创建时间">
{{ parseTime(form.createTime) }}
</el-descriptions-item>
<el-descriptions-item label="订单状态">
<el-tag v-if="form.orderStatus === 1" style="margin-bottom: 6px;">待发货</el-tag>
<el-tag v-if="form.orderStatus === 2" style="margin-bottom: 6px;">已发货</el-tag>
<el-tag v-if="form.orderStatus === 3" style="margin-bottom: 6px;">已签收</el-tag>
</el-descriptions-item>
<el-descriptions-item label="退款状态">
<el-tag v-if="form.refundStatus === 1">无售后或售后关闭</el-tag>
<el-tag v-if="form.refundStatus === 2">售后处理中</el-tag>
<el-tag v-if="form.refundStatus === 3">退款中</el-tag>
<el-tag v-if="form.refundStatus === 4">退款成功</el-tag>
</el-descriptions-item>
<el-descriptions-item label="">
<!-- <el-tag v-if="form.shipType === 1" type="danger">供应商代发</el-tag>-->
<!-- <el-tag v-if="form.shipType === 0" type="danger">仓库发货</el-tag>-->
</el-descriptions-item>
<el-descriptions-item label="收件人姓名">{{form.receiverName}}</el-descriptions-item>
<el-descriptions-item label="收件人手机号">{{form.receiverMobile}}</el-descriptions-item>
<el-descriptions-item label="省市区">{{form.province}}{{form.city}}{{form.town}}</el-descriptions-item>
<el-descriptions-item label="详细地址">{{form.address}}</el-descriptions-item>
</el-descriptions>
<el-divider content-position="center">商品明细</el-divider>
<el-table :data="form.itemList" style="margin-bottom: 10px;">
<!-- <el-table-column type="selection" width="50" align="center" /> -->
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="商品图片" prop="goodsImg" width="80">
<template slot-scope="scope">
<el-image style="width: 70px; height: 70px" :src="scope.row.goodsImg"></el-image>
</template>
</el-table-column>
<el-table-column label="商品标题" prop="goodsTitle" ></el-table-column>
<el-table-column label="SKU" prop="goodsSpec" width="150"></el-table-column>
<el-table-column label="sku编码" prop="skuNum"></el-table-column>
<!-- <el-table-column label="单价" prop="goodsPrice"></el-table-column>-->
<el-table-column label="数量" prop="quantity"></el-table-column>
<!-- <el-table-column label="商品金额" prop="itemAmount"></el-table-column> -->
</el-table>
<el-form-item label="包裹尺寸" prop="height">
<el-input type="number" v-model.number="form.length" placeholder="长mm" style="width:90px" /> x
<el-input type="number" v-model.number="form.width" placeholder="宽mm" style="width:90px" /> x
<el-input type="number" v-model.number="form.height" placeholder="高mm" style="width:90px" />
</el-form-item>
<el-form-item label="包裹重量" prop="weight">
<el-input type="number" v-model.number="form.weight" placeholder="请输入包裹重量（单位g）" style="width:300px" />
</el-form-item>
<el-row>
<el-col>
<el-form-item label="物流公司" prop="shippingCompany">
<!-- <el-input v-model="form.shippingCompany" placeholder="请输入物流公司" style="width:300px" />-->
<el-select v-model="form.shippingCompany" filterable r placeholder="选择快递公司" style="width:300px">
<el-option v-for="item in logisticsList" :key="item.id" :label="item.name" :value="item.id">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px" >{{item.number}}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="物流单号" prop="shippingNumber">
<el-input v-model="form.shippingNumber" placeholder="请输入物流单号" style="width:300px" />
</el-form-item>
<el-form-item label="包装费用" prop="packageAmount">
<el-input v-model="form.packageAmount" placeholder="请输入包装费用" style="width:300px" />
</el-form-item>
<el-form-item label="物流费用" prop="shippingCost">
<el-input v-model="form.shippingCost" placeholder="请输入物流费用" style="width:300px" />
</el-form-item>
<el-form-item label="发货人" prop="shippingMan">
<el-input v-model="form.shippingMan" placeholder="请输入发货人" style="width:300px" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitShipForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 分配给供应商发货对话框 -->
<el-dialog title="分配给供应商发货" :visible.sync="allocateShipmentOpen" width="1100px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" >
<el-descriptions title="订单信息">
<el-descriptions-item label="订单号">{{form.orderNum}}</el-descriptions-item>
<el-descriptions-item label="买家留言">
{{form.buyerMemo}}
</el-descriptions-item>
<el-descriptions-item label="卖家留言">
{{form.sellerMemo}}
</el-descriptions-item>
<el-descriptions-item label="创建时间">
{{ parseTime(form.createTime) }}
</el-descriptions-item>
<el-descriptions-item label="收件人姓名">{{form.receiverName}}</el-descriptions-item>
<el-descriptions-item label="收件人手机号">{{form.receiverMobile}}</el-descriptions-item>
<el-descriptions-item label="省市区">{{form.province}}{{form.city}}{{form.town}}</el-descriptions-item>
<el-descriptions-item label="详细地址">{{form.address}}</el-descriptions-item>
</el-descriptions>
<el-divider content-position="center">商品明细</el-divider>
<el-table :data="form.itemList" style="margin-bottom: 10px;">
<!-- <el-table-column type="selection" width="50" align="center" /> -->
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="商品图片" prop="goodsImg" width="80">
<template slot-scope="scope">
<el-image style="width: 70px; height: 70px" :src="scope.row.goodsImg"></el-image>
</template>
</el-table-column>
<el-table-column label="商品标题" prop="goodsTitle" ></el-table-column>
<el-table-column label="SKU" prop="goodsSpec" width="150"></el-table-column>
<el-table-column label="sku编码" prop="skuNum"></el-table-column>
<!-- <el-table-column label="单价" prop="goodsPrice"></el-table-column>-->
<el-table-column label="数量" prop="quantity"></el-table-column>
<!-- <el-table-column label="商品金额" prop="itemAmount"></el-table-column> -->
</el-table>
<el-form-item label="收件人" prop="receiverName">
<el-input v-model="form.receiverName" placeholder="请输入收件人" style="width:300px" />
</el-form-item>
<el-form-item label="手机号" prop="receiverMobile">
<el-input type="number" v-model.number="form.receiverMobile" placeholder="请输入收件人" style="width:300px" />
</el-form-item>
<el-form-item label="详细地址" prop="address">
<el-input v-model="form.address" placeholder="请输入详细地址" style="width:300px" />
</el-form-item>
<el-form-item label="买家留言" prop="buyerMemo">
<el-input type="textarea" v-model="form.buyerMemo" placeholder="请输入买家留言" style="width:300px" />
</el-form-item>
<el-form-item label="卖家留言" prop="sellerMemo">
<el-input type="textarea" v-model="form.sellerMemo" placeholder="请输入卖家留言" style="width:300px" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitAllocateShipmentForm">分配给供应商发货</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import {
getOrder,
manualShipmentOrder,
allocateShipmentOrder,
waitSelfShipmentList
} from "@/api/order/order";
import {listLogisticsStatus} from "@/api/api/logistics";
import {listShop} from "@/api/shop/shop";
import {amountFormatter, parseTime} from "@/utils/zhijian";
import {getDicts} from "@/api/system/dict/data";
export default {
name: "ShipmentWait",
data() {
return {
// 遮罩层
loading: true,
getCodeOpen: false,
// 选中数组
ids: [],
shopList: [],
orderList: [],
logisticsList: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
shipOpen: false,
allocateShipmentOpen: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
shopType:null,
shopId:null,
},
// 打印参数
printParams: {
deliver: null,
printer: null
},
// 表单参数
form: {
weight:0.0
},
printerList: [],
deliverList: [],
// 表单校验
rules: {
height: [{ required: true, message: '不能为空' }],
weight: [{ required: true, message: '不能为空' }],
shippingNumber: [{ required: true, message: '不能为空' }],
shippingCompany: [{ required: true, message: '不能为空' }],
packageAmount: [{ required: true, message: '不能为空' }],
shippingCost: [{ required: true, message: '不能为空' }],
// shippingMan: [{ required: true, message: '不能为空' }],
receiverName: [{ required: true, message: '不能为空' }],
receiverMobile: [{ required: true, message: '不能为空' }],
address: [{ required: true, message: '不能为空' }],
}
};
},
created() {
listShop().then(response => {
this.shopList = response.rows;
this.getList();
});
},
methods: {
amountFormatter,
parseTime,
getSkuValues(spec){
try {
// 解析 JSON，返回一个数组
const parsedSpec = JSON.parse(spec) || [];
// 使用 map 提取所有 value，使用 join() 用逗号连接
return parsedSpec.map(item => item.attr_value).join(', ') || '';
} catch (error) {
return spec; // 如果 JSON 解析出错，返回空字符串
}
},
/** 查询列表 */
getList() {
this.loading = true;
waitSelfShipmentList(this.queryParams).then(response => {
this.orderList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
// 取消按钮
cancel() {
this.open = false;
this.allocateShipmentOpen = false;
this.shipOpen = false;
this.getCodeOpen = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
erpSkuId: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleLink(row) {
this.reset();
const id = row.id || this.ids
getGoodsSku(id).then(response => {
console.log('=====00000000============',response)
this.form = response.data;
this.open = true;
});
},
getUUID(len, radix) {
var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
var uuid = [], i;
radix = radix || chars.length;
if (len) {
for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
} else {
var r;
uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
uuid[14] = '4';
for (i = 0; i < 36; i++) {
if (!uuid[i]) {
r = 0 | Math.random() * 16;
uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
}
}
}
return uuid.join('');
},
handleShipSend(){
pushShipSend({shopId: this.queryParams.shopId, ids: this.ids}).then(response => {
this.$modal.msgSuccess("发货成功！");
this.getList()
})
},
// 分配给供应商发货
allocateShipmentToSupplier(row){
this.reset();
const id = row.id || this.ids
console.log('======',id)
getOrder(id).then(response => {
this.form = response.data;
this.allocateShipmentOpen = true;
// this.detailTitle = "订单详情";
});
},
// 手动发货按钮
handleShip(row){
this.reset();
const id = row.id || this.ids
console.log('======',id)
getOrder(id).then(response => {
this.form = response.data;
this.form.length=0
this.form.width=0
this.form.height=0
this.form.weight=0.0
this.form.shippingCost=4.0
this.form.packageAmount=1.0
listLogisticsStatus({shopType:response.data.shopType}).then(resp=>{
this.logisticsList = resp.rows
})
// 获取系统配置的物流费用
getDicts('logistics_cost').then(resp=>{
console.log("=====获取配置的物流费用=====",resp)
})
this.shipOpen = true;
// this.detailTitle = "订单详情";
});
},
// 手动发货表单
submitShipForm(){
this.$refs["form"].validate(valid => {
if (valid) {
manualShipmentOrder(this.form).then(resp =>{
this.$modal.msgSuccess("手动发货成功");
this.shipOpen = false
this.getList()
})
}
})
},
// 分配给供应商发货
submitAllocateShipmentForm(){
this.$refs["form"].validate(valid => {
if (valid) {
allocateShipmentOrder(this.form).then(resp =>{
if(resp.code==200){
this.$modal.msgSuccess("分配发货成功");
this.allocateShipmentOpen = false
this.getList()
}else{
this.$modal.msgError(resp.msg);
}
})
}
})
}
}
};
</script>