This commit is contained in:
jiask 2025-10-27 13:36:43 +08:00
parent b92dcd1297
commit 76f4976192
3 changed files with 150 additions and 17 deletions

View File

@ -154,6 +154,16 @@ export function getReplacelistApi(data) {
params:data params:data
}) })
} }
export function getSysUserListApi(data) {
return request({
url: '/certificate/certificate_returnmanage/certificateAtake/sysUserlist',
method: 'get',
headers: {
//"merchant-id":"378915229716713472",
},
params:data
})
}
export function getDevicelistApi(data) { export function getDevicelistApi(data) {
return request({ return request({
url: '/certificate/certificate_returnmanage/certificateSave/devicelist', url: '/certificate/certificate_returnmanage/certificateSave/devicelist',

View File

@ -143,8 +143,20 @@
<el-dialog :title="title+''" :visible.sync="open" width="700px" append-to-body> <el-dialog :title="title+''" :visible.sync="open" width="700px" append-to-body>
<el-tabs v-model="activeName" @tab-click="handleTabClick"> <el-tabs v-model="activeName" @tab-click="handleTabClick">
<!-- 基础设置 --> <!-- 基础设置 -->
<el-tab-pane label="添加证件" name="baseSetting" style="height: 400px;"> <el-tab-pane label="" name="baseSetting" style="height: 400px;">
<el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px"> <el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px">
<el-row>
<el-col :span="24" v-if="baseForm.deptId !== 0">
<el-form-item label="系统人员" prop="sysuser">
<el-button
type="success"
size="mini"
@click="handleSelect()"
>系统人员
</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="24" v-if="baseForm.deptId !== 0"> <el-col :span="24" v-if="baseForm.deptId !== 0">
<el-form-item label="单位" prop="deptId"> <el-form-item label="单位" prop="deptId">
@ -202,7 +214,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="证件编号" prop="certificateNo"> <el-form-item label="证件编号" prop="certificateNo">
<el-input v-model="baseForm.certificateNo" placeholder="请输入" maxlength="30" clearable/> <el-input v-model="baseForm.certificateNo" :readonly="isReadOnly" placeholder="请输入" maxlength="30" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -243,7 +255,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label-width="120px" label="是否创建账号" prop="isCreate"> <el-form-item v-if="isCreateFlage" label-width="120px" label="是否创建账号" prop="isCreate">
<el-radio-group v-model="baseForm.isCreate" size="small"> <el-radio-group v-model="baseForm.isCreate" size="small">
<el-radio @change="handleRadioChange('1')" label="1"></el-radio> <el-radio @change="handleRadioChange('1')" label="1"></el-radio>
<el-radio @change="handleRadioChange('0')" label="0"></el-radio> <el-radio @change="handleRadioChange('0')" label="0"></el-radio>
@ -263,6 +275,44 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :title="selectUserTitle+''" :visible.sync="openSelectUser" width="700px" append-to-body>
<el-tabs v-model="activeName">
<!-- 基础设置 -->
<el-tab-pane label="" name="baseSetting" style="height: 100px;">
<el-form ref="baseForm2" :model="baseForm2" :rules="baseFormRules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="name">
<el-select
v-model="selectItme"
placeholder="请选择"
filterable
clearable
style="width: 240px"
@change="handleSelectChange"
>
<el-option
v-for="item in allUser"
:key="item.phone"
:label="item.userName"
:value="item.phone"
@click.native="getCorpAndDept(item)"
/>
</el-select>
</el-form-item>
<el-form-item label="手机号码" prop="phone">
<el-input style="width: 240px;background-color:#DAE1EE;" v-model="baseForm2.phone" readonly="true" maxlength="30" clearable/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm2"> </el-button>
<el-button @click="cancel2"> </el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -275,7 +325,8 @@
updateDept, updateDept,
listDeptExcludeChild, listDeptExcludeChild,
} from '@/api/system/dept' } from '@/api/system/dept'
import { getCertificateInfoListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi } from "@/api/certificateManage/index"; import { getCertificateInfoListPageApi,addCertificateInfoApi, updateCertificateInfoApi,
deleteCertificateInfoApi,getSysUserListApi } from "@/api/certificateManage/index";
import base64 from 'base-64'; import base64 from 'base-64';
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { downloadFileByUrl } from '@/utils/download' import { downloadFileByUrl } from '@/utils/download'
@ -306,8 +357,14 @@
// //
open: false, open: false,
checked: false, checked: false,
isCreateFlage:true,
userNameFlage:false, userNameFlage:false,
certificateNos:[], certificateNos:[],
isReadOnly:false,
openSelectUser:false,
selectUserTitle:"",
selectItme:{},
allUser:[],
// //
deptOptions: [], deptOptions: [],
// //
@ -335,8 +392,13 @@
issueLifespan:"0", issueLifespan:"0",
createTime:"", createTime:"",
phone:"", phone:"",
userId:"",
isEle:"" isEle:""
}, },
baseForm2: {
name:"",
phone:""
},
// //
baseFormRules: { baseFormRules: {
deptId: [ deptId: [
@ -346,7 +408,8 @@
{ required: true, message: "姓名不能为空", trigger: "blur" } { required: true, message: "姓名不能为空", trigger: "blur" }
], ],
idNumber: [ idNumber: [
{ required: true, message: "身份证不能为空", trigger: "blur" } { required: true, message: "身份证不能为空", trigger: "blur" },
{ validator: this.validateIDCard, trigger: 'blur' }
], ],
certificateType: [ certificateType: [
{ required: true, message: "证件类型不能为空", trigger: "blur" } { required: true, message: "证件类型不能为空", trigger: "blur" }
@ -358,7 +421,8 @@
{ required: true, message: "签发日期不能为空", trigger: "blur" } { required: true, message: "签发日期不能为空", trigger: "blur" }
], ],
phone: [ phone: [
{ required: true, message: "手机号码不能为空", trigger: "blur" } { required: true, message: "手机号码不能为空", trigger: "blur" },
{ pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
], ],
issueLifespan: [ issueLifespan: [
{ required: true, message: "有效期不能为空", trigger: "blur" } { required: true, message: "有效期不能为空", trigger: "blur" }
@ -386,6 +450,17 @@
}, },
methods: { methods: {
validateIDCard(rule, value, callback) {
// 15
const reg15 = /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$/;
// 18
const reg18 = /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}(\d|X|x)$/;
if (reg15.test(value) || reg18.test(value)) {
callback(); //
} else {
callback(new Error('请输入有效的身份证号')); //
}
},
handleRadioChange(val){ handleRadioChange(val){
if(val==1){ if(val==1){
this.userNameFlage=true; this.userNameFlage=true;
@ -397,7 +472,8 @@
{ required: true, message: "姓名不能为空", trigger: "blur" } { required: true, message: "姓名不能为空", trigger: "blur" }
], ],
idNumber: [ idNumber: [
{ required: true, message: "身份证不能为空", trigger: "blur" } { required: true, message: "身份证不能为空", trigger: "blur" },
{ validator: this.validateIDCard, trigger: 'blur' }
], ],
certificateType: [ certificateType: [
{ required: true, message: "证件类型不能为空", trigger: "blur" } { required: true, message: "证件类型不能为空", trigger: "blur" }
@ -409,7 +485,8 @@
{ required: true, message: "签发日期不能为空", trigger: "blur" } { required: true, message: "签发日期不能为空", trigger: "blur" }
], ],
phone: [ phone: [
{ required: true, message: "手机号码不能为空", trigger: "blur" } { required: true, message: "手机号码不能为空", trigger: "blur" },
{ pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
], ],
issueLifespan: [ issueLifespan: [
{ required: true, message: "有效期不能为空", trigger: "blur" } { required: true, message: "有效期不能为空", trigger: "blur" }
@ -428,7 +505,8 @@
{ required: true, message: "姓名不能为空", trigger: "blur" } { required: true, message: "姓名不能为空", trigger: "blur" }
], ],
idNumber: [ idNumber: [
{ required: true, message: "身份证不能为空", trigger: "blur" } { required: true, message: "身份证不能为空", trigger: "blur" },
{ validator: this.validateIDCard, trigger: 'blur' }
], ],
certificateType: [ certificateType: [
{ required: true, message: "证件类型不能为空", trigger: "blur" } { required: true, message: "证件类型不能为空", trigger: "blur" }
@ -440,7 +518,8 @@
{ required: true, message: "签发日期不能为空", trigger: "blur" } { required: true, message: "签发日期不能为空", trigger: "blur" }
], ],
phone: [ phone: [
{ required: true, message: "手机号码不能为空", trigger: "blur" } { required: true, message: "手机号码不能为空", trigger: "blur" },
{ pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
], ],
issueLifespan: [ issueLifespan: [
{ required: true, message: "有效期不能为空", trigger: "blur" } { required: true, message: "有效期不能为空", trigger: "blur" }
@ -477,11 +556,6 @@
this.loading = false; this.loading = false;
}); });
}, },
//
cancel() {
this.open = false;
this.reset();
},
// //
reset() { reset() {
this.baseForm = { this.baseForm = {
@ -504,6 +578,7 @@
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.isReadOnly=false;
this.title = "新增"; this.title = "新增";
listDept().then((response) => { listDept().then((response) => {
this.deptOptions = this.handleTree(response.data, 'deptId') this.deptOptions = this.handleTree(response.data, 'deptId')
@ -532,8 +607,11 @@
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
this.open = true; this.open = true;
this.isReadOnly=true;
this.baseForm = Object.assign({}, row) this.baseForm = Object.assign({}, row)
// this.$set(this,"metadata",row.deviceMetadata) listDept().then((response) => {
this.deptOptions = this.handleTree(response.data, 'deptId')
})
this.title = "修改"; this.title = "修改";
}, },
handleTabClick(tab, event) { handleTabClick(tab, event) {
@ -560,6 +638,49 @@
} }
}); });
}, },
//
cancel() {
this.open = false;
this.reset();
},
handleSelect(){
this.openSelectUser = true;
this.selectUserTitle = "选择系统人员";
getSysUserListApi({}).then(response => {
console.log("response",response);
this.allUser=response;
});
},
handleSelectChange() {
console.log('Selected item:', this.selectItme);
this.baseForm2.phone=this.selectItme.phone;
this.baseForm2.name=this.selectItme.userName;
//
},
getCorpAndDept(val){
console.log("getCorpAndDept",val)
this.selectItme=val;
this.baseForm2.phone=this.selectItme.phone;
this.baseForm2.name=this.selectItme.userName;
this.baseForm.userId=this.selectItme.userId;
},
/** 提交按钮 */
submitForm2: function() {
console.log("this.baseForm2",this.baseForm2);
this.$refs["baseForm2"].validate(valid => {
if (valid) {
this.baseForm.phone=this.selectItme.phone;
this.baseForm.name=this.selectItme.userName;
this.baseForm.deptId=this.selectItme.deptId;
this.openSelectUser = false;
this.isCreateFlage=false;
}
});
},
//
cancel2() {
this.openSelectUser = false;
},
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
var certificateNoRow=""; var certificateNoRow="";
@ -588,7 +709,7 @@
handleExport() { handleExport() {
this.download('certificate/certificate_manage/certificateInfo/export', { this.download('certificate/certificate_manage/certificateInfo/export', {
...this.queryParams ...this.queryParams
}, `证件信息_${new Date().getTime()}.xlsx`) }, `证件信息_${new Date().getTime()}.xlsx`);
}, },
// //
handleFileUploadProgress(event, file, fileList) { handleFileUploadProgress(event, file, fileList) {

View File

@ -69,6 +69,8 @@
<el-table-column label="签发日期" align="center" prop="issueDay" :show-overflow-tooltip="true" width="180"/> <el-table-column label="签发日期" align="center" prop="issueDay" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="有效期至" align="center" prop="issueLifespan" :show-overflow-tooltip="true" width="180"/> <el-table-column label="有效期至" align="center" prop="issueLifespan" :show-overflow-tooltip="true" width="180"/>
<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="deviceAddr" :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="soltNo" :show-overflow-tooltip="true"/>
<el-table-column label="验证码" align="center" prop="verificationCode" :show-overflow-tooltip="true"/> <el-table-column label="验证码" align="center" prop="verificationCode" :show-overflow-tooltip="true"/>