Skip to content

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

Merge remote-tracking branch 'origin/pre-release' into pre-release

parents 374e78b9 4ba95a82
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 54 deletions
src/views/ecw/customer/index.vue
View file @ 5e297f52
......@@ -320,7 +320,7 @@
.map((e) => (isChinese ? e.label : e.labelEn))
.join(", ")
}}
<!-- {{ getPickupPointNames(row.pickupPoints) }}-->
<!-- {{ getPickupPointNames(row.pickupPoints) }}-->
</template>
</el-table-column>
<el-table-column :label="$t('年度发货量')" align="center">
......@@ -934,7 +934,7 @@ export default {
return (val) => {
let t = val.split(":")
t[t.length - 1] = this.authorityFn + t[t.length - 1]
console.log(t.join(":"))
// console.log(t.join(":"))
return t.join(":")
}
},
......@@ -998,6 +998,7 @@ export default {
}
},
created() {
console.log("created")
getCreditPage({ page: 1, rows: 999 }).then((r) => {
this.creditList = r.data.list
})
......@@ -1035,6 +1036,8 @@ export default {
})
},
activated() {
console.log("activated")
this.getList()
},
methods: {
......@@ -1121,7 +1124,7 @@ export default {
})
},
// 去掉客户名称的首尾空格
trimCustomerName(){
trimCustomerName() {
this.queryParams.name = this.queryParams.name.trim()
},
countryFormatter(row, column, cellValue) {
......
src/views/ecw/myCustomerService/index.vue
View file @ 5e297f52
......@@ -7,7 +7,7 @@
<el-input v-model.trim="queryParams.number" :placeholder="$t('请输入客户编号')" clearable @keyup.enter.native="handleQuery" @input="queryParams.number = queryParams.number.replace(/\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" @blur="trimCustomerName"/>
<el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" @blur="trimCustomerName" />
</el-form-item>
<el-form-item :label="$t('区号')">
<el-select filterable v-model="queryParams.areaCode" :placeholder="$t('请选择区号')">
......@@ -131,17 +131,12 @@
<el-form-item :label="$t('会员电话')" prop="department" label-width="100px">
<el-input :placeholder="$t('请输入会员电话')" class="w-200" clearable v-model.trim="queryParams.memberMobile" @input="queryParams.memberMobile = queryParams.memberMobile.replace(/\s+/g, '')">
<template slot="prepend">
<area-code-selector v-model="queryParams.memberAreaCode" class="w-50"/>
<area-code-selector v-model="queryParams.memberAreaCode" class="w-50" />
</template>
</el-input>
</el-form-item>
<el-form-item :label="$t('会员编号')" prop="number">
<el-input
v-model.trim="queryParams.memberCode"
:placeholder="$t('请输入会员编号')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model.trim="queryParams.memberCode" :placeholder="$t('请输入会员编号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('控货无收货人')" v-show="showSearch" label-width="100px">
<div style="width: 194px">
......@@ -312,7 +307,7 @@
.map((e) => (isChinese ? e.label : e.labelEn))
.join(", ")
}}
<!-- {{ getPickupPointNames(row.pickupPoints) }}-->
<!-- {{ getPickupPointNames(row.pickupPoints) }}-->
</template>
</el-table-column>
<el-table-column :label="$t('年度发货量')" align="center">
......@@ -428,7 +423,7 @@ import { getProductTypeList } from "@/api/ecw/productType"
import { getProductList } from "@/api/ecw/product"
import CompetitorSelector from "@/components/CompetitorSelector/index.vue"
export default {
name: "EcwMyCustomerServiceIndex",
name: "EcwMycustomerserviceIndex",
components: {
CompetitorSelector,
Contacts,
......@@ -766,7 +761,7 @@ export default {
this.resetForm("form")
},
// 去掉客户名称的首尾空格
trimCustomerName(){
trimCustomerName() {
this.queryParams.name = this.queryParams.name.trim()
},
/** 搜索按钮操作 */
......
src/views/ecw/offer/logList.vue
View file @ 5e297f52
......@@ -7,7 +7,7 @@
<script>
import logListCommon from "@/views/ecw/offer/logListCommon"
export default {
name: "offerLogList",
name: "EcwOfferLoglist",
components: { logListCommon },
data() {
return {}
......
src/views/ecw/offer/logListCommon.vue
View file @ 5e297f52
......@@ -4,16 +4,16 @@
<div slot="header" class="clearfix">
<el-form size="small" :inline="true" label-width="100px">
<div class="search-z">
<el-form-item :label="$t('联系人')" prop="contactName" >
<el-form-item :label="$t('联系人')" prop="contactName">
<el-input v-model.trim="followForm.contactName" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('联系方式')" prop="contactPhone" >
<el-form-item :label="$t('联系方式')" prop="contactPhone">
<el-input v-model.trim="followForm.contactPhone" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('跟进类型')" >
<el-form-item :label="$t('跟进类型')">
<dict-selector clearable :type="DICT_TYPE.CUSTOMER_FOLLOWUP_TYPE" v-model="followForm.followType" @input="handleQuery"></dict-selector>
</el-form-item>
<el-form-item :label="$t('销售阶段')" >
<el-form-item :label="$t('销售阶段')">
<dict-selector clearable :type="DICT_TYPE.CUSTOMER_FOLLOWUP_SALE_STAGE" v-model="followForm.saleStage" @input="handleQuery"></dict-selector>
</el-form-item>
<el-form-item :label="$t('编号')" prop="number" v-show="showSearch">
......@@ -78,10 +78,7 @@
{{ $t("导出") }}
</el-button>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getDataSpaceCustomerFollowupList"
></right-toolbar>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getDataSpaceCustomerFollowupList"></right-toolbar>
</el-row>
<el-table ref="multipleTable" border :data="customerFollowList" v-loading="loading" @selection-change="handleSelectionChange" style="width: 100%">
<el-table-column type="selection" width="55" fixed></el-table-column>
......
src/views/ecw/order/warningCargoControl.vue
View file @ 5e297f52
......@@ -3,17 +3,17 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" class="search-z">
<el-form-item :label="$t('订单编号')" prop="orderNo">
<el-input v-model.trim="queryParams.orderNo" :placeholder="$t('订单编号')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'orderNo')" class="w-200"/>
<el-input v-model.trim="queryParams.orderNo" :placeholder="$t('订单编号')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'orderNo')" class="w-200" />
</el-form-item>
<el-form-item :label="$t('发货人')" prop="consignorKey">
<el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
<el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" class="w-200" />
</el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeKey">
<el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
<el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" class="w-200" />
</el-form-item>
<el-form-item :label="$t('控货状态')" prop="isCargoControl">
<dict-selector v-model="queryParams.cargoControlStatusList" multiple :type="DICT_TYPE.CONTROL_GOODS_STATUS" clearable @change="handleQuery" class="w-200"/>
<dict-selector v-model="queryParams.cargoControlStatusList" multiple :type="DICT_TYPE.CONTROL_GOODS_STATUS" clearable @change="handleQuery" class="w-200" />
</el-form-item>
<div>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
......@@ -38,7 +38,7 @@
</el-form-item>
</div>
<el-form-item :label="$t('客户经理')">
<user-selector manage v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery" :prepend="{ id: 0, nickname: $t('未分配客户经理') }" class="w-200"/>
<user-selector manage v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery" :prepend="{ id: 0, nickname: $t('未分配客户经理') }" class="w-200" />
</el-form-item>
<el-form-item :label="$t('出货渠道')" prop="channelIds">
......@@ -46,25 +46,25 @@
</el-form-item>
<el-form-item :label="$t('商品')" prop="prodId" v-show="showSearch">
<product-selector v-model.trim="queryParams.prodId" @keyup.enter.native="handleQuery" clearable @change="handleQuery" class="w-200"/>
<product-selector v-model.trim="queryParams.prodId" @keyup.enter.native="handleQuery" clearable @change="handleQuery" class="w-200" />
</el-form-item>
<el-form-item :label="$t('订单状态')" prop="statusList" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ORDER_STATUS" multiple v-model="queryParams.statusList" @keyup.enter.native="handleQuery" clearable @change="handleQuery" class="w-200"/>
<dict-selector :type="DICT_TYPE.ORDER_STATUS" multiple v-model="queryParams.statusList" @keyup.enter.native="handleQuery" clearable @change="handleQuery" class="w-200" />
</el-form-item>
<el-form-item :label="$t('提单号')" prop="tidanNo">
<el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" class="w-200"/>
<el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" class="w-200" />
</el-form-item>
<el-form-item :label="$t('报关方式')" prop="customsTypes">
<dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypes" clearable @change="handleQuery" class="w-200"/>
<dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypes" clearable @change="handleQuery" class="w-200" />
</el-form-item>
<el-form-item :label="$t('唛头')" prop="marks">
<el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" class="w-200"/>
<el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" class="w-200" />
</el-form-item>
<el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch">
<dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" clearable @change="handleQuery" class="w-200"/>
<dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" clearable @change="handleQuery" class="w-200" />
</el-form-item>
<el-form-item :label="$t('外部仓')" prop="isExternalWarehouse" v-show="showSearch">
<el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery" class="w-200">
......@@ -101,7 +101,7 @@
<router-link :to="`detail?orderId=` + scope.row.orderId">{{ scope.row.orderNo }}</router-link>
</template>
</el-table-column>
<el-table-column :label="$t('唛头')" align="center" prop="marks" fixed/>
<el-table-column :label="$t('唛头')" align="center" prop="marks" fixed />
<el-table-column :label="$t('箱数')" align="center" prop="sumNum">
<template v-slot="{ row }">
{{ row.sumNum > 0 ? row.sumNum : row.totalNum }}
......@@ -175,7 +175,7 @@ import UserSelector from "@/components/UserSelector"
import { getChannelList } from "@/api/ecw/channel"
export default {
name: "EcwOrderWarningCargocontrol",
name: "EcwOrderWarningcargocontrol",
components: {
CargoLogList,
UserSelector,
......
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