ソースを参照

Merge branch 'develop_yh42' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh42

chenrui 1 年間 前
コミット
d4180d56ec

+ 2 - 2
src/views/salesManagement/salesQuery/list.vue

@@ -140,8 +140,8 @@
           总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
           总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
           <span v-if="showDiscount">
-            折扣金额:<strong>{{ totalData&&(totalData.totalDiscountAmount || totalData.totalDiscountAmount==0) ? toThousands(totalData.totalDiscountAmount) : '--' }}</strong>;
-            折后总售价:<strong>{{ totalData&&(totalData.totalDiscountedAmount || totalData.totalDiscountedAmount==0) ? toThousands(totalData.totalDiscountedAmount) : '--' }}</strong>;
+            折扣金额:<strong>{{ totalData&&(totalData.discountAmount || totalData.discountAmount==0) ? toThousands(totalData.discountAmount) : '--' }}</strong>;
+            折后总售价:<strong>{{ totalData&&(totalData.discountedAmount || totalData.discountedAmount==0) ? toThousands(totalData.discountedAmount) : '--' }}</strong>;
           </span>
         </div>
       </a-alert>

+ 2 - 2
src/views/salesManagement/salesQueryNew/list.vue

@@ -127,8 +127,8 @@
             总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
             总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
             <span v-if="showDiscount">
-              折扣金额:<strong>{{ totalData&&(totalData.totalDiscountAmount || totalData.totalDiscountAmount==0) ? toThousands(totalData.totalDiscountAmount) : '--' }}</strong>;
-              折后总售价:<strong>{{ totalData&&(totalData.totalDiscountedAmount || totalData.totalDiscountedAmount==0) ? toThousands(totalData.totalDiscountedAmount) : '--' }}</strong>;
+              折扣金额:<strong>{{ totalData&&(totalData.discountAmount || totalData.discountAmount==0) ? toThousands(totalData.discountAmount) : '--' }}</strong>;
+              折后总售价:<strong>{{ totalData&&(totalData.discountedAmount || totalData.discountedAmount==0) ? toThousands(totalData.discountedAmount) : '--' }}</strong>;
             </span>
           </div>
           <div class="action-buttons">