lilei 2 weeks ago
parent
commit
429e914a88

+ 3 - 3
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -459,7 +459,7 @@ export default {
       // 销售价权限
       // 销售价权限
       if (this.type == 'view' && this.$hasPermissions('B_salesDetail_salesPrice') || this.type == 'edit' && this.$hasPermissions('B_salesEdit_salesPrice')) {
       if (this.type == 'view' && this.$hasPermissions('B_salesDetail_salesPrice') || this.type == 'edit' && this.$hasPermissions('B_salesEdit_salesPrice')) {
         cols.push({ field: 'totalAmount', key: '24', title: '总金额', width: 60, align: 'center', fixed: 'right', renderBodyCell: ({ row, column, rowIndex }, h) => { return this.toThousands(row[column.field]) } })
         cols.push({ field: 'totalAmount', key: '24', title: '总金额', width: 60, align: 'center', fixed: 'right', renderBodyCell: ({ row, column, rowIndex }, h) => { return this.toThousands(row[column.field]) } })
-        cols.push({ field: 'lossAmount', key: '25', title: '优惠金额', width: 60, align: 'center', fixed: 'right', renderBodyCell: ({ row, column, rowIndex }, h) => { return this.toThousands(row[column.field]) } })
+        cols.push({ field: 'lossAmount', key: '25', title: '优惠金额', width: 60, align: 'center', fixed: 'right', renderBodyCell: ({ row, column, rowIndex }, h) => { return this.toThousands(row[column.field] * -1) } })
       }
       }
       // 编辑页面
       // 编辑页面
       if (this.type == 'edit') {
       if (this.type == 'edit') {
@@ -607,8 +607,8 @@ export default {
         const regularPromotionSameFlag = item.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && item.promotionRule.regularPromotionSameFlag == 1 // 促销品是否与正品一致
         const regularPromotionSameFlag = item.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && item.promotionRule.regularPromotionSameFlag == 1 // 促销品是否与正品一致
         const baseVal1 = isYuan1 ? Number(item.regularRuleValue).toFixed(2) : item.regularRuleValue
         const baseVal1 = isYuan1 ? Number(item.regularRuleValue).toFixed(2) : item.regularRuleValue
         const nextVal1 = isYuan1 ? Number(item.regularShortfallValue).toFixed(2) : item.regularShortfallValue
         const nextVal1 = isYuan1 ? Number(item.regularShortfallValue).toFixed(2) : item.regularShortfallValue
-        const regularBaseVal = regularPromotionSameFlag ? undefined : baseVal1 * 1 <= 0 ? 0 : baseVal1 // 基础差
-        const regularNextVal = regularPromotionSameFlag ? undefined : nextVal1 * 1 <= 0 ? 0 : nextVal1 // 下级差
+        const regularBaseVal = regularPromotionSameFlag ? undefined : baseVal1 // 基础差
+        const regularNextVal = regularPromotionSameFlag ? undefined : nextVal1 // 下级差
         // 促销品
         // 促销品
         const promoUnit = '个'
         const promoUnit = '个'
         const promoSelected = item.giftQty || 0 // 已选
         const promoSelected = item.giftQty || 0 // 已选

+ 7 - 3
src/views/salesManagement/salesQueryNew/comps/updateActiveModal.vue

@@ -42,7 +42,9 @@
                 v-for="(item,sindex) in noStackActiveList"
                 v-for="(item,sindex) in noStackActiveList"
                 :key="item.id"
                 :key="item.id"
                 :value="item.salesPromoSn">
                 :value="item.salesPromoSn">
-                {{ sindex+1 }}、{{ item.promotionRule.promotionRuleTypeDictValue }} — {{ item.promotion.title }}({{ item.promotionRule.description }})
+                <div style="text-wrap: auto;display:inline-block;">
+                  {{ sindex+1 }}、{{ item.promotionRule.promotionRuleTypeDictValue }} — {{ item.promotion.title }}({{ item.promotionRule.description }})
+                </div>
               </aRadio>
               </aRadio>
             </aRadioGroup>
             </aRadioGroup>
           </div>
           </div>
@@ -57,7 +59,9 @@
                 v-for="(item,sindex) in stackActiveList"
                 v-for="(item,sindex) in stackActiveList"
                 :value="item.salesPromoSn"
                 :value="item.salesPromoSn"
                 :key="item.id">
                 :key="item.id">
-                {{ sindex+1 }}、{{ item.promotionRule.promotionRuleTypeDictValue }} — {{ item.promotion.title }}({{ item.promotionRule.description }})
+                <div style="text-wrap: auto;display:inline-block;">
+                  {{ sindex+1 }}、{{ item.promotionRule.promotionRuleTypeDictValue }} — {{ item.promotion.title }}({{ item.promotionRule.description }})
+                </div>
               </a-checkbox>
               </a-checkbox>
             </a-checkbox-group>
             </a-checkbox-group>
           </div>
           </div>
@@ -94,7 +98,7 @@ export default {
       confirmLoading: false,
       confirmLoading: false,
       upActiveVal: null,
       upActiveVal: null,
       upActiveValArr: [],
       upActiveValArr: [],
-      radioStyle: "display:block;height: '30px';lineHeight: '30px';padding:5px 0;margin:0;",
+      radioStyle: 'display:flex;align-items:center;padding:5px 0;margin:0;',
       radioStyle0: "height: '30px';lineHeight: '30px';padding:5px 0;margin:0;",
       radioStyle0: "height: '30px';lineHeight: '30px';padding:5px 0;margin:0;",
       activeList: [],
       activeList: [],
       editRow: null,
       editRow: null,

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

@@ -314,11 +314,11 @@ export default {
           <div>
           <div>
             <span style="padding-right: 10px;">{data}</span>
             <span style="padding-right: 10px;">{data}</span>
             {record.promotionFlag.indexOf('GIFT') >= 0 ? <a-badge count="促" numberStyle={{ backgroundColor: '#52c41a', zoom: '0.7' }}/> : ''}
             {record.promotionFlag.indexOf('GIFT') >= 0 ? <a-badge count="促" numberStyle={{ backgroundColor: '#52c41a', zoom: '0.7' }}/> : ''}
-            {record.promotionFlag.indexOf('DISCOUNT') >= 0 ? <a-badge count="特" numberStyle={{ backgroundColor: '#faad14', zoom: '0.7' }}/> : ''}
             {record.promotionFlag.indexOf('GATE') >= 0 ? <a-badge count="槛" numberStyle={{ backgroundColor: '#108ee9', zoom: '0.7' }}/> : ''}
             {record.promotionFlag.indexOf('GATE') >= 0 ? <a-badge count="槛" numberStyle={{ backgroundColor: '#108ee9', zoom: '0.7' }}/> : ''}
             {record.promotionFlag.indexOf('REGULAR') >= 0 ? <a-badge count="正" numberStyle={{ backgroundColor: '#ff5500', zoom: '0.7' }}/> : ''}
             {record.promotionFlag.indexOf('REGULAR') >= 0 ? <a-badge count="正" numberStyle={{ backgroundColor: '#ff5500', zoom: '0.7' }}/> : ''}
-            {record.bakConvertPromoGiftsQty ? (<a-badge count="转" numberStyle={{ backgroundColor: '#ffaa00', zoom: '80%' }}></a-badge>) : ''}
+            {record.promotionFlag.indexOf('DISCOUNT') >= 0 ? <a-badge count="特" numberStyle={{ backgroundColor: '#faad14', zoom: '0.7' }}/> : ''}
             {Number((record.tireFlag != 0 ? record.lockStockQty : record.stockQty) || 0) < Number(record.unpushedQty || 0) ? (<a-badge count="缺" numberStyle={{ zoom: '0.7' }}></a-badge>) : ''}
             {Number((record.tireFlag != 0 ? record.lockStockQty : record.stockQty) || 0) < Number(record.unpushedQty || 0) ? (<a-badge count="缺" numberStyle={{ zoom: '0.7' }}></a-badge>) : ''}
+            {record.bakConvertPromoGiftsQty ? (<a-badge count="转" numberStyle={{ backgroundColor: '#ffaa00', zoom: '80%' }}></a-badge>) : ''}
           </div>
           </div>
         )
         )
       }
       }