lilei 5 mesi fa
parent
commit
25e31213d3
1 ha cambiato i file con 0 aggiunte e 4 eliminazioni
  1. 0 4
      src/views/salesManagement/salesQueryNew/list.vue

+ 0 - 4
src/views/salesManagement/salesQueryNew/list.vue

@@ -97,11 +97,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="发货经销商">
-<<<<<<< HEAD
                   <custList id="salesManagementList-transferDealerSn" :dataAuthFlag="0" placeholder="请输入发货经销商" ref="dealerTireScopeList" @change="custTireChange" />
-=======
-                  <custList id="salesManagementList-transferDealerSn" dataAuthFlag="0" placeholder="请输入发货经销商" ref="dealerTireScopeList" @change="custTireChange" />
->>>>>>> 393a7f3be846e8a0a61773c80e9388f1c5171abd
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">