lilei 2 vuotta sitten
vanhempi
commit
8627500ada

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1676274572534
+  "version": 1676275497514
 }

+ 1 - 1
src/views/financialManagement/financialCollection/list.vue

@@ -224,7 +224,7 @@ export default {
         { title: '待收金额', dataIndex: 'unsettleAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '收款类型', dataIndex: 'bizName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款时间', dataIndex: 'settleTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '5%', align: 'center' }

+ 1 - 1
src/views/financialManagement/financialPayment/list.vue

@@ -220,7 +220,7 @@ export default {
         { title: '待付金额', dataIndex: 'unsettleAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '单据类型', dataIndex: 'bizName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '付款方式', dataIndex: 'settleStyleName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '付款时间', dataIndex: 'settleTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '5%', align: 'center' }

+ 6 - 2
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -216,9 +216,13 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
+        const params = Object.assign(parameter, this.queryParam)
+        if(!params.billStatus){
+          params.billStatus = undefined
+        }
         // 获取统计数据
-        this.getTotalData(Object.assign(parameter, this.queryParam))
-        return purchaseList(Object.assign(parameter, this.queryParam)).then(res => {
+        this.getTotalData(params)
+        return purchaseList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

+ 6 - 2
src/views/purchasingManagement/purchaseOrderNew/list.vue

@@ -208,9 +208,13 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
+        const params = Object.assign(parameter, this.queryParam)
+        if(!params.billStatus){
+          params.billStatus = undefined
+        }
         // 获取统计数据
-        this.getTotalData(Object.assign(parameter, this.queryParam))
-        return purchaseList(Object.assign(parameter, this.queryParam)).then(res => {
+        this.getTotalData(params)
+        return purchaseList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data