bug

src/views/List/quote.vue

@@ -76,8 +76,6 @@
           </el-table-column>
           <el-table-column prop="inquiry_brand_name" label="品牌" width="200" align="center" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column prop="inquiry_sn" label="询价单号" width="200" align="center" :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column prop="quote_goods_name" label="报价型号" width="200" align="center" :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column prop="quote_brand_name" label="报价品牌" width="200" align="center" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column prop="unchecked_reason" label="原因" width="100" align="center" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column prop="status" label="状态" width="100" align="center" :show-overflow-tooltip="true">
             <template slot-scope="scope">
@@ -94,7 +92,7 @@
           </el-table-column>
           <el-table-column prop="expire_status_val" label="报价是否有效" width="100" align="center" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.expire_status_val}}</span>
+              <span>{{ scope.row.expire_status_val }}</span>
               <el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
                 <i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i>
                 <div slot="content">{{ scope.row.expire_status_tips }}</div>
@@ -599,10 +597,10 @@ export default {
         return;
       }
 
-      if (this.multipleSelection[0].quote_status != 1) {
+      if (this.multipleSelection[0].quote_status != 1 && this.multipleSelection[0].quote_status != 7) {
         this.$message({
           showClose: true,
-          message: '请勾选状态为确认中',
+          message: '请勾选状态为确认中和待确认',
           type: 'warning'
         });
         return;

src/views/OrderTrack/goods.vue

@@ -269,8 +269,11 @@ export default {
      * 导出
      */
     exportChange() {
-      var params = Object.assign({}, {token: Tool.getCookie('token')}, this.formInline, {is_export: 1})
-      var url = NODE_ENVS + '/api/statistics/inquiryChangeStatisticsList?' + qs.stringify(params);
+      var ids = this.multipleSelection.map(obj => {
+        return obj.purchase_id;
+      });
+      var params = Object.assign({}, {token: Tool.getCookie('token')},{ids: ids.join(',')})
+      var url = NODE_ENVS + '/api/purchase/export?' + qs.stringify(params);
       const newsUrl = this.$router.resolve(url);
       window.open(url);
     },