Merge branch 'master' into 测试

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

@@ -72,7 +72,30 @@
         <el-button @click="clickReset()" v-preReClick>重置</el-button>
       </el-form-item>
     </el-form>
-    <div style="font-size: 22px; font-weight: 700; color: black; margin-top: 20px">计算结果: {{ price }}</div>
+    <div style="font-size: 22px; font-weight: 700; color: black; margin-top: 20px">
+      计算公式=（基材价格+品类+特性+颜色价格）*[（长+裁切配置）*（宽+裁切配置）/10000]*（厚度+压纹配置）*（1+损耗）+加工费+运费
+    </div>
+    <div style="font-size: 22px; font-weight: 700; color: black; margin-top: 20px">
+      注：颜色价格区分单色层双色层，双色层时如果一半为加价颜色时，颜色价格除以2计算，如果双色都为加价颜色分别除以2后单价相加
+    </div>
+    <div style="font-size: 22px; font-weight: 700; color: black; margin-top: 20px">例如：兰黛紫+兰黛颜色费用为0.2/2+0.3/2</div>
+    <div style="font-size: 22px; font-weight: 700; color: black; margin-top: 20px">计算结果:</div>
+    <div style="font-size: 22px; margin-top: 20px">
+      <span>裸垫价格: {{ priceData.data.unitPrice }},</span>
+      <span>基材价格: {{ priceData.data.baseMaterialPrice }},</span>
+      <span>品类价格: {{ priceData.data.categoryPrice }},</span>
+      <span>特性价格: {{ priceData.data.characterPrice }},</span>
+      <span>颜色价格: {{ priceData.data.colourPrice }},</span>
+      <span>长（cm）: {{ priceData.data.length }},</span>
+      <span>裁切长（cm）: {{ priceData.data.cropLength }},</span>
+      <span>宽（cm）: {{ priceData.data.width }},</span>
+      <span>裁切宽（cm）: {{ priceData.data.cropWidth }},</span>
+      <span>厚度（mm）: {{ priceData.data.height }},</span>
+      <span>压纹厚度（mm）: {{ priceData.data.embossingHeight }},</span>
+      <span>损耗: {{ priceData.data.depletion }}%,</span>
+      <span>加工费: {{ priceData.data.processingFee }},</span>
+      <span>运费: {{ priceData.data.freightFee }}</span>
+    </div>
 
     <el-dialog title="颜色加价规则" v-if="openColour" v-model="openColour" width="1000">
       <Colour></Colour>
@@ -174,7 +197,9 @@ const getDemandData = () => {
   });
 };
 getDemandData();
-const price = ref("");
+const priceData = reactive({
+  data: {},
+});
 const clickCalculator = () => {
   proxy.$refs.submit.validate((valid) => {
     if (valid) {
@@ -184,13 +209,13 @@ const clickCalculator = () => {
         formData.data.colourConfigIds = formData.data.colourConfigOne;
       }
       proxy.post("/bomSpecPriceConfig/getBomSpecPrice", formData.data).then((res) => {
-        price.value = res;
+        priceData.data = res;
       });
     }
   });
 };
 const clickReset = () => {
-  price.value = "";
+  priceData.data = {};
   proxy.$refs.submit.resetFields();
 };
 </script>