Merge branch 'master' into 测试

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

@@ -3,7 +3,18 @@
     <el-card class="box-card">
       <div style="padding: 8px; text-align: center" v-if="formData.data.code || formData.data.wlnCode">
         <span style="font-size: 18px; font-weight: 700">{{ formData.data.code }} </span>
-        <span style="font-size: 18px; font-weight: 700" v-if="formData.data.wlnCode"> ({{ formData.data.wlnCode }})</span>
+        <span style="font-size: 18px; font-weight: 700">
+          <span> （{{ formData.data.wlnCode }}</span>
+          <el-tooltip content="修改E10单号" placement="top" effect="light">
+            <el-icon
+              style="transform: translateY(2px); color: #409eff; cursor: pointer"
+              @click="clickChangeWlnCode"
+              v-if="route.query && route.query.detailId && userStatus">
+              <EditPen />
+            </el-icon>
+          </el-tooltip>
+          <span>）</span>
+        </span>
       </div>
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
         <template #type>
@@ -451,6 +462,18 @@
         <el-button @click="openViewPackaging = false">关 闭</el-button>
       </template>
     </el-dialog>
+
+    <el-dialog title="修改E10单号" v-if="changeWlnCode" v-model="changeWlnCode" width="500">
+      <el-form :model="formWlnCode.data" label-width="120px" ref="wlnCode">
+        <el-form-item label="E10单号" prop="wlnCode" :rules="[{ required: true, message: '请输入E10单号', trigger: 'blur' }]">
+          <el-input v-model="formWlnCode.data.wlnCode" placeholder="请输入E10单号"></el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="changeWlnCode = false" size="large">取 消</el-button>
+        <el-button type="primary" @click="submitChangeWlnCode()" size="large" v-preReClick>提 交</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -1117,6 +1140,68 @@ const computePackagingMoney = (item, label) => {
   }
   return money;
 };
+const changeWlnCode = ref(false);
+const formWlnCode = reactive({
+  data: {
+    wlnCode: "",
+  },
+});
+const clickChangeWlnCode = () => {
+  formWlnCode.data.wlnCode = formData.data.wlnCode;
+  changeWlnCode.value = true;
+};
+const submitChangeWlnCode = () => {
+  proxy.$refs.wlnCode.validate((valid) => {
+    if (valid) {
+      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;
+          if (formData.data.orderSkuList[i].quantity) {
+            if (formData.data.orderSkuList[i].orderSkuBomList && formData.data.orderSkuList[i].orderSkuBomList.length > 0) {
+              for (let j = 0; j < formData.data.orderSkuList[i].orderSkuBomList.length; j++) {
+                if (formData.data.orderSkuList[i].orderSkuBomList[j].quantity && formData.data.orderSkuList[i].orderSkuBomList[j].unitPrice) {
+                  packagingMaterialCost = Number(
+                    Math.round(
+                      (packagingMaterialCost +
+                        formData.data.orderSkuList[i].orderSkuBomList[j].quantity * formData.data.orderSkuList[i].orderSkuBomList[j].unitPrice) *
+                        100
+                    ) / 100
+                  );
+                }
+              }
+            }
+          }
+          formData.data.orderSkuList[i].packagingMaterialCost = packagingMaterialCost;
+        }
+      }
+      formData.data.productTotalAmount = calculatedAmount("unitPrice");
+      formData.data.customProcessingFee = calculatedAmount("customProcessingFee");
+      formData.data.lssueFee = calculatedAmount("lssueFee");
+      formData.data.deliveryMaterialsFee = computeDeliveryMaterialsFee();
+      formData.data.packingLabor = calculatedAmount("packingLabor");
+      formData.data.managementFee = calculatedAmount("managementFee");
+      formData.data.packagingMaterialCost = calculatedPackagingMaterialCost();
+      formData.data.totalAmount = calculatedTotalAmount();
+      if (fileList.value && fileList.value.length > 0) {
+        formData.data.fileList = fileList.value.map((item) => {
+          return {
+            id: item.raw.id,
+            fileName: item.raw.fileName,
+            fileUrl: item.raw.fileUrl,
+          };
+        });
+      } else {
+        formData.data.fileList = [];
+      }
+      proxy.post("/orderInfo/edit", formData.data).then(() => {
+        ElMessage({ message: "修改完成", type: "success" });
+        changeWlnCode.value = false;
+        getOrderDetail({ id: route.query.id || route.query.detailId });
+      });
+    }
+  });
+};
 </script>
 
 <style lang="scss" scoped>