Skip to content

J
jiedao-app-operator-master
Commit 759ce0d2 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

部分bug和新需求

parent 2192026f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 246 additions and 203 deletions
src/views/ecw/order/components/DetailProd.vue
View file @ 759ce0d2
......@@ -270,12 +270,13 @@ export default {
<template slot-scope="{row}">
<!--<el-link type="primary" @click.native="showWarehouseLogs(row,1)">{{row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0}}</el-link>
<div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>-->
<div v-if="row.warehouseInInfoVO">
<el-link type="primary" @click.native="$emit('showWarehouseLogs', row,1)" v-if="row.warehouseInInfoVO">
{{row.warehouseInInfoVO.cartonsNum}}{{$t('箱')}}
{{row.warehouseInInfoVO.weight}}Kg
{{row.warehouseInInfoVO.volume}}m³
{{row.warehouseInInfoVO.quantityAll}}{{$t('个')}}
</div>
</el-link>
<div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>
</template>
</el-table-column>
<el-table-column prop="warehouseType" :label="$t('类型')" width="120px"/>
......
src/views/ecw/order/components/Release.vue
View file @ 759ce0d2
<template>
<el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" width="1000px">
<el-form v-if="agreement" ref="form" :model="formData" :rules="rules" size="small" label-width="100px">
<el-form v-if="agreement" ref="form" :model="formData" :rules="rules" size="small" label-width="140px">
<el-row>
<el-col :span="6">
<el-col :span="8">
<el-form-item :label="$t('订单号')">
{{ detail.orderNo }}
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('总箱数')">
{{ detail.sumNum }}
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item :label="$t('体积')">
{{ detail.sumVolume }}m³
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item :label="$t('重量')">
{{ detail.sumWeight }}kg
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item :label="$t('总箱数')">
{{ detail.sumNum }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('总控货箱数')">
{{ detail.sumNum }}
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item :label="$t('剩余放货箱数')">
{{ detail.sumNum - detail.releaseNum }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="$t('到仓日期/卸柜日期')" label-width="200px">
{{ detail.unloadTime }}
<el-col :span="8">
<el-form-item :label="$t('到仓日期/卸柜日期')">
{{ detail.unloadTime || '-'}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('放货锁定收货人到期')" label-width="200px">
<el-col :span="8">
<el-form-item :label="$t('放货锁定收货人到期')">
{{ detail.lockConsigneeTime || '-' }}
</el-form-item>
</el-col>
......@@ -48,17 +46,19 @@
<div class="title">{{ $t('请填写放货信息') }}</div>
<div class="flex">
<el-form-item :label="$t('收货人')" prop="consigneeName">
<el-input v-model="formData.consigneeName" :placeholder="$t('请输入收货人')" clearable
<el-input v-model="formData.consigneeName" :placeholder="$t('请输入收货人')" clearable :disabled="disableUpdateCongsignee"
class="w-150"></el-input>
</el-form-item>
<el-form-item :label="$t('收货人电话')" prop="consigneePhone">
<!-- <el-input v-model="formData.field109" :placeholder="$t('区号')" clearable class="w-150"></el-input> -->
<area-code-selector v-model="formData.consigneeCountryCode" class="w-150"/>
<el-input v-model="formData.consigneePhone" :placeholder="$t('请输入收货人电话')" clearable
class="w-150 ml-10"></el-input>
<div class="flex">
<area-code-selector v-model="formData.consigneeCountryCode" class="w-80" :disabled="disableUpdateCongsignee"/>
<el-input v-model="formData.consigneePhone" :placeholder="$t('请输入收货人电话')" clearable :disabled="disableUpdateCongsignee"
class="w-120 flex-1 ml-5"></el-input>
</div>
</el-form-item>
<el-form-item :label="$t('收货人邮箱')" prop="consigneeEmail">
<el-input v-model="formData.consigneeEmail" :placeholder="$t('请输入收货人邮箱')" clearable
<el-input v-model="formData.consigneeEmail" :placeholder="$t('请输入收货人邮箱')" clearable :disabled="disableUpdateCongsignee"
class="w-150"></el-input>
</el-form-item>
</div>
......@@ -168,6 +168,14 @@ export default {
t += '-' + this.detail.orderNo
}
return t
},
disableUpdateCongsignee(){
if(!this.detail?.isLimitUpdateConsignee) return false
// 锁定且过期了返回false，其他情况全部是true
if(this.detail.isLimitUpdateConsignee && this.detail.isLimitUpdateConsignee && new Date(this.detail.isLimitUpdateConsignee).getTime() > Date.now()){
return false
}
return true
}
},
created() {
......@@ -206,6 +214,9 @@ export default {
}
</script>
<style lang="scss" scoped>
.w-80{
width: 80px;
}
.title {
font-size: 16px;
margin: 20px 0;
......
src/views/ecw/order/detail.vue
View file @ 759ce0d2
......@@ -187,11 +187,27 @@
<el-card class="card">
<el-tabs v-model="activeName">
<el-tab-pane :label="$t('货物详情')" name="first">
<detail-prod :list="order.orderItemVOList" :attr-list="attrList" :prod-type-list="prodTypeList" :currency-map="currencyMap" :unit-map="unitMap" :transport-id="order.transportId"></detail-prod>
<detail-prod
:list="order.orderItemVOList"
:attr-list="attrList"
:prod-type-list="prodTypeList"
:currency-map="currencyMap"
:unit-map="unitMap"
:transport-id="order.transportId"
@showWarehouseLogs="showWarehouseLogs"
></detail-prod>
</el-tab-pane>
<!--退参品名 退仓/已混箱品名 lanbm 2024-04-16 按客户的要求修改-->
<el-tab-pane :label="$t('退仓/已混箱品名')" name="six">
<detail-prod :list="orderItemDeletedData" :attr-list="attrList" :prod-type-list="prodTypeList" :currency-map="currencyMap" :unit-map="unitMap" :transport-id="order.transportId"></detail-prod>
<detail-prod
:list="orderItemDeletedData"
:attr-list="attrList"
:prod-type-list="prodTypeList"
:currency-map="currencyMap"
:unit-map="unitMap"
:transport-id="order.transportId"
@showWarehouseLogs="showWarehouseLogs"
></detail-prod>
</el-tab-pane>
<!--lanbm 2024-06-11 处理订单到仓时间取值问题-->
<el-tab-pane :label="$t('订单动态')" name="second">
......
src/views/ecw/order/exception/index.vue
View file @ 759ce0d2
......@@ -7,6 +7,7 @@
size="small"
:inline="true"
label-width="100px"
class="search-z"
>
<el-form-item :label="$t('订单号') + ':'">
<el-input
......@@ -15,12 +16,12 @@
clearable
@keyup.enter.native="handleQuery"
@input="replaceSpace(queryParams, 'orderNo')"
class="w-200"
>
<template slot="prepend">
<dict-selector
:type="DICT_TYPE.EXCEPTION_SELECT_FILED"
v-model="queryParams.orderNoKey"
class="w-50"
/>
</template>
</el-input>
......@@ -31,6 +32,7 @@
:placeholder="$t('发货人')"
clearable
@keyup.enter.native="handleQuery"
class="w-200"
/>
</el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeText">
......@@ -39,6 +41,7 @@
:placeholder="$t('收货人')"
clearable
@keyup.enter.native="handleQuery"
class="w-200"
/>
</el-form-item>
<el-form-item :label="$t('运输方式') + ':'" v-show="showSearch">
......@@ -46,15 +49,16 @@
:type="DICT_TYPE.ECW_TRANSPORT_TYPE"
:clearable="true"
v-model="queryParams.transportId"
class="w-200"
/>
</el-form-item>
<div>
<el-form-item :label="$t('始发仓')">
<el-select
v-model="queryParams.startWarehouseIds"
multiple
:placeholder="$t('请选择始发仓')"
clearable
class="w-200"
>
<el-option
v-for="item in exportWarehouseList"
......@@ -73,6 +77,7 @@
:placeholder="$t('请选择目的国')"
clearable
@change="handleQuery"
class="w-200"
>
<el-option
v-for="item in AddressProvince"
......@@ -90,6 +95,7 @@
style="width: 200px"
clearable
@change="handleQuery"
class="w-200"
>
<el-option
v-for="item in AddressCity"
......@@ -107,6 +113,7 @@
style="width: 200px"
clearable
@change="handleQuery"
class="w-200"
>
<el-option
v-for="item in AddressTown"
......@@ -116,7 +123,6 @@
></el-option>
</el-select>
</el-form-item>
</div>
<!--<el-form-item :label="$t('订单状态')" prop="status">
<dict-selector
......@@ -132,6 +138,7 @@
multiple
:placeholder="$t('请选择')"
clearable
class="w-200"
>
<el-option
v-for="dict in followUpList"
......@@ -150,6 +157,7 @@
:options="channelList"
value-field="channelId"
:label-field="$l(null, 'name')"
class="w-200"
></selector>
</el-form-item>
<el-form-item :label="$t('控货') + ':'" v-show="showSearch">
......@@ -158,6 +166,7 @@
:clearable="true"
v-model="queryParams.isCargoControl"
@keyup.enter.native="handleQuery"
class="w-200"
/>
</el-form-item>
<el-form-item :label="$t('异常状态') + ':'">
......@@ -167,6 +176,7 @@
v-model="queryParams.orderExceptionStatusList"
multiple
@keyup.enter.native="handleQuery"
class="w-200"
/>
</el-form-item>
<el-form-item :label="$t('异常类型') + ':'">
......@@ -175,6 +185,8 @@
:clearable="true"
v-model="queryParams.orderExceptionType"
@keyup.enter.native="handleQuery"
multiple
class="w-200"
/>
</el-form-item>
<!-- <el-form-item :label="$t('发货人')+':'">
......@@ -191,6 +203,7 @@
clearable
@keyup.enter.native="handleQuery"
@input="replaceSpace(queryParams, 'marks')"
class="w-200"
>
<template slot="prepend">
<dict-selector
......@@ -202,17 +215,17 @@
</el-input>
</el-form-item>
<el-form-item :label="$t('商品') + ':'">
<div style="display: flex; width: 100%">
<div class="flex w-200">
<dict-selector
:type="DICT_TYPE.EXCEPTION_SELECT_FILED"
style="width: 90px"
style="width: 40px"
v-model="queryParams.goodsNameKey"
/>
<product-selector
v-model.trim="queryParams.goodsName"
style="flex: 1"
:clearable="true"
@keyup.enter.native="handleQuery"
class="flex-1"
/>
</div>
</el-form-item>
......@@ -224,6 +237,7 @@
v-model="queryParams.productRecord"
multiple
@keyup.enter.native="handleQuery"
class="w-200"
/>
</el-form-item>
<el-form-item :label="$t('客户经理') + ':'">
......@@ -232,6 +246,7 @@
multiple
:placeholder="$t('请选择客户经理')"
clearable
class="w-200"
>
<el-option
v-for="item in creatorData"
......@@ -247,6 +262,7 @@
:placeholder="$t('请选择')"
clearable
@change="handleQuery"
class="w-200"
>
<el-option :label="$t('外部仓')" :value="1"></el-option>
<el-option :label="$t('自有仓')" :value="0"></el-option>
......@@ -258,6 +274,7 @@
multiple
:placeholder="$t('请选择')"
clearable
class="w-200"
>
<template
v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"
......@@ -270,7 +287,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch">
<selector v-model="queryParams.goodsTypes" multiple clearable :options="productAttrList" label-field="attrName" value-field="id">
<selector v-model="queryParams.goodsTypes" multiple clearable :options="productAttrList" label-field="attrName" value-field="id" class="w-200">
</selector>
</el-form-item>
<el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch">
......@@ -280,13 +297,14 @@
:placeholder="$t('请选择')"
clearable
@change="handleQuery"
class="w-200"
>
<el-option :label="$t('普通订单')" :value="0"></el-option>
<el-option :label="$t('集运服务')" :value="1"></el-option>
<el-option :label="$t('海外仓')" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<div class="flex pb-20 items-center">
<el-select
v-model="queryParams.dateType"
style="width: 150px"
......@@ -312,17 +330,14 @@
type="datetime"
:placeholder="$t('请选择结束日期')"
/>
</el-form-item>
<el-form-item>
<div class="mr-10">
<el-checkbox
style="margin-left: 60px"
v-model="queryParams.isHaveCustomer"
@change="handleQuery"
>{{ $t("无归属订单") }}</el-checkbox>
</el-form-item>
</div>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
......@@ -332,7 +347,7 @@
<el-button icon="el-icon-refresh" @click="reset">{{
$t("重置")
}}</el-button>
</el-form-item>
</div>
</el-form>
<!-- 操作工具栏 -->
......
src/views/ecw/order/index.vue
View file @ 759ce0d2
This diff is collapsed.
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