瀏覽代碼

Merge branch 'develop_yh55' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh55

lilei 2 月之前
父節點
當前提交
b9ae7f3d2f

+ 1 - 1
src/views/productManagement/foreignTradeGoods/list.vue

@@ -205,7 +205,7 @@ export default {
       exportExcel(foreignProductListExport, params, '外贸产品', function () {
         _this.spinning = false
         _this.exportLoading = false
-        _this.showExport = false
+        // _this.showExport = false
       })
     },
     //  产品分类  change

+ 4 - 4
src/views/reportData/productRebateReport/dealerList.vue

@@ -111,8 +111,8 @@
               <a-col flex="10%">总开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               <a-col flex="10%">总实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
               <a-col flex="10%">总差价金额:{{ (totalData && (totalData.directRebateAmount || totalData.directRebateAmount==0)) ? toThousands(totalData.directRebateAmount) : '--' }}</a-col>
-              <a-col flex="10%">原总开单金额:{{ (totalData && (totalData.totalBillingAmount || totalData.totalBillingAmount==0)) ? toThousands(totalData.totalBillingAmount) : '--' }}</a-col>
-              <a-col flex="10%">原总实售金额:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
+              <a-col flex="10%">原总开单金额:{{ (totalData && (totalData.totalAmountOrig || totalData.totalAmountOrig==0)) ? toThousands(totalData.totalAmountOrig) : '--' }}</a-col>
+              <a-col flex="10%">原总实售金额:{{ (totalData && (totalData.totalRealAmountOrig || totalData.totalRealAmountOrig==0)) ? toThousands(totalData.totalRealAmountOrig) : '--' }}</a-col>
             </a-row>
           </template>
         </s-table>
@@ -228,8 +228,8 @@ export default {
         { title: '总差价金额', dataIndex: 'directRebateAmount', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '差价金额', dataIndex: 'rebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原总开单金额', dataIndex: 'totalBillingAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '原总实售金额', dataIndex: 'totalRealSaleAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '原总开单金额', dataIndex: 'totalAmountOrig', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '原总实售金额', dataIndex: 'totalRealAmountOrig', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       return arr
     }