diff --git a/src/views/index/reporting.vue b/src/views/index/reporting.vue index 85fd69c0..4bc8b05f 100644 --- a/src/views/index/reporting.vue +++ b/src/views/index/reporting.vue @@ -64,6 +64,7 @@ export default { this.queryType = urlParams.get('queryType'); this.userOrderId = urlParams.get('userOrderId'); this.orderCode = urlParams.get('orderCode') + this.$toast('queryType' + this.queryType) }, computed:{ isRadio(){ @@ -82,9 +83,9 @@ export default { }, async goReporting(){ console.log("1111") - if(this.isRadio || this.isTxt){ + if(this.isRadio && this.isTxt){ let result = await orderReporting({ - queryType:this.queryType, + queryType:Number(this.queryType), userOrderId:this.userOrderId, orderCode:this.orderCode, reportingItem:this.radio ? this.radio : "", @@ -97,7 +98,7 @@ export default { },2000) // } }else{ - this.$toast("报备事项和报备描述必填一项") + this.$toast("报备事项和报备描述必选") } } }, diff --git a/src/views/index/supplySettlement.vue b/src/views/index/supplySettlement.vue index 25da80bf..544bd6ef 100644 --- a/src/views/index/supplySettlement.vue +++ b/src/views/index/supplySettlement.vue @@ -141,7 +141,8 @@ export default { margin-bottom: 10px; } .otherFee { - @include wh(100%, 198px) + @include wh(100%, 198px); + margin-bottom: 20px; } .title { @include fontWeightSize(bold, 14px); @@ -198,7 +199,7 @@ export default { } /* 如果需要调整按钮在底部容器内的位置,可以使用更具体的选择器进行样式调整 */ .fixed-bottom .btn { - margin-top: 20px; + position: absolute; /* 将按钮设置为绝对定位 */ bottom: 30px; /* 可根据需要调整按钮距离底部的距离 */ left: 50%; /* 可根据需要调整按钮在容器中的水平位置 */ diff --git a/src/views/workOrder/accounting.vue b/src/views/workOrder/accounting.vue index cce271df..dc05a884 100644 --- a/src/views/workOrder/accounting.vue +++ b/src/views/workOrder/accounting.vue @@ -104,15 +104,15 @@