Merge branch 'master' into 测试

src/views/group/order/already-removed/detail.vue

@@ -227,6 +227,7 @@
             </div>
             <div style="padding: 8px 0 0 0">
               <span style="font-weight: 700; color: red">订单总金额(含税): ¥{{ moneyFormat(calculatedTotalAmount(), 2) }}</span>
+              <span style="font-weight: 700; color: red; margin-left: 40px">成本价: ¥{{ moneyFormat(calculatedCostPrice(), 2) }}</span>
             </div>
           </div>
         </template>
@@ -603,6 +604,11 @@ const calculatedTotalAmount = () => {
   );
   return money;
 };
+const calculatedCostPrice = () => {
+  let money = 0;
+  money = Number(Math.round((calculatedAmount("unitPrice") + computeDeliveryMaterialsFee() + calculatedPackagingMaterialCost()) * 100) / 100);
+  return money;
+};
 const fileList = ref([]);
 const uploadFileData = ref({});
 const beforeUpload = async (file) => {

src/views/group/order/management/detail.vue

@@ -364,6 +364,7 @@
             </div>
             <div style="padding: 8px 0 0 0">
               <span style="font-weight: 700; color: red">订单总金额(含税): ¥{{ moneyFormat(calculatedTotalAmount(), 2) }}</span>
+              <span style="font-weight: 700; color: red; margin-left: 40px">成本价: ¥{{ moneyFormat(calculatedCostPrice(), 2) }}</span>
             </div>
           </div>
         </template>
@@ -1099,6 +1100,11 @@ const calculatedTotalAmount = () => {
   );
   return money;
 };
+const calculatedCostPrice = () => {
+  let money = 0;
+  money = Number(Math.round((calculatedAmount("unitPrice") + computeDeliveryMaterialsFee() + calculatedPackagingMaterialCost()) * 100) / 100);
+  return money;
+};
 const fileList = ref([]);
 const uploadFileData = ref({});
 const beforeUpload = async (file) => {
@@ -1153,7 +1159,7 @@ const clickChangeWlnCode = () => {
 const submitChangeWlnCode = () => {
   proxy.$refs.wlnCode.validate((valid) => {
     if (valid) {
-      formData.data.wlnCode = formWlnCode.data.wlnCode
+      formData.data.wlnCode = formWlnCode.data.wlnCode;
       if (formData.data.orderSkuList && formData.data.orderSkuList.length > 0) {
         for (let i = 0; i < formData.data.orderSkuList.length; i++) {
           let packagingMaterialCost = 0;