diff --git a/src/views/emis/emisCreditCustomer/emisCreditCustomerForm.vue b/src/views/emis/emisCreditCustomer/emisCreditCustomerForm.vue index 0e73f0e5..cf42aa5b 100644 --- a/src/views/emis/emisCreditCustomer/emisCreditCustomerForm.vue +++ b/src/views/emis/emisCreditCustomer/emisCreditCustomerForm.vue @@ -142,6 +142,40 @@ export default { }, methods: { + getProperty(obj, str) { + str = str.replace(/\[(\w+)\]/g, ".$1"); // 处理数组下标 + let arr = str.split("."); + for (let i in arr) { + obj = obj[arr[i]] || ""; + } + return obj; + }, + sortFun: function (attr, rev) { + //第一个参数传入info里的prop表示排的是哪一列，第二个参数是升还是降排序 + if (rev == undefined||rev==null) { + rev = 1; + } else { + rev = (rev) ? 1 : -1; + } + let that=this; + return function (a, b) { + a = that.getProperty(a,attr); + b = that.getProperty(b,attr); + if (a < b) { + return rev * -1; + } + if (a > b) { + return rev * 1; + } + return 0; + } + }, + // 排序 查询字段是表格中字段名字 动态取值排序顺序 + handleSortChange(column) { + this.emisSettleSubBillList = this.emisSettleSubBillList.sort( + this.sortFun(column.prop, column.order === 'ascending') + ); + }, initData() { if(this.id !=null) { diff --git a/src/views/emis/emisCreditCustomer/index.vue b/src/views/emis/emisCreditCustomer/index.vue index c70102bd..94196914 100644 --- a/src/views/emis/emisCreditCustomer/index.vue +++ b/src/views/emis/emisCreditCustomer/index.vue @@ -48,7 +48,7 @@ ref="refTable" - storageName="emisCreditCustomerList_main_250309" + storageName="emisCreditCustomerList_main_250310" v-loading="loading" border stripe @@ -112,13 +112,8 @@ - - - - - + + - + - + - + + + + @@ -270,6 +270,41 @@ export default { }); }, + getProperty(obj, str) { + str = str.replace(/\[(\w+)\]/g, ".$1"); // 处理数组下标 + let arr = str.split("."); + for (let i in arr) { + obj = obj[arr[i]] || ""; + } + return obj; + }, + sortFun: function (attr, rev) { + //第一个参数传入info里的prop表示排的是哪一列，第二个参数是升还是降排序 + if (rev == undefined||rev==null) { + rev = 1; + } else { + rev = (rev) ? 1 : -1; + } + let that=this; + return function (a, b) { + a = that.getProperty(a,attr); + b = that.getProperty(b,attr); + if (a < b) { + return rev * -1; + } + if (a > b) { + return rev * 1; + } + return 0; + } + }, + // 排序 查询字段是表格中字段名字 动态取值排序顺序 + handleSortChange(column) { + this.emisSettleSubBillList = this.emisSettleSubBillList.sort( + this.sortFun(column.prop, column.order === 'ascending') + ); + }, + switchChange(row){ let form={id:row.id,blOpen:row.blOpen} updateEmisCreditCustomer(form).then(response => { diff --git a/src/views/emis/emisCreditSalesmen/index.vue b/src/views/emis/emisCreditSalesmen/index.vue index 0ce4c1b4..a4272d2d 100644 --- a/src/views/emis/emisCreditSalesmen/index.vue +++ b/src/views/emis/emisCreditSalesmen/index.vue @@ -37,7 +37,7 @@ - - - - - + + + - + - + - + + + + diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index 380524d4..67765a64 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -838,7 +838,7 @@ export default { this.queryParams.paymentType='1,3'; } - this.queryParams.transType=this.$route.query.transType; + this.queryParams.carryType=this.$route.query.transType; this.queryParams.paymentStatus='0,2'; this.queryParams.params.problemQueryType=2; @@ -869,7 +869,7 @@ export default { this.queryParams.paymentType='1,3'; } - this.queryParams.transType=this.$route.query.transType; + this.queryParams.carryType=this.$route.query.transType; this.queryParams.paymentStatus='0,2'; this.queryParams.params.problemQueryType=2;