bug

src/views/List/inquire.vue

@@ -250,36 +250,24 @@
             <el-table-column prop="stock" label="库存数量" width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="cn_ladder_price" label="国内含税价" width="120" :show-overflow-tooltip="true" align="center">
               <template slot-scope="scope" v-if="scope.row.cn_ladder_price&&scope.row.cn_ladder_price.length>0">
-                <div class="price-more">
-                  <el-tooltip placement="bottom" effect="light">
-                    <div slot="content">
-                      <div class="boxxrth2021">
-                        <p class="clr" v-for="item in scope.row.cn_ladder_price">
-                          <span class="fl">{{ item.purchases }}+</span>
-                          <span class="fl">&yen;{{ item.price }}</span>
-                        </p>
-                      </div>
-                    </div>
-                    <div class="more-search-btn">查看更多</div>
-                  </el-tooltip>
-                </div>
+                <el-popover effect="light" trigger="hover" placement="bottom">
+                  <p class="row" v-for="item in scope.row.cn_ladder_price">
+                    <span>{{ item.purchases }}+</span>
+                    <span style="margin-left: 5px">&yen;{{ item.price }}</span>
+                  </p>
+                  <a slot="reference" href="javascript:;" class="alink">查看</a>
+                </el-popover>
               </template>
             </el-table-column>
             <el-table-column prop="hk_ladder_price" label="香港交货价" width="120" :show-overflow-tooltip="true" align="center">
               <template slot-scope="scope" v-if="scope.row.hk_ladder_price&&scope.row.hk_ladder_price.length>0">
-                <div class="price-more">
-                  <el-tooltip placement="bottom" effect="light">
-                    <div slot="content">
-                      <div class="boxxrth2021">
-                        <p class="clr" v-for="item in scope.row.hk_ladder_price">
-                          <span class="fl">{{ item.purchases }}+</span>
-                          <span class="fl">${{ item.price }}</span>
-                        </p>
-                      </div>
-                    </div>
-                    <div class="more-search-btn">查看更多</div>
-                  </el-tooltip>
-                </div>
+                <el-popover effect="light" trigger="hover" placement="bottom">
+                  <p class="row" v-for="item in scope.row.hk_ladder_price">
+                    <span>{{ item.purchases }}+</span>
+                    <span style="margin-left: 5px">&yen;{{ item.price }}</span>
+                  </p>
+                  <a slot="reference" href="javascript:;" class="alink">查看</a>
+                </el-popover>
               </template>
             </el-table-column>
             <el-table-column prop="cn_delivery_time" label="大陆交期" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
@@ -726,38 +714,41 @@ export default {
      *匹配库存选择修改报价 一部分数据是来自当前报价的第一条
      */
     editSku(row) {
-      let data = this.currentQuotoDataList[0];
       this.title = '修改报价';
       this.dialogVisible = true;
       this.isModify = true; //标记修改状态
 
-      this.ruleForm.inquiry_sn = data.inquiry_sn;
-      this.ruleForm.inquiry_id = data.inquiry_id;
-      this.ruleForm.inquiry_items_id = data.inquiry_items_id;
-      this.ruleForm.quote_id = data.id; //编辑的时候需要
+      if (this.currentQuotoDataList.length > 0) {
+        let data = this.currentQuotoDataList[0];
+        this.ruleForm.inquiry_sn = data.inquiry_sn;
+        this.ruleForm.inquiry_id = data.inquiry_id;
+        this.ruleForm.inquiry_items_id = data.inquiry_items_id;
+        this.ruleForm.quote_id = data.id; //编辑的时候需要
 
-      this.ruleForm.goods_name = row.goods_name;//赋值型号
-      this.ruleForm.brand_name = row.brand_name;//赋值品牌
-      this.ruleForm.quote_number = data.quote_number;//报价数量
-      data.price_origin = this.float(data.price_origin);//价格转换
-      this.ruleForm.price_origin = data.price_origin;//价格
-      this.ruleForm.currency = data.currency.toString();//币种
-      this.ruleForm.tax_rate = Number(data.tax_rate) * 100 + '%';//税率
-      this.ruleForm.batch = row.batch;//批次
-      this.ruleForm.delivery_int = data.delivery_info.delivery_int; //货期
-      this.ruleForm.delivery_unit_val = data.delivery_info.delivery_unit_val;//货期单位
-      this.ruleForm.mpq = data.mpq;//最小包装数量
-      this.ruleForm.moq = data.moq;//起订量
-      data.price_other = this.float(data.price_other);//其他费用
-      this.ruleForm.price_other = data.price_other;//其他费用
-      this.ruleForm.remark = data.remark;//备注
+        this.ruleForm.goods_name = row.goods_name;//赋值型号
+        this.ruleForm.brand_name = row.brand_name;//赋值品牌
+        this.ruleForm.quote_number = data.quote_number;//报价数量
+        data.price_origin = this.float(data.price_origin);//价格转换
+        this.ruleForm.price_origin = data.price_origin;//价格
+        this.ruleForm.currency = data.currency.toString();//币种
+        this.ruleForm.tax_rate = Number(data.tax_rate) * 100 + '%';//税率
+        this.ruleForm.batch = row.batch;//批次
+        this.ruleForm.delivery_int = data.delivery_info.delivery_int; //货期
+        this.ruleForm.delivery_unit_val = data.delivery_info.delivery_unit_val;//货期单位
+        this.ruleForm.mpq = data.mpq;//最小包装数量
+        this.ruleForm.moq = data.moq;//起订量
+        data.price_other = this.float(data.price_other);//其他费用
+        this.ruleForm.price_other = data.price_other;//其他费用
+        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;
+        //报价有效期
+        if (data.expire_time == '0000-00-00 00:00:00') {
+          this.ruleForm.expire_time = '';
+        } else {
+          this.ruleForm.expire_time = data.expire_time;
+        }
       }
+
     },
     /**
      * 编辑修改