Merge branch 'master' into 测试

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

@@ -35,9 +35,7 @@
       </el-form-item>
       <el-form-item label="压纹类型" prop="embossing">
         <el-select v-model="formData.data.embossing" placeholder="请选择">
-          <el-option label="单面压纹" value="单面压纹"></el-option>
-          <el-option label="双面压纹" value="双面压纹"></el-option>
-          <el-option label="双面一次压纹" value="双面一次压纹"></el-option>
+          <el-option v-for="item in embossingList" filterable clearable :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="长度 cm" prop="length">
@@ -135,6 +133,7 @@ const clickProcessCost = () => {
 const levelConfigList = ref([]);
 const categoryConfigList = ref([]);
 const colourPriceList = ref([]);
+const embossingList = ref([]);
 const formData = reactive({
   data: {
     bomClassify: "",
@@ -189,6 +188,16 @@ const getDemandData = () => {
       });
     }
   });
+  proxy.post("/bomSpecPriceConfig/list", { code: "embossing_config" }).then((res) => {
+    if (res && res.length > 0) {
+      embossingList.value = res.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
+    }
+  });
 };
 getDemandData();
 const priceData = reactive({