Kaynağa Gözat

Merge branch 'develop_yh30' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh30

lilei 1 yıl önce
ebeveyn
işleme
e19f5d552b

+ 11 - 1
src/api/promotion.js

@@ -188,7 +188,17 @@ export const queryAuditPageList = (params) => {
     method: 'post'
   })
 }
-
+// 经销商列表查询  分页  已选择的排在最上边
+export const queryDealerPage = (params) => {
+  const url = `/promotion/dealer/queryDealerPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
 // 参与客户 提交审核
 export const midwaySubmit = (params) => {
   return axios({

+ 8 - 3
src/views/promotionRulesManagement/dealerPromotions/chooseDealer.vue

@@ -66,7 +66,7 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import AreaList from '@/views/common/areaList.js'
 import subarea from '@/views/common/subarea.js'
-import { queryAuditPageList } from '@/api/promotion'
+import { queryDealerPage } from '@/api/promotion'
 import { getDealerListInfo } from '@/api/dealer'
 export default {
   name: 'ChooseDealer',
@@ -78,6 +78,10 @@ export default {
       default: function () {
         return null
       }
+    },
+    promotionSn: {
+      type: String,
+      default: ''
     }
   },
   data () {
@@ -138,8 +142,9 @@ export default {
     },
     loadData () {
       this.spinning = true
-      const params = { pageSize: 20, pageNo: 1, ...this.pagination }
-      queryAuditPageList(Object.assign(params, this.queryParam)).then(res => {
+      const params = { pageSize: 20, pageNo: 1, ...this.pagination, promotionSn: this.promotionSn }
+
+      queryDealerPage(Object.assign(params, this.queryParam)).then(res => {
         let data
         if (res.status == 200) {
           data = res.data

+ 1 - 2
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -332,6 +332,7 @@ export default {
     // 参与客户
     handleCustomers (row) {
       this.openCustomerModal = true
+      this.itemPromotionSn = row.promotionSn
       if ((row.state === 'NOT_START' || row.state === 'RUNNING') && row.dealerAuditFlag && row.dealerAuditFlag == 0) {
         this.itemStatusType = 'isEdit'
       } else if ((row.state === 'NOT_START' || row.state === 'RUNNING') && row.dealerAuditFlag && row.dealerAuditFlag == 1) {
@@ -340,10 +341,8 @@ export default {
         this.itemStatusType = 'isClose'
       }
       if (row.dealerScope != 'ALL_DEALER') {
-        this.itemPromotionSn = row.promotionSn
         this.chooseDealerArr = row.dealerSnList
       } else {
-        this.itemPromotionSn = ''
         this.getAllDealerSnList()
       }
     },

+ 5 - 2
src/views/promotionRulesManagement/dealerPromotions/lookUpCustomersModal.vue

@@ -89,7 +89,7 @@
       width="60%"
     >
       <div class="dealerModalCon">
-        <chooseDealer ref="dealerChoose" @plAdd="handleAddDealer"></chooseDealer>
+        <chooseDealer ref="dealerChoose" :promotionSn="itemSn" @plAdd="handleAddDealer"></chooseDealer>
       </div>
     </a-modal>
   </a-modal>
@@ -184,6 +184,7 @@ export default {
       const _this = this
       _this.openDealerModal = true
       const arr = _this.chooseDealerList
+      console.log('111111111111111:',arr)
       // 选择参与客户回显
       _this.$nextTick(() => {
         _this.$refs.dealerChoose.pageInit(arr)
@@ -192,15 +193,17 @@ export default {
     // 添加经销商
     handleAddDealer (list) {
       const newArr = []
+      let dealerSnArr= []
       list.forEach(item => {
         const obj = {
           dealerScope: this.itemSn ? 'SOME_DEALER' : 'ALL_DEALER',
-          promotionSn: this.itemSn ? this.itemSn : undefined,
           dealerSn: item.dealerSn
         }
         newArr.push(obj)
+        dealerSnArr.push(item.dealerSn)
       })
       this.openDealerModal = false
+      this.chooseDealerList = dealerSnArr
       this.updateDataList(newArr)
     },
     // 更新列表显示状态