Skip to content

J
jiedao-app-operator-master
Commit db9bb0e6 authored by lanbaoming's avatar lanbaoming
Browse files
Options

2024-06-03

parents 49c72676 ce88bf93
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 129 deletions
src/views/ecw/customer/index.vue
View file @ db9bb0e6
......@@ -11,27 +11,30 @@
>
<el-form-item :label="$t('客户编号')" prop="number">
<el-input
v-model="queryParams.number"
v-model.trim="queryParams.number"
:placeholder="$t('请输入客户编号')"
clearable
@keyup.enter.native="handleQuery"
/>
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"/>
</el-form-item>
<el-form-item :label="$t('客户名称')" prop="name">
<el-input
v-model="queryParams.name"
v-model.trim="queryParams.name"
:placeholder="$t('请输入客户名称')"
clearable
@keyup.enter.native="handleQuery"
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/>
</el-form-item>
<el-form-item :label="$t('客户等级')" prop="level">
<el-select
multiple
clearable
v-model="queryParams.level"
:placeholder="$t('请选择客户等级')"
clearable
size="small"
@change="handleQuery"
>
<el-option
v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)"
......@@ -44,23 +47,28 @@
<el-form-item :label="$t('联系方式')">
<el-input
:placeholder="$t('请输入联系方式')"
v-model="queryParams.defaultContactPhone"
v-model.trim="queryParams.defaultContactPhone"
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
></el-input>
</el-form-item>
<el-form-item :label="$t('客户类别')" prop="level">
<dict-selector
multiple
clearable
:type="DICT_TYPE.CUSTOMER_TYPE"
v-model="queryParams.type"
@change="handleQuery"
></dict-selector>
</el-form-item>
<el-form-item :label="$t('客户经理')" prop="customerService">
<el-select
multiple
clearable
v-model="queryParams.customerService"
:placeholder="$t('请选择客户经理')"
clearable
size="small"
@change="handleQuery"
>
<el-option
v-for="dict in customerServiceList"
......@@ -72,10 +80,12 @@
</el-form-item>
<el-form-item :label="$t('客户来源')" prop="source">
<el-select
multiple
clearable
v-model="queryParams.source"
:placeholder="$t('请选择客户来源')"
size="small"
@change="handleQuery"
>
<el-option
v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
......@@ -87,9 +97,11 @@
</el-form-item>
<el-form-item :label="$t('国家')" prop="source">
<el-select
multiple
clearable
v-model="queryParams.country"
:placeholder="$t('请选择国家')"
@change="handleQuery"
>
<el-option
v-for="dict in countryList"
......@@ -101,11 +113,13 @@
</el-form-item>
<el-form-item :label="$t('客户状态')" prop="status">
<el-select
multiple
clearable
v-model="queryParams.status"
:placeholder="$t('请选择客户状态')"
clearable
size="small"
@change="handleQuery"
>
<el-option
v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
......@@ -125,24 +139,29 @@
range-separator="-"
:start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')"
/>
</el-form-item>
<el-form-item :label="$t('信用等级')" prop="department">
<el-select clearable v-model="queryParams.creditLevel">
<el-select multiple clearable v-model="queryParams.creditLevel">
<el-option
v-for="(item, index) in creditList"
:label="isChinese ? item.nameZh : item.nameEn"
:key="index"
:value="item.id"
@change="handleQuery"
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('市场获客')" prop="department">
<dict-selector
multiple
clearable
:type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE"
v-model="queryParams.resourceType"
formatter="number"
@change="handleQuery"
></dict-selector>
</el-form-item>
<el-form-item>
......
src/views/ecw/customer/indirectCustomer.vue
View file @ db9bb0e6
......@@ -4,19 +4,19 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item :label="$t('客户名称')" prop="name">
<el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model.trim="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"/>
</el-form-item>
<el-form-item :label="$t('联系方式')">
<el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
<el-input :placeholder="$t('请输入联系方式')" v-model.trim="queryParams.defaultContactPhone" @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"></el-input>
</el-form-item>
<el-form-item :label="$t('客户经理')" prop="customerService">
<el-select clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
<el-select clearable v-model="queryParams.customerService" @change="handleQuery" :placeholder="$t('请选择客户经理')" clearable size="small">
<el-option v-for="dict in customerServiceList"
:key="dict.id" :label="dict.nickname" :value="dict.id"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('客户来源')" prop="source">
<el-select clearable v-model="queryParams.source" :placeholder="$t('请选择客户来源')" clearable size="small">
<el-select clearable v-model="queryParams.source" :placeholder="$t('请选择客户来源')" @change="handleQuery" clearable size="small">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
:key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value"/>
</el-select>
......@@ -26,7 +26,7 @@
type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item :label="$t('市场获客')" prop="department">
<dict-selector clearable :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="queryParams.marketType" formatter="number"></dict-selector>
<dict-selector clearable :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="queryParams.marketType" formatter="number" @change="handleQuery"></dict-selector>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
......
src/views/ecw/customerConfirm/index.vue
View file @ db9bb0e6
......@@ -4,43 +4,43 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item :label="$t('客户编号')" prop="number">
<el-input v-model="queryParams.number" :placeholder="$t('请输入客户编号')" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model.trim="queryParams.number" :placeholder="$t('请输入客户编号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"/>
</el-form-item>
<el-form-item :label="$t('客户名称')" prop="name">
<el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model.trim="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"/>
</el-form-item>
<el-form-item :label="$t('客户等级')" prop="level">
<el-select clearable v-model="queryParams.level" :placeholder="$t('请选择客户等级')" clearable size="small">
<el-select multiple v-model="queryParams.level" :placeholder="$t('请选择客户等级')" clearable size="small" @change="handleQuery">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)"
:key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('联系方式')">
<el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
<el-input :placeholder="$t('请输入联系方式')" v-model.trim="queryParams.defaultContactPhone" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"></el-input>
</el-form-item>
<el-form-item :label="$t('客户类别')" prop="level">
<dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" v-model="queryParams.type"></dict-selector>
<dict-selector multiple :type="DICT_TYPE.CUSTOMER_TYPE" v-model="queryParams.type" clearable @change="handleQuery"></dict-selector>
</el-form-item>
<el-form-item :label="$t('客户经理')" prop="customerService">
<el-select clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
<el-select multiple v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small" @change="handleQuery">
<el-option v-for="dict in customerServiceList"
:key="dict.id" :label="dict.nickname" :value="dict.id"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('客户来源')" prop="source">
<el-select clearable v-model="queryParams.source" :placeholder="$t('请选择客户来源')" clearable size="small">
<el-select v-model="queryParams.source" :placeholder="$t('请选择客户来源')" clearable size="small" @change="handleQuery">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
:key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('国家')" prop="source">
<el-select clearable v-model="form.country" :placeholder="$t('请选择国家')">
<el-select multiple clearable v-model="form.country" :placeholder="$t('请选择国家')" @change="handleQuery">
<el-option v-for="dict in countryList"
:key="dict.id" :label=" isChinese ? dict.nameZh : dict.nameEn" :value="parseInt(dict.id)" />
</el-select>
</el-form-item>
<el-form-item :label="$t('客户状态')" prop="status">
<el-select clearable v-model="queryParams.status" :placeholder="$t('请选择客户状态')" clearable size="small">
<el-select multiple v-model="queryParams.status" :placeholder="$t('请选择客户状态')" clearable size="small" @change="handleQuery">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
:key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value"/>
</el-select>
......@@ -50,12 +50,12 @@
type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item :label="$t('信用等级')" prop="department">
<el-select clearable v-model="queryParams.creditLevel" >
<el-select multiple clearable v-model="queryParams.creditLevel" @change="handleQuery">
<el-option v-for="(item,index) in creditList" :label=" isChinese ? item.nameZh : item.nameEn" :key="index" :value="item.id" ></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('市场获客')" prop="department">
<dict-selector clearable :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="queryParams.marketType" formatter="number"></dict-selector>
<dict-selector multiple clearable :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="queryParams.marketType" formatter="number" @change="handleQuery"></dict-selector>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
......
src/views/ecw/financial/selfNoReport.vue
View file @ db9bb0e6
......@@ -16,9 +16,11 @@
:label="$t('始发仓')"
:rules="{ required: true, message: $t('请选择始发仓') }"
prop="startWarehouseIdList"
@change="handleSelect"
>
<el-select
v-model="queryParams.startWarehouseIdList"
multiple
:placeholder="$t('请选择')"
clearable
......@@ -373,6 +375,7 @@ export default {
startWarehouseIdList: [],
destWarehouseIdList: [],
},
exportWarehouseList:[],
// tradeCityList: [],
currencyList: [],
warehouseList: [],
......@@ -381,6 +384,7 @@ export default {
exporting: false,
};
},
activated() {
// 如果有必须的条件则查询
if (
......@@ -391,15 +395,32 @@ export default {
}
},
created() {
this.handleSelect();
getCurrencyPage(this.params).then(
(res) => (this.currencyList = res.data.list)
);
// getTradeCityList().then((res) => (this.tradeCityList = res.data));
// 默认不查询，必须选择目的国以后才可以查询 this.getList();
getWarehouseList().then((res) => (this.warehouseList = res.data));
getWarehouseList().then((res) =>{
this.warehouseList = res.data
let da= res.data.filter(
(item) => +item.tradeType === 2 || +item.tradeType === 3
);
let ids = da.map(item => item.id);
this.$set(this.queryParams, "startWarehouseIdList", ids);
this.exportWarehouseList = da;//下拉框数据
}
);
getListTree({ treeType: 1 }).then((r) => {
this.countryList = r.data;
});
},
watch: {
// 目的国变更后要重置目的仓
......@@ -417,12 +438,19 @@ export default {
importCityList() {
return this.tradeCityList.filter((item) => item.type === 1);
},*/
exportWarehouseList() {
// exportWarehouseList() {
// /* tradeType 1 进口，2出口，3进出口 */
// return this.warehouseList.filter(
// (item) => +item.tradeType === 2 || +item.tradeType === 3
// );
// },
t() {
/* tradeType 1 进口，2出口，3进出口 */
return this.warehouseList.filter(
(item) => +item.tradeType === 2 || +item.tradeType === 3
);
},
importWarehouseList() {
// 目的仓根据选择的目的国过滤
if (!this.queryParams.destCountryId) return [];
......@@ -454,6 +482,12 @@ export default {
},
},
methods: {
handleSelect(val){
console.log("带")
//console.log(this.currencyList)
},
getCurrencyLabel(id) {
const item = this.currencyList.find((item) => item.id === id);
if (!item) return "";
......@@ -527,7 +561,7 @@ export default {
// 其他费用折扣
this.getTotal("discountOtherFee") + OtherCurrencyName,
];
console.log("sum", { data });
return data;
},
/** 搜索按钮操作 */
......
src/views/ecw/myCustomerService/index.vue
View file @ db9bb0e6
......@@ -11,93 +11,39 @@
label-width="68px"
>
<el-form-item :label="$t('客户编号')" prop="number">
<el-input
v-model="queryParams.number"
:placeholder="$t('请输入客户编号')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model.trim="queryParams.number" :placeholder="$t('请输入客户编号')" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('客户名称')" prop="name">
<el-input
v-model="queryParams.name"
:placeholder="$t('请输入客户名称')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model.trim="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"/>
</el-form-item>
<el-form-item :label="$t('客户等级')" prop="level">
<el-select
clearable
v-model="queryParams.level"
:placeholder="$t('请选择客户等级')"
clearable
size="small"
>
<el-option
v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)"
:key="dict.value"
:label="isChinese ? dict.label : dict.labelEn"
:value="dict.value"
/>
<el-select clearable v-model="queryParams.level" multiple :placeholder="$t('请选择客户等级')" clearable size="small" @change="handleQuery">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)"
:key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('联系方式')">
<el-input
:placeholder="$t('请输入联系方式')"
v-model="queryParams.defaultContactPhone"
></el-input>
<el-input :placeholder="$t('请输入联系方式')" v-model.trim="queryParams.defaultContactPhone" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"></el-input>
</el-form-item>
<el-form-item :label="$t('客户类别')" prop="level">
<dict-selector
:type="DICT_TYPE.CUSTOMER_TYPE"
v-model="queryParams.type"
></dict-selector>
<dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" multiple v-model="queryParams.type" @change="handleQuery"></dict-selector>
</el-form-item>
<el-form-item :label="$t('客户来源')" prop="source">
<el-select
clearable
v-model="queryParams.source"
:placeholder="$t('请选择客户来源')"
clearable
size="small"
>
<el-option
v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
:key="dict.value"
:label="isChinese ? dict.label : dict.labelEn"
:value="dict.value"
/>
<el-select clearable v-model="queryParams.source" multiple :placeholder="$t('请选择客户来源')" clearable size="small" @change="handleQuery">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
multiple :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('国家')" prop="source">
<el-select
clearable
v-model="queryParams.country"
:placeholder="$t('请选择国家')"
>
<el-option
v-for="dict in countryList"
:key="dict.id"
:label="isChinese ? dict.nameZh : dict.nameEn"
:value="parseInt(dict.id)"
/>
<el-select clearable v-model="queryParams.country" :placeholder="$t('请选择国家')" multiple @change="handleQuery">
<el-option v-for="dict in countryList"
:key="dict.id" :label=" isChinese ? dict.nameZh : dict.nameEn " :value="parseInt(dict.id)" />
</el-select>
</el-form-item>
<el-form-item :label="$t('客户状态')" prop="status">
<el-select
clearable
v-model="queryParams.status"
:placeholder="$t('请选择客户状态')"
clearable
size="small"
>
<el-option
v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
:key="dict.value"
:label="isChinese ? dict.label : dict.labelEn"
:value="dict.value"
/>
<el-select clearable v-model="queryParams.status" multiple :placeholder="$t('请选择客户状态')" size="small" @change="handleQuery">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
:key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('创建时间')">
......@@ -114,22 +60,12 @@
</el-form-item>
<el-form-item :label="$t('信用等级')" prop="department">
<el-select clearable v-model="queryParams.creditLevel">
<el-option
v-for="(item, index) in creditList"
:label="isChinese ? item.nameZh : item.nameEn"
:key="index"
:value="item.id"
></el-option>
<el-select clearable v-model="queryParams.creditLevel" multiple @change="handleQuery">
<el-option v-for="(item,index) in creditList" :label="isChinese ? item.nameZh : item.nameEn" :key="index" :value="item.id" ></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('市场获客')" prop="department">
<dict-selector
clearable
:type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE"
v-model="queryParams.marketType"
formatter="number"
></dict-selector>
<el-form-item :label="$t('市场获客')" prop="department">
<dict-selector clearable multiple :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="queryParams.marketType" formatter="number" @change="handleQuery"></dict-selector>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
......
src/views/ecw/oceanCustomer/index.vue
View file @ db9bb0e6
......@@ -12,22 +12,25 @@
>
<el-form-item :label="$t('客户编号')" prop="number">
<el-input
v-model="queryParams.number"
v-model.trim="queryParams.number"
:placeholder="$t('请输入客户编号')"
clearable
@keyup.enter.native="handleQuery"
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/>
</el-form-item>
<el-form-item :label="$t('客户名称')" prop="name">
<el-input
v-model="queryParams.name"
v-model.trim="queryParams.name"
:placeholder="$t('请输入客户名称')"
clearable
@keyup.enter.native="handleQuery"
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/>
</el-form-item>
<el-form-item :label="$t('客户等级')" prop="level">
<el-select
multiple
clearable
v-model="queryParams.level"
:placeholder="$t('请选择客户等级')"
......@@ -45,22 +48,28 @@
<el-form-item :label="$t('联系方式')">
<el-input
:placeholder="$t('请输入联系方式')"
v-model="queryParams.defaultContactPhone"
v-model.trim="queryParams.defaultContactPhone"
@keyup.enter.native="handleQuery"
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
></el-input>
</el-form-item>
<el-form-item :label="$t('客户类别')" prop="level">
<dict-selector
multiple
:type="DICT_TYPE.CUSTOMER_TYPE"
v-model="queryParams.type"
v-model="queryParams.type"
@change="handleQuery"
></dict-selector>
</el-form-item>
<el-form-item :label="$t('客户经理')" prop="customerService">
<el-select
clearable
<el-select
multiple
clearable
v-model="queryParams.customerService"
:placeholder="$t('请选择客户经理')"
clearable
size="small"
size="small"
@change="handleQuery"
>
<el-option
v-for="dict in customerServiceList"
......@@ -72,11 +81,13 @@
</el-form-item>
<el-form-item :label="$t('客户来源')" prop="source">
<el-select
clearable
multiple
clearable
v-model="queryParams.source"
:placeholder="$t('请选择客户来源')"
clearable
size="small"
size="small"
@change="handleQuery"
>
<el-option
v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
......@@ -88,9 +99,11 @@
</el-form-item>
<el-form-item :label="$t('国家')" prop="source">
<el-select
clearable
multiple
clearable
v-model="queryParams.country"
:placeholder="$t('请选择国家')"
:placeholder="$t('请选择国家')"
@change="handleQuery"
>
<el-option
v-for="dict in countryList"
......@@ -102,11 +115,13 @@
</el-form-item>
<el-form-item :label="$t('客户状态')" prop="status">
<el-select
clearable
multiple
clearable
v-model="queryParams.status"
:placeholder="$t('请选择客户状态')"
clearable
size="small"
size="small"
@change="handleQuery"
>
<el-option
v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
......@@ -129,7 +144,7 @@
/>
</el-form-item>
<el-form-item :label="$t('信用等级')" prop="department">
<el-select clearable v-model="queryParams.creditLevel">
<el-select multiple clearable v-model="queryParams.creditLevel" @change="handleQuery">
<el-option
v-for="(item, index) in creditList"
:label="isChinese ? item.nameZh : item.nameEn"
......@@ -140,10 +155,12 @@
</el-form-item>
<el-form-item :label="$t('市场获客')" prop="department">
<dict-selector
clearable
multiple
clearable
:type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE"
v-model="queryParams.marketType"
formatter="number"
formatter="number"
@change="handleQuery"
></dict-selector>
</el-form-item>
<el-form-item>
......
src/views/ecw/order/splitApply/index.vue
View file @ db9bb0e6
......@@ -438,6 +438,11 @@
<span class="mr-10">{{ $t('数量(个)') }}：{{ putin.quantity || 0 }}，</span>
<span class="mr-10">{{ $t('入仓方数') }}：{{ putin.volume || 0 }}m³， </span>
<span class="mr-10">{{ $t('入仓重量') }}：{{ putin.weight || 0 }}kg</span>
<span style="margin-left: 250px;color: #ff3430;">{{ $t('剩余收费方数') }}：{{ leftData.chargeVolume || 0 }}m³</span>
<span style="margin-left: 10px;color: #ff3430;">{{ $t('剩余收费重量') }}：{{ leftData.chargeWeight || 0 }}kg</span>
<span style="margin-left: 5px;color: #ff3430;" v-if="orderLeftData">{{ $t('剩余订单货值') }}：{{ orderLeftData.splitResidueWorth || 0 }}元</span>
</div>
<el-form-item :label="$t('收费方数')" prop="chargeVolume">
<el-input-number v-model="shopForm.chargeVolume" controls-position="right"></el-input-number>m³
......@@ -1065,6 +1070,28 @@ export default {
if(this.putin.num > this.leftData.num){
return this.$message.error(this.$t("放入箱数不能大于可拆箱数"));
}
//放入数据 收费方数不能小于入仓方数
if(this.shopForm.chargeVolume < this.putin.volume){
return this.$message.error(this.$t("收费方数<入仓方数，请参考剩余收费方数并修改"));
}
//当收费方数大于剩余收费方数
if(this.shopForm.chargeVolume > this.leftData.chargeVolume){
return this.$message.error(this.$t("收费方数>剩余收费方数，请参考剩余收费方数并修改"));
}
//当收费重量小于入仓重量
if(this.shopForm.chargeWeight < this.putin.weight){
return this.$message.error(this.$t("收费重量<入仓重量，请参考剩余收费重量并修改"));
}
//当收费重量大于剩余收费重量
if(this.shopForm.chargeWeight > this.leftData.chargeWeight){
return this.$message.error(this.$t("收费重量>剩余收费重量，请参考剩余收费重量并修改"));
}
//放入货值 要大于0
if(this.shopForm.worth <=0){
return this.$message.error(this.$t("订单货值必须大于0，请参考剩余订单货值并修改"));
}
this.shopForm.specsRecordVOList.forEach(item => {
item.boxGauge = `${item.boxGauge1}*${item.boxGauge2}*${item.boxGauge3}`
})
......
src/views/ecw/product/index.vue
View file @ db9bb0e6
......@@ -3,11 +3,11 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item :label="$t('商品编码')" prop="productCode">
<el-input v-model="queryParams.productCode" :placeholder="$t('请输入商品编码')" clearable @keyup.enter.native="handleQuery" />
<el-input v-model.trim="queryParams.productCode" :placeholder="$t('请输入商品编码')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" />
</el-form-item>
<el-form-item :label="$t('海关编码')" prop="customsCode">
<el-input v-model="queryParams.customsCode" :placeholder="$t('请输入海关编码')" clearable @keyup.enter.native="handleQuery" />
<el-input v-model.trim="queryParams.customsCode" :placeholder="$t('请输入海关编码')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"/>
</el-form-item>
<el-form-item :label="$t('商品名称')" prop="titleZh">
......@@ -15,13 +15,13 @@
</el-form-item>
<el-form-item :label="$t('商品类型')" prop="attrId">
<el-select v-model="queryParams.typeId" :placeholder="$t('选择商品类型')" clearable>
<el-select v-model="queryParams.typeId" multiple :placeholder="$t('选择商品类型')" clearable @change="handleQuery">
<el-option v-for="types in typeList" :key="types.id" :label="$l(types, 'title')" :value="types.id" />
</el-select>
</el-form-item>
<el-form-item :label="$t('商品特性')" prop="attrId">
<el-select v-model="queryParams.attrId" :placeholder="$t('选择商品特性')" clearable>
<el-select v-model="queryParams.attrId" multiple :placeholder="$t('选择商品特性')" clearable @change="handleQuery">
<el-option v-for="attr in attrList" :key="attr.id" :label="attr.attrName" :value="attr.id" />
</el-select>
</el-form-item>
......@@ -553,7 +553,7 @@ export default {
params.filter=false;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询
params.status = 0;
params.status = 1;
getProductPage(params).then(response => {
this.list = response.data.list;
this.total = response.data.total;
......
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