js

src/views/List/inquire.vue

@@ -222,7 +222,7 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <el-table-column prop="remark" label="备注" width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="remark" label="备注" width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
-            <el-table-column prop="create_time" label="报价时间" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+            <el-table-column prop="quote_time" label="报价时间" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
           </el-table>
           </el-table>
         </template>
         </template>
         <!--匹配库存-->
         <!--匹配库存-->
@@ -733,25 +733,37 @@ export default {
         this.ruleForm.goods_name = row.goods_name;//赋值型号
         this.ruleForm.goods_name = row.goods_name;//赋值型号
         this.ruleForm.brand_name = row.brand_name;//赋值品牌
         this.ruleForm.brand_name = row.brand_name;//赋值品牌
         this.ruleForm.quote_number = data.quote_number;//报价数量
         this.ruleForm.quote_number = data.quote_number;//报价数量
-        data.price_origin = this.float(data.price_origin);//价格转换
-        this.ruleForm.price_origin = data.price_origin;//价格
+
+        //取当前报价的字段quote_number，与匹配库存里的阶梯价格符合条件的第一条
+        let quote_number = data.quote_number * 1;
+        let purchases_filter = [];
+        if (row.cn_ladder_price.length > 0) {
+          purchases_filter = row.cn_ladder_price.filter((item) => {
+            if (quote_number <= item.purchases) {
+              return item;
+            }
+          });
+        }
+        if (purchases_filter.length > 0) {
+          this.ruleForm.price_origin = purchases_filter[0].price * 1;//价格
+        } else {
+          this.ruleForm.price_origin = 0;//价格
+        }
         this.ruleForm.currency = data.currency.toString();//币种
         this.ruleForm.currency = data.currency.toString();//币种
         this.ruleForm.tax_rate = Number(data.tax_rate) * 100 + '%';//税率
         this.ruleForm.tax_rate = Number(data.tax_rate) * 100 + '%';//税率
-        this.ruleForm.batch = row.batch;//批次
+        this.ruleForm.batch = row.batch_sn;//批次
         this.ruleForm.delivery_int = data.delivery_info.delivery_int; //货期
         this.ruleForm.delivery_int = data.delivery_info.delivery_int; //货期
         this.ruleForm.delivery_unit_val = data.delivery_info.delivery_unit_val;//货期单位
         this.ruleForm.delivery_unit_val = data.delivery_info.delivery_unit_val;//货期单位
-        this.ruleForm.mpq = data.mpq;//最小包装数量
-        this.ruleForm.moq = data.moq;//起订量
+        this.ruleForm.mpq = row.mpq;//最小包装数量
+        this.ruleForm.moq = row.moq;//起订量
         data.price_other = this.float(data.price_other);//其他费用
         data.price_other = this.float(data.price_other);//其他费用
         this.ruleForm.price_other = data.price_other;//其他费用
         this.ruleForm.price_other = data.price_other;//其他费用
         this.ruleForm.remark = data.remark;//备注
         this.ruleForm.remark = data.remark;//备注
 
 
         //报价有效期
         //报价有效期
-        if (data.expire_time == '0000-00-00 00:00:00') {
-          this.ruleForm.expire_time = '';
-        } else {
-          this.ruleForm.expire_time = data.expire_time;
-        }
+        const start = new Date();
+        start.setTime(start.getTime() + 3600 * 1000 * 24 * 2);
+        this.ruleForm.expire_time = start;
       }
       }
 
 
     },
     },
@@ -785,8 +797,10 @@ export default {
       this.ruleForm.remark = row.remark;//备注
       this.ruleForm.remark = row.remark;//备注
 
 
       //报价有效期
       //报价有效期
-      if (row.expire_time == '0000-00-00 00:00:00') {
-        this.ruleForm.expire_time = '';
+      if (row.expire_time == '') {
+        const start = new Date();
+        start.setTime(start.getTime() + 3600 * 1000 * 24 * 2);
+        this.ruleForm.expire_time = start;
       } else {
       } else {
         this.ruleForm.expire_time = row.expire_time;
         this.ruleForm.expire_time = row.expire_time;
       }
       }