lilei 1 jaar geleden
bovenliggende
commit
7b29bc82d8
1 gewijzigde bestanden met toevoegingen van 24 en 26 verwijderingen
  1. 24 26
      src/views/salesManagement/salesQueryNew/comps/productList.vue

+ 24 - 26
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -6,35 +6,24 @@
             <span>促销类型:</span>
             {{ descDetail.promotionRuleTypeDictValue||'--' }}
           </a-col>
-          <a-col span="6" style="padding: 6px;" v-if="descDetail.promotionRuleType!='PROMO_PROD'&&descDetail.promotionRuleType!='BUY_PROD_GIVE_MONEY'">
-            <span>限制正价产品款数:</span>
-            {{ descDetail.restrictCategory||'--' }}
-          </a-col>
-          <a-col span="6" style="padding: 6px;">
-            <span>订单起订金额(元):</span>
-            {{ descDetail.minOrderAmount||'无' }}
-          </a-col>
-          <a-col span="6" style="padding: 6px;">
-            <span>活动经费上线(元):</span>
-            {{ descDetail.upperLimitAmount||'无' }}
+          <a-col span="18" style="padding: 6px;">
+            <div style="display: flex;">
+              <span>促销门槛:</span>
+              <div v-if="descDetail.gateFlag === '1'">
+                <span v-if="descDetail.gateType==='RATIO_AMOUNT'">
+                  购买门槛产品金额{{ descDetail.gateAmount*100 }}%作为配额
+                </span>
+                <span v-else-if="descDetail.gateType==='MIN_AMOUNT'">
+                  购买门槛产品满最低金额{{ descDetail.gateAmount }}不限制配额。
+                </span>
+                <span v-else>购买满{{ descDetail.gateAmount }}元门槛产品,可使用 {{ descDetail.quotaAmount }}元配额,采购规则中的正价商品</span>
+              </div>
+              <span v-else>无</span>
+            </div>
           </a-col>
           <a-col span="24" style="padding: 6px;">
             <div style="display: flex;">
-              <div style="min-width: 40%;display: flex;">
-                <span>促销门槛:</span>
-                <div v-if="descDetail.gateFlag === '1'">
-                  <span v-if="descDetail.gateType==='RATIO_AMOUNT'">
-                    购买门槛产品金额{{ descDetail.gateAmount*100 }}%作为配额
-                  </span>
-                  <span v-else-if="descDetail.gateType==='MIN_AMOUNT'">
-                    购买门槛产品满最低金额{{ descDetail.gateAmount }}不限制配额。
-                  </span>
-                  <span v-else>购买满{{ descDetail.gateAmount }}元门槛产品,可使用 {{ descDetail.quotaAmount }}元配额,采购规则中的正价商品</span>
-                </div>
-                <span v-else>无</span>
-              </div>
-
-              <div style="display: flex;padding-left: 24px;">
+              <div style="display: flex;">
                 <span>促销规则:</span>
                 <span v-if="descDetail.promotionRuleType == 'BUY_PROD_GIVE_PROD'">
                   {{ descDetail.regularSameFlag==='1'?'同款,':'不同款,' }}
@@ -50,6 +39,15 @@
                   特价产品
                 </span>
               </div>
+              <div style="display: flex;flex-grow: 1;">
+                <div v-if="descDetail.promotionRuleType!='PROMO_PROD'&&descDetail.promotionRuleType!='BUY_PROD_GIVE_MONEY'">
+                  <span style="margin-left: 50px;">限制正价产品款数:</span>{{ descDetail.restrictCategory||'--' }}
+                </div>
+                <div>
+                  <span style="margin-left: 50px;">订单起订金额(元):</span>{{ descDetail.minOrderAmount||'无' }}
+                  <span style="margin-left: 50px;">活动经费上线(元):</span>{{ descDetail.upperLimitAmount||'无' }}
+                </div>
+              </div>
             </div>
           </a-col>
         </a-row>