diff --git a/src/views/order/orderReading.vue b/src/views/order/orderReading.vue
index 961342d..d765dcd 100644
--- a/src/views/order/orderReading.vue
+++ b/src/views/order/orderReading.vue
@@ -6,7 +6,7 @@
保存
订单读入
-
+
@@ -208,6 +208,7 @@ export default {
},
},
],
+ orderBy:'',
formInline: {
time: [],
time1: [],
@@ -245,12 +246,14 @@ export default {
{
prop: 'cpznum',
label: "凭证号",
- width: "120"
+ width: "120",
+ sortable: "custom",
},
{
prop: 'cdlcode',
label: "订单号",
- width: "120"
+ width: "120",
+ sortable: "custom",
},
{
prop: 'ccusname',
@@ -362,6 +365,17 @@ export default {
}
},
methods: {
+ handleSort(column, prop, order) {
+ console.log(column);
+ if(column.prop == "ddh"){
+ column.order == 'ascending' ? this.orderBy = 'ddhAsc' : this.orderBy = 'ddhDesc';
+
+ }
+ if(column.prop == "pzh"){
+ column.order == 'ascending' ? this.orderBy = 'pzhAsc' : this.orderBy = 'pzhDesc';
+ }
+ this.orderList();
+ },
pageChange (cur) {
this.page.page = cur.page;
this.page.limit = cur.limit;
@@ -375,6 +389,7 @@ export default {
//table列表展示数据
orderList () {
let invoiceData = {
+ orderBy:this.orderBy,
ghfNsrsbh: "",
startTime: this.formInline.time[0] + ' ' + '00:00:00',
endTime: this.formInline.time[1] + ' ' + '23:59:59',
@@ -446,8 +461,8 @@ export default {
if (valid) {
showLoading()
readIn({
- readTimeStart: this.ReadingData.date1 + ' ' + '00:00:00',
- readTimeEnd: this.ReadingData.date2 + ' ' + '23:59:59',
+ startTime: this.ReadingData.date1 + ' ' + '00:00:00',
+ endTime: this.ReadingData.date2 + ' ' + '23:59:59',
pzh: this.ReadingData.pzh,
ddh: this.ReadingData.ddh,
orgId: this.$store.state.system.userInfo.dept.enterpriseNumbers,
diff --git a/src/views/order/orderReadingSK.vue b/src/views/order/orderReadingSK.vue
index 8a4ff0b..0978fab 100644
--- a/src/views/order/orderReadingSK.vue
+++ b/src/views/order/orderReadingSK.vue
@@ -428,8 +428,8 @@ export default {
if (valid) {
showLoading()
readIn({
- readTimeStart: this.ReadingData.date1 + ' ' + '00:00:00',
- readTimeEnd: this.ReadingData.date2 + ' ' + '23:59:59',
+ startTime: this.ReadingData.date1 + ' ' + '00:00:00',
+ endTime: this.ReadingData.date2 + ' ' + '23:59:59',
ddh: this.ReadingData.ddh,
orgId: this.$store.state.system.userInfo.dept.enterpriseNumbers,
entId: this.$store.state.system.userInfo.currentDeptId,
diff --git a/vue.config.js b/vue.config.js
index 246c731..7e71f26 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -71,7 +71,7 @@ module.exports = {
'/sims-api': {
// target: 'http://10.1.31.166:18107/sims-api', // 张双超
// target: 'http://10.1.30.104:18108/sims-api', // 姚旭光
- target: 'http://10.18.90.125:10000/sims-api', // 测试环境
+ target: 'http://10.18.90.124:10000/sims-api', // 测试环境
changeOrigin: false,
// target: 'http://10.1.3.216:10000/sims-api', //乐企通
pathRewrite: {
@@ -79,7 +79,7 @@ module.exports = {
},
},
'/management': {
- target: 'http://10.18.90.125:10000/management', // 新测试环境
+ target: 'http://10.18.90.124:10000/management', // 新测试环境
// target: 'http://10.1.3.216:10000/management', //乐企通
changeOrigin: false,
pathRewrite: {