物料管理领用出库领料单合计计算，由单价改为含税单价计算后合计

src/views/system/jbdScan/goods/lingliaodan.vue

@@ -192,9 +192,13 @@ export default {
       this.getLook(idStr);
     },
     addNumber(num1, num2) {
-      let a = parseFloat(num1);
-      let b = parseFloat(num2);
-      return a.toFixed("2") * 1 + b.toFixed("2") * 1;
+      let a = num1*1;
+      let b = num2*1;
+      let c = a + b 
+      return c;
+      // let a = parseFloat(num1);
+      // let b = parseFloat(num2);
+      // return a.toFixed("2") * 1 + b.toFixed("2") * 1;
     },
     riqi(value) {
       let date = new Date(value);
@@ -233,7 +237,8 @@ export default {
         zhubiao = res.variables.data;
         console.log(zhubiao)
         zhubiao.forEach((item) => {
-          let sql1 = `select * FROM t_crkjlx  WHERE FIND_IN_SET(parent_id_,'${item.id_}')`;
+          // let sql1 = `select * FROM t_crkjlx  WHERE FIND_IN_SET(parent_id_,'${item.id_}')`;
+          let sql1 = `select c.*,IFNULL(m.dan_jia_han_shui_,'') as dan_jia_han_shui_,IFNULL(m.shui_lv_,'') as shui_lv_ FROM t_crkjlx c LEFT JOIN t_mjwlgl m on c.ming_cheng_zhuan_ = m.id_ WHERE FIND_IN_SET(parent_id_,'${item.id_}')`;
           let chushi = 0;
           repostCurd("sql", sql1).then((res) => {
             let data = res.variables.data;
@@ -265,11 +270,13 @@ export default {
                 data["ling_liao_ri_qi_"] = item.ling_liao_ri_qi_;
                 data["gong_ying_shang_"] = item.gong_ying_shang_ || 0;
                 data.forEach((it) => {
-                  data["heji"] = this.addNumber(chushi, it.jin_e_);
+
+                  let jine = (Number(it.dan_jia_han_shui_)/((parseFloat(Number(it.shui_lv_.replace("%", ""))) / 100)+1))*Number(it.shu_liang_)
+                  data["heji"] = this.addNumber(chushi, jine);
                   chushi = data["heji"];
                 });
-
-                data["heji"] = this_.toDecimal2(data["heji"]);
+                data["heji"] = data["heji"].toFixed(5)
+                // data["heji"] = this_.toDecimal2(data["heji"]);
                 this_.list.push(data);
                 chushi = 0;
               });

src/views/system/jbdScan/wuliao/lingliaodan.vue

@@ -189,9 +189,13 @@ export default {
       this.getLook(idStr);
     },
     addNumber(num1, num2) {
-      let a = parseFloat(num1);
-      let b = parseFloat(num2);
-      return a.toFixed("2") * 1 + b.toFixed("2") * 1;
+      let a = num1*1;
+      let b = num2*1;
+      let c = a + b 
+      return c;
+      // let a = parseFloat(num1);
+      // let b = parseFloat(num2);
+      // return a.toFixed("2") * 1 + b.toFixed("2") * 1;
     },
     riqi(value) {
       let date = new Date(value);
@@ -239,7 +243,8 @@ export default {
         zhubiao = res.variables.data;
         console.log(zhubiao)
         zhubiao.forEach((item) => {
-          let sql1 = `select * FROM t_crkjlx  WHERE FIND_IN_SET(parent_id_,'${item.id_}')`;
+          // let sql1 = `select * FROM t_crkjlx  WHERE FIND_IN_SET(parent_id_,'${item.id_}')`;
+          let sql1 = `select c.*,IFNULL(m.dan_jia_han_shui_,'') as dan_jia_han_shui_,IFNULL(m.shui_lv_,'') as shui_lv_ FROM t_crkjlx c LEFT JOIN t_mjwlgl m on c.ming_cheng_zhuan_ = m.id_ WHERE FIND_IN_SET(parent_id_,'${item.id_}')`;
           let chushi = 0;
           repostCurd("sql", sql1).then((res) => {
             let data = res.variables.data;
@@ -272,11 +277,12 @@ export default {
                 data["ling_liao_ri_qi_"] = item.ling_liao_ri_qi_;
                 data["gong_ying_shang_"] = item.gong_ying_shang_ || 0;
                 data.forEach((it) => {
-                  data["heji"] = this.addNumber(chushi, it.jin_e_);
+                  let jine = (Number(it.dan_jia_han_shui_)/((parseFloat(Number(it.shui_lv_.replace("%", ""))) / 100)+1))*Number(it.shu_liang_)
+                  data["heji"] = this.addNumber(chushi, jine);
                   chushi = data["heji"];
                 });
-
-                data["heji"] = this_.toDecimal2(data["heji"]);
+                data["heji"] = data["heji"].toFixed(5)
+                // data["heji"] = this_.toDecimal2(data["heji"]);
                 this_.list.push(data);
                 chushi = 0;
               });