Browse Source

修改bug

chenrui 7 months ago
parent
commit
94d208315f

+ 36 - 36
src/views/easyPassManagement/promotionalActivities/addPromotionModal.vue

@@ -218,24 +218,24 @@ export default {
     // 参与经销商 change
     changeDealerScope (val) {
       const _this = this
-      if (_this.itemSn && _this.itemSn.length > 0) {
-        if (_this.chooseProductNum > 0) {
-          _this.$confirm({
-            title: '提示',
-            content: <div>变更【参与经销商】后将会【<span style="color:red">清空</span>】已选产品列表,确定变更吗?</div>,
-            centered: true,
-            onOk () {
-              _this.form.allDealerFlag = val
-              if (val == '1') {
-                _this.chooseDealerList = []
-              }
-            },
-            onCancel () {
-              _this.form.allDealerFlag = val == '1' ? '0' : '1'
-            }
-          })
-        }
-      }
+      // if (_this.itemSn && _this.itemSn.length > 0) {
+      //   if (_this.chooseProductNum > 0) {
+      //     _this.$confirm({
+      //       title: '提示',
+      //       content: <div>变更【参与经销商】后将会【<span style="color:red">清空</span>】已选产品列表,确定变更吗?</div>,
+      //       centered: true,
+      //       onOk () {
+      //         _this.form.allDealerFlag = val
+      //         if (val == '1') {
+      //           _this.chooseDealerList = []
+      //         }
+      //       },
+      //       onCancel () {
+      //         _this.form.allDealerFlag = val == '1' ? '0' : '1'
+      //       }
+      //     })
+      //   }
+      // }
       _this.form.allDealerFlag = val
       if (val == '1' || !val) {
         _this.chooseDealerList = []
@@ -254,24 +254,24 @@ export default {
     // 部分经销商  选择经销商成功
     addDealerOk (list) {
       const _this = this
-      if (_this.itemSn && _this.itemSn.length > 0) {
-        const hasEq = list.filter(item => !this.chooseDealerList.map(k => k.dealerSn).includes(item.dealerSn))
-        if (hasEq.length > 0 && _this.chooseProductNum > 0) {
-          _this.$confirm({
-            title: '提示',
-            content: <div>变更【参与经销商】后将会【<span style="color:red">清空</span>】已选产品列表,确定变更吗?</div>,
-            centered: true,
-            onOk () {
-              _this.chooseDealerList = list
-              _this.openDealerModal = false
-            },
-            onCancel () {
-              _this.$refs.chooseDearler.pageFlag = false
-              _this.$refs.chooseDearler.searchForm()
-            }
-          })
-        }
-      }
+      // if (_this.itemSn && _this.itemSn.length > 0) {
+      //   const hasEq = list.filter(item => !this.chooseDealerList.map(k => k.dealerSn).includes(item.dealerSn))
+      //   if (hasEq.length > 0 && _this.chooseProductNum > 0) {
+      //     _this.$confirm({
+      //       title: '提示',
+      //       content: <div>变更【参与经销商】后将会【<span style="color:red">清空</span>】已选产品列表,确定变更吗?</div>,
+      //       centered: true,
+      //       onOk () {
+      //         _this.chooseDealerList = list
+      //         _this.openDealerModal = false
+      //       },
+      //       onCancel () {
+      //         _this.$refs.chooseDearler.pageFlag = false
+      //         _this.$refs.chooseDearler.searchForm()
+      //       }
+      //     })
+      //   }
+      // }
       _this.chooseDealerList = list
       _this.openDealerModal = false
     },

+ 2 - 2
src/views/easyPassManagement/promotionalActivities/lookUpCustomersModal.vue

@@ -70,11 +70,11 @@
           <!-- 商户类型 -->
           <template slot="businessType" slot-scope="text, record" >
             <div v-if="queryParam.bannerSn">
-              <span v-if="record.dealerEntity&&record.dealerEntity.dealerTypeDictValue">{{ record.dealerEntity.dealerTypeDictValue }}</span>
+              <span v-if="record.dealerEntity&&record.dealerEntity.dealerTypeName">{{ record.dealerEntity.dealerTypeName }}</span>
               <span v-else>--</span>
             </div>
             <div v-else>
-              {{ record.dealerTypeDictValue||'--' }}
+              {{ record.dealerTypeName1 }}{{ record.dealerTypeName1?'>'+record.dealerTypeName2:record.dealerTypeName2 }}
             </div>
           </template>
           <!-- 商户级别 -->