Browse Source

Merge branch 'develop_yh51' of jianguan-web/jg-ocs-html into pre-release

李磊 6 months ago
parent
commit
653b517e30

+ 2 - 4
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -352,6 +352,8 @@ export default {
         } else if (this.transferQty == '1') { // 满足
           return (item.transferDealerStockQty && item.transferDealerStockQty * 1 >= item.qty * 1)
         }
+      }).filter(item => {
+        return item.warehouseSn == this.warehouseSn
       })
     },
     // 查询表格数据
@@ -427,16 +429,12 @@ export default {
       // 发货经销商时 查询
       if (this.chooseList && this.chooseList.length) {
         this.dataSource = this.chooseList
-        console.log('111111111:', this.transferQty)
         if (this.transferQty) {
           this.searchTableData(this.chooseList)
         }
       } else {
         // 赋值
         this.dataSource = listData
-        if (this.transferQty) {
-          this.searchTableData(listData)
-        }
       }
       // 格式化数据
       let f = 0

+ 3 - 2
src/views/salesManagement/salesQueryNew/list.vue

@@ -97,7 +97,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="发货经销商">
-                  <dealerSubareaScopeList ref="dealerTireScopeList" placeholder="请输入发货经销商" id="salesManagementList-transferDealerSn" @change="custTireChange" />
+                  <custList id="salesManagementList-transferDealerSn" dataAuthFlag="0" placeholder="请输入发货经销商" ref="dealerTireScopeList" @change="custTireChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -354,6 +354,7 @@ import baseDataModal from '@/views/expenseManagement/expenseReimbursement/baseDa
 import reportModal from '@/views/common/reportModal.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 import customerService from '@/views/common/customerService'
+import custList from '@/views/common/custList.vue'
 // 接口
 import { dispatchBatchPrintStatus, queryBySalesBillSn } from '@/api/dispatch'
 import { salesList, salesDel, salesCancle, salesCount, queryCreateBySalesBillSn, expenseAccountSave, changeBillCheckUpdatePrice, changeBillCheck } from '@/api/salesNew'
@@ -362,7 +363,7 @@ import { salesDetailExport } from '@/api/salesBillReport'
 export default {
   name: 'SalesQueryList',
   mixins: [commonMixin],
-  components: { STable, VSelect, tipModal, chooseCustomModal, dealerSubareaScopeList, Area, rangeDate, subarea, commonModal, reportModal, chooseWarehouse, baseDataModal, customerService },
+  components: { STable, VSelect, tipModal, chooseCustomModal, dealerSubareaScopeList, Area, rangeDate, subarea, commonModal, reportModal, custList, chooseWarehouse, baseDataModal, customerService },
   data () {
     return {
       spinning: false,