diff --git a/src/util/api/api.js b/src/util/api/api.js
index a2cca5e..cfa0a53 100644
--- a/src/util/api/api.js
+++ b/src/util/api/api.js
@@ -44,6 +44,7 @@ export const getVehicleClassToal = data => post("/devProjectJt/divFeeStat/getVeh
//20250507 未计费 未拆分数据核验
export const getFeeListByPage = data => post("/devProjectJt/divPassidAll/getFeeListByPage", data,"")
export const getMatchListByPage = data => post("/devProjectJt/divPassidAllMatch/getMatchListByPage", data,"")
+export const getMatchDetail = data => post("/devProjectJt/divPassidAllMatch/getMatchDetail", data,"")
export const getProvinceListByPage = data => post("/devProjectJt/divPassidAll/getListByPage", data,"")
export const getProvinceData = data => post("/devProjectJt/divPassidAll/getProvinceData", data,"")
export const getDivFeeListByPage = data => post("/devProjectJt/divPassidAll/getDivFeeListByPage", data,"")
diff --git a/src/views/dev/detail/nodivandnofee/DivMatchNoFee.vue b/src/views/dev/detail/nodivandnofee/DivMatchNoFee.vue
index b9e3a38..0c94faa 100644
--- a/src/views/dev/detail/nodivandnofee/DivMatchNoFee.vue
+++ b/src/views/dev/detail/nodivandnofee/DivMatchNoFee.vue
@@ -14,7 +14,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
@@ -149,7 +149,7 @@ export default {
paramsData.MANO=localStorage.mannoDe;
paramsData.MANAME=localStorage.man;
}
- /* paramsData.MANO="11";
+ /* paramsData.MANO="11";
paramsData.MANAME="测试";*/
paramsData.divFeegroup=this.tableDataFee[0].divFeegroup;
paramsData.divTollintervalid=this.tableDataFee[0].divTollintervalid;
@@ -178,7 +178,21 @@ export default {
paramsData.dataType=2;
paramsData.VEHICLEID=row.vehicleid;
paramsData.vehicleidColor=this.tableDataFee[0].vehicleidColor;
-
+ matchData(paramsData).then(res=>{
+ this.div_full_loading=false;
+ if(res.code<=0){
+ alert("匹配失败");
+ return false;
+ }else{
+ alert("匹配成功");
+ this.$emit('subMethod');
+ }
+ })
+ /* this.$confirm('此操作执行之后无法撤回, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
matchData(paramsData).then(res=>{
this.div_full_loading=false;
if(res.code<=0){
@@ -189,6 +203,13 @@ export default {
this.$emit('subMethod');
}
})
+ }).catch(() => {
+ this.div_full_loading=false;
+ this.$message({
+ type: 'info',
+ message: '已取消'
+ });
+ });*/
},cancelDivMatch(){
this.isShowDivMap=false;
this.statusCheck="";
@@ -232,6 +253,29 @@ export default {
this.$emit('subMethod');
}
})
+ /* this.$confirm('此操作执行之后无法撤回, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ matchData(paramsData).then(res=>{
+ this.div_full_loading=false;
+ if(res.code<=0){
+ alert("处理失败");
+ return false;
+ }else{
+ alert("处理成功");
+ this.$emit('subMethod');
+ }
+ })
+ }).catch(() => {
+ this.div_full_loading=false;
+ this.$message({
+ type: 'info',
+ message: '已取消'
+ });
+ });*/
+
},
handleSizeChange(val) {
this.pageSize = val;
@@ -247,7 +291,7 @@ export default {
sums[index] = '总计';
return;
}
- if(index === 6){
+ if(index === 7){
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
diff --git a/src/views/dev/detail/nodivandnofee/FeeMatchNoDiv.vue b/src/views/dev/detail/nodivandnofee/FeeMatchNoDiv.vue
index d51e916..e7b09e2 100644
--- a/src/views/dev/detail/nodivandnofee/FeeMatchNoDiv.vue
+++ b/src/views/dev/detail/nodivandnofee/FeeMatchNoDiv.vue
@@ -14,7 +14,7 @@
-
+
@@ -46,10 +46,10 @@
-
+
-
+
@@ -149,14 +149,14 @@ export default {
var paramsData={};
paramsData.PASSID=this.tableDataFee[0].passid;
paramsData.DIVPASSID=row.passid;
- if(localStorage.mannoDe ===undefined || localStorage.mannoDe===""){
+ if(localStorage.mannoDe ===undefined || localStorage.mannoDe===""){
alert("您账号已登录过期，请重新登陆之后在此操作");
return false;
}else{
paramsData.MANO=localStorage.mannoDe;
paramsData.MANAME=localStorage.man;
}
- /* paramsData.MANO="11";
+/* paramsData.MANO="11";
paramsData.MANAME="测试";*/
paramsData.gpaFeegroup=this.tableDataFee[0].gpaFeegroup;
paramsData.gpaTollintervalid=this.tableDataFee[0].gpaTollintervalid;
@@ -194,6 +194,29 @@ export default {
this.$emit('subMethod');
}
})
+ /*this.$confirm('此操作执行之后无法撤回, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ matchData(paramsData).then(res=>{
+ this.div_full_loading=false;
+ if(res.code<=0){
+ alert("匹配失败");
+ return false;
+ }else{
+ alert("匹配成功");
+ this.$emit('subMethod');
+ }
+ })
+ }).catch(() => {
+ this.div_full_loading=false;
+ this.$message({
+ type: 'info',
+ message: '已取消'
+ });
+ });*/
+
},matchMainDataOper(row){
this.isShowFeeMap=true;
},getSumData(param){
@@ -268,6 +291,30 @@ export default {
this.$emit('subMethod');
}
})
+ /* this.$confirm('此操作执行之后无法撤回, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ matchData(paramsData).then(res=>{
+ this.div_full_loading=false;
+ if(res.code<=0){
+ alert("处理失败");
+ return false;
+ }else{
+ alert("处理成功");
+ this.isShowFeeMap=false;
+ this.$emit('subMethod');
+ }
+ })
+ }).catch(() => {
+ this.div_full_loading=false;
+ this.$message({
+ type: 'info',
+ message: '已取消'
+ });
+ });*/
+
},
handleSizeChange(val) {
this.pageSize = val;
diff --git a/src/views/dev/detail/nodivandnofee/querySolveData.vue b/src/views/dev/detail/nodivandnofee/querySolveData.vue
index 460ee6f..6efa0e3 100644
--- a/src/views/dev/detail/nodivandnofee/querySolveData.vue
+++ b/src/views/dev/detail/nodivandnofee/querySolveData.vue
@@ -6,6 +6,8 @@
@@ -21,9 +23,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/dev/detail/nodivandnofee/querySolveDataDiv.vue b/src/views/dev/detail/nodivandnofee/querySolveDataDiv.vue
new file mode 100644
index 0000000..002e4b4
--- /dev/null
+++ b/src/views/dev/detail/nodivandnofee/querySolveDataDiv.vue
@@ -0,0 +1,218 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+