Browse Source

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

chenrui 9 months ago
parent
commit
b39e743072

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.433",
+    "version": "2.2.466",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 1 - 0
src/views/salesManagement/receiptPrint/list.vue

@@ -230,6 +230,7 @@ export default {
         { title: '订单金额', dataIndex: 'orderAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '收款金额', dataIndex: 'receiptAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '使用授信', dataIndex: 'useCreditAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '授信还款', dataIndex: 'payCreditAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '余款抵扣', dataIndex: 'balanceAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '跨月打款', dataIndex: 'nextMonthAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '特殊申请发货', dataIndex: 'specialSendAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },

+ 0 - 4
src/views/salesManagement/salesQueryNew/list.vue

@@ -394,10 +394,6 @@ export default {
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        if (moment(this.queryParam.beginDate).isAfter(moment(getDate.getThreeMonthDays().starttime))) {
-          this.$message.error('最多查看最近7天的报表')
-          return
-        }
         this.disabled = true
         this.spinning = true
         delete parameter.tableId