bug

src/views/List/inquire.vue

@@ -54,7 +54,7 @@
       <!--操作区-->
       <!--操作区-->
       <div class="operation-area row verCenter bothSide">
       <div class="operation-area row verCenter bothSide">
         <div class="operation-button row verCenter">
         <div class="operation-button row verCenter">
-          <el-button type="primary" @click="add">报价</el-button>
+          <!--<el-button type="primary" @click="add">报价</el-button>-->
           <el-button type="primary" @click="exportChange">导出</el-button>
           <el-button type="primary" @click="exportChange">导出</el-button>
           <el-button type="danger" @click="del">删除</el-button>
           <el-button type="danger" @click="del">删除</el-button>
         </div>
         </div>
@@ -230,7 +230,7 @@
                 <!--待报价和已报价才可以新增报价-->
                 <!--待报价和已报价才可以新增报价-->
                 <template v-if="inquireObj.i_status == 1 || inquireObj.i_status == 2">
                 <template v-if="inquireObj.i_status == 1 || inquireObj.i_status == 2">
                   <template v-if="scope.row.is_bind != 1">
                   <template v-if="scope.row.is_bind != 1">
-                    <a href="javascript:;" @click="addMatchingHistory(scope.row)" class="row rowCenter verCenter btn-element">选择</a>
+                    <a href="javascript:;" @click="editSku(scope.row)" class="row rowCenter verCenter btn-element">选择</a>
                   </template>
                   </template>
                   <template v-else>
                   <template v-else>
                     <a class="row rowCenter verCenter btn-element" style="background: #ccc">选择</a>
                     <a class="row rowCenter verCenter btn-element" style="background: #ccc">选择</a>
@@ -296,7 +296,7 @@
                 <!--待报价和已报价才可以新增报价-->
                 <!--待报价和已报价才可以新增报价-->
                 <template v-if="inquireObj.i_status == 1 || inquireObj.i_status == 2">
                 <template v-if="inquireObj.i_status == 1 || inquireObj.i_status == 2">
                   <template v-if="scope.row.is_bind != 1">
                   <template v-if="scope.row.is_bind != 1">
-                    <a href="javascript:;" @click="addMatchingHistory(scope.row)" class="row rowCenter verCenter btn-element">选择</a>
+                    <a href="javascript:;" @click="edit(scope.row)" class="row rowCenter verCenter btn-element">选择</a>
                   </template>
                   </template>
                   <template v-else>
                   <template v-else>
                     <a class="row rowCenter verCenter btn-element" style="background: #ccc">选择</a>
                     <a class="row rowCenter verCenter btn-element" style="background: #ccc">选择</a>
@@ -329,7 +329,7 @@
                 <span>{{ scope.row.price_rmb|floatZero }}</span>
                 <span>{{ scope.row.price_rmb|floatZero }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column prop="currency" label="币种" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
+            <el-table-column prop="currency_val" label="币种" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="tax_rate" label="税率" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="tax_rate" label="税率" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="batch" label="批次" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="batch" label="批次" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="delivery_time" label="货期" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
             <el-table-column prop="delivery_time" label="货期" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
@@ -719,6 +719,43 @@ 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; //编辑的时候需要
+
+      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;
+      }
+    },
+    /**
      * 编辑修改
      * 编辑修改
      */
      */
     edit(row) {
     edit(row) {