Merge branch '20220812' of http://git.shengws.com/csx/Vue_New into 20220812

src/xt_pages/stock/stockInOrderAdd.vue

@@ -765,8 +765,8 @@
                 this.warehousing_info_id  = info.id
                 for(let i=0;i<list.length;i++){
                   for(let j=0;j<dealerList.length;j++){
-                     if(list[i].dealer == dealerList[i].id){
-                        list[i].dealer = dealerList[i].dealer_name
+                     if(list[i].dealer == dealerList[j].id){
+                        list[i].dealer = dealerList[j].dealer_name
                      }
                   }
                   for(let s=0;s<manufacturerList.length;s++){

src/xt_pages/stock/stockInOrderEdit.vue

@@ -760,8 +760,8 @@ export default {
               var dealerList = response.data.data.dealerList
               for(let i=0;i<list.length;i++){
                 for(let j=0;j<dealerList.length;j++){
-                 if(list[i].dealer == dealerList[i].id){
-                    list[i].dealer = dealerList[i].dealer_name
+                 if(list[i].dealer == dealerList[j].id){
+                    list[i].dealer = dealerList[j].dealer_name
                   }
                 }
                 for(let s=0;s<manufacturerList.length;s++){