Merge branch 'master' into 测试

src/main.js

@@ -2,7 +2,7 @@ import { createApp } from "vue";
 
 import Cookies from "js-cookie";
 
-import ElementPlus from "element-plus";
+import ElementPlus, { ElSelect } from "element-plus";
 import locale from "element-plus/lib/locale/lang/zh-cn"; // 中文语言
 
 import "@/assets/styles/index.scss"; // global css
@@ -123,6 +123,14 @@ app.use(VueLazyLoad, {
 
 directive(app);
 
+ElSelect.props.filterable = {
+  type: Boolean,
+  default: true,
+};
+ElSelect.props.clearable = {
+  type: Boolean,
+  default: true,
+};
 // 使用element-plus 并且设置全局的大小
 app.use(ElementPlus, {
   locale: locale,

src/views/group/BOM/calculator/index.vue

@@ -25,17 +25,17 @@
       </el-form-item>
       <el-form-item label="颜色1" prop="colourConfigOne">
         <el-select v-model="formData.data.colourConfigOne" placeholder="请选择">
-          <el-option v-for="item in colourPriceList" filterable clearable :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+          <el-option v-for="item in colourPriceList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="颜色2" prop="colourConfigTwo">
         <el-select v-model="formData.data.colourConfigTwo" placeholder="请选择">
-          <el-option v-for="item in colourPriceList" filterable clearable :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+          <el-option v-for="item in colourPriceList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="压纹类型" prop="embossing">
         <el-select v-model="formData.data.embossing" placeholder="请选择">
-          <el-option v-for="item in embossingList" filterable clearable :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+          <el-option v-for="item in embossingList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="长度 cm" prop="length">