报表处理，金价核对

src/apis/service/reportQuery/purchaseReport/index.js

@@ -13,6 +13,15 @@ export default {
   // 更新
   update: (data, params) => http(api + "cgdedit", data, "post", params),
   
-   //导出
-   exportcgdlist: (data, params) => http(api + "exportcgdlist", data, "post", params),
+   //咨询单总数
+   reportzixuntotal: (data, params) => http(api + "reportzixuntotal", data, "post", params),
+   //采购订单总金额
+   reportpurcheaseordersum: (data, params) => http(api + "reportpurcheaseordersum", data, "post", params),
+   //采购员回复咨询单数
+   reportconsultbidssum: (data, params) => http(api + "reportconsultbidssum", data, "post", params),
+   //采购员订单金额
+   reportpurcheaseordersumbyuser: (data, params) => http(api + "reportpurcheaseordersumbyuser", data, "post", params),
+   //已采反报价信息
+   reportconsultinfobidssum: (data, params) => http(api + "reportconsultinfobidssum", data, "post", params),
+   
 };

src/views/purchaseIn/workbench/components/baseForm.vue

@@ -14,28 +14,26 @@
         :span="24"
         style="padding: 12px 16px 12px 16px; text-align: right"
       >
-      <!-- 贵金属重量*供应商采购金价 + 工艺费*贵金属重量+加标费+包装费+证书费+成本裸价+运费+其他费用=成本合计 -->
-      <!-- 贵金属重量*供应商采购金价 + 工艺费*贵金属重量+加标费+包装费+证书费+成本裸价+运费=成本合计 -->
-      <!-- ps:没有其他费用-->  
-      <!-- （ruleForm.noble_weight*newGoldPrice)+ （ruleForm.cost_fee*ruleForm.noble_weight）
+        <!-- $total_fee(成本合计初始价格) =打样费/购买数量 + 开模费/购买数量 + 金属重量* 最新金价 + 工艺费* 金属重量+包装费+加标费+证书费+产品裸价0+运费; -->
+        <!-- ps:没有其他费用-->
+        <!-- （ruleForm.noble_weight*newGoldPrice)+ （ruleForm.cost_fee*ruleForm.noble_weight）
       + ruleForm.mark_fee + ruleForm.pakge_fee + ruleForm.cert_fee + ruleForm.nake_fee + ruleForm.delivery_fee-->
-      <!-- 乘法精度函数调用在mounted（初始调用），number_change函数（改变调用），如果放在dom层初始值时undifind会报错  r1,r2-->
-        <span
-          > 成本合计：<span>
-           
-            {{ 
-              accAdd(
-                r1,
-                r2,
-                ruleForm.mark_fee,
-                ruleForm.pakge_fee,
-                ruleForm.cert_fee,
-                ruleForm.nake_fee,
-                ruleForm.delivery_fee,
-                )
-            }}
-           <!-- {{ruleForm.delivery_fee}} -->
-            </span></span
+        <!-- 乘法精度函数调用在mounted（初始调用），number_change函数（改变调用），如果放在dom层初始值时undifind会报错  r1,r2-->
+        <span>
+          <!-- {{
+          (ruleForm.demo_fee/askItem.num)+
+          (ruleForm.open_fee/askItem.num)+
+          (ruleForm.noble_weight*newGoldPrice)+
+          (ruleForm.cost_fee*ruleForm.noble_weight)+
+          ruleForm.pakge_fee+
+          ruleForm.mark_fee+
+          ruleForm.cert_fee+ruleForm.nake_fee+ruleForm.delivery_fee 
+
+          }} -->
+          预计成本合计：<span>
+            
+            {{newPrice}}
+          </span></span
         >
         <span
           class="fl"
