fix

src/views/sellOut/filing/cpns/baseForm.vue

@@ -801,16 +801,19 @@ export default {
     //计算单价
     getPrice(key) {
       const { is_determine_price, type } = this.ruleForm;
-      if (
-        (key === "price" && String(is_determine_price) == "1") ||
-        (String(type) == "1" && key === "expect_service")
-      ) {
+      if(String(type) == "1" && key === "expect_service"){
+        this.ruleForm.price = Number(add_sum(this.ruleForm.cgd_charge,this.ruleForm.expect_service) || 0).toFixed(2)
+        this.ruleForm.expect_service_proportion = accMul(
+            this.ruleForm.cgd_charge ? accDiv(this.ruleForm.expect_service, this.ruleForm.cgd_charge) : "0",
+            "100"
+        ).toFixed(2);
+      } else if ((key === "price" && String(is_determine_price) == "1")) {
         const Sub = accSub(
           Number(this.ruleForm.price),
           Number(this.ruleForm.expect_service)
         );
         // console.log(Sub, Number(Sub));
-        this.ruleForm.cgd_charge = (Number(Sub) < 0 ? 0 : Sub).toFixed(2);
+        this.ruleForm.cgd_charge = Number(Number(Sub) < 0 ? 0 : Sub).toFixed(2);
         const cgd_charge = Number(this.ruleForm.cgd_charge);
         this.ruleForm.expect_service_proportion = accMul(
           cgd_charge ? accDiv(this.ruleForm.expect_service, cgd_charge) : "0",

src/views/supplierSellOut/supplierFiling/cpns/baseForm.vue

@@ -806,16 +806,20 @@ export default {
     //计算单价
     getPrice(key) {
       const { is_determine_price, type } = this.ruleForm;
-      if (
-        (key === "price" && String(is_determine_price) == "1") ||
-        (String(type) == "1" && key === "expect_service")
-      ) {
+
+      if(String(type) == "1" && key === "expect_service"){
+        this.ruleForm.price = Number(add_sum(this.ruleForm.cgd_charge,this.ruleForm.expect_service) || 0).toFixed(2)
+        this.ruleForm.expect_service_proportion = accMul(
+          this.ruleForm.cgd_charge ? accDiv(this.ruleForm.expect_service, this.ruleForm.cgd_charge) : "0",
+          "100"
+        ).toFixed(2);
+      }else if ((key === "price" && String(is_determine_price) == "1")) {
         const Sub = accSub(
           Number(this.ruleForm.price),
           Number(this.ruleForm.expect_service)
         );
         // console.log(Sub, Number(Sub));
-        this.ruleForm.cgd_charge = (Number(Sub) < 0 ? 0 : Sub).toFixed(2);
+        this.ruleForm.cgd_charge = Number(Number(Sub) < 0 ? 0 : Sub).toFixed(2);
         const cgd_charge = Number(this.ruleForm.cgd_charge);
         this.ruleForm.expect_service_proportion = accMul(
           cgd_charge ? accDiv(this.ruleForm.expect_service, cgd_charge) : "0",