This commit is contained in:
zzyuan 2025-12-18 15:10:32 +08:00
commit 0c3e0acd56
9 changed files with 53 additions and 25 deletions

Binary file not shown.

View File

@ -218,7 +218,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="name">
<el-input style="background-color;:#E7EAEE" v-model="baseForm.name" readonly="true" placeholder="请选择" maxlength="30" clearable/>
<el-input style="background-color;:#E7EAEE" v-model="baseForm.name" disabled placeholder="请选择" maxlength="30" clearable/>
</el-form-item>
</el-col>
<el-col el-col :span="12" v-if="baseForm.deptId !== 0&&!isUpdate">
@ -244,19 +244,19 @@
</el-col>
<el-col :span="12">
<el-form-item label="手机号码" prop="phone">
<el-input style="background-color:#E7EAEE" v-model="baseForm.phone" placeholder="请输入" maxlength="30" readonly="true" />
<el-input style="background-color:#E7EAEE" disabled v-model="baseForm.phone" placeholder="请输入" maxlength="30" readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="身份证号" prop="idNumber">
<el-input style="background-color:#E7EAEE" v-model="baseForm.idNumber" placeholder="请输入" maxlength="30" readonly="true"/>
<el-input style="background-color:#E7EAEE" disabled v-model="baseForm.idNumber" placeholder="请输入" maxlength="30" readonly="true"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出生日期" prop="birthday">
<el-date-picker
<el-form-item label="出生日期" prop="birthday">
<el-date-picker disabled
v-model="baseForm.birthday"
type="date"
placeholder="选择日期"
@ -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}});
}
}
};

View File

@ -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,
}

View File

@ -431,9 +431,9 @@
},
/** 导出按钮操作 */
handleExport() {
// this.download('certificate/certificate_manage/certificateInfo/export', {
// ...this.queryParams
// }, `_${new Date().getTime()}.xlsx`);
this.download('certificate/certificate_manage/certificateLifespan/export', {
...this.queryParams
}, `存证超期记录_${new Date().getTime()}.xlsx`);
},
formatDate(date) {
// YYYY-MM-DD

View File

@ -447,9 +447,9 @@
},
/** 导出按钮操作 */
handleExport() {
// this.download('certificate/certificate_manage/certificateInfo/export', {
// ...this.queryParams
// }, `_${new Date().getTime()}.xlsx`);
this.download('certificate/certificate_manage/certificateOverdue/export', {
...this.queryParams
}, `证件超期记录_${new Date().getTime()}.xlsx`);
},
formatDate(date) {
// YYYY-MM-DD

View File

@ -91,7 +91,7 @@
<el-table-column label="签发日期" align="center" prop="issueDay" :show-overflow-tooltip="true"/>
<el-table-column label="有效期至" align="center" prop="issueLifespan" :show-overflow-tooltip="true"/>
<el-table-column label="设备编号" align="center" prop="deviceNo" :show-overflow-tooltip="true"/>
<el-table-column label="槽位编号" align="center" prop="soltNo" :show-overflow-tooltip="true"/>
<el-table-column label="槽位编号" align="center" prop="slotNo" :show-overflow-tooltip="true"/>
<el-table-column label="当前状态" align="center" prop="stateName" :show-overflow-tooltip="true"/>
<el-table-column label="是否电子标签" align="center" prop="isEleName" :show-overflow-tooltip="true"/>
</el-table>
@ -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 => {

View File

@ -91,7 +91,6 @@
<!-- <el-table-column label="是否电子标签" align="center" prop="isEleName" :show-overflow-tooltip="true"/> -->
<el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true"/>
<el-table-column label="设备地址" align="center" prop="deviceAddr" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="设备编号" align="center" prop="deviceNo" :show-overflow-tooltip="true"/>
<el-table-column label="槽位编号" align="center" prop="slotNo" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="验证码" align="center" prop="verificationCode" :show-overflow-tooltip="true"></el-table-column> -->
<el-table-column label="二维码" align="center" prop="verificationCode" :show-overflow-tooltip="true">

View File

@ -416,6 +416,14 @@ export default {
submitTask: function () {
this.$refs['taskForm'].validate((valid) => {
let paramd = Object.assign({},this.taskForm)
if(!this.taskForm.startTime){
this.$modal.msgError("请选择开始时间!");
return;
}
if(!this.taskForm.endTime){
this.$modal.msgError("请选择结束时间!");
return;
}
console.log(paramd)
console.log(this.ids)
if (valid) {