From 9af09590a86a5d45218f142f335c8e0dceef888f Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Thu, 18 Dec 2025 15:06:21 +0800
Subject: [PATCH] jsk
---
.../certificateInfo/index.vue | 2 +-
.../certificateInfo/logList.vue | 23 ++++++++++---------
.../certificateAtake/index.vue | 22 +++++++++++++++++-
.../certificateTask/index.vue | 1 -
4 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/src/views/certificate/certificateManage/certificateInfo/index.vue b/src/views/certificate/certificateManage/certificateInfo/index.vue
index a8d7293..1957427 100644
--- a/src/views/certificate/certificateManage/certificateInfo/index.vue
+++ b/src/views/certificate/certificateManage/certificateInfo/index.vue
@@ -1085,7 +1085,7 @@
})
},
openLog(row){
- this.$router.push({ path: "/certificate/certificateManage/certificateLogList",query: {certificateInfoRowData:JSON.stringify(row)} });
+ this.$router.push({ path: "/certificate/certificateManage/certificateLogList",query:{certificateNo:row.certificateNo}});
}
}
};
diff --git a/src/views/certificate/certificateManage/certificateInfo/logList.vue b/src/views/certificate/certificateManage/certificateInfo/logList.vue
index 514bef5..196ecb3 100644
--- a/src/views/certificate/certificateManage/certificateInfo/logList.vue
+++ b/src/views/certificate/certificateManage/certificateInfo/logList.vue
@@ -122,7 +122,7 @@ export default {
dicts: [],
data() {
return {
- certificateInfoRowData:{},
+ certificateNo:"",
// 遮罩层
loading: false,
// 选中数组
@@ -184,21 +184,19 @@ export default {
},
};
},
- created() {
- if(this.$route.query.certificateInfoRowData){
- this.certificateInfoRowData = JSON.parse(this.$route.query.certificateInfoRowData)
- console.log(this.certificateInfoRowData)
- this.getList()
- }
- console.log(new Date(33000000))
+ mounted() {
+ console.log(this.$route.query.certificateNo)
+ this.certificateNo = this.$route.query.certificateNo
+ this.getList()
+ console.log(new Date(33000000))
},
watch:{
- '$route.query.certificateInfoRowData':function(newId, oldId) {
+ '$route.query.certificateNo':function(newId, oldId) {
if(newId){
- this.certificateInfoRowData = JSON.parse(newId)
+ this.certificateNo = newId
this.getList()
}else{
- this.certificateInfoRowData={}
+ this.certificateNo=""
this.tableListData=[]
this.tableListData2=[]
}
@@ -248,8 +246,10 @@ export default {
},
/** 查询列表 */
getList() {
+ console.log(this.certificateNo)
// this.loading = true;
let param = {
+ "certificateNo":this.certificateNo,
"pageNum": this.queryParams.pageNum,
"pageSize": this.queryParams.pageSize,
}
@@ -287,6 +287,7 @@ export default {
getList2() {
this.loading = true;
let param = {
+ "certificateNo":this.certificateNo,
"pageNum": this.queryParams2.pageNum,
"pageSize": this.queryParams2.pageSize,
}
diff --git a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
index 9974d21..993fe7c 100644
--- a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
+++ b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
@@ -91,7 +91,7 @@
-
+
@@ -418,6 +418,14 @@
}
},
submitFormset: function() {
+ if(!this.baseForm.exitTime){
+ this.$modal.msgError("请填写出入境时间");
+ return;
+ }
+ if(!this.baseForm.entryTime){
+ this.$modal.msgError("请填写出入境时间");
+ return;
+ }
const params={"certificateNos":this.selectCertificateNos,"type":this.selectType,"exitTime":this.baseForm.exitTime,"entryTime":this.baseForm.entryTime};
console.log("params",params);
getCertificateTakeAddPageApi(params).then(response => {
@@ -440,6 +448,18 @@
this.reset();
},
submitForm: function() {
+ if(!this.selectIdNumber){
+ this.$modal.msgError("请填写代领人信息");
+ return;
+ }
+ if(!this.baseForm.exitTime){
+ this.$modal.msgError("请填写出入境时间");
+ return;
+ }
+ if(!this.baseForm.entryTime){
+ this.$modal.msgError("请填写出入境时间");
+ return;
+ }
const param={"certificateNos":this.selectCertificateNos,"type":this.selectType,"idNumber":this.selectIdNumber,"name":this.selectName,"exitTime":this.baseForm.exitTime,"entryTime":this.baseForm.entryTime};
console.log("param",param);
getCertificateTakeAddPageApi(param).then(response => {
diff --git a/src/views/certificate/certificateReturnManage/certificateTask/index.vue b/src/views/certificate/certificateReturnManage/certificateTask/index.vue
index 7e6edd7..1cbe438 100644
--- a/src/views/certificate/certificateReturnManage/certificateTask/index.vue
+++ b/src/views/certificate/certificateReturnManage/certificateTask/index.vue
@@ -91,7 +91,6 @@
-