采购金价，成本核算修改

src/apis/service/purchaseIn/purchaseOrder/index.js

@@ -33,4 +33,6 @@ export default {
 
   //采购单修改实时金价
   cgdeditgoldprice: (data, params) => http(api + "cgdeditgoldprice", data, "post", params),
+   // 采返商品详情 订单生成前
+   cove_detail: (data, params) => http(api + "getgoodzxinfobynotzixun", data, "post", params),
 };

src/apis/service/purchaseIn/workbench/index.js

@@ -22,6 +22,8 @@ export default {
   delete: (data, params) => http(api + "customardelete", data, "post", params),
   // 状态
   status: (data, params) => http(api + "resultstatu", data, "post", params),
+  // 获取实时金价
+  golpricelast: (data, params) => http(api + "golpricelast", data, "post", params),
 
 
 };

src/views/purchaseIn/purchaseOrder/components/editPrice.vue

@@ -3,7 +3,7 @@
     ref="ruleForm"
     :model="ruleForm"
     status-icon
-    v-if="sitem.status == '0' && sitem.can[0].id == '6' && cost_detailArr.is_gold_price == '1'"
+   
     :size="'mini'"
     :rules="rulesThis"
     label-width="112px"
@@ -19,7 +19,7 @@
             :position="'right'"
             :precision="2"
             :size="'mini'"
-            
+            :newTime="newTime"
             :controls="false"
             :append="'元'"
             @reschange="rate_change"
@@ -44,7 +44,7 @@ import resToken from "@/mixins/resToken";
 
 export default {
   name: "Account",
-  props: ["showModel", "sitem", "id", "type",'newTime',],
+  props: ["showModel", "sitem", "id", "type",'newTime',"cost_detailArr"],
   mixins: [resToken],
   computed: {
     powers() {
@@ -104,6 +104,7 @@ export default {
           },
         ],
       },
+      newTime:""
     };
   },
   mounted() {
@@ -123,25 +124,31 @@ export default {
 
     //初始化整个组件
     async initForm() {
-      this.loading = true;
+      // this.loading = true;
+      console.log(this.sitem)
       this.company = "";
+      
       this.ruleForm = {
         cgdNo: this.sitem.cgdNo,
         gold_price: this.sitem.gold_price,
       };
+      console.log(this.ruleForm )
       this.rulesThis = this.rules;
+      this.newTime = new Date().valueOf()+""
+      console.log(this.newTime )
+
       //新增商品信息请求
-      const res = await asyncRequest.cost_detail({ spuCode: this.sitem.spuCode });
-      if (res && res.code === 0 && res.data) {
-        this.cost_detailArr = res.data;
-        console.log(this.cost_detailArr)
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
+      // const res = await asyncRequest.cost_detail({ spuCode: this.sitem.spuCode });
+      // if (res && res.code === 0 && res.data) {
+      //   this.cost_detailArr = res.data;
+      //   console.log(this.cost_detailArr)
+      // } else if (res && res.code >= 100 && res.code <= 104) {
+      //   await this.logout();
+      // } else {
+      //   this.$message.warning(res.message);
+      // }
       
-      this.loading = false;
+      // this.loading = false;
     },
     //初始化整个表单
     // async resetForm() {

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -175,8 +175,10 @@
 
               <editPrice
                 :newTime="newTime"
-                v-if="newTime !== ''"
+                v-if="newTime !== '' && sitem.status == '0' && sitem.can[0].id == '6' && cost_detailArr.is_gold_price == '1'"
+                
                 :sitem="sitem"
+                :cost_detailArr="cost_detailArr"
                 @refresh = "refresh"
               >
 
@@ -381,10 +383,19 @@ export default {
       }
     },
     async goldPrice(){
-      const res = await asyncRequest.cost_detail({ spuCode: this.sitem.spuCode });
+      
+      // console.log(this.sitem.order_type,"11111111111111111111111")
+      // if(this.sitem.order_type){}
+      // return;
+      let res = {}
+      let {order_type} = this.sitem
+      if(order_type == "1"||order_type == "2"||order_type == "5"){
+        res = await asyncRequest.cost_detail({ spuCode: this.sitem.spuCode });
+      }else{
+        res = await asyncRequest.cove_detail({ spuCode: this.sitem.spuCode });
+      }
       if (res && res.code === 0 && res.data) {
         this.cost_detailArr = res.data;
-        console.log(this.cost_detailArr)
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {

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

@@ -17,11 +17,12 @@
       <!-- 贵金属重量*供应商采购金价 + 工艺费*贵金属重量+加标费+包装费+证书费+成本裸价+运费+其他费用=成本合计 -->
       <!-- 贵金属重量*供应商采购金价 + 工艺费*贵金属重量+加标费+包装费+证书费+成本裸价+运费=成本合计 -->
       <!-- ps:没有其他费用-->  
-      <!-- （ruleForm.noble_weight*askItem.gold_price)+ （ruleForm.cost_fee*ruleForm.noble_weight）
+      <!-- （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>
+          > 成本合计：<span>
+           
             {{ 
               accAdd(
                 r1,
@@ -672,6 +673,9 @@ export default {
       activeName: "1",
       loading: true,
 
+      //新实时金价
+      newGoldPrice:0,
+
       options1: options1,
       options2: options2,
       options3: options3,
@@ -692,11 +696,7 @@ export default {
   mounted() {
     this.initForm();
 
-  this.$nextTick(()=>{
-    this.r1 = this.accMul(this.ruleForm.noble_weight,this.askItem.gold_price)
-    this.r2 = this.accMul(this.ruleForm.cost_fee,this.ruleForm.noble_weight)
-   console.log(this.r1,this.r2)
-  })
+    this.computedCost()
    
     
   },
@@ -798,13 +798,20 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
       this.loading = false;
     },
 
+    computedCost(){
+      let goldPrice = this.newGoldPrice || this.askItem.gold_price
+      console.log(goldPrice,"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb")
+      this.$nextTick(()=>{
+        this.r1 = this.accMul(this.ruleForm.noble_weight,goldPrice)
+        this.r2 = this.accMul(this.ruleForm.cost_fee,this.ruleForm.noble_weight)
+    })
+    },
+
     number_change(e, key) {
       this.ruleForm[key] = e + "" || "0";
       this.$refs.ruleForm.validateField(key);
-      this.$nextTick(()=>{
-      this.r1 = this.accMul(this.ruleForm.noble_weight,this.askItem.gold_price)
-      this.r2 = this.accMul(this.ruleForm.cost_fee,this.ruleForm.noble_weight)
-  })
+      this.computedCost()
+      
     },
     async initData() {
       this.loading = true;
@@ -1127,8 +1134,15 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
       this.$refs.ruleForm.validateField("unit_id");
     },
     //金属种类选择
-    metal_idsearchChange(e) {
-      console.log(e);
+    //需修改，未改完
+   async metal_idsearchChange(e) {
+
+      // console.log()
+      if(!e.id){
+        this.newGoldPrice = 0;
+        return;
+      }
+      this.loading = true;
       const { id, code, label } = e;
       if (id) {
         this.ruleForm.metal_id = id;
@@ -1136,6 +1150,19 @@ accAdd(arg1,arg2,arg3,arg4,arg5,arg6,arg7){
         this.ruleForm.metal_id = "";
       }
       this.$refs.ruleForm.validateField("metal_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)
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        
+      }
+      this.loading = false;
     },
 
     //仓库省市区