询报价管理/报价详情：确认历史报价弹窗未带入品牌报错

src/views/List/inquireDetail.vue

@@ -202,7 +202,6 @@
             <el-table-column prop="inquiry_goods_name" label="型号" width="200"></el-table-column>
             <el-table-column prop="inquiry_goods_name" label="型号" width="200"></el-table-column>
             <el-table-column prop="inquiry_brand_name" label="品牌" width="200"></el-table-column>
             <el-table-column prop="inquiry_brand_name" label="品牌" width="200"></el-table-column>
             <el-table-column prop="inquiry_sn" label="询价单号" width="200"></el-table-column>
             <el-table-column prop="inquiry_sn" label="询价单号" width="200"></el-table-column>
-
           </el-table>
           </el-table>
           <el-pagination layout="prev, pager, next,jumper" :page-size="limit" :total="total"
           <el-pagination layout="prev, pager, next,jumper" :page-size="limit" :total="total"
                          @current-change="handleCurrentChange" :current-page="page"></el-pagination>
                          @current-change="handleCurrentChange" :current-page="page"></el-pagination>
@@ -872,9 +871,9 @@ export default {
         return;
         return;
       }
       }
       if (this.active == 1) {
       if (this.active == 1) {
-        this.currentDataId = row.id
+        this.currentDataId = row.id;
       } else {
       } else {
-        this.currentDataId = row.goods_id
+        this.currentDataId = row.goods_id;
       }
       }
       this.title = this.active == 1 ? '确认-历史报价' : '确认-匹配库存';
       this.title = this.active == 1 ? '确认-历史报价' : '确认-匹配库存';
       this.dialogVisible = true;
       this.dialogVisible = true;
@@ -899,11 +898,10 @@ export default {
           } else {
           } else {
             this.$message({
             this.$message({
               message: res.msg,
               message: res.msg,
-              type: 'warning'
+              type: 'error'
             });
             });
           }
           }
         })
         })
-
       } else {
       } else {
         this.$http('get', "/api/quote/getinfo", {
         this.$http('get', "/api/quote/getinfo", {
           id: row.id
           id: row.id
@@ -912,6 +910,7 @@ export default {
             res.data.quote_info.price_other = this.float(res.data.quote_info.price_other)
             res.data.quote_info.price_other = this.float(res.data.quote_info.price_other)
             res.data.quote_info.price_origin = this.float(res.data.quote_info.price_origin)
             res.data.quote_info.price_origin = this.float(res.data.quote_info.price_origin)
             this.ruleForm.goods_name = res.data.quote_info.goods_name;
             this.ruleForm.goods_name = res.data.quote_info.goods_name;
+            this.ruleForm.brand_name = res.data.quote_info.brand_name;
             this.ruleForm.quote_number = res.data.quote_info.quote_number;
             this.ruleForm.quote_number = res.data.quote_info.quote_number;
             this.ruleForm.currency = res.data.quote_info.currency.toString();
             this.ruleForm.currency = res.data.quote_info.currency.toString();
             this.ruleForm.batch = res.data.quote_info.batch;
             this.ruleForm.batch = res.data.quote_info.batch;
@@ -921,8 +920,8 @@ export default {
             this.ruleForm.brand = res.data.quote_info.brand_name;
             this.ruleForm.brand = res.data.quote_info.brand_name;
             this.ruleForm.price_origin = res.data.quote_info.price_origin;
             this.ruleForm.price_origin = res.data.quote_info.price_origin;
             this.ruleForm.tax_rate = res.data.quote_info.tax_rate;
             this.ruleForm.tax_rate = res.data.quote_info.tax_rate;
-            this.ruleForm.delivery_int = res.data.delivery_int;
-            this.ruleForm.delivery_unit_val = res.data.delivery_unit_val;
+            this.ruleForm.delivery_int = res.data.quote_info.delivery_int;
+            this.ruleForm.delivery_unit_val = res.data.quote_info.delivery_unit_val;
             this.ruleForm.moq = res.data.quote_info.moq;
             this.ruleForm.moq = res.data.quote_info.moq;
             this.ruleForm.remark = res.data.quote_info.remark;
             this.ruleForm.remark = res.data.quote_info.remark;
             if (res.data.quote_info.expire_time == '0000-00-00 00:00:00') {
             if (res.data.quote_info.expire_time == '0000-00-00 00:00:00') {