diff --git a/package-lock.json b/package-lock.json index 8cb29ea..7dadd7d 100755 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "regenerator-runtime": "^0.14.1", "vue": "^2.6.14", "vue-clickaway": "^2.2.2", + "vue-qr": "^4.0.9", "vue-router": "^3.5.1", "vuex": "^3.6.2" }, @@ -3874,8 +3875,7 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/base64-js": { "version": "1.5.1", @@ -4989,6 +4989,20 @@ } } }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmmirror.com/deep-is/-/deep-is-0.1.4.tgz", @@ -6497,8 +6511,7 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { "version": "2.3.3", @@ -7113,7 +7126,6 @@ "resolved": "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -7122,8 +7134,7 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/ipaddr.js": { "version": "2.2.0", @@ -7377,6 +7388,11 @@ "@sideway/pinpoint": "^2.0.0" } }, + "node_modules/js-binary-schema-parser": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/js-binary-schema-parser/-/js-binary-schema-parser-2.0.3.tgz", + "integrity": "sha512-xezGJmOb4lk/M1ZZLTR/jaBHQ4gG/lqQnJqdIv4721DMggsa1bDVlHXNeHYogaIEHD9vCRv0fcL4hMA+Coarkg==" + }, "node_modules/js-message": { "version": "1.0.7", "resolved": "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz", @@ -7954,6 +7970,17 @@ "node": ">=6" } }, + "node_modules/mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/mini-css-extract-plugin": { "version": "2.9.2", "resolved": "https://registry.npmmirror.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz", @@ -8375,7 +8402,6 @@ "version": "1.4.0", "resolved": "https://registry.npmmirror.com/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "dependencies": { "wrappy": "1" } @@ -8541,6 +8567,11 @@ "node": ">=6" } }, + "node_modules/parenthesis": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/parenthesis/-/parenthesis-3.1.8.tgz", + "integrity": "sha512-KF/U8tk54BgQewkJPvB4s/US3VQY68BRDpH638+7O/n58TpnwiwnOtGIOsT2/i+M78s61BBpeC83STB88d8sqw==" + }, "node_modules/parse-json": { "version": "5.2.0", "resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz", @@ -10271,6 +10302,49 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, + "node_modules/simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/simple-get": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", + "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "decompress-response": "^6.0.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + }, "node_modules/sirv": { "version": "2.0.4", "resolved": "https://registry.npmmirror.com/sirv/-/sirv-2.0.4.tgz", @@ -10459,6 +10533,14 @@ "safe-buffer": "~5.2.0" } }, + "node_modules/string-split-by": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string-split-by/-/string-split-by-1.0.0.tgz", + "integrity": "sha512-KaJKY+hfpzNyet/emP81PJA9hTVSfxNLS9SFTWxdCnnW1/zOOwiV248+EfoX7IQFcBaOp4G5YE6xTJMF+pLg6A==", + "dependencies": { + "parenthesis": "^3.1.5" + } + }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", @@ -11209,6 +11291,55 @@ } } }, + "node_modules/vue-qr": { + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/vue-qr/-/vue-qr-4.0.9.tgz", + "integrity": "sha512-pAISV94T0MNEYA3NGjykUpsXRE2QfaNxlu9ZhEL6CERgqNc21hJYuP3hRVzAWfBQlgO18DPmZTbrFerJC3+Ikw==", + "dependencies": { + "glob": "^8.0.1", + "js-binary-schema-parser": "^2.0.2", + "simple-get": "^4.0.1", + "string-split-by": "^1.0.0" + } + }, + "node_modules/vue-qr/node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/vue-qr/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/vue-qr/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/vue-router": { "version": "3.6.5", "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-3.6.5.tgz", @@ -11807,8 +11938,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/ws": { "version": "7.5.10", diff --git a/src/assets/site/prompt-icon-1.svg b/src/assets/site/prompt-icon-1.svg new file mode 100644 index 0000000..377fc99 --- /dev/null +++ b/src/assets/site/prompt-icon-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/site/prompt-icon-2.svg b/src/assets/site/prompt-icon-2.svg new file mode 100644 index 0000000..3789fbc --- /dev/null +++ b/src/assets/site/prompt-icon-2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/site/prompt-icon-3.svg b/src/assets/site/prompt-icon-3.svg new file mode 100644 index 0000000..98b0bdd --- /dev/null +++ b/src/assets/site/prompt-icon-3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/GroupFormBtns.vue b/src/components/GroupFormBtns.vue index c50accb..4e9a76e 100644 --- a/src/components/GroupFormBtns.vue +++ b/src/components/GroupFormBtns.vue @@ -2,8 +2,8 @@ + \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index 84116e8..54af857 100755 --- a/src/store/index.js +++ b/src/store/index.js @@ -54,6 +54,23 @@ export default new Vuex.Store({ ] }, { + name: '出诊公告', + path: '', + noToPath:true, + img: 'menu/Totalprofit1.svg', + imgActive: require('@/assets/menu/Totalprofit.svg'), + list: [ + { + name: '公告设置', + desc: 'siteMessage8' + }, + { + name: '出诊日历预览', + desc: 'siteMessage9' + }, + ] + }, + { name: '项目管理', path: '', noToPath:true, diff --git a/src/views/DoctorInformation.vue b/src/views/DoctorInformation.vue index 6e5ace8..1ce1f3a 100644 --- a/src/views/DoctorInformation.vue +++ b/src/views/DoctorInformation.vue @@ -18,23 +18,17 @@
- +
- - + +
@@ -46,8 +40,8 @@ - +
@@ -62,6 +56,27 @@
+

