diff --git a/public/template/导入菜谱模板.xlsx b/public/template/导入菜谱模板.xlsx deleted file mode 100644 index ee7c7b1..0000000 Binary files a/public/template/导入菜谱模板.xlsx and /dev/null differ diff --git a/public/template/批量新增原料模板.xlsx b/public/template/批量新增原料模板.xlsx deleted file mode 100644 index 2fb67d8..0000000 Binary files a/public/template/批量新增原料模板.xlsx and /dev/null differ diff --git a/public/template/批量新增商品模板.xlsx b/public/template/批量新增商品模板.xlsx deleted file mode 100644 index 79d4b53..0000000 Binary files a/public/template/批量新增商品模板.xlsx and /dev/null differ diff --git a/public/template/批量新增菜品模板.xlsx b/public/template/批量新增菜品模板.xlsx deleted file mode 100644 index 242631f..0000000 Binary files a/public/template/批量新增菜品模板.xlsx and /dev/null differ diff --git a/public/template/证件信息模板.xlsx b/public/template/证件信息模板.xlsx new file mode 100644 index 0000000..9f4a8e5 Binary files /dev/null and b/public/template/证件信息模板.xlsx differ diff --git a/src/api/certificateManage/index.js b/src/api/certificateManage/index.js index 8165a6e..80159a0 100644 --- a/src/api/certificateManage/index.js +++ b/src/api/certificateManage/index.js @@ -131,3 +131,14 @@ export function getCertificateTakeAddPageApi(data) { data: data }) } + +export function getReplacelistApi(data) { + return request({ + url: '/certificate/certificate_returnmanage/certificateAtake/replacelist', + method: 'get', + headers: { + //"merchant-id":"378915229716713472", + }, + params:data + }) +} diff --git a/src/views/certificate/certificateManage/certificateInfo/index.vue b/src/views/certificate/certificateManage/certificateInfo/index.vue index 0853319..308d054 100644 --- a/src/views/certificate/certificateManage/certificateInfo/index.vue +++ b/src/views/certificate/certificateManage/certificateInfo/index.vue @@ -93,6 +93,7 @@ + @@ -106,12 +107,12 @@ @@ -249,6 +269,7 @@ import { getCertificateInfoListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi } from "@/api/certificateManage/index"; import base64 from 'base-64'; import { getToken } from '@/utils/auth' + import { downloadFileByUrl } from '@/utils/download' import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' export default { @@ -276,6 +297,7 @@ // 是否显示弹出层 open: false, checked: false, + userNameFlage:false, certificateNos:[], // 部门树选项 deptOptions: [], @@ -302,6 +324,8 @@ issueAddr:"", issueDay:"", issueLifespan:"0", + createTime:"", + phone:"", isEle:"" }, // 表单校验 @@ -324,6 +348,9 @@ issueDay: [ { required: true, message: "签发日期不能为空", trigger: "blur" } ], + phone: [ + { required: true, message: "手机号码不能为空", trigger: "blur" } + ], issueLifespan: [ { required: true, message: "有效期不能为空", trigger: "blur" } ] @@ -342,23 +369,6 @@ // 上传的地址 url: process.env.VUE_APP_BASE_API + '/certificate/certificate_manage/certificateInfo/import', }, - appFormRules:{ - version: [ - { required: true, message: "版本号不能为空", trigger: "blur" } - ], - versionName: [ - { required: true, message: "版本号名称不能为空", trigger: "blur" } - ], - apkName: [ - { required: true, message: "APP名称不能为空", trigger: "blur" } - ], - apkPath: [ - { required: true, message: "APP路径不能为空", trigger: "blur" } - ], - updateContent: [ - { required: true, message: "更新内容不能为空", trigger: "blur" } - ] - }, }; }, mounted(){ @@ -367,6 +377,68 @@ }, methods: { + handleRadioChange(val){ + if(val==1){ + this.userNameFlage=true; + this.baseFormRules= { + deptId: [ + { required: true, message: "部门不能为空", trigger: "blur" } + ], + name: [ + { required: true, message: "姓名不能为空", trigger: "blur" } + ], + idNumber: [ + { required: true, message: "身份证不能为空", trigger: "blur" } + ], + certificateType: [ + { required: true, message: "证件类型不能为空", trigger: "blur" } + ], + certificateNo: [ + { required: true, message: "证件编号不能为空", trigger: "blur" } + ], + issueDay: [ + { required: true, message: "签发日期不能为空", trigger: "blur" } + ], + phone: [ + { required: true, message: "手机号码不能为空", trigger: "blur" } + ], + issueLifespan: [ + { required: true, message: "有效期不能为空", trigger: "blur" } + ], + userName: [ + { required: true, message: "用户名不能为空", trigger: "blur" } + ] + } + }else{ + this.userNameFlage=false; + this.baseFormRules= { + deptId: [ + { required: true, message: "部门不能为空", trigger: "blur" } + ], + name: [ + { required: true, message: "姓名不能为空", trigger: "blur" } + ], + idNumber: [ + { required: true, message: "身份证不能为空", trigger: "blur" } + ], + certificateType: [ + { required: true, message: "证件类型不能为空", trigger: "blur" } + ], + certificateNo: [ + { required: true, message: "证件编号不能为空", trigger: "blur" } + ], + issueDay: [ + { required: true, message: "签发日期不能为空", trigger: "blur" } + ], + phone: [ + { required: true, message: "手机号码不能为空", trigger: "blur" } + ], + issueLifespan: [ + { required: true, message: "有效期不能为空", trigger: "blur" } + ] + } + } + }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; @@ -415,7 +487,7 @@ issueAddr:"", issueDay:"", issueLifespan:"", - isEle:"0" + isEle:"0",isCreate:"0" }; this.resetForm("baseForm"); }, @@ -463,7 +535,7 @@ console.log("this.baseForm",this.baseForm); this.$refs["baseForm"].validate(valid => { if (valid) { - if (this.baseForm.certificateNo != undefined) { + if (this.baseForm.createTime != undefined) { updateCertificateInfoApi(this.baseForm).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; @@ -487,14 +559,13 @@ } const certificateNos = certificateNoRow || this.certificateNos; console.log("certificateNos",certificateNos); - this.$modal.confirm('是否确认删除数据项？').then(function() { + this.$modal.confirm('是否确认删除数据项？').then(() => { deleteCertificateInfoApi({certificateNos:certificateNos}).then(response => { console.log("deleteCertificateInfoApi",response); + this.getList(); + this.$modal.msgSuccess("删除成功"); + return; }); - return; - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); }).catch(() => {}); }, formatDate(date) { @@ -558,9 +629,4 @@ width: 100%; font-size: 14px !important; } - - - - - diff --git a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue index 24dde7d..a3373e5 100644 --- a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue +++ b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue @@ -42,7 +42,7 @@ icon="el-icon-download" size="mini" @click="handleAdd(3)" - >自主取证 + >自助取证 - + - - + + + + + - + - - - + @@ -137,7 +151,8 @@ updateDept, listDeptExcludeChild, } from '@/api/system/dept' - import { getCertificateAtakeListPageApi,addCertificateInfoApi, updateCertificateInfoApi, deleteCertificateInfoApi,getCertificateTakeAddPageApi } from "@/api/certificateManage/index"; + import { getCertificateAtakeListPageApi,addCertificateInfoApi, updateCertificateInfoApi, + deleteCertificateInfoApi,getCertificateTakeAddPageApi,getReplacelistApi } from "@/api/certificateManage/index"; import base64 from 'base-64'; import { getToken } from '@/utils/auth' import Treeselect from '@riophae/vue-treeselect' @@ -160,6 +175,7 @@ showSearch: true, // 总条数 total: 0, + allreplace:[], //表格数据 tableListData: [], // 弹出层标题 @@ -167,6 +183,10 @@ // 是否显示弹出层 open: false, checked: false, + selectName:"", + selectIdNumber:"", + selectCertificateNos:"", + selectType:"", // 部门树选项 deptOptions: [], // 查询参数 @@ -196,27 +216,11 @@ }, // 表单校验 baseFormRules: { - deptId: [ - { required: true, message: "部门不能为空", trigger: "blur" } - ], + name: [ { required: true, message: "姓名不能为空", trigger: "blur" } ], - idNumber: [ - { required: true, message: "身份证不能为空", trigger: "blur" } - ], - certificateType: [ - { required: true, message: "证件类型不能为空", trigger: "blur" } - ], - certificateNo: [ - { required: true, message: "证件编号不能为空", trigger: "blur" } - ], - issueDay: [ - { required: true, message: "签发日期不能为空", trigger: "blur" } - ], - issueLifespan: [ - { required: true, message: "有效期不能为空", trigger: "blur" } - ] + }, logTableData:[],//异常弹窗 // 总条数 @@ -232,30 +236,12 @@ // 上传的地址 url: process.env.VUE_APP_BASE_API + '/file/upload', }, - appFormRules:{ - version: [ - { required: true, message: "版本号不能为空", trigger: "blur" } - ], - versionName: [ - { required: true, message: "版本号名称不能为空", trigger: "blur" } - ], - apkName: [ - { required: true, message: "APP名称不能为空", trigger: "blur" } - ], - apkPath: [ - { required: true, message: "APP路径不能为空", trigger: "blur" } - ], - updateContent: [ - { required: true, message: "更新内容不能为空", trigger: "blur" } - ] - }, }; }, mounted(){ this.getList(); }, - methods: { /** 搜索按钮操作 */ handleQuery() { @@ -278,8 +264,6 @@ "certificateNo":this.queryParams.certificateNo } console.log("param",param) - // let str = base64.encode(JSON.stringify(param)) - // console.log({"content":str}) getCertificateAtakeListPageApi(param).then(response => { this.tableListData = response.rows; this.total = Number(response.total); @@ -309,6 +293,16 @@ }; this.resetForm("baseForm"); }, + handleSelectChange(value) { + console.log('Selected value:', value); + this.baseForm.idNumber=value; + // 这里可以执行其他逻辑 + }, + getCorpAndDept(val){ + console.log("getCorpAndDept",val) + this.selectName=val.name; + this.selectIdNumber=val.idNumber; + }, /** 取证按钮操作 */ handleAdd(type) { console.log("type",type); @@ -319,9 +313,9 @@ this.$modal.msgError("请选择证件"); return; } - var titlemsg="是否确定自主取证？" + var titlemsg="是否确定自助取证？" if(type==3){ - titlemsg="是否确定自主取证？" + titlemsg="是否确定自助取证？" }else if(type==4){ titlemsg="是否确定管理员取证？" }else if(type==5){ @@ -329,12 +323,37 @@ }else if(type==6){ titlemsg="是否确定代人取证？" } - this.$modal.confirm(titlemsg).then(() => { - getCertificateTakeAddPageApi({"certificateNos":CertificateNos,"type":type}).then(response => { - this.getList(); - this.$modal.msgSuccess("操作成功"); - }); - }).catch(() => {}); + if(type==6){ + this.open = true; + this.title = "代人取证"; + this.selectCertificateNos=CertificateNos; + this.selectType=type; + getReplacelistApi({}).then(response => { + console.log("response",response); + this.allreplace=response; + }); + }else{ + this.$modal.confirm(titlemsg).then(() => { + getCertificateTakeAddPageApi({"certificateNos":CertificateNos,"type":type,"idNumber":"","name":""}).then(response => { + this.getList(); + this.$modal.msgSuccess("操作成功"); + }); + }).catch(() => {}); + } + }, + submitForm: function() { + console.log("this.baseForm",this.baseForm); + getCertificateTakeAddPageApi({"certificateNos":this.selectCertificateNos,"type":this.selectType,"idNumber":this.selectIdNumber,"name":this.selectName}).then(response => { + this.getList(); + this.open = false; + this.reset(); + this.$modal.msgSuccess("操作成功"); + }); + }, + // 取消按钮 + cancel() { + this.open = false; + this.reset(); }, formatDate(date) { // 格式化为 YYYY-MM-DD diff --git a/src/views/certificate/certificateReturnManage/certificateSave/index.vue b/src/views/certificate/certificateReturnManage/certificateSave/index.vue index f9782c5..149f2a2 100644 --- a/src/views/certificate/certificateReturnManage/certificateSave/index.vue +++ b/src/views/certificate/certificateReturnManage/certificateSave/index.vue @@ -42,7 +42,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - >自主存证 + >自助存证 - - + + +