chenrui před 6 měsíci
rodič
revize
82cef7cb1a

+ 25 - 18
src/views/salesManagement/salesQueryNew/comps/updateActiveModal.vue

@@ -10,20 +10,25 @@
   >
     <a-spin :spinning="spinning" tip="Loading...">
       <div style="padding: 0 30px;" v-if="total">
-        <aRadioGroup v-model="upActiveVal">
-          <aRadio :style="radioStyle" value="0" v-if="promoRuleSn">
-            不参加促销
-          </aRadio>
-          <!-- 非叠加 -->
-          <div v-for="(item,idx) in activeList" :key="idx">
-            <div>
-              <strong>{{ item.title }}</strong>
-            </div>
-            <aRadio :style="radioStyle" v-for="(sitem,sindex) in item.promotionRuleList" :key="sindex" :value="item.promotionSn+'-'+sitem.promotionRuleSn+'-'+sitem.promotionProductType">
+        <aRadio :style="radioStyle" value="0" v-if="pageType">
+          不参加促销
+        </aRadio>
+        <!-- 非叠加 -->
+        <div v-for="(item,idx) in activeList" :key="idx">
+          <div>
+            <strong >{{ item.title }}</strong>
+          </div>
+          <aRadioGroup v-model="upActiveVal" v-if="!pageType">
+            <aRadio :style="radioStyle" v-for="(sitem,sindex) in item.promotionRule" :key="sindex" :value="item.promotionSn+'-'+sitem.promotionRuleSn+'-'+sitem.promotionProductType">
               {{ sindex+1 }}、{{ sitem.description }}
             </aRadio>
-          </div>
-        </aRadioGroup>
+          </aRadioGroup>
+          <a-checkbox-group @change="onChange" v-else>
+            <a-checkbox value="A" v-for="(sitem,sindex) in item.promotionRule" :key="sindex">
+              {{ sindex+1 }}、{{ sitem.description }}
+            </a-checkbox>
+          </a-checkbox-group>
+        </div>
       </div>
       <div style="padding: 10px 30px;text-align:center;" v-else>
         没有可参与的【启用状态】的促销规则
@@ -43,7 +48,11 @@ export default {
   name: 'SetWarehouse',
   mixins: [commonMixin],
   props: {
-    show: [Boolean]
+    show: [Boolean],
+    pageType: {// 判断是转促销弹窗
+      type: Boolean,
+      default: false
+    }
   },
   data () {
     return {
@@ -53,8 +62,7 @@ export default {
       upActiveVal: null,
       radioStyle: "display:block;height: '30px';lineHeight: '30px';padding:5px 0;",
       activeList: [],
-      editRow: null,
-      promoRuleSn: null
+      editRow: null
     }
   },
   computed: {
@@ -62,10 +70,10 @@ export default {
       if (this.total == 0) {
         return '提示'
       }
-      return this.promoRuleSn ? '确定换促销活动?' : '确定参加促销活动?'
+      return this.pageType ? '确定换促销活动?' : '确定参加促销活动?'
     },
     total () {
-      return this.promoRuleSn ? 1 : this.activeList.length
+      return this.pageType ? 1 : this.activeList.length
     },
     // 叠加活动
     stackActiveList () {
@@ -78,7 +86,6 @@ export default {
   },
   methods: {
     getActiveList (data, record) {
-      this.promoRuleSn = data.promoRuleSn
       this.editRow = record
       this.spinning = true
       salesPromoMatchProduct(data).then(res => {

+ 2 - 0
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -538,7 +538,9 @@ export default {
       const active = this.activeList
       // 正常产品
       const hasSearchNormal = !params.promotionFlag || params.promotionFlag == 0
+      // 所有活动接口
       const proList = hasSearchNormal ? await salesDetailAllList(params).then(res => res.data) : []
+      // 正常产品统计信息
       const norTotal = hasSearchNormal ? await salesDetaiCount(params).then(res => res.data) : null
       // 是否有正常产品
       this.hasNormalProduct = proList.length > 0