Bläddra i källkod

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

chenrui 1 år sedan
förälder
incheckning
8ab7d12238

+ 3 - 2
src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue

@@ -267,7 +267,7 @@ export default {
           tabList.push({text:'正价产品',val:'REGULAR'})
         }
         if(this.promoRuleData.regularPromotionSameFlag==='0'||this.promoRuleData.scopeFlag==='0'||(this.promoRuleData.promotionRuleType=='BUY_PROD_GIVE_MONEY'&&this.promoRuleData.scopeFlag==='1')){
-          const levelText = this.promoRuleData.scopeLevel ? '(阶梯'+this.promoRuleData.scopeLevel+')' : ''
+          const levelText = promo.countData.scopeLevelFlag ? '(阶梯'+promo.countData.scopeLevel+')' : ''
           tabList.push({text:'促销产品'+ levelText ,val:'GIFT'})
         }
         if(this.promoRuleData.promotionRuleType=='PROMO_PROD'){
@@ -277,7 +277,8 @@ export default {
       this.tabList = tabList
       this.promoProductClz = tabList[0].val
       this.tableHeight = window.innerHeight - 330
-
+      
+      this.queryParam.scopeLevel = promo.countData.scopeLevel
       this.resetSearchForm()
     },
     // 刷新当前页面

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -458,7 +458,7 @@ export default {
       this.$emit('showDesc', this.showDescBox)
     },
     openCpModal () {
-      this.$emit('openCpModal', 1, this.id, this.countData&&this.countData.scopeLevel)
+      this.$emit('openCpModal', 1, this.id, this.countData)
     },
     // 表格选中项
     rowSelectionFun (obj) {

+ 4 - 4
src/views/salesManagement/salesQueryNew/edit.vue

@@ -323,11 +323,11 @@ export default {
       // this.insterActiveOk(['normal','promo'][type])
     },
     // 打开选择产品弹框
-    openProductModal (type, refId, scopeLevel) {
-      console.log(type, refId, scopeLevel)
+    openProductModal (type, refId, countData) {
+      console.log(type, refId, countData)
       const promo = this.activeList.find(item => item.promoRuleSn == refId)
-      if(promo && promo.promotionRule){
-        promo.promotionRule.scopeLevel = scopeLevel
+      if(promo){
+        promo.countData = countData
       }
       this.$refs.chooseProduct.pageInit(this.detailData, promo, type)
       this.cpCurRefId = 'productList-' + refId

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.113:8660/ocs-admin',
+        target: 'http://192.168.2.111/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {