Merge remote-tracking branch 'origin/master'

src/views/supplier/products/supDiProductsCheck.vue

@@ -35,7 +35,7 @@
             <el-col :span="6">
               <el-form-item label="供应商:">
                 <el-select
-                  v-model="filterQuery.companyName"
+                  v-model="filterQuery.customerId"
                   filterable
                   remote
                   clearable="true"
@@ -49,7 +49,7 @@
                     v-for="item in companyNames"
                     :key="item.companyName"
                     :label="item.companyName"
-                    :value="item.companyName"
+                    :value="item.customerId"
                   >
                     <span style="float: left">{{ item.companyName }}</span>
                   </el-option>
@@ -268,7 +268,6 @@ export default {
         })
     },
     detailDialog(row) {
-      debugger
       if(row.type==1){
         let query = { uuid: row.uuid }
         getDiProductDetail(query).then((res) => {