diff --git a/jsFile/requst.js b/jsFile/requst.js index d3811bb..325795e 100644 --- a/jsFile/requst.js +++ b/jsFile/requst.js @@ -63,7 +63,7 @@ const request = (method, url, options) => { methods = 'GET' headers = { 'Content-Type': 'application/json; charset=UTF-8', - 'Authorization': 'Bearer '+uni.getStorageSync('token') || '' + 'token':uni.getStorageSync('token') || '' } break; case 'post': diff --git a/pages/dataQuery/details.vue b/pages/dataQuery/details.vue index a7fe196..d6d6e38 100644 --- a/pages/dataQuery/details.vue +++ b/pages/dataQuery/details.vue @@ -147,15 +147,17 @@ data() { return { time: '12:01', - // dataArr:{ - // customerName:"长沙警校", - // customerCode:"xxxxxxxxx", - // customerVIP:"VIP1", - // industryInvolved:"安防", - // customerType:"xxxx", - // warehouseTime:"2022.3.1" , + dataArr:{ + customerName:"长沙警校", + customerCode:"xxxxxxxxx", + customerVIP:"VIP1", + industryInvolved:"安防", + customerType:"xxxx", + warehouseTime:"2022.3.1" , + projectNum:"50", + area:"长沙", - // } + }, projectList:[], } }, diff --git a/pages/workOrder/workOrderLlsit.vue b/pages/workOrder/workOrderLlsit.vue index 9a7a8d9..a72c751 100644 --- a/pages/workOrder/workOrderLlsit.vue +++ b/pages/workOrder/workOrderLlsit.vue @@ -105,6 +105,10 @@ {id:12,title:'超时单'} ], workeOrderStatusIndex: 0, + dataPage:{ + list_rows:10, + page:1, + }, dataList:[ { id:1, @@ -239,8 +243,39 @@ onLoad(op) { this.workeOrderStatusIndex = this.array.findIndex(item=>item.title==op.status); if(this.workeOrderStatusIndex!=-1) this.workeOrderStatus = ''; + + this.getDatalist() + this.getType() }, methods: { + getType(){ + + this.$requst.get('/universal/api.order/order_type', { + list_rows: this.dataPage.list_rows, + page: this.dataPage.page, + }).then(res => { + // this.$toolAll.tools.showToast(res.msg); + if (res.code == 1) { + this.dataList = res.data.data + } else { + + } + }) + }, + + getDatalist(){ + this.$requst.get('/universal/api.order/order_list', { + list_rows: this.dataPage.list_rows, + page: this.dataPage.page, + }).then(res => { + // this.$toolAll.tools.showToast(res.msg); + if (res.code == 1) { + this.dataList = res.data.data + } else { + + } + }) + }, // 催一催事件 hurryUpEv(id) { this.$toolAll.tools.showToast(`已催单成功`); @@ -272,7 +307,7 @@ } }, bindPickerChange(data) { - console.log(data) + this.workeOrderStatus = ''; this.workeOrderStatusIndex = data.detail.value; },