skjia
/
bonus-Certificate-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.0.75:3000/skjia/bonus-Certificate-ui

This commit is contained in:
zzyuan 2025-12-18 15:10:32 +08:00
parent 88f3b8e2a6 9af09590a8
commit 0c3e0acd56
9 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/template/证件信息模板 .xlsx Normal file
View File

Binary file not shown.

BIN
public/template/证件信息模板.xlsx
View File

Binary file not shown.

12
src/views/certificate/certificateManage/certificateInfo/index.vue
View File

@ -218,7 +218,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="姓名" prop="name"> <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-form-item>
</el-col> </el-col>
<el-col el-col :span="12" v-if="baseForm.deptId !== 0&&!isUpdate"> <el-col el-col :span="12" v-if="baseForm.deptId !== 0&&!isUpdate">
@ -244,19 +244,19 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号码" prop="phone"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证号" prop="idNumber"> <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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="出生日期" prop="birthday"> <el-form-item label="出生日期" prop="birthday">
<el-date-picker <el-date-picker disabled
v-model="baseForm.birthday" v-model="baseForm.birthday"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
@ -1085,7 +1085,7 @@
}) })
}, },
openLog(row){ 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}});
} }
} }
}; };

23
src/views/certificate/certificateManage/certificateInfo/logList.vue
View File

@ -122,7 +122,7 @@ export default {
dicts: [], dicts: [],
data() { data() {
return { return {
certificateInfoRowData:{}, certificateNo:"",
// 遮罩层 // 遮罩层
loading: false, loading: false,
// 选中数组 // 选中数组
@ -184,21 +184,19 @@ export default {
}, },
}; };
}, },
created() { mounted() {
if(this.$route.query.certificateInfoRowData){ console.log(this.$route.query.certificateNo)
this.certificateInfoRowData = JSON.parse(this.$route.query.certificateInfoRowData) this.certificateNo = this.$route.query.certificateNo
console.log(this.certificateInfoRowData) this.getList()
this.getList() console.log(new Date(33000000))
}
console.log(new Date(33000000))
}, },
watch:{ watch:{
'$route.query.certificateInfoRowData':function(newId, oldId) { '$route.query.certificateNo':function(newId, oldId) {
if(newId){ if(newId){
this.certificateInfoRowData = JSON.parse(newId) this.certificateNo = newId
this.getList() this.getList()
}else{ }else{
this.certificateInfoRowData={} this.certificateNo=""
this.tableListData=[] this.tableListData=[]
this.tableListData2=[] this.tableListData2=[]
} }
@ -248,8 +246,10 @@ export default {
}, },
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
console.log(this.certificateNo)
// this.loading = true; // this.loading = true;
let param = { let param = {
"certificateNo":this.certificateNo,
"pageNum": this.queryParams.pageNum, "pageNum": this.queryParams.pageNum,
"pageSize": this.queryParams.pageSize, "pageSize": this.queryParams.pageSize,
} }
@ -287,6 +287,7 @@ export default {
getList2() { getList2() {
this.loading = true; this.loading = true;
let param = { let param = {
"certificateNo":this.certificateNo,
"pageNum": this.queryParams2.pageNum, "pageNum": this.queryParams2.pageNum,
"pageSize": this.queryParams2.pageSize, "pageSize": this.queryParams2.pageSize,
} }

6
src/views/certificate/certificateManage/certificateLifespan/index.vue
View File

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

6
src/views/certificate/certificateManage/certificateOverdue/index.vue
View File

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

22
src/views/certificate/certificateReturnManage/certificateAtake/index.vue
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="issueDay" :show-overflow-tooltip="true"/>
<el-table-column label="有效期至" align="center" prop="issueLifespan" :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="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="stateName" :show-overflow-tooltip="true"/>
<el-table-column label="是否电子标签" align="center" prop="isEleName" :show-overflow-tooltip="true"/> <el-table-column label="是否电子标签" align="center" prop="isEleName" :show-overflow-tooltip="true"/>
</el-table> </el-table>
@ -418,6 +418,14 @@
} }
}, },
submitFormset: function() { 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}; const params={"certificateNos":this.selectCertificateNos,"type":this.selectType,"exitTime":this.baseForm.exitTime,"entryTime":this.baseForm.entryTime};
console.log("params",params); console.log("params",params);
getCertificateTakeAddPageApi(params).then(response => { getCertificateTakeAddPageApi(params).then(response => {
@ -440,6 +448,18 @@
this.reset(); this.reset();
}, },
submitForm: function() { 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}; 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); console.log("param",param);
getCertificateTakeAddPageApi(param).then(response => { getCertificateTakeAddPageApi(param).then(response => {

1
src/views/certificate/certificateReturnManage/certificateTask/index.vue
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="isEleName" :show-overflow-tooltip="true"/> -->
<el-table-column label="设备名称" align="center" prop="deviceName" :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="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="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"></el-table-column> -->
<el-table-column label="二维码" align="center" prop="verificationCode" :show-overflow-tooltip="true"> <el-table-column label="二维码" align="center" prop="verificationCode" :show-overflow-tooltip="true">

8
src/views/certificate/filingUser/index.vue
View File

@ -416,6 +416,14 @@ export default {
submitTask: function () { submitTask: function () {
this.$refs['taskForm'].validate((valid) => { this.$refs['taskForm'].validate((valid) => {
let paramd = Object.assign({},this.taskForm) 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(paramd)
console.log(this.ids) console.log(this.ids)
if (valid) { if (valid) {