diff --git a/package.json b/package.json index a9d1549..02c4f2f 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "nprogress": "0.2.0", "quill": "1.3.7", "screenfull": "5.0.2", + "snabbdom": "^3.6.2", "sortablejs": "1.10.2", "vue": "2.6.12", "vue-count-to": "1.0.13", diff --git a/src/api/system/specialDiseaseNode.js b/src/api/system/specialDiseaseNode.js new file mode 100644 index 0000000..46fea71 --- /dev/null +++ b/src/api/system/specialDiseaseNode.js @@ -0,0 +1,23 @@ +import request from '@/utils/request' + +// /system/partition/taskPartitionList 任务细分 +export function taskPartitionList(taskTypeId) { + return request({ + url: `/system/partition/taskPartitionList?taskTypeId=${taskTypeId}`, + method: 'get', + }) +} +///system/taskType/selectTaskTypeList 任务类型 +export function selectTaskTypeList() { + return request({ + url: '/system/taskType/selectTaskTypeList', + method: 'get', + }) +} +// /system/taskStatus/taskStatusDictList 任务状态 +export function taskStatusDictList() { + return request({ + url: '/system/taskStatus/taskStatusDictList', + method: 'get', + }) +} \ No newline at end of file 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/materials/index.vue b/src/views/manage/materials/index.vue index f67272c..c64f8a0 100644 --- a/src/views/manage/materials/index.vue +++ b/src/views/manage/materials/index.vue @@ -676,13 +676,15 @@ video { // background: #409eff; display: flex; .left { + overflow: auto; + width: 77%; height: 500px; // background: #989992; } img { - height: 100%; - width: 100%; + // height: 100%; + // width: 100%; } .right { width: 20%; 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 @@ - + - + - + @@ -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/script/index.vue b/src/views/manage/script/index.vue index 46e1046..383327f 100644 --- a/src/views/manage/script/index.vue +++ b/src/views/manage/script/index.vue @@ -221,14 +221,13 @@ /> - - + + @@ -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/servicepackage/index.vue b/src/views/manage/servicepackage/index.vue index 6479950..9720ddf 100644 --- a/src/views/manage/servicepackage/index.vue +++ b/src/views/manage/servicepackage/index.vue @@ -405,7 +405,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() + }); + + } } } }); 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 @@ - + - + - + @@ -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' } diff --git a/src/views/system/components/wangEditor.vue b/src/views/system/components/wangEditor.vue index b7a5c87..ee132ca 100644 --- a/src/views/system/components/wangEditor.vue +++ b/src/views/system/components/wangEditor.vue @@ -11,10 +11,12 @@