Merge branch 'master' into 测试

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

@@ -121,7 +121,7 @@
                           <div style="line-height: 35px">
                             <span style="color: black; font-weight: 700">包装人工费: </span>
                             <span>{{ item.packingLabor }}</span>
-                            <el-tooltip content="修改包装人工费" placement="top" effect="light">
+                            <el-tooltip content="修改包装人工费" placement="top" effect="light" v-if="userStatus">
                               <el-icon
                                 style="margin-left: 10px; transform: translateY(2px); color: #409eff; cursor: pointer"
                                 @click="clickChangePrice(item, index, 'packingLabor', '包装人工费')"
@@ -129,7 +129,7 @@
                                 <EditPen />
                               </el-icon>
                             </el-tooltip>
-                            <el-tooltip content="清零" placement="top" effect="light">
+                            <el-tooltip content="清零" placement="top" effect="light" v-if="userStatus">
                               <el-icon
                                 style="margin-left: 10px; transform: translateY(2px); color: #409eff; cursor: pointer"
                                 @click="clickRefresh(index, 'packingLabor')"
@@ -453,6 +453,7 @@ import { useRouter, useRoute } from "vue-router";
 import useTagsViewStore from "/src/store/modules/tagsView";
 
 const { proxy } = getCurrentInstance();
+const userStatus = ref(proxy.useUserStore().user.userId === "1");
 const router = useRouter();
 const route = useRoute();
 const submit = ref(null);
@@ -1085,7 +1086,7 @@ const onPreviewFile = (file) => {
   window.open(file.raw.fileUrl, "_blank");
 };
 const computeDeliveryMaterialsFee = () => {
-  let money = calculatedAmount("deliveryMaterialsFee");
+  let money = 0;
   if (formData.data.orderPackageBomList && formData.data.orderPackageBomList.length > 0) {
     for (let i = 0; i < formData.data.orderPackageBomList.length; i++) {
       if (formData.data.orderPackageBomList[i].internalSellingPrice && formData.data.orderPackageBomList[i].quantity) {

src/views/subsidiary/order/management/add.vue

@@ -123,7 +123,7 @@
                           </div>
                           <div style="line-height: 35px">
                             <span style="color: black; font-weight: 700">快递包材费: </span>
-                            <span>{{ item.deliveryMaterialsFee }}</span>
+                            <span>{{ computeSingleDeliveryMaterialsFee(index) }}</span>
                           </div>
                           <div style="line-height: 35px">
                             <span style="color: black; font-weight: 700">包装人工费: </span>
@@ -1224,11 +1224,6 @@ const handleAdhesiveSuccess = (UploadFile, index) => {
     fileUrl: UploadFile.raw.fileUrl,
   };
 };
-const formShippingPackage = reactive({
-  data: {
-    assemblyName: "",
-  },
-});
 const rulesShippingPackage = ref({
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
 });
@@ -1361,7 +1356,7 @@ const getShippingPackage = () => {
   }
 };
 const computeDeliveryMaterialsFee = () => {
-  let money = calculatedAmount("deliveryMaterialsFee");
+  let money = 0;
   if (formData.data.orderPackageBomList && formData.data.orderPackageBomList.length > 0) {
     for (let i = 0; i < formData.data.orderPackageBomList.length; i++) {
       if (formData.data.orderPackageBomList[i].internalSellingPrice && formData.data.orderPackageBomList[i].quantity) {
@@ -1377,6 +1372,20 @@ const openViewPackaging = ref(false);
 const clickViewPackaging = () => {
   openViewPackaging.value = true;
 };
+const computeSingleDeliveryMaterialsFee = (index) => {
+  let money = computeDeliveryMaterialsFee();
+  let list = formData.data.orderSkuList.filter((item) => item.quantity > 0);
+  let num = 0;
+  let singlePrice = 0;
+  if (list && list.length > 0) {
+    for (let i = 0; i < list.length; i++) {
+      num = Number(Math.round(num + list[i].quantity));
+    }
+    singlePrice = Number(Math.ceil((money / num) * 1000) / 1000);
+  }
+  formData.data.orderSkuList[index].deliveryMaterialsFee = singlePrice;
+  return formData.data.orderSkuList[index].deliveryMaterialsFee;
+};
 </script>
 
 <style lang="scss" scoped>

src/views/subsidiary/order/management/design.vue

@@ -61,7 +61,7 @@
                           </div>
                           <div style="line-height: 35px">
                             <span style="color: black; font-weight: 700">快递包材费: </span>
-                            <span>{{ item.deliveryMaterialsFee }}</span>
+                            <span>{{ computeSingleDeliveryMaterialsFee(index) }}</span>
                           </div>
                           <div style="line-height: 35px">
                             <span style="color: black; font-weight: 700">包装人工费: </span>
@@ -924,11 +924,6 @@ const handleAdhesiveSuccess = (UploadFile, index) => {
     fileUrl: UploadFile.raw.fileUrl,
   };
 };
-const formShippingPackage = reactive({
-  data: {
-    assemblyName: "",
-  },
-});
 const rulesShippingPackage = ref({
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
 });
@@ -1011,7 +1006,7 @@ const selectExpressPacking = (data) => {
   ElMessage({ message: "添加成功", type: "success" });
 };
 const computeDeliveryMaterialsFee = () => {
-  let money = calculatedAmount("deliveryMaterialsFee");
+  let money = 0;
   if (formData.data.orderPackageBomList && formData.data.orderPackageBomList.length > 0) {
     for (let i = 0; i < formData.data.orderPackageBomList.length; i++) {
       if (formData.data.orderPackageBomList[i].internalSellingPrice && formData.data.orderPackageBomList[i].quantity) {
@@ -1023,6 +1018,20 @@ const computeDeliveryMaterialsFee = () => {
   }
   return money;
 };
+const computeSingleDeliveryMaterialsFee = (index) => {
+  let money = computeDeliveryMaterialsFee();
+  let list = formData.data.orderSkuList.filter((item) => item.quantity > 0);
+  let num = 0;
+  let singlePrice = 0;
+  if (list && list.length > 0) {
+    for (let i = 0; i < list.length; i++) {
+      num = Number(Math.round(num + list[i].quantity));
+    }
+    singlePrice = Number(Math.ceil((money / num) * 1000) / 1000);
+  }
+  formData.data.orderSkuList[index].deliveryMaterialsFee = singlePrice;
+  return formData.data.orderSkuList[index].deliveryMaterialsFee;
+};
 </script>
 
 <style lang="scss" scoped>