Skip to content

J
jiedao-app-operator-master
Commit 08bafad9 authored by Smile's avatar Smile
Browse files
Options

包裹主页面

parent 4efb5b05
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 73 deletions
src/utils/dict.js
View file @ 08bafad9
......@@ -284,6 +284,7 @@ export const DICT_TYPE = {
CONS_BUSINESS_NODE: "cons_business_node",//集运业务节点
ECW_LANGUAGE_CODE: "ecw_language_code",//语言编码
CONS_STATUS: "cons_status", //包裹状态
CONS_INSPECT_STATUS: "cons_inspect_status", //验货状态
};
/**
......
src/views/ecw/cons/index.vue
View file @ 08bafad9
......@@ -3,79 +3,21 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="编号" prop="customerId">
<el-input v-model="queryParams.customerId" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('编号')">
<el-input
v-model.trim="noParam.value"
:placeholder="$t('请输入快递号、包裹号、订单号')"
clearable
class="w-200"
@input="replaceSpace(noParam, 'value')"
@keyup.enter.native="handleQuery">
<template slot="prepend">
<dict-selector :type="DICT_TYPE.ORDER_QUERY_NO_FIELD" defaultable v-model="noParam.key" />
</template>
</el-input>
</el-form-item>
<el-form-item label="发货人" prop="customerNumber">
<el-input v-model="queryParams.customerNumber" placeholder="请输入发货人手机号、名称、客户编号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="发货人名称" prop="customerNumber">
<el-input v-model="queryParams.customerNumber" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="客户经理" prop="customerNumber">
<el-input v-model="queryParams.customerNumber" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="运输方式" prop="transportId">
<el-input v-model="queryParams.transportId" placeholder="请输入运输方式来自字典的值" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="目的国" prop="orderId">
<el-input v-model="queryParams.orderId" placeholder="请输入订单ID，关联订单表" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="目的城市" prop="platformId">
<el-input v-model="queryParams.platformId" placeholder="请输入平台ID，关联平台表数据，为后面系统对接预留字段" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="平台订单号" prop="platformOrderSn">
<el-input v-model="queryParams.platformOrderSn" placeholder="请输入平台订单号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="包裹状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择包裹状态，来自字典表，cons_status" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="快递公司ID" prop="expressId">
<el-input v-model="queryParams.expressId" placeholder="请输入快递公司ID，对应快递公司表" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="快递单号" prop="expressNo">
<el-input v-model="queryParams.expressNo" placeholder="请输入快递单号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="仓库ID" prop="wareId">
<el-input v-model="queryParams.wareId" placeholder="请输入仓库ID" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="货值" prop="worth">
<el-input v-model="queryParams.worth" placeholder="请输入货值" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="货值单位" prop="worthCurrency">
<el-input v-model="queryParams.worthCurrency" placeholder="请输入货值单位，默认为3，人民币" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="预计到仓时间">
<el-date-picker v-model="dateRangeWatEtime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="">
<el-date-picker v-model="dateRangeWatTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="是否被签收" prop="signed">
<el-select v-model="queryParams.signed" placeholder="请选择是否被签收" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="签收时间">
<el-date-picker v-model="dateRangeSignedTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="签收备注" prop="signedRemarks">
<el-input v-model="queryParams.signedRemarks" placeholder="请输入签收备注" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="数量" prop="sumQuantity">
<el-input v-model="queryParams.sumQuantity" placeholder="请输入数量" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input v-model="queryParams.remarks" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
<el-input v-model="queryParams.customerKey" placeholder="请输入发货人手机号、客户编号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
......@@ -114,6 +56,11 @@
<dict-tag :type="DICT_TYPE.CONS_BUSINESS_NODE" :value="scope.row.businessNode" />
</template>
</el-table-column>
<el-table-column label="最新跟进时间" align="center">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.trackingTime) }}</span>
</template>
</el-table-column>
<el-table-column label="箱数" align="center" prop="sumQuantity" />
<el-table-column label="填单商品" align="center">
<template slot-scope="scope">
......@@ -152,12 +99,34 @@
{{scope.row.channelName||"/"}}
</template>
</el-table-column>
<el-table-column :label="$t('验货')" align="center">
<template slot-scope="scope">
<template v-if="scope.row.needInspect==='0'">
{{$t('未申请')}}
</template>
<template v-else>
<dict-tag :type="DICT_TYPE.CONS_INSPECT_STATUS" :value="scope.row.inspectStatus" />
</template>
</template>
</el-table-column>
<el-table-column :label="$t('包裹状态')" align="center">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CONS_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remarks" />
<el-table-column label="关联订单号" align="center" prop="orderNo" />
<el-table-column :label="$t('订单状态')" align="center">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.orderStatus" />
</template>
</el-table-column>
<el-table-column :label="$t('退仓处理状态')" align="center">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.AUDIT_STATUS" :value="scope.row.returnStatus" />
</template>
</el-table-column>
<el-table-column label="包裹号" align="center" prop="consNum" />
<el-table-column label="包裹备注" align="center" prop="remarks" />
<el-table-column label="" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
......@@ -254,10 +223,12 @@
<script>
import {createCons, deleteCons, exportConsExcel, getCons, getConsPage, updateCons} from "@/api/ecw/cons";
import Template from "@/views/cms/template/index.vue";
export default {
name: "Cons",
components: {
Template
},
data() {
return {
......@@ -275,6 +246,11 @@ export default {
title: "",
// 是否显示弹出层
open: false,
// 编号搜索条件
noParam: {
key: "numberKey",
value: ""
},
dateRangeWatEtime: [],
dateRangeWatTime: [],
dateRangeSignedTime: [],
......@@ -316,8 +292,20 @@ export default {
isChinese() {
return this.$i18n.locale === "zh_CN";
},
combinedQueryParams(){
console.log(this.queryParams)
let queryParams = {...this.queryParams}
if (this.noParam.value) {
queryParams[this.noParam.key] = this.noParam.value
}
return queryParams
},
},
methods: {
// 自动去除空格
replaceSpace(obj, field) {
obj[field] = obj[field].replace(/\s+/g, "")
},
getGoodsName(val){
return val.map((item, index) => `${index + 1}.${item.prodName}*${item.quantity}`).join('<br>');
},
......@@ -340,7 +328,8 @@ export default {
getList() {
this.loading = true;
// 处理查询参数
let params = {...this.queryParams};
let params = { ...this.combinedQueryParams };
console.log(params)
this.addBeginAndEndTime(params, this.dateRangeWatEtime, 'watEtime');
this.addBeginAndEndTime(params, this.dateRangeWatTime, 'watTime');
this.addBeginAndEndTime(params, this.dateRangeSignedTime, 'signedTime');
......@@ -395,6 +384,7 @@ export default {
this.dateRangeWatTime = [];
this.dateRangeSignedTime = [];
this.dateRangeCreateTime = [];
this.noParam.value = ""
this.resetForm("queryForm");
this.handleQuery();
},
......
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