Browse Source

online

master
pengjun 2 months ago
parent
commit
b2053d71e2
  1. 167
      package-lock.json
  2. 1
      package.json
  3. 4
      public/sysConfig.json
  4. 4
      src/components/customerOrg/customerOrgTree.vue
  5. 4
      src/components/doctorCheck/RegisterCheckList.vue
  6. 104
      src/components/patientRegister/PatientRegisterEdit.vue
  7. 144
      src/components/patientRegister/PatientRegisterList.vue
  8. 139
      src/components/patientRegister/customerOrgTreeAll.vue
  9. 2
      src/utlis/proFunc.js

167
package-lock.json

@ -18,6 +18,7 @@
"moment": "^2.29.4",
"node-polyfill-webpack-plugin": "^2.0.1",
"print-js": "^1.6.0",
"qrcode": "^1.5.4",
"sortablejs": "^1.15.0",
"umy-ui": "^1.1.6",
"vue": "^2.6.14",
@ -3414,7 +3415,6 @@
"version": "5.0.1",
"resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true,
"engines": {
"node": ">=8"
}
@ -5134,6 +5134,14 @@
}
}
},
"node_modules/decamelize": {
"version": "1.2.0",
"resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz",
"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/deep-is": {
"version": "0.1.4",
"resolved": "https://registry.npmmirror.com/deep-is/-/deep-is-0.1.4.tgz",
@ -5369,6 +5377,11 @@
"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.0.tgz",
"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
},
"node_modules/dijkstrajs": {
"version": "1.0.3",
"resolved": "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
"integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
},
"node_modules/dir-glob": {
"version": "3.0.1",
"resolved": "https://registry.npmmirror.com/dir-glob/-/dir-glob-3.0.1.tgz",
@ -5611,8 +5624,7 @@
"node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
"dev": true
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
},
"node_modules/emojis-list": {
"version": "3.0.0",
@ -6672,7 +6684,6 @@
"version": "4.1.0",
"resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
"dev": true,
"dependencies": {
"locate-path": "^5.0.0",
"path-exists": "^4.0.0"
@ -6863,7 +6874,6 @@
"version": "2.0.5",
"resolved": "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz",
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
"dev": true,
"engines": {
"node": "6.* || 8.* || >= 10.*"
}
@ -7498,7 +7508,6 @@
"version": "3.0.0",
"resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true,
"engines": {
"node": ">=8"
}
@ -7968,7 +7977,6 @@
"version": "5.0.0",
"resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
"dev": true,
"dependencies": {
"p-locate": "^4.1.0"
},
@ -9107,7 +9115,6 @@
"version": "2.3.0",
"resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz",
"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"dependencies": {
"p-try": "^2.0.0"
},
@ -9119,7 +9126,6 @@
"version": "4.1.0",
"resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
"dev": true,
"dependencies": {
"p-limit": "^2.2.0"
},
@ -9144,7 +9150,6 @@
"version": "2.2.0",
"resolved": "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz",
"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
"dev": true,
"engines": {
"node": ">=6"
}
@ -9252,7 +9257,6 @@
"version": "4.0.0",
"resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
"dev": true,
"engines": {
"node": ">=8"
}
@ -9336,6 +9340,14 @@
"node": ">=8"
}
},
"node_modules/pngjs": {
"version": "5.0.0",
"resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz",
"integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
"engines": {
"node": ">=10.13.0"
}
},
"node_modules/portfinder": {
"version": "1.0.32",
"resolved": "https://registry.npmmirror.com/portfinder/-/portfinder-1.0.32.tgz",
@ -10076,6 +10088,121 @@
"node": ">=6"
}
},
"node_modules/qrcode": {
"version": "1.5.4",
"resolved": "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.4.tgz",
"integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==",
"dependencies": {
"dijkstrajs": "^1.0.1",
"pngjs": "^5.0.0",
"yargs": "^15.3.1"
},
"bin": {
"qrcode": "bin/qrcode"
},
"engines": {
"node": ">=10.13.0"
}
},
"node_modules/qrcode/node_modules/ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dependencies": {
"color-convert": "^2.0.1"
},
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
"node_modules/qrcode/node_modules/camelcase": {
"version": "5.3.1",
"resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
"engines": {
"node": ">=6"
}
},
"node_modules/qrcode/node_modules/cliui": {
"version": "6.0.0",
"resolved": "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz",
"integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
"dependencies": {
"string-width": "^4.2.0",
"strip-ansi": "^6.0.0",
"wrap-ansi": "^6.2.0"
}
},
"node_modules/qrcode/node_modules/color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dependencies": {
"color-name": "~1.1.4"
},
"engines": {
"node": ">=7.0.0"
}
},
"node_modules/qrcode/node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/qrcode/node_modules/wrap-ansi": {
"version": "6.2.0",
"resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
"dependencies": {
"ansi-styles": "^4.0.0",
"string-width": "^4.1.0",
"strip-ansi": "^6.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/qrcode/node_modules/y18n": {
"version": "4.0.3",
"resolved": "https://registry.npmmirror.com/y18n/-/y18n-4.0.3.tgz",
"integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
},
"node_modules/qrcode/node_modules/yargs": {
"version": "15.4.1",
"resolved": "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz",
"integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
"dependencies": {
"cliui": "^6.0.0",
"decamelize": "^1.2.0",
"find-up": "^4.1.0",
"get-caller-file": "^2.0.1",
"require-directory": "^2.1.1",
"require-main-filename": "^2.0.0",
"set-blocking": "^2.0.0",
"string-width": "^4.2.0",
"which-module": "^2.0.0",
"y18n": "^4.0.0",
"yargs-parser": "^18.1.2"
},
"engines": {
"node": ">=8"
}
},
"node_modules/qrcode/node_modules/yargs-parser": {
"version": "18.1.3",
"resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz",
"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
"dependencies": {
"camelcase": "^5.0.0",
"decamelize": "^1.2.0"
},
"engines": {
"node": ">=6"
}
},
"node_modules/qs": {
"version": "6.11.0",
"resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
@ -10348,7 +10475,6 @@
"version": "2.1.1",
"resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
@ -10362,6 +10488,11 @@
"node": ">=0.10.0"
}
},
"node_modules/require-main-filename": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz",
"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
},
"node_modules/requires-port": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/requires-port/-/requires-port-1.0.0.tgz",
@ -10716,6 +10847,11 @@
"node": ">= 0.8.0"
}
},
"node_modules/set-blocking": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz",
"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
},
"node_modules/set-function-length": {
"version": "1.1.1",
"resolved": "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.1.1.tgz",
@ -11061,7 +11197,6 @@
"version": "4.2.3",
"resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"dev": true,
"dependencies": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
@ -11075,7 +11210,6 @@
"version": "6.0.1",
"resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
"dev": true,
"dependencies": {
"ansi-regex": "^5.0.1"
},
@ -12670,6 +12804,11 @@
"which": "bin/which"
}
},
"node_modules/which-module": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz",
"integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
},
"node_modules/which-typed-array": {
"version": "1.1.13",
"resolved": "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.13.tgz",

1
package.json

@ -22,6 +22,7 @@
"moment": "^2.29.4",
"node-polyfill-webpack-plugin": "^2.0.1",
"print-js": "^1.6.0",
"qrcode": "^1.5.4",
"sortablejs": "^1.15.0",
"umy-ui": "^1.1.6",
"vue": "^2.6.14",

4
public/sysConfig.json

@ -1,7 +1,7 @@
{
"apiurl": "http://140.143.162.39:9529",
"apiurl": "http://192.168.0.188:9530",
"softName": "神豚体检管理系统",
"pacsApi": "http://140.143.162.39:9529",
"pacsApi": "http://140.143.162.39:9530",
"dcmViewers": "https://app.mzaktj.com:4436",
"pacsApiHttps": "https://app.mzaktj.com:8042"
}

4
src/components/customerOrg/customerOrgTree.vue

@ -161,14 +161,14 @@ export default {
},
//
//
filterNode(value, data) {
//console.log(value,data)
if (!value) return true;
return data['displayName'].indexOf(value) !== -1 || data['simpleCode'].indexOf(value.toUpperCase()) !== -1;
},
//
//
filterParentNode(value) {
// console.log(value, data)
// if (!value) return true;

4
src/components/doctorCheck/RegisterCheckList.vue

@ -193,13 +193,13 @@ export default {
let token = window.sessionStorage.getItem('token')
let barcodeNo = row.checkRequestNo
if(this.pacs_interface_barcode_type == '1'){
barcodeNo = row.patientRegisterNo
barcodeNo = this.dataTransOpts.tableS.patient_register.patientRegisterNo
}
let url = ''
url = `${this.sysConfig.dcmViewers}/?mrn=${barcodeNo}&registerCheckId=${row.id}&token=${token}&pacsapi=${this.sysConfig.pacsApiHttps}`
//if (this.isDescription == 'Y' && this.curPacs.pacsDesc) url += `&description=${this.curPacs.pacsDesc}`
console.log('url',url)
let inParams = ''
try {
inParams = JSON.stringify({ url })

104
src/components/patientRegister/PatientRegisterEdit.vue

@ -737,6 +737,7 @@ export default {
privs: [] //
},
patient_register_occ_check_id: '', // ID
merge_lis_pacs_label: "0", //0 01
LocalConfig: {
patientRegister: {
editMode: 'standard', //standard/qztl
@ -985,13 +986,20 @@ export default {
//
dictInit() {
// --
let sysParmId = "patient_register_occ_check_id"
postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId })
.then(res => {
if (res.code > -1) this.patient_register_occ_check_id = res.data
})
// --
postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: 'merge_lis_pacs_label' })
.then(res => {
if (res.code > -1) {
this.merge_lis_pacs_label = res.data || "0"
}
})
//
getapi("/api/app/sex").then((res) => {
@ -2287,22 +2295,42 @@ export default {
this.printing = true
if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('patient') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('lis') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('pacs') > -1) {
this.guidePrintEasy('0008', isPreview, toOutShell)
.then(res => {
return this.lisPrint('0002', isPreview, toOutShell)
})
.then(res => {
return this.pacsPrint('0004', isPreview, toOutShell)
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
.finally(() => {
this.printing = false
})
if (this.merge_lis_pacs_label == '1') {
this.guidePrintEasy('0008', isPreview, toOutShell)
.then(res => {
return this.lisPrint('0002', isPreview, toOutShell)
})
// .then(res => {
// return this.pacsPrint('0004', isPreview, toOutShell)
// })
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
.finally(() => {
this.printing = false
})
} else {
this.guidePrintEasy('0008', isPreview, toOutShell)
.then(res => {
return this.lisPrint('0002', isPreview, toOutShell)
})
.then(res => {
return this.pacsPrint('0004', isPreview, toOutShell)
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
.finally(() => {
this.printing = false
})
}
} else if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('patient') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('lis') > -1) {
this.guidePrintEasy('0008', isPreview, toOutShell)
.then(res => {
@ -2332,19 +2360,35 @@ export default {
this.printing = false
})
} else if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('lis') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('pacs') > -1) {
this.lisPrint('0002', isPreview, toOutShell)
.then(res => {
return this.pacsPrint('0004', isPreview, toOutShell)
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
.finally(() => {
this.printing = false
})
if (this.merge_lis_pacs_label == '1') {
this.lisPrint('0002', isPreview, toOutShell)
// .then(res => {
// return this.pacsPrint('0004', isPreview, toOutShell)
// })
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
.finally(() => {
this.printing = false
})
} else {
this.lisPrint('0002', isPreview, toOutShell)
.then(res => {
return this.pacsPrint('0004', isPreview, toOutShell)
})
.then(res => {
resolve(res)
})
.catch(err => {
reject(err)
})
.finally(() => {
this.printing = false
})
}
} else if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('patient') > -1) {
this.guidePrintEasy('0008', isPreview, toOutShell)
.then(res => {

144
src/components/patientRegister/PatientRegisterList.vue

@ -393,9 +393,8 @@
</el-dialog>
<!-- 批量调整检查项目医生 -->
<el-dialog title="批量调整检查项目医生"
:visible.sync="dialogWin.PatientRegisterEditDoctorBatch" width="610px" :append-to-body="true"
:close-on-click-modal="false">
<el-dialog title="批量调整检查项目医生" :visible.sync="dialogWin.PatientRegisterEditDoctorBatch" width="610px"
:append-to-body="true" :close-on-click-modal="false">
<PatientRegisterEditDoctorBatch :multipleSelection="multipleSelection" :doctorType="doctorType" />
</el-dialog>
@ -410,11 +409,19 @@
:append-to-body="true" width="800px" height="600px">
<LocalConfig />
</el-dialog>
<!--云胶片二维码-->
<el-dialog :visible.sync="qrCode.winDisplay" title="云胶片二维码" width="400px" style="text-align:center">
<!--<canvas ref="canvas"></canvas>-->
<img width="100%" :src="qrCode.url">
<div style="font-size: 16px;">{{ qrCode.barcodeNo + ' ' + qrCode.patientName }}</div>
</el-dialog>
</div>
</div>
</template>
<script>
import moment from "moment";
import QRCode from 'qrcode'
import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import Sortable from "sortablejs";
@ -628,7 +635,14 @@ export default {
},
LocalConfigInit: {},
tableName: "", //
doctorType: "check" //check: audit
doctorType: "check", //check: audit
merge_lis_pacs_label:"0", //0 01
qrCode: {
winDisplay: false, //
url: 'https://ccjktj.cn:5081/', //
barcodeNo: '条码号',
patientName: '姓 名'
}
};
},
@ -649,6 +663,8 @@ export default {
deepCopy(this.LocalConfigInit),
JSON.parse(LocalConfig) || {}
);
} catch (error) {
console.log('window.localStorage.getItem("LocalConfig")', error);
}
@ -658,6 +674,22 @@ export default {
);
this.loadOptsInit = Object.assign({}, this.loadOpts);
// --
postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId:'merge_lis_pacs_label' })
.then(res => {
if(res.code > -1){
this.merge_lis_pacs_label = res.data||"0"
}
})
// --
postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId:'pacs_cloud_url' })
.then(res => {
if(res.code > -1){
this.qrCode.url = res.data||"https://ccjktj.cn:5081/"
}
})
},
//
@ -927,6 +959,22 @@ export default {
printGuideLisPacs(row) {
return new Promise((resolve, reject) => {
// this.merge_lis_pacs_label == '1'
if(this.merge_lis_pacs_label == '1'){
this.guidePrintPromise("0008", false, row)
.then((res) => {
return this.lisPrint(row, "0002", false);
})
// .then((res) => {
// return this.pacsPrint(row, "0004", false);
// })
.then((res) => {
resolve(res);
})
.catch((err) => {
reject(err);
});
}else{
this.guidePrintPromise("0008", false, row)
.then((res) => {
return this.lisPrint(row, "0002", false);
@ -940,6 +988,9 @@ export default {
.catch((err) => {
reject(err);
});
}
});
},
@ -1733,6 +1784,7 @@ export default {
this.fnQueue(row);
},
});
if (
checkPagePriv(this.pagePriv.privs, "发送检验申请") &&
row.completeFlag != "0"
@ -1834,6 +1886,16 @@ export default {
this.importResult("lis", row);
},
});
if (
checkPagePriv(this.pagePriv.privs, "导入迪安结果") &&
row.completeFlag != "0"
)
subMenuImp.push({
label: "导入迪安结果",
onClick: () => {
this.importResult("diAn", row);
},
});
if (subMenuImp.length > 0)
items.push({ label: "导入结果", children: subMenuImp });
@ -1860,6 +1922,15 @@ export default {
},
});
if (
checkPagePriv(this.pagePriv.privs, "查看云胶片二维码")
)
items.push({
label: "查看云胶片二维码",
onClick: () => {
this.makeQrCode(row)
},
});
items.push({ label: "----------------" });
this.$contextmenu({
@ -2128,10 +2199,11 @@ export default {
},
//
// checkTypepacs/lis/diAn
importResult(checkType, row) {
let url = "/api/app/ImportLisResult/ImportResultByPatientRegisterId";
switch (checkType) {
case "pacs":
case "pacs": // pacs
url = "/api/app/ImportPacsResult/ImportResultByPatientRegisterId";
postapi(url, { patientRegisterId: row.id })
.then((res) => {
@ -2152,7 +2224,16 @@ export default {
}
});
break;
default:
case "diAn": //
url = "/api/app/ImportLisResult/ImportDianResultByPatientRegisterId";
postapi(url, { patientRegisterId: row.id }).then((res) => {
if (res.code > -1) {
this.$message.success({ showClose: true, message: "导入成功!" });
this.rowClick(row);
}
});
break;
default: //lis
postapi(url, { patientRegisterId: row.id }).then((res) => {
if (res.code > -1) {
this.$message.success({ showClose: true, message: "导入成功!" });
@ -2163,6 +2244,51 @@ export default {
}
},
//
makeQrCode(row) {
//let canvas = this.$refs.canvas;
let url = `${this.qrCode.url}?reportparam=条码号&mrn=条码号` //`https://ccjktj.cn:5081/?reportparam=条码号&mrn=条码号`
if (row?.patientRegisterNo) {
url = `${this.qrCode.url}?reportparam=${row.checkRequestNo}&mrn=${row.checkRequestNo}`
this.qrCode.barcodeNo = row.patientRegisterNo
}
if (row?.patientName) {
this.qrCode.patientName = row.patientName
}
this.qrCode.patientName = this.qrCode.patientName.substring(0, 1) + '*' + this.qrCode.patientName.substring(2)
// canvas
// this.$nextTick(() => {
// QRCode.toCanvas(canvas, url, { errorCorrectionLevel: 'H' })
// .then(() => {
// console.log('success!')
// })
// .catch(err => {
// this.dialogQrCode = false
// this.$message.error({ showClose: true, message: err.message })
// console.log('fail!', err.message)
// })
// .finally(() => {
// console.log('url:', url)
// })
// })
QRCode.toDataURL(url, { errorCorrectionLevel: 'H' })
.then(res => {
console.log(res)
this.qrCode.url = res
this.qrCode.winDisplay = true
})
.catch(err => {
this.$message.error({ showClose: true, message: err.message })
console.error(err)
})
.finally(() => {
console.log('url', url)
})
},
//
btnExport(elId) {
this.dragCol.forEach((e) => {
@ -2172,11 +2298,11 @@ export default {
tableDatas.forEach((e, index) => {
if (index) e.sn = index + 1
if (e.completeFlag) e.completeFlag = e.isAudit == "Y" ? "已审核" : dddw(this.dict.completeFlag, "id", e.completeFlag, "displayName")
if (e.guidePrintTimes.toString())e.guidePrintTimes = e.guidePrintTimes > 0 ? '打印' : ''
if (e.guidePrintTimes.toString()) e.guidePrintTimes = e.guidePrintTimes > 0 ? '打印' : ''
if (e.isLock) e.isLock = e.isLock == 'Y' ? '锁住' : ''
if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName")
if(e.patientRegisterNo)e.patientRegisterNo='&'+e.patientRegisterNo
if(e.patientNo)e.patientNo='&'+e.patientNo
if (e.patientRegisterNo) e.patientRegisterNo = '&' + e.patientRegisterNo
if (e.patientNo) e.patientNo = '&' + e.patientNo
if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
e.groupPack = dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
} else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {

139
src/components/patientRegister/customerOrgTreeAll.vue

@ -1,12 +1,18 @@
<template>
<div style="width:208px">
<div style="margin:2px 2px 2px 2px;">
<div style="margin:2px 2px 2px 2px;display: flex;">
<el-tooltip content="勾选时,可对子单位进行查询" placement="top">
<el-checkbox style="margin-top: 6px;" v-model="cusQuery.haveSunCus" true-label="Y" false-label="N" size="small">
含子单位
</el-checkbox>
</el-tooltip>
<el-input placeholder="输入关键字进行过滤" v-model="filterText" size="small" />
</div>
<div>
<el-tree
:style="'overflow: scroll;height:' + (window.pageHeight < 600 ? 465 : window.pageHeight - 135) + 'px;width:200px;'"
:data="customerOrgTreeAll" :props="treeprops" node-key="id" @node-contextmenu="nodeContextmenu"
:filter-node-method="filterNode"
@node-click="treeclick" highlight-current ref="customerOrgTree" :load="loadNode" lazy>
<span class="custom-tree-node" slot-scope="{ node, data }">
<div>
@ -30,7 +36,7 @@
import { mapState } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { tcdate, deepCopy, reMadeOrgTree, arrayExistObj } from "../../utlis/proFunc";
import { madeTree } from "@/utlis/tree";
import { madeTree, getTreeAllChildIdsById, getTreeNode } from "@/utlis/tree";
export default {
components: {},
data() {
@ -49,6 +55,15 @@ export default {
}
},
customerOrgTreeAll: [],
//
cusQuery: {
treeDataAll: [], //
treeDataTop1: [], //
haveSunCus: 'Y', //
times: 0, // times > 0
}
};
},
//<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
@ -70,17 +85,52 @@ export default {
//
mounted() {
//
this.getCustomerOrgChild(null)
.then(res => {
this.customerOrgTreeAll = res
this.patientRegister.customerOrgTreeAll = res
// console.log('this.customerOrgTreeAll', this.customerOrgTreeAll)
})
// (Y:N)
//
if (this.cusQuery.haveSunCus == 'Y') {
this.getCustomerOrgAll()
.then(res => {
this.customerOrgTreeAll = res
this.patientRegister.customerOrgTreeAll = res
// console.log('this.customerOrgTreeAll', this.customerOrgTreeAll)
})
} else {
this.getCustomerOrgChild(null)
.then(res => {
this.customerOrgTreeAll = res
this.patientRegister.customerOrgTreeAll = res
// console.log('this.customerOrgTreeAll', this.customerOrgTreeAll)
})
}
},
methods: {
//
getCustomerOrgAll() {
return new Promise((resolve, reject) => {
getapi("/api/app/customerorg/getbycodeall")
.then((res) => {
if (res.code > -1) {
let treeData = reMadeOrgTree(deepCopy(res.data), this.LocalConfig.patientRegister.dispCustomerOrgCode);
this.cusQuery.times += 1
//console.log('getCustomerOrgAll.treeData', treeData)
//console.log('getTreeNode', getTreeNode(treeData, "treeChildren", 'id', '3a1d3736-d7c6-a9fb-c165-675335dc0e9b').treeChildren)
this.cusQuery.treeDataAll = treeData
resolve(treeData)
} else {
reject(res.message)
}
})
.catch(err => {
reject(err)
})
})
},
//
getCustomerOrgChild(parentId) {
return new Promise((resolve, reject) => {
postapi('/api/app/CustomerOrg/GetCustomerOrgByParentId', { parentId })
@ -95,8 +145,9 @@ export default {
this.patientRegister.customerOrgs.push(e)
}
});
this.patientRegister.customerOrgTreeAll = madeTree(this.patientRegister.customerOrgs,'treeChildren','parentId','id',null)
//this.patientRegister.customerOrgTreeAll = madeTree(this.patientRegister.customerOrgs, 'treeChildren', 'parentId', 'id', null)
// console.log('this.patientRegister.customerOrgTreeAll', this.patientRegister.customerOrgTreeAll)
if (!parentId) this.cusQuery.treeDataTop1 = treeData
resolve(treeData)
}
})
@ -107,15 +158,29 @@ export default {
},
//
loadNode(node, resolve) {
// console.log('node', node)
if (node && node.data && node.data.id) {
this.getCustomerOrgChild(node.data.id).then(res => {
resolve(res)
}).catch(err => {
resolve([])
})
// console.log('this.cusQuery.treeDataAll', this.cusQuery.treeDataAll)
// console.log('this.patientRegister.customerOrgTreeAll1', this.patientRegister.customerOrgTreeAll)
//
if (node?.data?.id) {
if (this.cusQuery.times == 0) {
this.getCustomerOrgChild(node.data.id).then(res => {
console.log('res', res)
resolve(res)
}).catch(err => {
resolve([])
})
} else {
let ret = getTreeNode(this.cusQuery.treeDataAll, this.treeprops.children, this.treeprops.children.id, node.data.id)[this.treeprops.children]
ret = ret || []
ret.forEach(e => {
if (!e[this.treeprops.children]) e.isLeaf = true
});
//console.log('ret',ret)
resolve(ret)
}
}
},
@ -161,38 +226,48 @@ export default {
// console.log('data,sortType',data,sortType)
putapi(`/api/app/customerorg/updatemanysort?id=${data.id}&SortType=${sortType}`).then(res => {
if (res.code > -1) {
//
this.getCustomerOrgChild(data.parentId).then(res => {
data.treeChildren = res
if (data.parentId == null) {
this.customerOrgTreeAll = res
this.patientRegister.customerOrgTreeAll = res
this.patientRegister.customerOrgTreeAll = deepCopy(res)
}
})
}
})
},
//
filterNode(value, data) {
// console.log(value, data)
//
filterParentNode(value) {
console.log('filterParentNode', value)
// if (!value) return true;
// return data['displayName'].indexOf(value) > -1 || data['simpleCode'].indexOf(value.toUpperCase()) > -1 || data['shortName'].indexOf(value) > -1 || data['customerOrgCode'].indexOf(value) > -1;
this.customerOrgTreeAll = this.patientRegister.customerOrgTreeAll.filter(e => {
this.customerOrgTreeAll = this.cusQuery.treeDataTop1.filter(e => {
return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1 || e.shortName.indexOf(value) > -1
})
},
//
filterNode(value, data) {
console.log('filterNode', value, data)
if (!value) return true;
return data['displayName'].indexOf(value) !== -1 || data['simpleCode'].indexOf(value.toUpperCase()) !== -1;
},
//
treeclick(data) {
// console.log('data',data)
this.patientRegister.query.customerOrgId = data.id;
this.patientRegister.query.customerOrgName = data.displayName;
this.dataTransOpts.plus.PatientRegisterEditQuery++
//ID
// this.getCustomerOrgParentId(data.id);
// this.patientRegister.query.times++; //
},
},
@ -201,9 +276,25 @@ export default {
// immediate: true,
handler(newVal, oldVal) {
// console.log(`watch newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
if (newVal != oldVal) this.filterNode(newVal)
if (newVal != oldVal) {
if (this.cusQuery.haveSunCus == 'Y') {
//this.customerOrgTreeAll = deepCopy(this.cusQuery.treeDataAll)
this.$refs['customerOrgTree'].filter(newVal);
} else {
this.filterParentNode(newVal)
}
}
}
},
//
"cusQuery.haveSunCus": {
// immediate: true,
handler(newVal, oldVal) {
// console.log(`watch newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
if (newVal != oldVal && newVal == 'Y' && this.cusQuery.times == 0) this.getCustomerOrgAll()
}
},
},
};
</script>

2
src/utlis/proFunc.js

@ -21,8 +21,10 @@ function reMadeOrgTree(treeData,dispCustomerOrgCode){
}
if (e.treeChildren && Array.isArray(e.treeChildren) && e.treeChildren.length > 0) {
e.treeChildren = reMadeOrgTree(e.treeChildren,dispCustomerOrgCode)
//e.isLeaf = false
}else{
delete e.treeChildren
//e.isLeaf = true
}
})
return treeData

Loading…
Cancel
Save