lilei před 1 rokem
rodič
revize
a908027454

+ 7 - 3
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -272,9 +272,13 @@ export default {
                   </div>
                 ):(<div></div>)}
                 <div>
-                    款数:<strong>{record.total&&record.total.totalCategory||'--'}</strong>;
-                    数量:<strong>{record.total&&record.total.totalQty||'--'}</strong>;
-                    {_this.$hasPermissions('B_salesEdit_salesPrice') ? (<span>总金额:<strong>{record.total&&record.total.totalAmount||'--'}</strong>;</span>):('')}
+                  款数:<strong>{record.total&&record.total.totalCategory||'--'}</strong>;
+                  数量:<strong>{record.total&&record.total.totalQty||'--'}</strong>;
+                  {_this.$hasPermissions('B_salesEdit_salesPrice') ? (<span>总金额:<strong>{record.total&&record.total.totalAmount||'--'}</strong>;</span>):('')}
+                  {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total ? (<span>优惠金额:<strong>{record.total.lossAmount||'--'}</strong>;</span>):('')}
+                  {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total ? (<span>采购额结余:<strong>{_this.toThousands(Number(record.total.totalPromoGiftsAmount) - Number(record.total.totalUsePromoGiftsAmount))}</strong>;</span>):('')}
+                  {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total ? (<span>采购额超出:<strong>{_this.toThousands(Number(record.total.totalUsePromoGiftsAmount) - Number(record.total.totalPromoGiftsAmount))}</strong>;</span>):('')}
+                  {record.expenseAccountFlag!='WAIT' ? record.expenseAccountFlagDictValue : ''}
                 </div>
               </div>
             ):(<span>{data}</span>)}