Skip to content

J
jiedao-app-operator-master
Commit f56fe670 authored by zs嵩's avatar zs嵩
Browse files
Options

Merge branch 'test' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into test

parents 2505bb99 4722185a
Show whitespace changes
Inline Side-by-side
Showing with 242 additions and 187 deletions
src/api/ecw/customer.js
View file @ f56fe670
......@@ -291,6 +291,14 @@ export function infoListOrderPage(params){
params
})
}
//客户详情订单统计
export function infoListStatisticsOrder(params){
return request({
url:'/ecw/order/customer-statistics-order',
method:'get',
params
})
}
//客户详情 --- 报价
export function infoListOfferPage(params){
return request({
......
src/api/ecw/order.js
View file @ f56fe670
......@@ -359,6 +359,13 @@ export function feeApplicationGet(params) {
params
})
}
export function approvalFeeApplicationGet(params) {
return request({
url: "/order/fee-application/approval/get",
method: "get",
params
})
}
//获得调仓明细
export function orderWarehouseInGetAdjustInfo(params) {
......
src/views/ecw/box/indexAir.vue
View file @ f56fe670
<template>
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="88px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="108px">
<el-form-item :label="$t('自编号')" prop="selfNo">
<el-input v-model="queryParams.selfNo" :placeholder="$t('请输入自编号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
......@@ -33,12 +33,12 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('状态')" prop="shipmentStatusAir">
<el-select v-model="queryParams.shipmentStatusAir" :placeholder="$t('请选择状态')" clearable size="small">
<el-form-item :label="$t('状态')" prop="shipmentStatusAirList">
<el-select v-model="queryParams.shipmentStatusAirList" :placeholder="$t('请选择状态')" clearable size="small" multiple collapse-tags>
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_AIR_SHIPMENT_STATE)" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
</el-select>
</el-form-item>
<el-row>
<!-- <el-row> -->
<el-form-item :label="$t('时间')" prop="date">
<el-select v-model="queryParams.dateType" :placeholder="$t('请选择时间类型')" clearable size="small">
<el-option v-for="item in dateTypes" :key="item.value" :label="item.label" :value="item.value" />
......@@ -66,7 +66,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('发货方式')" prop="deliveryType" v-show="showSearch">
<el-select v-model="queryParams.deliveryType" :placeholder="$t('请选择发货方式')" clearable size="small">
<el-select v-model="queryParams.deliveryType" :placeholder="$t('请选择发货方式')" clearable size="small" multiple collapse-tags>
<el-option v-for="item in deliveryTypeData" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
......@@ -86,14 +86,11 @@
<supplierSelect v-model="queryParams.shipperId" :companyType="'5'" :placeholder="$t('请选择订舱代理')" :allSupplier="allSupplier" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('航空公司')" v-show="showSearch">
<supplierSelect v-model="queryParams.airlineCompanyId" :placeholder="$t('请选择航空公司')" company-type="10" :allSupplier="allSupplier" clearable multiple collapse-tags />
<supplierSelect v-model="queryParams.airlineCompanyIdList" :placeholder="$t('请选择航空公司')" company-type="10" :allSupplier="allSupplier" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('代理公司Agent')" v-show="showSearch">
<supplierSelect v-model="queryParams.agentIdList" :placeholder="$t('请选择代理公司')" company-type="1" :allSupplier="allSupplier" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('预计起飞时间')" prop="flyTime" v-show="showSearch">
<el-date-picker type="datetimerange" :start-placeholder="$t('预计起飞开始日期')" :end-placeholder="$t('预计起飞结束日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.flyBeginTime"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch">
<el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable multiple collapse-tags>
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
......@@ -102,11 +99,16 @@
<el-form-item :label="$t('报关公司')" v-show="showSearch">
<supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable multiple collapse-tags />
</el-form-item>
<el-row>
<el-form-item :label="$t('预计起飞时间')" prop="flyTime" v-show="showSearch">
<el-date-picker type="datetimerange" :start-placeholder="$t('预计起飞开始日期')" :end-placeholder="$t('预计起飞结束日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.flyBeginTime"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('放行时间')" v-show="showSearch">
<el-date-picker type="datetimerange" :start-placeholder="$t('放行开始日期')" :end-placeholder="$t('放行结束日期')" v-model="queryParams.dcPassBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
</el-row>
<!-- </el-row> -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
......@@ -748,6 +750,26 @@ export default {
}
});
},
formatQuery() {
let obj = {}
//始发仓
// if (this.startWarehouseId != null && this.startWarehouseId != "") {
// obj.startWarehouseIds = this.startWarehouseId
// }
//目的国
if (this.countryIdList != null && this.countryIdList != "") {
obj.countryIdLists = this.countryIdList
}
//目的城市
if (this.destCityIdList != null && this.destCityIdList != "") {
obj.destCityIdLists = this.destCityIdList
}
//目的仓
if (this.destWarehouseIdList != null && this.destWarehouseIdList != "") {
obj.destWarehouseIdList = this.destWarehouseIdList
}
return obj
},
/** 查询列表 */
getList() {
this.loading = true
......@@ -758,7 +780,7 @@ export default {
this.addBeginAndEndTimeNew(params, params.flyBeginTime, 'fly');// 预计起飞时间
this.addBeginAndEndTimeNew(params, params.dcPassBeginTime, 'dcPass');// 放行时间
// 执行查询
getboxPage(params).then((response) => {
getboxPage({...params, ...this.formatQuery()}).then((response) => {
this.list = response.data.list
this.total = response.data.total
// var lineParams = []
......@@ -793,6 +815,9 @@ export default {
destWarehouseIdList: undefined,
transportType: undefined
}
this.countryIdList = null;
this.destCityIdList = null;
this.destWarehouseIdList = null;
this.resetForm('form')
},
/** 搜索按钮操作 */
......@@ -861,7 +886,7 @@ export default {
.confirm(this.$t('是否确认导出所有出货数据项?'))
.then(() => {
this.exportLoading = true
return exportboxExcel(params)
return exportboxExcel({...params, ...this.formatQuery()})
})
.then((response) => {
this.$download.excel(response, this.$t("空运管理") + ".xls");
......
src/views/ecw/box/indexSea.vue
View file @ f56fe670
......@@ -6,7 +6,7 @@
ref="queryForm"
size="small"
:inline="true"
label-width="68px"
label-width="104px"
>
<el-form-item :label="$t('运输方式')" prop="transportType">
<el-select
......@@ -76,39 +76,41 @@
<el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="dateType">
<el-form-item :label="$t('国家')" prop="countryId">
<el-select
v-model="queryParams.dateType"
:placeholder="$t('请选择时间类型')"
v-model="queryParams.countryId"
:placeholder="$t('请选择国家')"
clearable
size="small"
>
<el-option
v-for="item in dateTypes"
:key="item.value"
:label="$l(item, 'label')"
:value="item.value"
/>
v-for="item in countryList"
:key="item.id"
:label="$l(item, 'title')"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="dateRangeCreateTime">
<el-date-picker
v-model="queryParams.dateRangeCreateTime"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="-"
:start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')"
<el-form-item :label="$t('提单制作')" prop="ladingBillStatus">
<el-select
v-model="queryParams.ladingBillStatus"
:placeholder="$t('请选择提单制作状态')"
clearable
/>
size="small"
>
<el-option
v-for="(item, index) in ladingBillStatusData"
:key="index"
:label="item"
:value="index"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('状态')" prop="boxStatusList">
<el-form-item :label="$t('状态')" prop="shipmentStatusList">
<el-select
v-model="queryParams.boxStatusList"
v-model="queryParams.shipmentStatusList"
:placeholder="$t('请选择状态')"
clearable
multiple
......@@ -124,40 +126,41 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('国家')" prop="countryId">
<el-form-item :label="$t('出单方式')" v-show="showSearch">
<el-select v-model="queryParams.cdOutBillType" :placeholder="$t('请选择出单方式')" clearable multiple collapse-tags>
<el-option v-for="item in method" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-row>
<el-form-item :label="$t('时间')" prop="dateType">
<el-select
v-model="queryParams.countryId"
:placeholder="$t('请选择国家')"
v-model="queryParams.dateType"
:placeholder="$t('请选择时间类型')"
clearable
size="small"
>
<el-option
v-for="item in countryList"
:key="item.id"
:label="$l(item, 'title')"
:value="item.id"
>
</el-option>
v-for="item in dateTypes"
:key="item.value"
:label="$l(item, 'label')"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('提单制作')" prop="ladingBillStatus">
<el-select
v-model="queryParams.ladingBillStatus"
:placeholder="$t('请选择提单制作状态')"
<el-form-item label="" prop="dateRangeCreateTime">
<el-date-picker
v-model="queryParams.dateRangeCreateTime"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="-"
:start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')"
clearable
size="small"
>
<el-option
v-for="(item, index) in ladingBillStatusData"
:key="index"
:label="item"
:value="index"
>
</el-option>
</el-select>
/>
</el-form-item>
</el-row>
<el-form-item :label="$t('起运港')" v-show="showSearch">
<dockSelect v-model="queryParams.bigPortIdList" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
......@@ -171,6 +174,14 @@
<el-form-item :label="$t('订舱公司')" v-show="showSearch">
<supplierSelect v-model="queryParams.spaceCompanyIdList" :companyType="'1'" :placeholder="$t('请选择订舱公司')" :allSupplier="allSupplier" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch">
<el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable multiple collapse-tags>
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('报关公司')" v-show="showSearch">
<supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('预计驳船时间')" v-show="showSearch">
<el-date-picker type="datetimerange" :start-placeholder="$t('预计驳船开始日期')" :end-placeholder="$t('预计驳船结束日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.bargeBeginTime"></el-date-picker>
</el-form-item>
......@@ -186,14 +197,6 @@
<el-form-item :label="$t('截关时间')" v-show="showSearch">
<el-date-picker type="datetimerange" :start-placeholder="$t('截关开始日期')" :end-placeholder="$t('截关结束日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.cutOffBeginTime"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch">
<el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable multiple collapse-tags>
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('报关公司')" v-show="showSearch">
<supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable multiple collapse-tags />
</el-form-item>
<el-form-item :label="$t('放行时间')" v-show="showSearch">
<el-date-picker type="datetimerange" :start-placeholder="$t('放行开始日期')" :end-placeholder="$t('放行结束日期')" v-model="queryParams.dcPassBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
......@@ -203,10 +206,8 @@
<el-form-item :label="$t('预计到港时间')" v-show="showSearch">
<el-date-picker type="datetimerange" :start-placeholder="$t('预计到港开始日期')" :end-placeholder="$t('预计到港结束日期')" v-model="queryParams.estBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('出单方式')" v-show="showSearch">
<el-select v-model="queryParams.cdOutBillType" :placeholder="$t('请选择出单方式')" clearable multiple collapse-tags>
<el-option v-for="item in method" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<el-form-item :label="$t('预计清关时间')" v-show="showSearch">
<el-date-picker type="datetimerange" :start-placeholder="$t('预计清关开始日期')" :end-placeholder="$t('预计清关结束日期')" v-model="queryParams.clEstBeginTime" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="Agent list状态" v-show="showSearch">
<el-select v-model="queryParams.cdAgentlistType">
......@@ -228,9 +229,6 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('预计清关时间')" v-show="showSearch">
<el-date-picker type="datetimerange" :start-placeholder="$t('预计清关开始日期')" :end-placeholder="$t('预计清关结束日期')" v-model="queryParams.clEstBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
......@@ -963,6 +961,26 @@ export default {
this.countryList = response.data;
});
},
formatQuery() {
let obj = {}
//始发仓
// if (this.startWarehouseId != null && this.startWarehouseId != "") {
// obj.startWarehouseIds = this.startWarehouseId
// }
//目的国
if (this.countryIdList != null && this.countryIdList != "") {
obj.countryIdLists = this.countryIdList
}
//目的城市
if (this.destCityIdList != null && this.destCityIdList != "") {
obj.destCityIdLists = this.destCityIdList
}
//目的仓
if (this.destWarehouseIdList != null && this.destWarehouseIdList != "") {
obj.destWarehouseIdList = this.destWarehouseIdList
}
return obj
},
/** 查询列表 */
getList() {
this.loading = true;
......@@ -980,7 +998,7 @@ export default {
this.addBeginAndEndTimeNew(params, params.estBeginTime, 'est');// 预计到港时间
this.addBeginAndEndTimeNew(params, params.dcPassBeginTime, 'dcPass');// 放行时间
// 执行查询
getboxPage(params).then((response) => {
getboxPage({...params, ...this.formatQuery()}).then((response) => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
......@@ -995,6 +1013,9 @@ export default {
resetQuery() {
this.queryParams = {};
this.dateRangeCreateTime = [];
this.countryIdList = null;
this.destCityIdList = null;
this.destWarehouseIdList = null;
this.resetForm("queryForm");
this.handleQuery();
},
......@@ -1060,7 +1081,7 @@ export default {
.confirm(this.$t("是否确认导出所有出货数据项?"))
.then(() => {
this.exportLoading = true;
return exportboxExcel(params);
return exportboxExcel({...params, ...this.formatQuery()});
})
.then((response) => {
this.$download.excel(response, this.$t("海运管理") + ".xls");
......
src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
View file @ f56fe670
......@@ -118,6 +118,9 @@
<el-table-column :label="$t('清关状态')" align="center" prop="">
<template slot-scope="scope">{{ clearStatus(scope.row) }}</template>
</el-table-column>
<el-table-column :label="$t('卸柜/到仓时间')" align="center" prop="">
<template slot-scope="scope">{{ scope.row.unloadTime }}</template>
</el-table-column>
<el-table-column :label="$t('始发仓')" align="center" prop="startWarehouseName" />
<el-table-column :label="$t('目的仓')" align="center" prop="destWarehouseName" />
<el-table-column :label="$t('体积')" align="center" prop="volume" />
......@@ -142,9 +145,9 @@
<div class="btns">
<el-button type="danger" size="small" @click="openError(scope.row)">{{ $t("异常") }}</el-button>
<el-button v-if="pageData.boxCustomsBackVO && pageData.boxCustomsBackVO.overMachineStatus == 2 && pageData.boxCustomsBackVO.overMachineAbnormalStatus == 2" plain type="primary" size="small" @click="$router.push('/order/warehousing-update?id=' + scope.row.orderId)">{{ $t("入仓修改 ") }}</el-button>
<el-button plain type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("撤销到仓") }}</el-button>
<el-button plain type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button>
<el-button plain type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button>
<el-button type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("撤销到仓") }}</el-button>
<el-button type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218 && scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button>
<el-button type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button>
</div>
</template>
</el-table-column>
......
src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
View file @ f56fe670
......@@ -109,6 +109,9 @@
<el-table-column :label="$t('清关状态')" align="center" prop="">
<template slot-scope="scope">{{ clearStatus(scope.row) }}</template>
</el-table-column>
<el-table-column :label="$t('卸柜/到仓时间')" align="center" prop="">
<template slot-scope="scope">{{ scope.row.unloadTime }}</template>
</el-table-column>
<el-table-column :label="$t('始发仓')" align="center" prop="startWarehouseName" />
<el-table-column :label="$t('目的仓')" align="center" prop="destWarehouseName" />
<el-table-column :label="$t('体积')" align="center" prop="volume" />
......@@ -132,9 +135,9 @@
<template slot-scope="scope">
<div class="btns">
<el-button type="danger" size="small" @click="openError(scope.row)">{{ $t("异常") }}</el-button>
<el-button plain type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("撤销到仓") }}</el-button>
<el-button plain type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button>
<el-button plain type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button>
<el-button type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("撤销到仓") }}</el-button>
<el-button type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218 && scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button>
<el-button type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button>
</div>
</template>
</el-table-column>
......
src/views/ecw/customer/components/customerFollow.vue
View file @ f56fe670
......@@ -42,7 +42,7 @@
<el-col :span="12" v-else>
<el-form-item :label="$t('联系人')" required>
<div class="contact">
<el-input :value="form.contactName" placeholder="" disabled />
<el-input v-model="form.contactName" :value="form.customerContactsId" placeholder="" disabled />
<img src="@/assets/svg/contacts.svg" class="phonebook" @click="ChooseContactDialog = true" />
</div>
</el-form-item>
......@@ -268,12 +268,14 @@ export default {
console.log(item)
if (item) {
this.form.contactId = item.customerContactsId
this.form.contactName = item.contactsName
this.form.customerId = item.customerId
this.form.contactPhone = "+" + item.areaCode + item.phoneNew
if (item.customerService) this.form.followUserId = item.customerService
if (item.customerNumber) this.form.customerNumber = item.customerNumber
} else {
this.form.contactId = null
this.form.contactName = null
this.form.contactPhone = null
}
......@@ -283,6 +285,7 @@ export default {
if (val) {
for (const item of this.customerContactsList) {
if (item.id == val) {
this.form.contactId = item.id
this.form.contactName = item.name
this.form.customerId = item.customerId
this.form.contactPhone = "+" + item.areaCode + item.phoneNew
......
src/views/ecw/customer/index.vue
View file @ f56fe670
......@@ -362,7 +362,7 @@
</el-table-column>
<el-table-column :label="$t('主营类别')">
<template slot-scope="{ row }">
{{ getProductTypeNames(row.productType) }}
{{ getProductTypeNames(row.productTypes) }}
</template>
</el-table-column>
<el-table-column :label="$t('主要竞争对手')" prop="competitorNames"> </el-table-column>
......@@ -519,15 +519,15 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('主营类别')" prop="productType">
<el-form-item :label="$t('主营类别')" prop="productTypes">
<el-row :gutter="10">
<el-col :span="11">
<el-select v-model="form.productType" :placeholder="$t('请选择产品类别')">
<el-select v-model="form.productTypes" :placeholder="$t('请选择产品类别')">
<!-- <el-option :label="$t('请选择字典生成')" value="" />-->
</el-select>
</el-col>
<el-col :span="11">
<el-select v-model="form.productType" :placeholder="$t('请选择主营类别')">
<el-select v-model="form.productTypes" :placeholder="$t('请选择主营类别')">
<!-- <el-option :label="$t('请选择字典生成')" value="" />-->
</el-select>
</el-col>
......@@ -1289,8 +1289,8 @@ export default {
agentId: undefined,
company: undefined,
address: undefined,
productType: undefined,
productId: undefined,
productTypes: undefined,
productIds: undefined,
pickupPoint: undefined,
memberId: undefined,
birthday: undefined,
......
src/views/ecw/customer/query.vue
View file @ f56fe670
......@@ -134,6 +134,12 @@
<el-button type="primary" @click="handleOrderReset">{{ $t("重置") }}</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="15" v-if="statisticsOrder">
<!-- 订单列表显示搜索条件对应箱数、仓库实测、收款方数、重量 -->
{{ $t("合计：{totalNum}箱，{totalVolume}m³(测) {totalChargeVolume}m³(重) {totalWeight}KG(测), {totalChargeWeight}kg(收费)", statisticsOrder) }}
</el-col>
</el-row>
</div>
<el-descriptions :column="2">
<el-descriptions-item :label="$t('海空联运/海运拼柜/海运整柜/专线空运')"> {{ orderStatisticsObj.hklyTotal || 0 }}/{{ orderStatisticsObj.hypgTotal || 0 }}/{{ orderStatisticsObj.hyzgTotal || 0 }}/{{ orderStatisticsObj.zxkyTotal || 0 }} </el-descriptions-item>
......@@ -657,7 +663,21 @@
</template>
<script>
import { getCustomer, getCustomerSelect, getBrankByCustomer, levelLogPage, customerCreditLogPage, infoListOrderPage, orderStatistics, creditLogCreate, creditScoreStatistic, infoListReceiptPage, memberUserList, deleteCustomer } from "@/api/ecw/customer"
import {
getCustomer,
getCustomerSelect,
getBrankByCustomer,
levelLogPage,
customerCreditLogPage,
infoListOrderPage,
orderStatistics,
creditLogCreate,
creditScoreStatistic,
infoListReceiptPage,
memberUserList,
deleteCustomer,
infoListStatisticsOrder
} from "@/api/ecw/customer"
import { getOfferPage as infoListOfferPage } from "@/api/ecw/offer"
import { DICT_TYPE, getDictDataLabel, getDictDatas2 } from "@/utils/dict"
import { getProductTypeList } from "@/api/ecw/productType"
......@@ -876,8 +896,8 @@ export default {
agentId: undefined,
company: undefined,
address: undefined,
productType: undefined,
productId: undefined,
productTypes: undefined,
productIds: undefined,
pickupPoint: undefined,
memberId: undefined,
birthday: undefined,
......@@ -932,6 +952,7 @@ export default {
importances: []
},
orderList: [],
statisticsOrder: {},
orderTotal: 0,
infoListOfferFrom: {
pageNo: 1,
......@@ -1105,6 +1126,11 @@ export default {
if (this.destWarehouseId != null && this.destWarehouseId != "") {
queryParams.destWarehouseIds = this.destWarehouseId
}
infoListStatisticsOrder({ customerDetailId: this.id, ...this.queryParams, ...queryParams }).then((r) => {
if (r.code === 0) {
this.statisticsOrder = r.data
}
})
infoListOrderPage({ customerDetailId: this.id, ...this.queryParams, ...queryParams }).then((r) => {
if (r.code === 0) {
this.orderList = r.data.list
......
src/views/ecw/offer/detail.vue
View file @ f56fe670
<template>
<div class="app-container">
<el-card>
<div slot="header" class="card-title">{{$t('报价单详情')}}</div>
<div slot="header" class="card-title">{{$t('报价单号')}}：{{list.number}} - <dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="list.status" /></div>
<!-- 列表 -->
<div class="offer-header">
<span style="font-size: 15px;">{{$t('报价单号')}}：{{list.number}} - <dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="list.status" /></span>
<span style="font-size: 15px;"></span>
<div class="btns">
<el-button v-hasPermi="['ecw:offer:update']" size="mini" type="primary" v-if="[4,5,6].indexOf(list.status) == -1" @click="$router.push('edit?id=' + offerId)">{{$t('编辑')}}</el-button>
<el-button v-hasPermi="['ecw:offer:loglist']" type="primary" v-if="[1,3,7].indexOf(list.status) > -1" size="mini" @click="handleAdd">{{$t('跟进')}}</el-button>
......
src/views/ecw/order/components/warehouseDetails.vue
View file @ f56fe670
......@@ -165,7 +165,7 @@ import {
warehouseAreaPositionList
} from "@/api/ecw/batchSingleApplication";
import {
applicationGetOrderByProcessId,
applicationGetOrderByProcessId, approvalFeeApplicationGet,
feeApplicationGet,
getOrder,
getOrderPage,
......@@ -229,10 +229,12 @@ export default {
getChannelList().then(r => this.channelList = r.data);
warehouseAreaPositionList().then(r => this.warehouseList = r.data)
if(this.type === 2){
feeApplicationGet({id:this.processId}).then(r => {
// feeApplicationGet({id:this.processId}).then(r => {
approvalFeeApplicationGet({id:this.processId}).then(r => {
if(r.code === 0){
this.processInstanceID = r.data.bpmProcessId;
this.getDetails()
// this.processInstanceID = r.data.bpmProcessId;
// this.getDetails()
this.FeeDetails = r.data
}
})
}else {
......@@ -268,13 +270,13 @@ export default {
});
break;
case 2:
// 费用申请
applicationGetOrderByProcessId({processId:this.processInstanceID}).then(r => {
this.FeeDetails = r.data
console.log(this.FeeDetails,'FeeDetails')
})
break;
// case 2:
// // 费用申请
// applicationGetOrderByProcessId({processId:this.processInstanceID}).then(r => {
// this.FeeDetails = r.data
// console.log(this.FeeDetails,'FeeDetails')
// })
// break;
case 3:
//退仓
warehouseApprovalGetByFormId({formId:this.processInstanceID}).then( res => {
......
src/views/ecw/order/feeApplication.vue
View file @ f56fe670
......@@ -133,7 +133,7 @@
>
<el-button
type="text"
v-if="scope.row.id && scope.row.applicationFee === 0"
v-if="scope.row.id && scope.row.applicationFee === 0 && scope.row.status === 2 && !scope.row.editMode"
@click="deleteByFeeIsZero(scope.row.id)"
>删除
</el-button
......
src/views/ecw/order/warehousingTo/components/Warehouse.vue
View file @ f56fe670
......@@ -192,12 +192,6 @@
</el-tab-pane>
</el-tabs>
<div v-if="edit && order.status !== 3">
<h2>{{ $t("审批流程") }}</h2>
<work-flow xmlkey="free_apply" v-model="selectedUsers" />
<!-- <div>选择的用户：{{selectedUsers}}</div>-->
</div>
<span slot="footer">
<el-button @click="handleClose">{{ $t("关 闭") }}</el-button>
<el-button type="primary" :loading="submitting" @click="handleSubmit()">{{ $t("确认修改") }}</el-button>
......@@ -239,9 +233,8 @@ import ProductSelector from "@/components/ProductSelector"
import WarehouseAreaSelect from "@/components/WarehouseAreaSelect"
import { getFeeTypeByOrderProduct, getProductBrankPage } from "@/api/ecw/productBrank"
import { cancelProcessInstance } from "@/api/bpm/processInstance"
import WorkFlow from "@/components/WorkFlow"
import { DICT_TYPE, getDictDataLabel, getDictDatas } from "@/utils/dict"
import { orderWarehouseIn, orderWarehouseInUpdateApply, warehousePictureDelete, warehousePictureList, order_warehouse_check_update } from "@/api/ecw/order"
import { orderWarehouseIn, orderWarehouseInUpdateApply, warehousePictureDelete, warehousePictureList, order_warehouse_check_update, order_warehouse_check_query } from "@/api/ecw/order"
import { getProductAttrList } from "@/api/ecw/productAttr"
import { getProductTypeList } from "@/api/ecw/productType"
import { addProduct } from "@/api/ecw/product"
......@@ -255,8 +248,7 @@ export default {
WarehouseRecordDetail,
ImageAndVideoUpload,
ProductSelector,
WarehouseAreaSelect,
WorkFlow
WarehouseAreaSelect
},
props: {
......@@ -423,8 +415,6 @@ export default {
// // quantityAll: [{required: true, message: this.$t("数量不能为空"), trigger: "change"}]
},
selectedUsers: undefined,
// 入仓修改正在审核中
isEditing: false,
// 审批业务id
......@@ -456,7 +446,7 @@ export default {
},
methods: {
init() {
async init() {
this.form.brandType = this.warehousing.brandType
this.form.orderId = this.warehousing.orderId
this.form.orderItemId = this.warehousing.orderNo
......@@ -484,13 +474,29 @@ export default {
if (this.form.usageIds.length > 0 && this.form.usageIds[0] === "") {
this.usageIds.splice(0, 1)
}
this.warehousing.orderWarehouseInBackItemDoList.forEach((e) => {
// this.warehousing.orderWarehouseInBackItemDoList.forEach((e) => {
// let bg = {}
// if (e.boxGauge) {
// const boxGauge = e.boxGauge.split("*")
// // e.boxGauge1 = boxGauge[0]
// // e.boxGauge2 = boxGauge[1]
// // e.boxGauge3 = boxGauge[2]
// bg = {
// boxGauge1: boxGauge[0],
// boxGauge2: boxGauge[1],
// boxGauge3: boxGauge[2]
// }
// }
// this.form.table.push({ ...e, ...bg })
// })
let r = await order_warehouse_check_query(this.warehousing.orderItemId)
console.log(r)
r.data.forEach((e) => {
let bg = {}
if (e.boxGauge) {
const boxGauge = e.boxGauge.split("*")
// e.boxGauge1 = boxGauge[0]
// e.boxGauge2 = boxGauge[1]
// e.boxGauge3 = boxGauge[2]
bg = {
boxGauge1: boxGauge[0],
boxGauge2: boxGauge[1],
......@@ -570,14 +576,13 @@ export default {
prodId: this.form.prodId,
warehouseCheckProdAttrIds: this.form.warehouseCheckProdAttrIds.join(","),
usageIds: this.form.usageIds.join(","),
orderWarehouseInUpdateItemDoList: this.form.table.map((e) => {
updates: this.form.table.map((e) => {
return {
...e,
boxGauge: e.boxGauge1 + "*" + e.boxGauge2 + "*" + e.boxGauge3,
orderLocationCreateReqVOList: e.orderLocationBackVOList
}
}),
copyUserId: this.selectedUsers
})
})
.then((r) => {
this.submitting = false
......
src/views/ecw/order/warehousingTo/index.vue
View file @ f56fe670
......@@ -60,24 +60,6 @@
</el-table-column>
</el-table>
<el-card v-if="order.parentOrderId" style="margin-top: 20px">
<div slot="header" class="clearfix">
<span style="font-size: 18px">{{ $t("标签箱号") }}</span>
</div>
<div v-for="(item, index) in label.orderLabelDtoList" :key="index" style="margin-bottom: 10px">
<el-input-number v-model="item.start" controls-position="right"></el-input-number>
-
<el-input-number v-model="item.end" controls-position="right"></el-input-number>
<el-button icon="el-icon-minus" circle v-show="index !== 0" @click="label.orderLabelDtoList.splice(index, 1)" style="margin-left: 10px"></el-button>
<el-button icon="el-icon-plus" circle @click="handleLabelAdd(index)"></el-button>
</div>
<div style="text-align: center">
<el-button type="primary" @click="handleLabelSubmit">{{ $t("修改箱号") }}</el-button>
</div>
</el-card>
<h2 v-if="orderSpecialNeeds.length > 0">{{ $t("特殊需求") }}</h2>
<el-form ref="form" :model="form" label-width="200px">
<el-form-item :label="$i18n.locale === 'en_US' ? item.labelEn : item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value" style="width: 600px">
<el-input-number v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" type="number" :min="0" step-strictly :placeholder="$t('请输入') + ($i18n.locale === 'en_US' ? item.labelEn : item.label)"></el-input-number>
......@@ -111,7 +93,7 @@
</template>
<script>
import { getCurrencyList } from "@/api/ecw/currency"
import { getLabelByOrder, getLabelWaitInByOrder, getOrder, getOrderWarehouseIn, getSpecialListByOrderId, listByOrderId, orderWarehouseInFinish, orderWarehouseInUpdateLabel, rollbackDelete, warehousePictureList } from "@/api/ecw/order"
import { getLabelWaitInByOrder, getOrder, getOrderWarehouseIn, getSpecialListByOrderId, listByOrderId, orderWarehouseInFinish, orderWarehouseInUpdateLabel, rollbackDelete, warehousePictureList } from "@/api/ecw/order"
import orderBaseInfo from "@/components/OrderBaseInfo"
import WarehouseAreaDialog from "@/components/WarehouseAreaDialog"
import { DICT_TYPE } from "@/utils/dict"
......@@ -229,39 +211,6 @@ export default {
return arr.indexOf(state) == -1
}
},
handleLabelSubmit() {
orderWarehouseInUpdateLabel({
...this.label,
orderId: this.orderId
}).then((r) => {
if (r.code === 0) {
this.$message.success(r.msg || this.$t("修改标签箱号成功"))
}
})
},
// 箱号标签回显
getLabelByOrder() {
getLabelByOrder(this.orderId).then((r) => {
if (r.code === 0 && !!r.data && r.data.length > 0) {
this.label.orderLabelDtoList = r.data
} else {
// 没有历史数据，查默认值
getLabelWaitInByOrder(this.orderId).then((r) => {
console.log(r)
if (r.code === 0 && !!r.data) {
this.label.orderLabelDtoList = [r.data]
}
})
}
})
},
handleLabelAdd(index) {
this.label.orderLabelDtoList.splice(index + 1, 0, {
end: "",
start: ""
})
},
getTowSum() {
// let sumVolume = 0
// let sumWeight = 0
......@@ -279,7 +228,6 @@ export default {
this.getTowSum()
})
.then(() => {
this.getLabelByOrder()
this.getWarehousePictureList()
})
},
......
src/views/ecw/productPrice/index.vue
View file @ f56fe670
......@@ -1601,6 +1601,10 @@ export default {
resetQuery() {
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.destCountryId = null
this.destWarehouseId = null
this.objectiveId = null
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