@@ -454,31 +454,31 @@
// 弹出层标题
title: "",
// 是否显示弹出层
- open: false,
+ open: false,
// 查询参数
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 10,
keyWord:null,//姓名
},
// 表单参数
baseForm: {
userId:"",
- applyType:"1",
+ applyType:"1",
applyReason:"1",
isThrid:"2",
- certificateNos:[],
- applyDetail:"",
- exitAddr:"",
- exitTime:"",
- entryTime:"",
- thridId:"",
- thridName:"",
- thridIdNumber:"",
+ certificateNos:[],
+ applyDetail:"",
+ exitAddr:"",
+ exitTime:"",
+ entryTime:"",
+ thridId:"",
+ thridName:"",
+ thridIdNumber:"",
remark:"",
},
selectItme:{},
- allUserList:[],
+ allUserList:[],
certificateList:[],
thridManList:[],
allDeviceList:[],
@@ -495,13 +495,13 @@
],
applyDetail: [
{ required: true, message: "事由不能为空", trigger: "blur" }
- ],
+ ],
exitAddr: [
- { required: true, message: "计划出国地点不能为空", trigger: "change" },
- ],
+ { required: true, message: "计划出国地点不能为空", trigger: "change" },
+ ],
exitTime: [
- { required: true, message: "计划出国日期不能为空", trigger: "change" },
- ],
+ { required: true, message: "计划出国日期不能为空", trigger: "change" },
+ ],
entryTime: [
{ required: true, message: "计划回国日期不能为空", trigger: "change" }
],
@@ -528,15 +528,15 @@
openFile:false,//查看附件
checkProcess:[],
dialogVisible:false,//图片弹窗
- dialogImageUrl:"",//图片弹窗
+ dialogImageUrl:"",//图片弹窗
openView:false,//查看弹窗
viewRow:{},
};
},
mounted(){
- this.getList();
- this.getDeviceList();
- },
+ this.getList();
+ this.getDeviceList();
+ },
methods: {
//获取可申请证件编号列表
getDeviceList(){
@@ -544,7 +544,7 @@
this.allDeviceList=[]
this.$set(this.baseForm,"deviceId",null)
getDevicelistApi(param).then((response) => {
- this.allDeviceList = response
+ this.allDeviceList = response
})
},
/** 搜索按钮操作 */
@@ -562,8 +562,8 @@
this.loading = true;
let param = {
"pageNum":this.queryParams.pageNum,
- "pageSize":this.queryParams.pageSize,
- "keyWord":this.queryParams.keyWord,
+ "pageSize":this.queryParams.pageSize,
+ "keyWord":this.queryParams.keyWord,
}
getCertificateApplyListPageApi(param).then(response => {
this.tableListData = response.rows;
@@ -581,17 +581,17 @@
this.thridManList=[]
this.baseForm = {
userId:"",
- applyType:"1",
+ applyType:"1",
applyReason:"1",
isThrid:"2",
- certificateNos:[],
- applyDetail:"",
- exitAddr:"",
- exitTime:"",
- entryTime:"",
- thridId:"",
- thridName:"",
- thridIdNumber:"",
+ certificateNos:[],
+ applyDetail:"",
+ exitAddr:"",
+ exitTime:"",
+ entryTime:"",
+ thridId:"",
+ thridName:"",
+ thridIdNumber:"",
remark:"",
};
this.resetForm("baseForm");
@@ -600,17 +600,17 @@
handleAdd() {
this.reset();
this.getApplyUserList()
- this.open = true;
+ this.open = true;
this.title = "新增";
console.log("this.baseForm",this.baseForm);
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
- this.open = true;
+ this.open = true;
this.baseForm = Object.assign({}, row)
this.getApplyUserList()
- this.getCertificateList() //获取可申请证件编号列表
+ this.getCertificateList() //获取可申请证件编号列表
setTimeout(()=>{
this.$set(this.baseForm,"name",row.name)
this.$set(this.baseForm,"userId",row.userId)
@@ -636,17 +636,17 @@
this.fileList=[]
this.fileUrls=[]
this.fileNames = []
- }
+ }
this.title = "修改";
},
//变更申请类型时获取可申请证件编号列表
changeApplyType(){
- console.log('changeApplyType')
+ console.log('changeApplyType')
this.getApplyUserList()
this.certificateList=[]
this.$set(this.baseForm,"certificateNos",[])
- this.thridManList=[]
+ this.thridManList=[]
this.$set(this.baseForm,'exitAddr',"")
this.$set(this.baseForm,'exitTime',"")
this.$set(this.baseForm,'entryTime',"")
@@ -654,7 +654,7 @@
this.$set(this.baseForm,'thridId',null)
this.$set(this.baseForm,'thridName',null)
this.$set(this.baseForm,'thridIdNumber',null)
- },
+ },
getApplyUserList(){
const param={"applyType":this.baseForm.applyType,pageNum:1,pageSize:100}
this.$set(this.baseForm,"name",null)
@@ -667,22 +667,22 @@
//选中人员-渲染数据
chosenSysUser(val){
console.log("chosenSysUser",val)
- this.selectItme=val;
+ this.selectItme=val;
this.$set(this.baseForm,"name",this.selectItme.userName)
- this.$set(this.baseForm,"userId",this.selectItme.userId)
- this.getCertificateList();//获取可申请证件编号列表
- this.getThridList();//获取代领人列表
+ this.$set(this.baseForm,"userId",this.selectItme.userId)
+ this.getCertificateList();//获取可申请证件编号列表
+ this.getThridList();//获取代领人列表
},
//获取可申请证件编号列表
getCertificateList(){
- let param = {
+ let param = {
applyType:this.baseForm.applyType,
userId:this.baseForm.userId
}
this.certificateList=[]
this.$set(this.baseForm,"certificateNos",[])
applyCertificateNoListApi(param).then((response) => {
- this.certificateList = response
+ this.certificateList = response
})
},
//获取代领人列表
@@ -702,11 +702,11 @@
this.getThridList()
},
changThridId(val){
- console.log(val)
- let index = this.thridManList.findIndex(v=>v.id==val)
+ console.log(val)
+ let index = this.thridManList.findIndex(v=>v.id==val)
this.$set(this.baseForm,'thridName',this.thridManList[index].name)
this.$set(this.baseForm,'thridIdNumber',this.thridManList[index].idNumber)
- },
+ },
/** 提交按钮 */
submitForm: function(type) {
console.log(this.baseForm.dateRange)
@@ -748,14 +748,14 @@
this.open = false;
this.reset();
},
- applyCheckProcess() {
+ applyCheckProcess() {
let param = {
"checkId":this.viewRow.checkId,
}
applyCheckProcessApi(param).then(response => {
- this.checkProcess = response.data||[];
+ this.checkProcess = response.data||[];
});
- },
+ },
//查看弹窗
handleView(row) {
this.viewRow = row;
@@ -765,14 +765,14 @@
let arr2 = row.fileName.split(",");
this.viewRow.fileList=[]
arr.forEach((item,index)=>{
- this.viewRow.fileList.push({url:item,name:arr2[index]})
+ this.viewRow.fileList.push({url:item,name:arr2[index]})
})
}else{
this.viewRow.fileList=[]
- }
+ }
console.log(this.viewRow.fileList)
- this.openView = true;
- },
+ this.openView = true;
+ },
// 撤销
handleRevoke(row) {
this.$modal.confirm('是否确认撤销申请?').then(() => {
@@ -869,7 +869,7 @@
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url
this.dialogVisible = true
- },
+ },
formatDate(date) {
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始
diff --git a/src/views/certificate/certificateReturnManage/certificateTask/index.vue b/src/views/certificate/certificateReturnManage/certificateTask/index.vue
index 6a49dde..7f32116 100644
--- a/src/views/certificate/certificateReturnManage/certificateTask/index.vue
+++ b/src/views/certificate/certificateReturnManage/certificateTask/index.vue
@@ -92,7 +92,7 @@
-
+
@@ -137,12 +137,24 @@
-
+
+
+
+
@@ -168,7 +180,7 @@
listDeptExcludeChild,
} from '@/api/system/dept'
import { getCertificateTaskListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi,
- getCertificateTakeReturnPageApi,addCertificateCheckApi,getCertificateTaskNumApi } from "@/api/certificateManage/index";
+ getCertificateTakeReturnPageApi,addCertificateCheckApi } from "@/api/certificateManage/index";
import { getTaskStatisticsApi } from "@/api/certificateStatistics/index";
import base64 from 'base-64';
import { getToken } from '@/utils/auth'
@@ -302,6 +314,8 @@
openTask: false,
// 表单参数
taskForm: {
+ startTime:"",
+ endTime:"",
processDate:""
},
// 表单校验
@@ -314,11 +328,30 @@
},
]
},
+ pickerOptionsToday: {
+ disabledDate(time) {
+ // 获取今天的日期
+ const today = new Date();
+ today.setHours(0, 0, 0, 0); // 设置时间为00:00:00,确保比较时只比较日期部分
+ // 比较日期,禁用今天之前的日期
+ return time.getTime() < today.getTime();
+ }
+ },
+ pickerOptionsStart: {
+ disabledDate(time) {
+ // 获取今天的日期
+ const startTime=this.taskForm.startTime;
+ const today = new Date(startTime);
+ today.setHours(0, 0, 0, 0); // 设置时间为00:00:00,确保比较时只比较日期部分
+ // 比较日期,禁用今天之前的日期
+ return time.getTime() < today.getTime();
+ }
+ },
};
},
mounted(){
this.getList();
- this.getNum();
+ // this.getNum();
this.initStatistics();
},
@@ -327,7 +360,37 @@
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
- this.initStatistics();ss
+ this.initStatistics();
+ },
+ startDateFocus() {
+ this.taskForm.endTime = ''
+ let endTime = this.taskForm.endTime;
+ if (!endTime) return;
+ let that = this;
+ that.pickerOptionsToday = {
+ disabledDate(time) {
+ // 获取今天的日期
+ const today = new Date();
+ today.setHours(0, 0, 0, 0); // 设置时间为00:00:00,确保比较时只比较日期部分
+ // 比较日期,禁用今天之前的日期
+ return time.getTime() < today.getTime();
+ },
+ };
+ },
+ endDateFocus() {
+ let startTime = this.taskForm.startTime;
+ if (!startTime) return;
+ let that = this;
+ that.pickerOptionsStart = {
+ disabledDate(time) {
+ // 获取开始的日期
+ const startTime=that.taskForm.startTime;
+ const today = new Date(startTime);
+ today.setHours(0, 0, 0, 0); // 设置时间为00:00:00,确保比较时只比较日期部分
+ // 比较日期,禁用开始之前的日期
+ return time.getTime() < today.getTime();
+ },
+ };
},
initStatistics(){
let param = {}
@@ -346,7 +409,7 @@
},
getNum(){
let param = {}
- getCertificateTaskNumApi(param).then(response => {
+ getTaskStatisticsApi(param).then(response => {
console.log("response",response)
this.saveNum = response.data.saveNum;
this.saveNumd = response.data.saveNumd;
@@ -565,13 +628,22 @@
/** 提交按钮 */
submitTask: function () {
this.$refs['taskForm'].validate((valid) => {
- let param = Object.assign({},this.taskForm)
+ let paramd = Object.assign({},this.taskForm)
if (valid) {
- param.userIds=this.chosenList.map(item => item.userId);
- param.exitTimes=this.chosenList.map(item => item.exitTime);
- param.entryTimes=this.chosenList.map(item => item.entryTime);
- param.checkType="3";
+ paramd.userIds=this.chosenList.map(item => item.userId);
+ paramd.exitTimes=this.chosenList.map(item => item.exitTime);
+ paramd.entryTimes=this.chosenList.map(item => item.entryTime);
+ paramd.checkType="3";
console.log(param)
+ let param={
+ verifyTitle:"出入境时间核验",
+ startTime:paramd.exitTimes[0],
+ endTime:paramd.entryTimes[0],
+ verifyUsers:paramd.userIds,
+ verifyType:"3",
+ noticeType:"2",
+ processDate:''
+ }
addCertificateCheckApi(param).then(response => {
if(response.code=200){
this.$modal.msgSuccess("验证下发成功");
diff --git a/src/views/certificate/device/index.vue b/src/views/certificate/device/index.vue
index f4b8fc0..31d03c1 100644
--- a/src/views/certificate/device/index.vue
+++ b/src/views/certificate/device/index.vue
@@ -20,7 +20,7 @@
-
-
+
+
{{Number(scope.row.soltNum)-Number(scope.row.soltUsedNum)}}
@@ -140,12 +140,12 @@
-
+
-
+
@@ -249,7 +249,7 @@
deviceNumber:"",
deviceName:"",
deviceSn:"",
- deviceIp:"",
+ deviceIp:"192.168.0.229",
deviceKey:"",
deviceAddr:"",
deviceMac:"",
@@ -269,7 +269,7 @@
{ required: true, message: "设备地址不能为空", trigger: "blur" }
],
funImp: [
- { required: true, message: "设备编号不能为空", trigger: "blur" }
+ { required: true, message: "功能接口不能为空", trigger: "blur" }
],
deviceName: [
{ required: true, message: "设备名称不能为空", trigger: "blur" }
@@ -333,6 +333,10 @@
this.getList()
},
methods: {
+ handleIpBlur(){
+ const ip=this.baseForm.deviceIp;
+ this.baseForm.funImp="http://"+ip+":8088/externaltask/accessfunction";
+ },
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
diff --git a/src/views/certificate/feedback/index.vue b/src/views/certificate/feedback/index.vue
index 6799826..b5ff8bf 100644
--- a/src/views/certificate/feedback/index.vue
+++ b/src/views/certificate/feedback/index.vue
@@ -4,9 +4,9 @@
-
-
+
出入境时间核验
-
+
邮件通知
- 短信通知
+ 短信通知
@@ -190,19 +190,19 @@
v-model="detailParams.name"
placeholder="请输入姓名"
clearable maxlength="20"
- style="width: 200px"
+ style="width: 200px"
/>
-
+
-
+
-
+
-
+
-
+
搜索
重置
-
-
+
+
{{(detailParams.pageNum - 1) * detailParams.pageSize + scope.$index + 1}}
@@ -233,14 +233,14 @@
- {{scope.row.exitTime||"/"}}
+ {{scope.row.exitTime||"/"}}
- {{scope.row.entryTime||"/"}}
+ {{scope.row.entryTime||"/"}}
-
+
有无证件核验
@@ -261,14 +261,14 @@
已通过
-
+
+ />