From f930a80d794529ea3b45ddfbdbe58c47e76cbfd6 Mon Sep 17 00:00:00 2001 From: shidongli Date: Thu, 28 Mar 2024 09:31:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/message/index.vue | 22 +++++++-------- src/views/manage/script/index.vue | 42 ++++++++++++++++------------- src/views/manage/template/index.vue | 16 +++++------ 3 files changed, 42 insertions(+), 38 deletions(-) diff --git a/src/views/manage/message/index.vue b/src/views/manage/message/index.vue index 9c71ff5..88ca6df 100644 --- a/src/views/manage/message/index.vue +++ b/src/views/manage/message/index.vue @@ -143,7 +143,7 @@ > - + - + @@ -255,7 +255,7 @@ - - + + @@ -239,8 +238,8 @@ /> - - + + - - - + + + + { this.DepartmentoList = response.data; - //定义 + //定义 let sum = 0; this.DepartmentoList.forEach((item) => { if (item.countNum != null) { @@ -1050,6 +1051,9 @@ export default { ::v-deep .el-input-number .el-input__inner{ text-align: left; } +::v-deep .el-textarea__inner{ + width: 206px; +} .leftscript { // width: 30%; height: 850px; diff --git a/src/views/manage/template/index.vue b/src/views/manage/template/index.vue index f3d07e3..98360fa 100644 --- a/src/views/manage/template/index.vue +++ b/src/views/manage/template/index.vue @@ -179,7 +179,7 @@ - + - + @@ -206,7 +206,7 @@ - - {{ formdetail.diseaseTypeName }} + {{ + formdetail.diseaseTypeName + }} {{ formdetail.packagePrice }}元 -
+
- {{ formdetail.packageTermAndUnit }} + {{ + formdetail.packageTermAndUnit + }} {{ @@ -807,25 +801,25 @@ export default { // 服务内容 optionscontent: { - '0':[], - '1':[], - '2':[], - '3':[], - '4':[], + '0': [], + '1': [], + '2': [], + '3': [], + '4': [], }, // 服务频次 - optionsfrequency:{ - '0':[], - '1':[], - '2':[], - '3':[], - '4':[], + optionsfrequency: { + '0': [], + '1': [], + '2': [], + '3': [], + '4': [], }, // optionsfrequency: [ - // { - // value: '', - // label: '' - // } + // { + // value: '', + // label: '' + // } // ], optionstype: [{ @@ -893,7 +887,7 @@ export default { hardwareType: null, whetherRelease: null, }, - + // 表单参数 form: {}, formdetail: {}, @@ -947,7 +941,7 @@ export default { }, }, - serviceWayId:'', + serviceWayId: '', }; }, @@ -1027,38 +1021,38 @@ export default { // console.log(this.optionscontent) var optionscontentPlus = [] this.optionscontent[index] = [] - for(var i = 0;i<5;i++){ - if(this.optionscontent[i] != []){ + for (var i = 0; i < 5; i++) { + if (this.optionscontent[i] != []) { optionscontentPlus.push(this.optionscontent[i]) } } // console.log(optionscontentPlus,'打印optionscontentPlus') // console.log(this.optionscontent,'optionscontent') this.optionscontent = { - '0':[], - '1':[], - '2':[], - '3':[], - '4':[], + '0': [], + '1': [], + '2': [], + '3': [], + '4': [], } - for(var j = 0 ; j f.serviceWayName == e).id serviccontent(this.serviceWayId).then(response => { this.optionscontent[index] = response.rows; }); - this.form.voList[index].serviceContent = null - this.form.voList[index].serviceFrequencyText = null + this.form.voList[index].serviceContent = null + this.form.voList[index].serviceFrequencyText = null }, // 服务内容点击事件 - changcontent(e,index) { + changcontent(e, index) { var id = null this.form.voList[index].serviceFrequencyText = null id = this.optionscontent[index].find(f => f.serviceContent == e).id @@ -1113,7 +1107,7 @@ export default { this.optionsfrequency[index].forEach(el => { if (el.serviceFrequencyType == "DIGIT") { el.serviceFrequencyText = el.serviceFrequencyStart + '~' + el.serviceFrequencyEnd - } + } else if (el.serviceFrequencyType == "serviceFrequencyType") { this.optionsfrequency[index] = this.optionscontent[index].find(f => f.id == e).serviceWayFrequencyList } @@ -1260,27 +1254,27 @@ export default { // this.optionscontent = [], this.optionscontent = { - '0':[], - '1':[], - '2':[], - '3':[], - '4':[], - }, - this.optionsfrequency={ - '0':[], - '1':[], - '2':[], - '3':[], - '4':[], - } - // 服务频次 - // this.optionsfrequency = [ - // { - // value: '', - // label: '' - // } - // ], - this.resetForm("form"); + '0': [], + '1': [], + '2': [], + '3': [], + '4': [], + }, + this.optionsfrequency = { + '0': [], + '1': [], + '2': [], + '3': [], + '4': [], + } + // 服务频次 + // this.optionsfrequency = [ + // { + // value: '', + // label: '' + // } + // ], + this.resetForm("form"); }, /** 搜索按钮操作 */ handleQuery() { @@ -1308,7 +1302,7 @@ export default { { serviceWayName: null, serviceContent: null, - serviceFrequencyText:null, + serviceFrequencyText: null, serviceFrequencyStart: null, serviceFrequencyEnd: null, idd: this.idd, @@ -1415,51 +1409,63 @@ export default { // return this.$refs["form"].validate(valid => { if (valid) { - if (this.form.voList) { - var obj = JSON.parse(JSON.stringify(this.form)) - obj.voList.forEach(e => { - if (e.serviceFrequencyText.includes('~')) { - const str = e.serviceFrequencyText; - const parts = str.split('~'); - e.serviceFrequencyStart = parts[0]; - e.serviceFrequencyEnd = parts[1]; - e.serviceFrequencyText = null - } else { - e.serviceFrequencyText = e.serviceFrequencyText - } - - if (this.form.id != null) { - this.form.departmentName = this.departmentName - this.form.diseaseTypeName = this.diseaseTypeName - updateServicepackage(obj).then(response => { - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.getList(); - }); + if (this.form.id != null) { + this.form.departmentName = this.departmentName + this.form.diseaseTypeName = this.diseaseTypeName + if (this.form.voList) { + var obj = JSON.parse(JSON.stringify(this.form)) + obj.voList.forEach(e => { + if (e.serviceFrequencyText.includes('~')) { + const str = e.serviceFrequencyText; + const parts = str.split('~'); + e.serviceFrequencyStart = parts[0]; + e.serviceFrequencyEnd = parts[1]; + e.serviceFrequencyText = null + } else { + e.serviceFrequencyText = e.serviceFrequencyText + } + }) + updateServicepackage(obj).then(response => { + this.$modal.msgSuccess("修改成功"); + this.open = false; + this.getList(); + }); + } + } else { + + if (this.diseaseTypeName == "请选择病种") { + this.form.diseaseTypeName == null } else { - - if (this.diseaseTypeName == "请选择病种") { - this.form.diseaseTypeName == null - } else { - this.form.diseaseTypeName = this.diseaseTypeName - } - if (this.itemname) { - this.form.departmentName = this.departmentName - this.form.departmentId = this.itemname - - } else { - this.form.departmentName = this.departmentName - - } - addServicepackage(obj).then(response => { - this.$modal.msgSuccess("新增成功"); - this.open = false; - this.getList(); - this.Departmentlist() - }); - + this.form.diseaseTypeName = this.diseaseTypeName } - }) + if (this.itemname) { + this.form.departmentName = this.departmentName + this.form.departmentId = this.itemname + + } else { + this.form.departmentName = this.departmentName + } + if (this.form.voList) { + var obj = JSON.parse(JSON.stringify(this.form)) + obj.voList.forEach(e => { + if (e.serviceFrequencyText.includes('~')) { + const str = e.serviceFrequencyText; + const parts = str.split('~'); + e.serviceFrequencyStart = parts[0]; + e.serviceFrequencyEnd = parts[1]; + e.serviceFrequencyText = null + } else { + e.serviceFrequencyText = e.serviceFrequencyText + } + }) + addServicepackage(obj).then(response => { + this.$modal.msgSuccess("新增成功"); + this.open = false; + this.getList(); + this.Departmentlist() + }); + + } } } }); From 0ad9f8254e0ea0e71579dbb995154391a82969e0 Mon Sep 17 00:00:00 2001 From: shidongli Date: Thu, 28 Mar 2024 10:34:34 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/blacklist/index.vue | 2 +- src/views/manage/preHospitalized/index.vue | 30 +++++++++++++++++++--- src/views/manage/visitin/index.vue | 30 +++++++++++++++++++--- src/views/manage/visitout/index.vue | 30 +++++++++++++++++++--- 4 files changed, 79 insertions(+), 13 deletions(-) diff --git a/src/views/manage/blacklist/index.vue b/src/views/manage/blacklist/index.vue index c61941f..43a1fd3 100644 --- a/src/views/manage/blacklist/index.vue +++ b/src/views/manage/blacklist/index.vue @@ -262,7 +262,7 @@ export default { { required: true, message: '请输入患者手机号', trigger: 'change' }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, - message: "请输入正确的手机码", + message: "请输入正确的手机号", trigger: "blur" } ], diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue index aba5107..c85e88f 100644 --- a/src/views/manage/preHospitalized/index.vue +++ b/src/views/manage/preHospitalized/index.vue @@ -195,10 +195,10 @@ - + - + - + @@ -462,11 +462,33 @@ export default { form: {}, // 表单校验 rules: { + cardNo:[ + { required: false, message: '', trigger: 'change' }, + { + pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, + message: "身份证号格式有误！", + trigger: "blur" + } + ], patientName: [ { required: true, message: '请输入患者姓名', trigger: 'change' } ], patientPhone: [ - { required: true, message: '请输入患者手机号', trigger: 'change' } + { required: true, message: '请输入患者手机号', trigger: 'change' }, + { + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + message: "请输入正确的手机号", + trigger: "blur" + } + ], + familyMemberPhone:[ + { required: false, message: '', trigger: 'change' }, + { + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + message: "请输入正确的手机号", + trigger: "blur" + } + ], appointmentDate: [ { required: true, message: '请选择患者预约时间', trigger: 'change' } diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue index f76ac8f..2df235f 100644 --- a/src/views/manage/visitin/index.vue +++ b/src/views/manage/visitin/index.vue @@ -201,10 +201,10 @@ - + - + - + @@ -469,11 +469,33 @@ export default { form: {}, // 表单校验 rules: { + cardNo:[ + { required: false, message: '', trigger: 'change' }, + { + pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, + message: "身份证号格式有误！", + trigger: "blur" + } + ], + familyMemberPhone:[ + { required: false, message: '', trigger: 'change' }, + { + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + message: "请输入正确的手机号", + trigger: "blur" + } + + ], patientName: [ { required: true, message: '请输入患者姓名', trigger: 'change' } ], patientPhone: [ - { required: true, message: '请输入患者手机号', trigger: 'change' } + { required: true, message: '请输入患者手机号', trigger: 'change' }, + { + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + message: "请输入正确的手机号", + trigger: "blur" + } ], visitMethod: [ { required: true, message: '请输入就诊方式', trigger: 'change' } diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue index e0831d8..2df0287 100644 --- a/src/views/manage/visitout/index.vue +++ b/src/views/manage/visitout/index.vue @@ -203,10 +203,10 @@ - + - + - + @@ -494,11 +494,33 @@ export default { form: {}, // 表单校验 rules: { + cardNo:[ + { required: false, message: '', trigger: 'change' }, + { + pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, + message: "身份证号格式有误！", + trigger: "blur" + } + ], + familyMemberPhone:[ + { required: false, message: '', trigger: 'change' }, + { + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + message: "请输入正确的手机号", + trigger: "blur" + } + + ], patientName: [ { required: true, message: '请输入患者姓名', trigger: 'change' } ], patientPhone: [ - { required: true, message: '请输入患者手机号', trigger: 'change' } + { required: true, message: '请输入患者手机号', trigger: 'change' }, + { + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + message: "请输入正确的手机号", + trigger: "blur" + } ], visitMethod: [ { required: true, message: '请输入就诊方式', trigger: 'change' } From 5eddbf30eaf7f5b8b328592c9533690ea4f61da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Thu, 28 Mar 2024 10:35:04 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=92=8C=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/taskExecuteRecord.js | 50 ++ src/views/manage/patientInfo/index.vue | 1 + src/views/manage/projectdevice/index.vue | 115 +--- src/views/system/agency/index.vue | 70 +- src/views/system/department/index.vue | 14 + src/views/system/record/record.vue | 409 +++++++++++ src/views/system/taskExecuteRecord/index.vue | 675 +++++++++++++++++++ src/views/system/user/index.vue | 22 +- 8 files changed, 1226 insertions(+), 130 deletions(-) create mode 100644 src/api/system/taskExecuteRecord.js create mode 100644 src/views/system/record/record.vue create mode 100644 src/views/system/taskExecuteRecord/index.vue diff --git a/src/api/system/taskExecuteRecord.js b/src/api/system/taskExecuteRecord.js new file mode 100644 index 0000000..aaa3bbb --- /dev/null +++ b/src/api/system/taskExecuteRecord.js @@ -0,0 +1,50 @@ +import request from '@/utils/request' + +// 查询患者管理任务执行记录列表 +export function listTaskExecuteRecord(query) { + return request({ + url: '/system/taskExecuteRecord/list', + method: 'get', + params: query + }) +} +// 查询患者管理任务执行记录详细 +export function getTaskExecuteRecord(id) { + return request({ + url: '/system/taskExecuteRecord/' + id, + method: 'get' + }) +} + +// 新增患者管理任务执行记录 +export function addTaskExecuteRecord(data) { + return request({ + url: '/system/taskExecuteRecord', + method: 'post', + data: data + }) +} + +// 修改患者管理任务执行记录 +export function updateTaskExecuteRecord(data) { + return request({ + url: '/system/taskExecuteRecord', + method: 'put', + data: data + }) +} + +// 删除患者管理任务执行记录 +export function delTaskExecuteRecord(id) { + return request({ + url: '/system/taskExecuteRecord/' + id, + method: 'delete' + }) +} +// 入院记录 +export function selectVisitRecord(id) { + return request({ + url: `/system/taskExecuteRecord/selectVisitRecord?id=${id}` , + method: 'get' + }) +} diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue index ec1dbe5..68dc563 100644 --- a/src/views/manage/patientInfo/index.vue +++ b/src/views/manage/patientInfo/index.vue @@ -231,6 +231,7 @@ export default { }, /** 详情操作 */ handleAuthRole(row) { + this.$router.push({ path: "/patient/patientdetails", query: { diff --git a/src/views/manage/projectdevice/index.vue b/src/views/manage/projectdevice/index.vue index 75bc0e3..829917c 100644 --- a/src/views/manage/projectdevice/index.vue +++ b/src/views/manage/projectdevice/index.vue @@ -8,14 +8,6 @@ v-show="showSearch" label-width="68px" > - - - - @@ -195,17 +153,7 @@ {{ parseTime(scope.row.deviceBindTime, "{y}-{m}-{d}") }} - + - + @@ -309,28 +261,7 @@ - - + @@ -455,22 +386,6 @@ import { getAgencytype } from "@/api/system/agency"; export default { name: "Projectdevice", data() { - //验证身份证 - var isCardId = (rule, value, callback) => { - console.log(value) - if (value==null) { - callback(new Error("身份证号不能为空！")); - } else { - const reg = - /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/; - const card = reg.test(value); - if (!card) { - callback(new Error("身份证号格式有误！")); - } else { - callback(); - } - } - }; return { options: [], // 遮罩层 @@ -498,6 +413,9 @@ export default { pageSize: 10, // patientId: null, patientName: null, + cardNo: null, + deviceType: null, + deviceCode: null, }, queryParams: { pageNum: 1, @@ -525,7 +443,13 @@ export default { { required: true, message: "患者不能为空", trigger: "blur" }, ], cardNo: [ - { required: true, message: "", validator: isCardId, trigger: "blur" }, + { + required: true, + message: "请输入正确的身份证号", + trigger: "blur", + pattern: + /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, + }, ], deviceCode: [ { required: true, message: "设备编码不能为空", trigger: "blur" }, @@ -552,6 +476,11 @@ export default { this.informationqueryParams = { pageNum: 1, pageSize: 10, + patientName: null, + patientName: null, + cardNo: null, + deviceType: null, + deviceCode: null, }; this.informationInfoinfo(); }, diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue index 67d5be1..c52dd56 100644 --- a/src/views/system/agency/index.vue +++ b/src/views/system/agency/index.vue @@ -94,7 +94,9 @@ {{ agencyList.agencyName }} - {{ agencyList.agencyRemark }} + {{ + agencyList.agencyRemark + }} {{ agencyList.agencyStatus == "ON" ? "启用" : "" }} {{ @@ -131,23 +133,25 @@ {{ agencyList.agencyCategoryName }} - {{ - agencyList.agencyCategoryManageLevel == - "NON_PROFIT_MEDICAL_AGENCY" - ? "非营利性医疗机构" - : "" - }} - {{ - agencyList.agencyCategoryManageLevel == - "FOR_PROFIT_MEDICAL_AGENCY" - ? "营利性医疗机构" - : "" - }} - {{ - agencyList.agencyCategoryManageLevel == "OTHER_HEALTH_AGENCY" - ? "其他卫生机构" - : "" - }} + + {{ + agencyList.agencyCategoryManageLevel == + "NON_PROFIT_MEDICAL_AGENCY" + ? "非营利性医疗机构" + : "" + }} + {{ + agencyList.agencyCategoryManageLevel == + "FOR_PROFIT_MEDICAL_AGENCY" + ? "营利性医疗机构" + : "" + }} + {{ + agencyList.agencyCategoryManageLevel == "OTHER_HEALTH_AGENCY" + ? "其他卫生机构" + : "" + }} {{ agencyList.areaName }} @@ -467,7 +471,7 @@ @@ -719,6 +723,13 @@ export default { areaCode: [ { required: true, message: "行政区划不能为空", trigger: "blur" }, ], + agencyPhone: [ + { + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + message: "请输入正确的手机码", + trigger: "blur", + }, + ], }, treeOptionsagencyCategoryId: [], treeOptions: [], @@ -1114,20 +1125,19 @@ export default { diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue index 23d7154..6a8502d 100644 --- a/src/views/system/department/index.vue +++ b/src/views/system/department/index.vue @@ -724,6 +724,20 @@ export default { departmentName: [ { required: true, message: "科室名称不能为空", trigger: "blur" }, ], + departmentPhone: [ + { + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + message: "请输入正确的手机码", + trigger: "blur", + }, + ], + departmentMail: [ + { + type: "email", + message: "请输入正确的邮箱地址", + trigger: ["blur", "change"] + } + ], }, }; }, diff --git a/src/views/system/record/record.vue b/src/views/system/record/record.vue new file mode 100644 index 0000000..2264fb8 --- /dev/null +++ b/src/views/system/record/record.vue @@ -0,0 +1,409 @@ + + + + + \ No newline at end of file diff --git a/src/views/system/taskExecuteRecord/index.vue b/src/views/system/taskExecuteRecord/index.vue new file mode 100644 index 0000000..f5fc938 --- /dev/null +++ b/src/views/system/taskExecuteRecord/index.vue @@ -0,0 +1,675 @@ + + + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 7fd519d..1253719 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -356,9 +356,10 @@ @@ -399,8 +400,9 @@ @@ -1024,6 +1026,14 @@ export default { trigger: "blur", }, ], + userCardNo: [ + { + pattern: + /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, + message: "请输入正确的身份证号", + trigger: "blur", + }, + ], email: [ { type: "email", @@ -1063,9 +1073,8 @@ export default { this.$refs.multipleTabledep.toggleRowSelection(selection.pop()); // 设置选择项 } this.nowSelectDatadep = selection; - if(selection.length>0){ + if (selection.length > 0) { this.formlistdep.departmentId = selection[0].departmentId; - } }, // // 科室右边选中事件 @@ -1089,7 +1098,7 @@ export default { }, // 机构左边选中事件 handleSelectionChangenleft(selection) { - console.log(selection,'55555555') + console.log(selection, "55555555"); this.$nextTick(() => { if (selection.length > 1) { this.$refs.multipleTable.clearSelection(); // 清空所有选择 @@ -1097,10 +1106,9 @@ export default { } }); this.nowSelectData = selection; - if(selection.length>0){ + if (selection.length > 0) { this.formlist.agencyId = selection[0].agencyId; } - }, // 机构右边选中事件 From 02911e02552c5edbb86b48dbd95a9346346ba1a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Thu, 28 Mar 2024 11:13:27 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/agency/index.vue | 18 ++++++++++++------ src/views/system/department/index.vue | 21 ++++++++++++++------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue index c52dd56..fa71665 100644 --- a/src/views/system/agency/index.vue +++ b/src/views/system/agency/index.vue @@ -318,7 +318,7 @@ > { this.citylist = res.data; @@ -936,7 +939,10 @@ export default { } }, changeagencyCategoryId(e) { - this.form.agencyCategoryId = e[e.length - 1]; + if(e){ + this.form.agencyCategoryId = e[e.length - 1]; + + } }, // // 节点单击事件 // handleNodeClick(data) { diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue index 6a8502d..967c793 100644 --- a/src/views/system/department/index.vue +++ b/src/views/system/department/index.vue @@ -727,7 +727,7 @@ export default { departmentPhone: [ { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, - message: "请输入正确的手机码", + message: "请输入正确的科室电话", trigger: "blur", }, ], @@ -735,8 +735,8 @@ export default { { type: "email", message: "请输入正确的邮箱地址", - trigger: ["blur", "change"] - } + trigger: ["blur", "change"], + }, ], }, }; @@ -803,10 +803,17 @@ export default { // 所属机构 change(e) { console.log(e, "78"); - this.form.agencyId = e[e.length - 1]; - const arr = this.$refs["cascader"].getCheckedNodes()[0].pathLabels; - this.form.agencyName = arr.slice(-1).join(","); - console.log(this.form.agencyName); + if (e) { + this.form.agencyId = e[e.length - 1]; + if (this.form.agencyId) { + const arr = this.$refs["cascader"].getCheckedNodes()[0].pathLabels; + // console.log(arr, "5555555"); + this.form.agencyName = arr.slice(-1).join(","); + // console.log(this.form.agencyName); + } else { + this.form.agencyName = ""; + } + } }, // changeagencyCategoryId(e) { From d13b84782bb6c0289097ca8bea8456d5dcc0353d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Thu, 28 Mar 2024 14:41:38 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/agency/index.vue | 70 ++++++++++++++++++++++++------- 1 file changed, 55 insertions(+), 15 deletions(-) diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue index fa71665..de6526c 100644 --- a/src/views/system/agency/index.vue +++ b/src/views/system/agency/index.vue @@ -153,7 +153,12 @@ }} {{ agencyList.areaName }} + v-if="agencyList.provinceName" >{{ agencyList.provinceName }}-{{ agencyList.cityName }}-{{ + agencyList.regionName + }}-{{ agencyList.streetName }}-{{ agencyList.communityName }} + +