Skip to content

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

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

parents c45f35e1 e2244531
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
src/views/ecw/customer/edit.vue
View file @ 58c674ff
......@@ -198,9 +198,9 @@
</el-col>
<el-col :span="12">
<el-form-item :label="$t('常用提货网点')" prop="pickupPoints">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
</el-select>>
<el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
</el-col>
......
src/views/ecw/customer/editIndirect.vue
View file @ 58c674ff
......@@ -37,9 +37,9 @@
</el-col>
<el-col :span="12">
<el-form-item :label="$t('常用提货网点')" prop="pickupPoint">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
</el-select>>
<el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="13" v-show="form.type && form.type.indexOf('2') !== -1">
......
src/views/ecw/customer/index.vue
View file @ 58c674ff
......@@ -57,9 +57,9 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
</el-select>>
<el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch">
<el-select filterable v-model="queryParams.founder">
......@@ -459,9 +459,9 @@
<!-- </el-col>-->
<el-col :span="12">
<el-form-item :label="$t('常用提货网点')" prop="pickupPoint">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
</el-select>>
<el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
......
src/views/ecw/customerConfirm/index.vue
View file @ 58c674ff
......@@ -58,9 +58,9 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
</el-select>>
<el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch">
<el-select v-model="queryParams.founder">
......@@ -438,9 +438,9 @@
</el-col>
<el-col :span="12">
<el-form-item :label="$t('常用提货网点')" prop="pickupPoint">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
</el-select>>
<el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
......
src/views/ecw/customerToBeAssigned/index.vue
View file @ 58c674ff
......@@ -58,9 +58,9 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
</el-select>>
<el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch">
<el-select v-model="queryParams.founder">
......
src/views/ecw/myCustomerService/index.vue
View file @ 58c674ff
......@@ -58,9 +58,9 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
</el-select>>
<el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch">
<el-select v-model="queryParams.founder">
......
src/views/ecw/oceanCustomer/index.vue
View file @ 58c674ff
......@@ -59,8 +59,8 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" >
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn"/>
<el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
<el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch">
......
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