@@ -631,7 +629,7 @@ import {
 export default {
   name: "goodsCostAdd",
   mixins: [resToken],
-  props: ["showModel", "id", "type", "sitem", "askItem", "newTime", "editId",],
+  props: ["showModel", "id", "type", "sitem", "askItem", "newTime", "editId"],
   components: {
     baseFormAddEdit,
   },
@@ -674,7 +672,7 @@ export default {
       loading: true,
 
       //新实时金价
-      newGoldPrice:0,
+      newGoldPrice: 0,
 
       options1: options1,
       options2: options2,
@@ -689,91 +687,125 @@ export default {
       options11: options11,
       ruleForm: {},
       rules: JSON.parse(JSON.stringify(rules)),
-      r1:"",
-      r2:"",
+      //乘法处理
+      r1: "",
+      r2: "",
+      //除法处理
+      r3: "",
+      r4: "",
+
+      //成本合算
+      newPrice:0,
     };
   },
   mounted() {
+    this.$nextTick(() => {});
     this.initForm();
-
-    this.computedCost()
-   
     
+    
+    // this.computedCost();
   },
   methods: {
     //加法精度问题
-//     accAdd(arg1,arg2){ 
-//     var r1,r2,m; 
-//     try{
-//     	r1=arg1.toString().split(".")[1].length;
-//     }catch(e){
-//     	r1=0;
-//     } 
-//     try{
-//     	r2=arg2.toString().split(".")[1].length;
-//     }catch(e){
-//     	r2=0;
-//     } 
-//     m=Math.pow(10,Math.max(r1,r2)) ;
-//     return (arg1*m+arg2*m)/m ;
-// },
-accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){ 
-    var r1,r2,r3,r4,r5,r6,r7,m; 
-    console.log(arg1,arg2,arg3,arg4,arg5,arg6,arg7)
-    try{
-    	r1=arg1.toString().split(".")[1].length;
-    }catch(e){
-    	r1=0;
-    } 
-    try{
-    	r2=arg2.toString().split(".")[1].length;
-    }catch(e){
-    	r2=0;
-    }
-    try{
-    	r3=arg3.toString().split(".")[1].length;
-    }catch(e){
-    	r3=0;
-    }  
-    try{
-    	r4=arg4.toString().split(".")[1].length;
-    }catch(e){
-    	r4=0;
-    } 
-    try{
-    	r5=arg5.toString().split(".")[1].length;
-    }catch(e){
-    	r5=0;
-    } 
-    try{
-    	r6=arg6.toString().split(".")[1].length;
-    }catch(e){
-    	r6=0;
-    } 
-    try{
-    	r7=arg7.toString().split(".")[1].length;
-    }catch(e){
-    	r7=0;
-    } 
-    m=Math.pow(10,Math.max(r1,r2,r3,r4,r5,r6,r7)) ;
-    return (arg1*m+arg2*m+arg3*m+arg4*m+arg5*m+arg6*m+arg7*m)/m ;
-},
+    accAdd(arg1, arg2) {
+      var r1, r2, m;
+      try {
+        r1 = arg1.toString().split(".")[1].length;
+      } catch (e) {
+        r1 = 0;
+      }
+      try {
+        r2 = arg2.toString().split(".")[1].length;
+      } catch (e) {
+        r2 = 0;
+      }
+      m = Math.pow(10, Math.max(r1, r2));
+      return (arg1 * m + arg2 * m) / m;
+    },
+    // accAdd(arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
+    //   var r1, r2, r3, r4, r5, r6, r7, m;
+    //   console.log(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+    //   try {
+    //     r1 = arg1.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r1 = 0;
+    //   }
+    //   try {
+    //     r2 = arg2.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r2 = 0;
+    //   }
+    //   try {
+    //     r3 = arg3.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r3 = 0;
+    //   }
+    //   try {
+    //     r4 = arg4.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r4 = 0;
+    //   }
+    //   try {
+    //     r5 = arg5.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r5 = 0;
+    //   }
+    //   try {
+    //     r6 = arg6.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r6 = 0;
+    //   }
+    //   try {
+    //     r7 = arg7.toString().split(".")[1].length;
+    //   } catch (e) {
+    //     r7 = 0;
+    //   }
+    //   m = Math.pow(10, Math.max(r1, r2, r3, r4, r5, r6, r7));
+    //   return (
+    //     (arg1 * m +
+    //       arg2 * m +
+    //       arg3 * m +
+    //       arg4 * m +
+    //       arg5 * m +
+    //       arg6 * m +
+    //       arg7 * m) /
+    //     m
+    //   );
+    // },
 
-     //乘法精度问题
+    //乘法精度问题
     accMul(arg1, arg2) {
-        var m = 0, s1 = arg1.toString(), s2 = arg2.toString();
-        try {
-            m += s1.split(".")[1].length;
-        }
-        catch (e) {
-        }
-        try {
-            m += s2.split(".")[1].length;
-        }
-        catch (e) {
-        }
-        let numStr = Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m);
-        return numStr.toString()
+      var m = 0,
+        s1 = arg1.toString(),
+        s2 = arg2.toString();
+      try {
+        m += s1.split(".")[1].length;
+      } catch (e) {}
+      try {
+        m += s2.split(".")[1].length;
+      } catch (e) {}
+      let numStr =
+        (Number(s1.replace(".", "")) * Number(s2.replace(".", ""))) /
+        Math.pow(10, m);
+      return numStr.toString();
+    },
+    //除法精度问题
+    accDiv(arg1, arg2) {
+      var t1 = 0,
+        t2 = 0,
+        c1,
+        c2;
+      try {
+        t1 = arg1.toString().split(".")[1].length;
+      } catch (e) {}
+      try {
+        t2 = arg2.toString().split(".")[1].length;
+      } catch (e) {}
+      // with (Math) {
+      c1 = Number(arg1.toString().replace(".", ""));
+      c2 = Number(arg2.toString().replace(".", ""));
+      return (c1 / c2) * Math.pow(10, t2 - t1);
+      // }
     },
     async initForm() {
       this.supplierNo = [];
@@ -794,23 +826,68 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
       if (this.type === "edit" || this.type === "view") {
         await this.initData();
       }
+      //调用实时金价获取接口
+        
+        this.golpricelast(this.ruleForm.metal_id)
+        //调用成本合算计算函数
+        // this.computedCost()
       this.setrules();
       this.loading = false;
     },
 
-    computedCost(){
-      let goldPrice = this.newGoldPrice || this.askItem.gold_price
-      this.$nextTick(()=>{
-        this.r1 = this.accMul(this.ruleForm.noble_weight,goldPrice)
-        this.r2 = this.accMul(this.ruleForm.cost_fee,this.ruleForm.noble_weight)
-    })
+    computedCost() {
+      //        (this.ruleForm.demo_fee/this.askItem.num)+
+      //       (this.ruleForm.open_fee/this.askItem.num)+
+      //       (this.ruleForm.noble_weight*this.newGoldPrice)+
+      //       (this.ruleForm.cost_fee*this.ruleForm.noble_weight)+
+      //       this.ruleForm.pakge_fee+
+      //       this.ruleForm.mark_fee+
+      //       this.ruleForm.cert_fee+this.ruleForm.nake_fee+this.ruleForm.delivery_fee
+
+      //  let price = this.accDiv(this.ruleForm.demo_fee,this.askItem.num)
+      //  let price = this.accDiv(this.ruleForm.open_fee,this.askItem.num)
+
+      // console.log(this.askItem.num)
+      
+      this.$nextTick(() => {
+        this.r1 = this.accMul(this.ruleForm.noble_weight, this.newGoldPrice);
+        this.r2 = this.accMul(
+          this.ruleForm.cost_fee,
+          this.ruleForm.noble_weight
+        );
+        this.r3 = this.accDiv(this.ruleForm.demo_fee, this.askItem.num);
+        this.r4 = this.accDiv(this.ruleForm.open_fee, this.askItem.num);
+
+        // this.accAdd(this.r1,this.r2)
+        // this.accAdd(this.r3,this.r4)
+        // this.accAdd(this.ruleForm.pakge_fee,this.ruleForm.mark_fee)
+        // this.accAdd(this.ruleForm.cert_fee,this.ruleForm.nake_fee)
+        // this.accAdd(this.ruleForm.delivery_fee,)
+
+       let price =  this.accAdd(
+            this.ruleForm.delivery_fee,
+            this.accAdd(
+              this.accAdd(
+                this.accAdd(
+                  this.accAdd(this.r1, this.r2),
+                  this.accAdd(this.r3, this.r4)
+                ),
+                this.accAdd(this.ruleForm.pakge_fee, this.ruleForm.mark_fee)
+              ),
+              this.accAdd(this.ruleForm.cert_fee, this.ruleForm.nake_fee)
+            )
+          );
+          price = price.toFixed(2)
+
+          this.newPrice = price;
+          console.log("aaaaaaaaaaaaaaaaaaa",price)
+      });
     },
 
     number_change(e, key) {
       this.ruleForm[key] = e + "" || "0";
       this.$refs.ruleForm.validateField(key);
-      this.computedCost()
-      
+      this.computedCost();
     },
     async initData() {
       this.loading = true;
@@ -916,7 +993,8 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
         if (this.is_noble) {
           this.ruleForm.nake_fee = "0";
         }
-        // console.log(this.ruleForm.origin_place);
+        
+        
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
@@ -992,9 +1070,9 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
           this.is_noble = this.askItem.is_metal;
           this.cat_id_name = this.type === "add" ? this.askItem.can_name : "";
 
-          this.brand_name =""
+          this.brand_name = "";
           // this.type === "add" ? this.askItem.brand : "";
-          this.unit_name = ""
+          this.unit_name = "";
           //this.type === "add" ? this.askItem.unit_name : "";
           this.ruleForm = {
             infoNo: this.id || "",
@@ -1004,10 +1082,10 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
             expire_day: "0", //有效期
             delivery_day: "0", //物流时间
             work_day: "0", //生产工期
-            brandid:[],
-              // this.type === "add" && this.askItem.brand_id
-              //   ? [this.askItem.brand_id]
-              //   : [],
+            brandid: [],
+            // this.type === "add" && this.askItem.brand_id
+            //   ? [this.askItem.brand_id]
+            //   : [],
             unit_id: [],
             //this.type === "add" ? [this.askItem.unit] : [],
             weight: this.type === "add" ? this.askItem.total_weight : "0.000",
@@ -1134,16 +1212,8 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
     },
     //金属种类选择
     //需修改，未改完
-   async metal_idsearchChange(e) {
-
-      // console.log(e.id,"1111111111111111111111")
-      if(!e.id){
-        // this.ruleForm.metal_id = this.askItem.gold_price;
-      // console.log(this.ruleForm.metal_id ,"1111111111111111111111")
-
-        this.newGoldPrice = 0;
-        return;
-      }
+    async metal_idsearchChange(e) {
+      
       this.loading = true;
       const { id, code, label } = e;
       if (id) {
@@ -1152,19 +1222,39 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
         this.ruleForm.metal_id = "";
       }
       this.$refs.ruleForm.validateField("metal_id");
+      
 
+      //获取实时金价
+      this.golpricelast(e.id)
+      
+      this.loading = false;
+    },
+    //获取实时金价
+    async golpricelast(id){
       
-      const res = await asyncRequest.golpricelast({type:e.id});
-      if (res && res.code === 0) { 
-        this.newGoldPrice = res.data[0].price;
-        this.computedCost()
-        console.log(res.data[0].price)
+      if (!id) {
+        // this.ruleForm.metal_id = this.askItem.gold_price;
+        // console.log(this.ruleForm.metal_id ,"1111111111111111111111")
+        
+        this.newGoldPrice = 0;
+        return;
+      }
+      const res = await asyncRequest.golpricelast({ type: id });
+      console.log(res)
+      if (res && res.code === 0) {
+        if(res.data.length<=0){
+          this.newGoldPrice = 0;
+        }else{
+          this.newGoldPrice = res.data[0].price;
+        }
+        
+
+        this.computedCost();
+        
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
-        
       }
-      this.loading = false;
     },
 
     //仓库省市区

src/views/reportQuery/purchaseReport/components/columns.js

@@ -169,77 +169,77 @@ const table5 = [
     _noset_: true
   },
   {
-    prop: "date",
+    prop: "addtime",
     label: "咨询时间",
     width: "145px",
   },
   {
-    prop: "name",
+    prop: "bidNo",
     label: "采购反馈单号",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "zxNo",
     label: "咨询订单号",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "cbaddtime",
     label: "回复时间",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "good_name",
     label: "产品名称",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "supplier",
     label: "供应商名称",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "total_fee",
     label: "成本合计",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "delivery_day",
     label: "物流时间（天）",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "work_day",
     label: "产品工期（天）",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "expire_day",
     label: "信息有效期（天）",
     width: "155px",
   },
   {
-    prop: "total",
+    prop: "creater",
     label: "采购员",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "num",
     label: "需求数量",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "arrival_time",
     label: "要求到货日期",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "salesman",
     label: "业务人员",
     width: "145px",
   },
   {
-    prop: "total",
+    prop: "companyName",
     label: "客户名称",
     width: "145px",
   },

src/views/reportQuery/purchaseReport/components/table5.vue

@@ -57,7 +57,7 @@
                 <el-input
                   clearable
                   placeholder="咨询订单号"
-                  v-model="parmValue.xiugai1"
+                  v-model="parmValue.zxNo"
                   maxlength="40"
                   :size="searchSize"
                   @blur="
@@ -118,11 +118,12 @@ export default {
       loading: false,
       //请求参数集合
       parmValue: {
-        xiugai1:"", //咨询订单号
+        zxNo:"", //咨询订单号
         start_date: "", //起始时间
         end_date: "", // 结束时间
         page: 1, // 页码
         size: 15, // 每页显示条数
+        is_export:0//是否导出
        
       },
       // 表格 - 数据集合
@@ -158,13 +159,14 @@ export default {
         this.$message.warning("时间区间不完整！");
         return;
       }
-      return;
+      // return;
       this.loading = true;
       
-      const res = await asyncRequest.list(this.parmValue);
+      const res = await asyncRequest.reportconsultinfobidssum(this.parmValue);
       if (res && res.code === 0 && res.data) {
+        console.log(res)
         this.tableData = res.data.list;
-        this.pageInfo.total = Number(res.data.count);
+        this.pageInfo.total = Number(res.data.total);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
@@ -177,10 +179,12 @@ export default {
     //重置
     restSearch() {
       this.parmValue = {
-        start_date: "", //新建起始时间
-        end_date: "", // 新建结束时间
+        zxNo:"", //咨询订单号
+        start_date: "", //起始时间
+        end_date: "", // 结束时间
         page: 1, // 页码
         size: 15, // 每页显示条数
+        is_export:0//是否导出
       };
       // 表格 - 分页
       this.pageInfo = {