diff --git a/src/utils/http.js b/src/utils/http.js index 796daab0..0afaad14 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -17,10 +17,10 @@ service.interceptors.request.use( config => { config.data = config.contentType ? config.data : qs.stringify(config.data) config.headers['Content-Type'] = config.contentType || 'application/x-www-form-urlencoded' - // const token = localStorage.getItem('token'); + const token = localStorage.getItem('token'); // const urlParams = new URLSearchParams(window.location.search); // const token = urlParams.get('token') ; - let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzemwiLCJhdWQiOlsic3VwcGxpZXItYXBwIl0sIm5iZiI6MTY5Mjc3MzMxMSwidXNlcl9pbmZvIjp7InVzZXJJZCI6NTQ1ODUsInBob25lIjoiMTc2MzAwMzU2NTgiLCJuYW1lIjoi5bCP5a6LIiwic3VwcGxpZXJOYW1lIjoi5LiK5rW35a6J55WFQSIsInN1cHBsaWVySWQiOjExMjgsInN1cHBsaWVyVHlwZSI6MSwidXNlcm5hbWUiOiJzemwiLCJ1c2VyVHlwZSI6IkFQUCIsImF1dGhvcml0aWVzIjpbXX0sInNjb3BlIjpbImFsbCJdLCJpc3MiOiJodHRwczovL3Npbm9hc3Npc3QuY29tIiwiZXhwIjoxNjkyODU5NzExLCJpYXQiOjE2OTI3NzMzMTF9.bFTJlX73vYl06ncE6Ge5_qtbEwRNFZwXhzNjMXzikkE' + // let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzemwiLCJhdWQiOlsic3VwcGxpZXItYXBwIl0sIm5iZiI6MTY5Mjc3MzMxMSwidXNlcl9pbmZvIjp7InVzZXJJZCI6NTQ1ODUsInBob25lIjoiMTc2MzAwMzU2NTgiLCJuYW1lIjoi5bCP5a6LIiwic3VwcGxpZXJOYW1lIjoi5LiK5rW35a6J55WFQSIsInN1cHBsaWVySWQiOjExMjgsInN1cHBsaWVyVHlwZSI6MSwidXNlcm5hbWUiOiJzemwiLCJ1c2VyVHlwZSI6IkFQUCIsImF1dGhvcml0aWVzIjpbXX0sInNjb3BlIjpbImFsbCJdLCJpc3MiOiJodHRwczovL3Npbm9hc3Npc3QuY29tIiwiZXhwIjoxNjkyODU5NzExLCJpYXQiOjE2OTI3NzMzMTF9.bFTJlX73vYl06ncE6Ge5_qtbEwRNFZwXhzNjMXzikkE' config.headers['Authorization'] = `${token}`; return config }, diff --git a/src/views/index/driverManage.vue b/src/views/index/driverManage.vue index 6692a265..1f2cd70d 100644 --- a/src/views/index/driverManage.vue +++ b/src/views/index/driverManage.vue @@ -204,8 +204,12 @@ export default { button { border: none; //width: 48px; - padding: 2px; - @include all-height(20px); + //padding: 2px; + //@include all-height(20px); + padding: 4px 8px; + display: flex; + justify-content: center; + align-items: center; border-radius: 3px; @include fontWeightSize(bold, 12px) } diff --git a/src/views/index/vehicleManage.vue b/src/views/index/vehicleManage.vue index 7059585f..c7024343 100644 --- a/src/views/index/vehicleManage.vue +++ b/src/views/index/vehicleManage.vue @@ -162,8 +162,11 @@ export default { button{ border: none; //width: 48px; - @include all-height(20px); - padding: 2px; + //@include all-height(20px); + padding: 4px 8px; + display: flex; + justify-content: center; + align-items: center; border-radius: 3px; @include fontWeightSize(bold,12px) } diff --git a/src/views/workOrder/accounting.vue b/src/views/workOrder/accounting.vue index dfb58689..c699690c 100644 --- a/src/views/workOrder/accounting.vue +++ b/src/views/workOrder/accounting.vue @@ -8,7 +8,7 @@ :border="false" :fixed="true" :safe-area-inset-top="true" - @click-left="h5GoBack" + @click-left="goback" />
@@ -266,6 +266,7 @@ export default { auditFormShow:false, auditPhotoList:[], supplierPhotoList:[], + index:'',//记录工单对账属于哪个状态 form:{ id:'', taskOrderCostHisId:'', @@ -340,6 +341,7 @@ export default { async mounted() { this.id=this.$route.params?.id; this.postfix=this.$route.params?.postfix; + this.index=this.$route.params?.index; this.$nextTick(async ()=>{ await this.getDetail() }) @@ -361,6 +363,14 @@ export default { handleFileRead() { // console.log("file",file) }, + goback(){ + this.$router.push({ + name:"workOrderReconciliation", + params:{ + activeIndex:this.index + } + }) + }, async compute() { //现金业务置为0 // if(this.form.contractSettleTypeString == '车主现收'){ diff --git a/src/views/workOrder/aduitCompleteDetail.vue b/src/views/workOrder/aduitCompleteDetail.vue index e6b12e8c..7dd08ebc 100644 --- a/src/views/workOrder/aduitCompleteDetail.vue +++ b/src/views/workOrder/aduitCompleteDetail.vue @@ -8,7 +8,7 @@ :border="false" :fixed="true" :safe-area-inset-top="true" - @click-left="h5GoBack" + @click-left="goback" />
@@ -104,15 +104,24 @@ export default { id:'', postfix:'', orderInfo:{}, + index:"", } }, async mounted() { - this.id=this.$route.query?.id; - this.postfix=this.$route.query?.postfix; - console.log(this.id,this.postfix) + this.id=this.$route.params?.id; + this.postfix=this.$route.params?.postfix; + this.index=this.$route.params?.index; await this.getDetail() }, methods: { + goback(){ + this.$router.push({ + name:"workOrderReconciliation", + params:{ + activeIndex:this.index, + } + }) + }, async getDetail() { let res = await getAccountRecordDetail({ id: this.id, diff --git a/src/views/workOrder/workOrderReconciliation.vue b/src/views/workOrder/workOrderReconciliation.vue index f71f5ba0..f11eee32 100644 --- a/src/views/workOrder/workOrderReconciliation.vue +++ b/src/views/workOrder/workOrderReconciliation.vue @@ -58,7 +58,7 @@ - +
@@ -86,16 +86,19 @@ export default { queryTime:'', showDatetime: false, currentDate: new Date(), - ymTime: '' + ymTime: '', + recordIndex:'', } }, mounted() { + this.activeIndex=this.$route.params?.activeIndex || 0 + this.queryType=this.$route.params?.queryType || this.queryType + this.initIndex() this.initSelectTime(); this.getList(); }, methods: { - async changeTab(index) { - this.activeIndex = index + initIndex(){ if(this.activeIndex === 0){ this.queryType = 1 }else if(this.activeIndex === 1){ @@ -105,6 +108,10 @@ export default { }else if(this.activeIndex === 3){ this.queryType = 7 } + }, + async changeTab(index) { + this.activeIndex = index + this.initIndex() this.total = 0; this.pageNum = 1 this.orderList = []; @@ -127,6 +134,17 @@ export default { params: { id: item.id, // 参数对象的属性 postfix:item.postfix, + index:this.activeIndex + } + }); + }, + goPageDetail(item){ + this.$router.push({ + name: 'aduitCompleteDetail', // 目标路由的名称 + params: { + id: item.id, // 参数对象的属性 + postfix:item.postfix, + index:this.activeIndex } }); },