Commit 58c674ff authored by dragondean@qq.com's avatar dragondean@qq.com

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

parents c45f35e1 e2244531
...@@ -198,9 +198,9 @@ ...@@ -198,9 +198,9 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('常用提货网点')" prop="pickupPoints"> <el-form-item :label="$t('常用提货网点')" prop="pickupPoints">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" > <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"/> <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-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
......
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('常用提货网点')" prop="pickupPoint"> <el-form-item :label="$t('常用提货网点')" prop="pickupPoint">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" > <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"/> <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-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="13" v-show="form.type && form.type.indexOf('2') !== -1"> <el-col :span="13" v-show="form.type && form.type.indexOf('2') !== -1">
......
...@@ -57,9 +57,9 @@ ...@@ -57,9 +57,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch"> <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" > <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"/> <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-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch"> <el-form-item :label="$t('创建人')" v-show="showSearch">
<el-select filterable v-model="queryParams.founder"> <el-select filterable v-model="queryParams.founder">
...@@ -459,9 +459,9 @@ ...@@ -459,9 +459,9 @@
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('常用提货网点')" prop="pickupPoint"> <el-form-item :label="$t('常用提货网点')" prop="pickupPoint">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" > <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"/> <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-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
......
...@@ -58,9 +58,9 @@ ...@@ -58,9 +58,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch"> <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" > <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"/> <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-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch"> <el-form-item :label="$t('创建人')" v-show="showSearch">
<el-select v-model="queryParams.founder"> <el-select v-model="queryParams.founder">
...@@ -438,9 +438,9 @@ ...@@ -438,9 +438,9 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('常用提货网点')" prop="pickupPoint"> <el-form-item :label="$t('常用提货网点')" prop="pickupPoint">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" > <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"/> <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-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
......
...@@ -58,9 +58,9 @@ ...@@ -58,9 +58,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch"> <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" > <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"/> <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-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch"> <el-form-item :label="$t('创建人')" v-show="showSearch">
<el-select v-model="queryParams.founder"> <el-select v-model="queryParams.founder">
......
...@@ -58,9 +58,9 @@ ...@@ -58,9 +58,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch"> <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" > <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"/> <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-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch"> <el-form-item :label="$t('创建人')" v-show="showSearch">
<el-select v-model="queryParams.founder"> <el-select v-model="queryParams.founder">
......
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch"> <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select v-model="form.pickupPoints" multiple filterable clearable :placeholder="$t('请选择')" > <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"/> <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-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch"> <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