出诊设置

+ +
+
+

您有多个出诊医院时，允许不同医院排班时段重合吗？

+
+
+ 允许时段重合 +

适用于：可由助理代为坐诊

+
+
+ 禁止时段重合 +

适用于：可由助理代为坐诊

+
+
+
+
+ + +
+

初诊审批

@@ -69,7 +84,7 @@ -
@@ -80,27 +95,24 @@
- - -
- + + +
+
-
批人微信二维码，大小2M以内
+
批人微信二维码，大小2M以内 +
@@ -121,8 +133,8 @@
- +
@@ -156,11 +168,11 @@ export default { fileList: [ // { name: 'image.jpeg', url: 'http://jasonyizherenxin.checkcopy.com/user_avatar/1.png?v=93940df0b596961c42de23ef1f2d3257' } ], - fileList1:[], - doctorAvatoFile:[], + fileList1: [], + doctorAvatoFile: [], doctorAvatorUrl: '', - approverWechatUrl:'', - approverWechatFile:[], + approverWechatUrl: '', + approverWechatFile: [], options_payword: [], groupOptions: [ { label: '需审批', value: '1' }, @@ -168,7 +180,7 @@ export default { ], formData: null, siteForm: { - did:0, + did: 0, name: '', idcard: ' ', phone: '', @@ -176,9 +188,10 @@ export default { doctor_desc: '', doctor_detail: '', label: '', - approver_phone:'', - approver_wechat:'', + approver_phone: '', + approver_wechat: '', first_visit_audit: '', + is_allow_coincide:''//是否允许重合 }, oldForm: {}, siteFormrules2: { @@ -186,6 +199,11 @@ export default { { required: true, message: '请选择初诊审批设置', trigger: 'change' } ] }, + siteFormrules3: { + coincide: [ + { required: true, message: '请选择出诊设置', trigger: 'change' } + ] + }, siteFormrules: { name: [ { required: true, message: '请输入姓名', trigger: 'blur' } @@ -231,7 +249,7 @@ export default { }, methods: { setDoctorDesc() { - if(!this.doctorId) { + if (!this.doctorId) { this.$message.error('请先设置医生基础信息') return; } @@ -253,7 +271,7 @@ export default { }) }, getDoctorData(doctor_id) { - this.$http('POST', '/api/admin/get_doctor_baseinfo', {did:doctor_id}).then(response => { + this.$http('POST', '/api/admin/get_doctor_baseinfo', { did: doctor_id }).then(response => { if (response.code != 0) { this.$message.error(response.msg) return; @@ -277,9 +295,9 @@ export default { this.$message.success(response.msg) var data = response.data - if(this.doctorId) return; + if (this.doctorId) return; setTimeout(() => { - location.href = location.href+'?doctor_id='+data.doctor_id + location.href = location.href + '?doctor_id=' + data.doctor_id }, 800); }).catch(error => { console.error(error, 'error') @@ -299,8 +317,8 @@ export default { this.setDoctorInfo(fd) }, submitDoctorBaseInfo() { - if(this.doctorAvatoFile.length == 0) { - if(this.doctorId) { + if (this.doctorAvatoFile.length == 0) { + if (this.doctorId) { this.setDoctorInfo(this.siteForm) return; } @@ -310,12 +328,12 @@ export default { this.$refs.avatorUpload.submit(); }, - clearDocotorAvatorFiles(){ + clearDocotorAvatorFiles() { this.doctorAvatorUrl = ''; this.doctorAvatoFile = [] this.$refs.avatorUpload.clearFiles(); }, - clearApproverWechatFiles(){ + clearApproverWechatFiles() { this.approverWechatUrl = ''; this.approverWechatFile = [] this.$refs.approverWechatUpload.clearFiles(); @@ -340,9 +358,9 @@ export default { this.$message.success(response.msg) var data = response.data - if(this.doctorId) return; + if (this.doctorId) return; setTimeout(() => { - location.href = location.href+'?doctor_id='+data.doctor_id + location.href = location.href + '?doctor_id=' + data.doctor_id }, 800); }).catch(error => { console.error(error, 'error') @@ -350,18 +368,42 @@ export default { }) }, submitApproverWechat() { - if(!this.doctorId) { + if (!this.doctorId) { this.$message.error('请先设置医生基础信息') return; } - if(this.approverWechatFile.length == 0) { + if (this.approverWechatFile.length == 0) { this.setApproverWechat(this.siteForm) return; } this.$refs.approverWechatUpload.submit(); }, + // 出诊设置 + submitCoincideSet() { + if (!this.doctorId) { + this.$message.error('请先设置医生基础信息') + return; + } + // 接口待定 + // this.$http('POST', '/api/admin/set_doctor_approver', { + // is_allow_coincide:this.siteForm.is_allow_coincide + // }).then(response => { + // if (response.code != 0) { + // this.$message.error(response.msg) + // return; + // } + + // this.$message.success(response.msg) + // if (this.doctorId) return; + + // }).catch(error => { + // console.error(error, 'error') + // this.$message.error('设置失败') + // }) + + }, handleApproverWechatChange(file, fileList) { console.log(file, fileList) this.approverWechatFile = file @@ -382,8 +424,30 @@ export default { }