lilei 1 år sedan
förälder
incheckning
bd7279822a

+ 1 - 1
src/api/sales.js

@@ -261,7 +261,7 @@ export const queryCountForWarehouse = (params) => {
 }
 // 按仓库查询销售明细 列表
 export const queryPageForWarehouseDetail = (params) => {
-  const url = `/sales/detail/queryPageForWarehouse/${params.pageNo}/${params.pageSize}`
+  const url = `/salesn/detail/queryPageForWarehouse/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 1 - 1
src/api/salesDetailNew.js

@@ -172,7 +172,7 @@ export const salesDetailPromoList = (params) => {
 // 促销产品统计  合计
 export const salesDetailPromoCount = (params) => {
   return axios({
-    url: `/sales/detail/queryCountByPromo`,
+    url: `/salesPromo/queryCount`,
     data: params,
     method: 'post'
   })

+ 3 - 4
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -222,8 +222,8 @@
                 还需门槛产品金额1000/4000(5000),已选择0元(可使用8000元配额)正价产品,已选择8个正价产品(满10送2),<strong>再满2件产品,可享受优惠</strong>,差200元到订单起订金额(1800元),可选择4个促销产品,已选择2个促销产品
               </div>
               <div>
-                <div v-if="$hasPermissions('B_salesEdit_salesPrice')">总金额:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong></div>
-                <div v-if="$hasPermissions('B_salesEdit_salesPrice')">优惠金额:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong></div>
+                <div v-if="$hasPermissions('B_salesEdit_salesPrice')">总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount) : '--' }}</strong></div>
+                <div v-if="$hasPermissions('B_salesEdit_salesPrice')">优惠金额:<strong>-{{ countData&&(countData.lossAmount || countData.lossAmount==0) ? toThousands(countData.lossAmount) : '--' }}</strong></div>
               </div>
             </div>
           </a-alert>
@@ -301,7 +301,7 @@
         loadData: parameter => {
           this.disabled = true
           this.queryParam.salesBillSn = this.salesBillSn || ''
-          // this.getCount()
+          this.getCount()
           return salesDetailList(Object.assign(parameter, this.queryParam, {
             showStock: true, 
             promoRuleSn: this.promo.promoRuleSn,
@@ -414,7 +414,6 @@
       // 统计
       getCount(){
         salesDetailPromoCount(Object.assign(this.queryParam, {
-            showStock: true, 
             promoRuleSn: this.promo.promoRuleSn,
             promoSn: this.promo.promoSn,
             salesPromoSn: this.promo.salesPromoSn

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

@@ -224,10 +224,11 @@ export default {
         class:'confirm-center',
         content: <div>
           <div style="padding:10px 0;text-align:center;">
-            系统发布新的促销活动:{arr.toString()}
+            系统发布新的促销活动:
           </div>
-          <div style="padding:0 0 10px 0;text-align:center;">
-            需要将现有产品识别到新的活动中吗?
+          <div style="text-align:center;color:#00aaff;">{arr.join(',')}</div>
+          <div style="padding:10px 0;text-align:center;">
+            是否将现有产品识别到新的活动中吗?
           </div>
         </div>,
         onOk() {