Merge branch 'master' into 测试

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

@@ -25,12 +25,12 @@
       </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" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+          <el-option v-for="item in colourPriceList" filterable clearable :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" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+          <el-option v-for="item in colourPriceList" filterable clearable :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="压纹类型" prop="embossing">
@@ -180,6 +180,8 @@ const clickCalculator = () => {
     if (valid) {
       if (formData.data.colourConfigTwo) {
         formData.data.colourConfigIds = formData.data.colourConfigOne + "," + formData.data.colourConfigTwo;
+      } else {
+        formData.data.colourConfigIds = formData.data.colourConfigOne;
       }
       proxy.post("/bomSpecPriceConfig/getBomSpecPrice", formData.data).then((res) => {
         price.value = res;