Commit 4d9b8a1e authored by zhengyi's avatar zhengyi

bug修复

parent 6fc3120d
...@@ -190,11 +190,13 @@ ...@@ -190,11 +190,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('常用提货网点')"> <el-table-column :label="$t('常用提货网点')">
<template slot-scope="{ row }">
{{ {{
getDictDatas2(DICT_TYPE.PICKUP_POINTS, (row.pickupPoints || "").split(",")) getDictDatas2(DICT_TYPE.PICKUP_POINTS, (row.pickupPoints || "").split(","))
.map((e) => (isChinese ? e.label : e.labelEn)) .map((e) => (isChinese ? e.label : e.labelEn))
.join(", ") .join(", ")
}} }}
</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('年度发货量')" align="center"> <el-table-column :label="$t('年度发货量')" align="center">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
......
...@@ -270,9 +270,9 @@ ...@@ -270,9 +270,9 @@
<el-input v-model.trim="queryOfferParams.searchNumber" :placeholder="$t('请输入报价单号、订单号')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model.trim="queryOfferParams.searchNumber" :placeholder="$t('请输入报价单号、订单号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('客户')" prop="searchCustomer" v-show="showSearch"> <!-- <el-form-item :label="$t('客户')" prop="searchCustomer" v-show="showSearch">-->
<el-input v-model.trim="queryOfferParams.searchCustomer" clearable @keyup.enter.native="handleQuery" /> <!-- <el-input v-model.trim="queryOfferParams.searchCustomer" clearable @keyup.enter.native="handleQuery" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item :label="$t('区号')" prop="relationAreaCode" v-show="showSearch"> <el-form-item :label="$t('区号')" prop="relationAreaCode" v-show="showSearch">
<el-input v-model.trim="queryOfferParams.relationAreaCode" :placeholder="$t('请输入客户')" clearable @keyup.enter.native="handleQuery" @input="queryOfferParams.relationAreaCode = queryOfferParams.relationAreaCode.replace(/\s+/g, '')" /> <el-input v-model.trim="queryOfferParams.relationAreaCode" :placeholder="$t('请输入客户')" clearable @keyup.enter.native="handleQuery" @input="queryOfferParams.relationAreaCode = queryOfferParams.relationAreaCode.replace(/\s+/g, '')" />
</el-form-item> </el-form-item>
......
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