diff --git a/src/components/doctorCheck/RegisterCheckEdit.vue b/src/components/doctorCheck/RegisterCheckEdit.vue index 78b7f9c..706a62a 100644 --- a/src/components/doctorCheck/RegisterCheckEdit.vue +++ b/src/components/doctorCheck/RegisterCheckEdit.vue @@ -12,7 +12,7 @@ style="width: 120px" size="small" :filter-method="filterMethod"> - +
审核 @@ -20,7 +20,7 @@ style="width: 120px" size="small" :disabled="doctorCheck.RegisterCheckEdit.isAudit == 'Y' ? true:false" :filter-method="filterMethod"> - + @@ -31,8 +31,8 @@ 操作 + :value="doctorCheck.RegisterCheckEdit.lastModificationTime ? lmoment(doctorCheck.RegisterCheckEdit.lastModificationTime, 'yyyy-MM-DD HH:mm:ss') : ''" + style="width: 140px" size="small" disabled>
diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue index 0e4aaad..27f8ddd 100644 --- a/src/components/patientRegister/customerOrgTreeAll.vue +++ b/src/components/patientRegister/customerOrgTreeAll.vue @@ -146,7 +146,7 @@ export default { }, methods: { - // 后续代完善（本地缓存） + // 获取单位数据，并存入缓存 getOrgDatas() { return new Promise((resolve, reject) => { console.log('getOrgDatas', this.orgDatas.length) @@ -185,7 +185,7 @@ export default { }) }, - // 查所有单位 + // 先从缓存处拿数据，拿不到再从数据库拉取 getCustomerOrgAll() { return new Promise((resolve, reject) => { getDBCom('orgDatas') diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue index bc33b99..0e00409 100644 --- a/src/components/report/PatientRegisterListNobtn.vue +++ b/src/components/report/PatientRegisterListNobtn.vue @@ -495,6 +495,7 @@ export default { let dateType = '1' switch (e.dateType) { case 'medicalStartDate': + case '2': dateType = '2' break; case 'checkDate': diff --git a/src/views/charge/invoiceReg.vue b/src/views/charge/invoiceReg.vue index 9209451..93e65c2 100644 --- a/src/views/charge/invoiceReg.vue +++ b/src/views/charge/invoiceReg.vue @@ -32,6 +32,7 @@
体检单位 + + +
开票状态 @@ -69,10 +76,8 @@ border-radius: 8px; margin-bottom: 10px; "> - @@ -89,11 +94,11 @@ '--' + scope.row.departmentName : '') : scope.row.customerOrgName }}
- - + + - + - + @@ -517,10 +384,12 @@ import { dddw, objCopy, arrayReduce, + reMadeOrgTree, arrayExistObj, deepCopy, } from "@/utlis/proFunc"; import ElProgressOCX from "../../components/report/ElProgressOCX.vue"; +import { setDBCom, getDBCom } from "../../utlis/indexedDB"; export default { @@ -649,51 +518,8 @@ export default { curChoosedRow: {}, //当前选择的行数据 curChoosedId: "", //当前选择的行ID - // 批量导入 - dialogGroup: { - //mode: true, //选模式 10 开始 文件导入，20开始 从数据库中导入 - fileReadme: false, //导入EXCEL注意事项 - fileChoose: false, //选择文件 - fileDataOpr: false, //文件数据分析操作 - }, - seq: -1, //0 当前显示窗口 - - mode: "10", //模式 10 开始 文件导入，20开始 从数据库中导入 ，30 开始职业病 - excelCols: [{ dispLabel: "", val: "", dataLabel: "" }], //excel数据列名 {dispLabel:'',val:'',dataLabel:''} - importCols: [], //实际导入的列（即有设置与 dataCols 匹配的列） - excelData: [], //excel表格数据 - choosedData: [], // 选中的待导入的数据 - - dataCols: [ - { dispLabel: "不设置", val: "" }, - { dispLabel: "卡类别", val: "cardTypeName" }, - { dispLabel: "会员卡号", val: "cardNo" }, - { dispLabel: "折扣率", val: "discount" }, - { dispLabel: "初始金额", val: "cardBalance" }, - { dispLabel: "充值方式", val: "payModeName" }, - { dispLabel: "有效期限", val: "expiryDate" }, - { dispLabel: "卡主姓名", val: "customerName" }, - { dispLabel: "卡主身份证号", val: "idNo" }, - { dispLabel: "卡主电话", val: "telephone" }, - { dispLabel: "卡主手机号", val: "mobileTelephone" }, - { dispLabel: "备注", val: "remark" }, - //{ dispLabel: '支付方式', val: 'payTypeFlag' }, - ], - - - workBook: null, //EXCEL 工作薄 - sheetNames: [], //EXCEL 工作薄中的表单 {sheetName:} - readDataOpts: { - file: "", //选中的文件名 - sheetNameChoosed: "", //当前选中的表格 - titleRow: 1, //标题行 - }, - readDataOptsInit: {}, - dataImportOpts: { - startRow: 0, //从 excelData 的第几行开始导入 - }, - dataImportOptsInit: {}, - tableData: [], // 批量建卡状态数据 + + jsonFields: { 卡类别: "cardTypeId", @@ -737,13 +563,91 @@ export default { this.enterToQuery() }, computed: { - ...mapState(["window", "dict", "elProgress"]), + ...mapState(["window", "dict", "elProgress", "customerOrg"]), + tableHeight() { + return this.window.pageHeight - 515 + }, }, methods: { ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]), dddw, moment, + // 获取单位数据，并存入缓存 + getOrgDatas() { + return new Promise((resolve, reject) => { + console.log('getOrgDatas', this.orgDatas.length) + let url = '/api/app/CustomerOrg/GetSimpleByCodeAll' + if (this.LocalConfig.patientRegister.dispCustomerOrgCode == 'Y') { + url = "/api/app/customerorg/getbycodeall" + getapi(url) + .then((res) => { + if (res.code > -1) { + this.orgDatas = res.data + setDBCom('orgDatas', res.data) //存本地 + resolve() + } else { + reject(res.message) + } + }) + .catch(err => { + reject(err) + }) + } else { + postapi(url) + .then((res) => { + if (res.code > -1) { + this.orgDatas = res.data + setDBCom('orgDatas', res.data) + resolve() + } else { + reject(res.message) + } + }) + .catch(err => { + reject(err) + }) + } + + }) + }, + + // 先从缓存处拿数据，拿不到再从数据库拉取 + getCustomerOrgAll() { + return new Promise((resolve, reject) => { + getDBCom('orgDatas') + .then(localData => { + let now = Date.now() + // 24小时 = 86400000 毫秒 + if (localData?.createdat && now - 43200000 < localData.createdat) { + this.orgDatas = localData.data + } + // console.log('this.orgDatas.length',this.orgDatas.length) + if (this.orgDatas.length > 0) { + let treeData = reMadeOrgTree(deepCopy(this.orgDatas), 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 { + this.getOrgDatas() + .then(() => { + let treeData = reMadeOrgTree(deepCopy(this.orgDatas), 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) + }) + .catch(err => { + reject(err) + }) + } + }) + }) + }, + //初始化字典数据 dictInit() { let today = moment(new Date()).format("YYYY-MM-DD") @@ -829,6 +733,7 @@ export default { } }); }, + category(e) { if (!this.form.id) { this.dict.cardType.forEach((item) => { @@ -842,12 +747,12 @@ export default { }); } }, - add() { + btnAdd() { this.form = deepCopy(this.formInit); this.dialogVisible = true; }, - edit() { + btnEdit() { if (!this.curChoosedId) { this.$message.warning("请先选择要操作的数据！"); return; @@ -866,43 +771,8 @@ export default { // this.dialogVisible = true; }, - enable() { - if (!this.curChoosedId) { - this.$message.warning("请先选择要操作的数据！"); - return; - } - postapi(`/api/app/cardregister/updateactive?id=${this.curChoosedId}`, { - isActive: "Y", - }).then((res) => { - if (res.code != -1) { - this.dataList.forEach((item) => { - if (item.id == this.curChoosedId) { - item.isActive = "Y"; - } - }); - //this.$message.success("操作成功！"); - } - }); - }, - disable() { - if (!this.curChoosedId) { - this.$message.warning("请先选择要操作的数据！"); - return; - } - postapi(`/api/app/cardregister/updateactive?id=${this.curChoosedId}`, { - isActive: "N", - }).then((res) => { - if (res.code != -1) { - this.dataList.forEach((item) => { - if (item.id == this.curChoosedId) { - item.isActive = "N"; - } - }); - //this.$message.success("操作成功！"); - } - }); - }, - del() { + + btnDel() { let lfind = -1; if (!this.curChoosedId) { this.$message.warning("请先选择要操作的数据！"); @@ -931,21 +801,8 @@ export default { } }); }, - refund() { - if (!this.curChoosedId) { - this.$message.warning("请先选择要充值的会员卡！"); - return; - } - this.refundorder = { - id: "", - cardRegisterId: this.curChoosedId, - cardNo: this.curChoosedRow.cardNo, - payModeId: "", - billMoney: null, - billFlag: "2", - }; - this.refundOrder = true; - }, + + // 登记到账 bntOrder() { if (!this.curChoosedId) { this.$message.warning("请先选择要充值的会员卡！"); @@ -962,6 +819,16 @@ export default { this.dialogOrder = true; }, + // 编辑到账 + bntOrderEdit() { + + }, + + // 删除到账 + bntOrderDel() { + + }, + //充值提交 orderSubmit(formName) { let body = {}, @@ -1166,41 +1033,6 @@ export default { }, - // 导入建卡 -- 确定导入 - btnImportCardOK() { - this.importCols = [] - this.excelCols.forEach(e => { - if (e.val) { - this.importCols.push(e) - } - }) - this.tableData = [] // 记录导入后结果状态 - this.choosedData = [] //选中待导入的数据 - this.excelData.forEach(e => { - if (e.choosed) this.choosedData.push(e) - }); - - if (this.choosedData.length == 0) { - this.$message.warning({ showClose: true, message: '请选中要导入的记录' }) - return - } else { - this.elProgress.display = true; - this.elProgress.percentage = 0; - //导入进行中 - this.importing(this.dataImportOpts.startRow) - // 开始导入时，清除选择的 文件 - document.getElementById('fileNames').value = ''; - } - }, - - //导入完后，导入状态显示 - importRowClassName({ row, rowIndex }) { - if (row.importState == "导入失败") { - return "danger"; - } else { - return ""; - } - }, //多选 颜色标记 handleRowClassName({ row, rowIndex }) { @@ -1211,430 +1043,7 @@ export default { } }, - //清空进度数据数据 - clearProcess() { - this.dialogGroup.fileReadme = false - this.dialogGroup.fileChoose = false - this.dialogGroup.fileDataOpr = false - - let elo = document.getElementById('fileNames') - if (elo) elo.value = ''; // 清空选择的文件 - - this.workBook = null //EXCEL 工作薄 - this.sheetNames = [] //EXCEL 工作薄中的表单 {sheetName:} - - this.readDataOpts = Object.assign({}, this.readDataOptsInit) - this.dataImportOpts = Object.assign({}, this.dataImportOptsInit) - - this.customerOrgIds = [] //选中单位节点 - this.customerOrgRegisterList = [] //体检次数列表 - this.customerOrgRegister = {} //体检次数 - - this.startPoint = -1 // 多选起点 -1 表示未选择 - this.endPoint = -1 // 多选终点 -1 表示未选择 - - }, - - // 导入过程 上一步，下一步 - btnProcess(seq) { - // console.log('keys',keys) - switch (seq) { - - case 0: - //显示 选择导入方式 - this.dialogGroup.fileReadme = true - this.excelCols = [] - this.tableData = [] - this.prList = [] - this.startPoint = -1 // 多选起点 -1 表示未选择 - this.endPoint = -1 // 多选终点 -1 表示未选择 - break; - case 1: - this.dialogGroup.fileReadme = false - this.dialogGroup.fileChoose = true - break; - case 2: - this.readData() //读取数据 - this.dialogGroup.fileChoose = false - this.dialogGroup.fileDataOpr = true - break; - default: - //关闭所有弹窗 - this.clearProcess() - break; - } - - }, - - //清除所选文件 - fileGetFocus(e) { - console.log("fileGetFocus(e)", e); - e.value = ""; //未起作用的 - // e.target.files = [] - }, - - // 获取选择的文件 - changeFileChoose(e) { - if (e.target.files.length <= 0) return; - // console.log('file',e.target.files[0]) - this.readDataOpts.file = e.target.files[0]; - // 调用导入Excel文件的方法 - // File {name: 'vulkan-1.dll', - // console.log('file',file,file.type) - let fileName = this.readDataOpts.file.name.split("."); - let fileNameExt = fileName[fileName.length - 1].toLowerCase(); - if (fileNameExt != "xls" && fileNameExt != "xlsx") { - this.$message.warning("你选的文件可能不是标准的Excel文件！"); - } - this.readFile(this.readDataOpts.file); - }, - - //sheetjs 读取文件 - readFile(file) { - const reader = new FileReader(); - - // reader.readAsArrayBuffer(file); - // 定义读取文件 - reader.onload = (e) => { - let data = e.target.result; - // let typedArray = new Uint8Array(data); - // var workBook = read(typedArray,{type:'array'}) - // this.workBook = read(data,{type:'binary',cellDates:true}) //日期将转成 标准 日期格式，显示会 undefined - this.workBook = read(data, { type: "binary" }); - // var workBook = readFile(file); //后端读法 - - this.sheetNames = []; - this.workBook.SheetNames.forEach((e) => { - this.sheetNames.push({ sheetName: e }); - }); - - this.$nextTick(() => { - this.$refs["sheetNames"].setCurrentRow(this.sheetNames[0]); - this.chooseSheetName(this.sheetNames[0]); - }); - }; - - // 错误处理 - reader.onerror = function (event) { - // 读取失败时执行的代码 - console.error("File could not be read!" + event.target.error); - }; - - reader.readAsBinaryString(file); - }, - - //选择要导入的Excel表单名 - chooseSheetName(row) { - this.readDataOpts.sheetNameChoosed = row.sheetName; - }, - - //读取数据 - readData() { - let ret = 1; - if ( - !this.readDataOpts.file || - !this.workBook || - !this.readDataOpts.sheetNameChoosed - ) { - this.$message.warning("请选择文件及要导入的表格"); - return 0; - } - - if (this.readDataOpts.titleRow <= 0) { - this.$message.warning("标题行不能小于1"); - return 0; - } - - let worksheet = this.workBook.Sheets[this.readDataOpts.sheetNameChoosed]; - - //分析标题信息 - let head = utils.sheet_to_json(worksheet, { header: 1 }); - - this.excelCols = []; - head[this.readDataOpts.titleRow - 1].forEach((e) => { - let lfind = arrayExistObj(this.dataCols, "dispTitle", e), - val = "", - dataLabel = ""; - if (lfind > -1) { - val = this.dataCols[lfind].val; - dataLabel = this.dataCols[lfind].dataLabel; - } - this.excelCols.push({ - dispLabel: e, - val, - dataLabel, - }); - }); - //console.log('head,',head,this.excelCols) - - this.excelData = utils.sheet_to_json(worksheet, { - raw: false, - range: this.readDataOpts.titleRow - 1, - }); //raw:false,range:1 从第1行开始读取 - this.excelData.forEach((e, index) => { - e.choosed = false; - e.index = index; - e.id = "excelData" + index; - }); - //console.log('this.excelCols',this.excelCols) - console.log('sheet_to_json excelData', this.excelData) - - // 导入后，批量分析Excel列 与 数据字段 的匹配关系 - this.parseExcelData(); - - return ret; - }, - - //选择要导入的数据 - chooseDataImport(row) { - // console.log("this.excelData",this.excelData); - - // 按住了shift键 - if (this.window.shift) { - //清除所有选择 - this.excelData.forEach((e, index) => { - e.choosed = false; - e.index = index; - }); - - if (this.startPoint == -1) { - this.excelData[row.index].choosed = true; - this.startPoint = row.index; - } else { - if (this.startPoint > row.index) { - for (let i = row.index; i <= this.startPoint; i++) { - this.excelData[i].choosed = true; - } - } else if (this.startPoint <= row.index) { - for (let i = this.startPoint; i <= row.index; i++) { - this.excelData[i].choosed = true; - } - } - } - } else if (this.window.ctrl) { - // 按住了ctrl 键 - this.excelData[row.index].choosed = true; - if (this.startPoint == -1) { - this.startPoint = row.index; - } - } else { - // 未按住了ctrl 、shift 键 - //清除所有选择 - console.log("清除所有选择"); - this.excelData.forEach((e, index) => { - e.choosed = false; - e.index = index; - }); - // console.log(this.excelData,row.index); - // console.log(this.excelData[row.index].choosed); - - this.excelData[row.index].choosed = true; - this.startPoint = row.index; - } - }, - - // 全选（取消全选） - btnChoose(refName, type) { - let choosed = false; - if (type && type == "all") { - choosed = true; - } - this[refName].forEach((e) => { - e.choosed = choosed; - if (choosed) { - this.$refs[refName].setCurrentRow(e); - } - }); - - if (!choosed) { - this.$refs[refName].setCurrentRow(); - } - }, - //右击标题 - headerContextmenu(column, event) { - let chooseCol = column.minWidth - 100; - let items = []; //菜单 - - this.dataCols.forEach((e) => { - items.push({ - label: e.dispLabel, - onClick: () => { - this.setColumn(chooseCol, e); - }, - }); - }); - - //右击显示的菜单 - this.$contextmenu({ - items, - event, - //x: event.clientX, - //y: event.clientY, - customClass: "custom-class", - zIndex: 30000, //够大再能在最上面显示 - minWidth: 80, - height: 20, - }); - - return false; - }, - - //设置真实数据字段列 - setColumn(oldColNum, newColObj) { - // console.log('oldColNum,newColObj',oldColNum,newColObj) - //如果数据字段已设置过，则将之前设置的先清空 - if (newColObj.dispLabel != "不设置") { - let lfind = arrayExistObj( - this.excelCols, - "dataLabel", - newColObj.dispLabel - ); - if (lfind > -1) { - this.excelCols[lfind].dataLabel = ""; - this.excelCols[lfind].val = ""; - } - } - - this.excelCols[oldColNum].dataLabel = newColObj.dispLabel; - this.excelCols[oldColNum].val = newColObj.val; - // console.log('newColObj.val',newColObj.val) - let tempVal = ""; - - // 数据转换 - switch (newColObj.val) { - case "birthDate": - case "expiryDate": - this.excelData.forEach((e) => { - tempVal = e[this.excelCols[oldColNum].dispLabel]; - e[this.excelCols[oldColNum].dispLabel] = tempVal - ? moment(new Date(tempVal)).format("yyyy-MM-DD") - : ""; - }); - break; - case "discount": - this.excelData.forEach((e) => { - tempVal = e[this.excelCols[oldColNum].dispLabel]; - e[this.excelCols[oldColNum].dispLabel] = Number(tempVal) || 100 - }); - break; - case "cardBalance": - this.excelData.forEach((e) => { - tempVal = e[this.excelCols[oldColNum].dispLabel]; - e[this.excelCols[oldColNum].dispLabel] = Number(tempVal) - }); - break; - default: - this.excelData.forEach((e) => { - tempVal = e[this.excelCols[oldColNum].dispLabel] || ''; - e[this.excelCols[oldColNum].dispLabel] = tempVal - }); - break; - } - - }, - - // 选择EXCEL文件后，批量分析Excel列 与 数据字段 的匹配关系 - parseExcelData() { - let lfind = -1; - this.excelCols.forEach((e, i) => { - lfind = arrayExistObj(this.dataCols, "dispLabel", e.dispLabel); - console.log('e.dispLabel', e.dispLabel, lfind) - if (lfind > -1) this.setColumn(i, this.dataCols[lfind]); - }); - }, - - - - //导入进行时 - - async importing(startRow) { - let body = {}; - let medicalCenterId = window.sessionStorage.getItem('peisid') - - - for (let i = startRow; i < this.choosedData.length; i++) { - this.elProgress.percentage = Math.floor( - ((i + 1) * 100) / this.choosedData.length - ); - - // 将Excel的数据转换成接口的数据 - body = this.excelDataToApiBody(this.choosedData[i]); - body.medicalCenterId = medicalCenterId - if (!body.cardBalance) { - body.cardBalance = 0 - } else { - body.cardBalance = Number(body.cardBalance) || 0 - } - console.log(`this.choosedData[${i}],startRowNameType,body`, body); - - try { - let res = await postapi( - "/api/app/CardRegister/BatchCreateCardRegisterByExcel", - body - ); - - if (res.code >= 0) { - this.tableData.push( - Object.assign({ importState: "导入成功" }, body) - ); - } else { - this.tableData.push( - Object.assign( - { importState: "导入失败", importDes: res.message }, - body - ) - ); - } - } catch (error) { - this.tableData.push( - Object.assign( - { importState: "导入失败", importDes: `${error}` }, - body - ) - ); - } - - // 结束导入 - if (i == this.choosedData.length - 1) { - this.elProgress.display = false; - this.seq = -1; - } - } - //console.log('this.tableData',this.tableData) - this.exportImportState("tableExport", "批量建卡") - }, - - //将Excel的数据转换成接口的数据 - excelDataToApiBody(ExcelData) { - let body = { - - } - - this.excelCols.forEach(e => { - if (e.val) { - body[e.val] = ExcelData[e.dispLabel] - } - }) - - return body - }, - - // 将批量建卡状态导出 - exportImportState(elId, title) { - - // let table = this.$refs["tableExport"] //.cloneNode(true) true - let table = document.getElementById(elId) - // console.log('table,refsTable', table, refsTable) - this.$nextTick(() => { - let tableData = table.innerHTML - let fileName = title + moment(new Date()).format('yyyyMMDDHHmmss') - - let blob = new Blob([tableData], { type: "text/plain;charset=utf-8" }); - - FileSaver.saveAs(blob, fileName + '.xls'); - }) - }, // 表格行底色样式 tableRowClassName({ row, rowIndex }) { @@ -1691,21 +1100,6 @@ export default { //监听事件 watch: { - "seq": { - //immediate: true, // 立即执行 - // // deep: true, // 深度监听复杂类型内变化 - handler(newVal, oldVal) { - // console.log('watch:seq:', newVal, oldVal) - // if (!oldVal && oldVal != 0) { - // this.oldSeq = -2 - // } else { - // this.oldSeq = oldVal - // } - if (newVal != oldVal) { - this.btnProcess(newVal); - } - } - }, //触发查询事件 "patientRegister.query.times"(newVal, oldVal) { if (newVal != oldVal) { diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue index 8441945..a3a1518 100644 --- a/src/views/login/Login.vue +++ b/src/views/login/Login.vue @@ -89,15 +89,15 @@ export default { } }, LocalConfigInit: {}, - rememberMe:false + rememberMe: false }; }, created() { this.form.Username = localStorage.getItem('username') || ''; this.form.Password = localStorage.getItem('password') || ''; - if(this.form.Username&&this.form.Password){ - this.rememberMe=true + if (this.form.Username && this.form.Password) { + this.rememberMe = true } }, @@ -131,7 +131,7 @@ export default { }, computed: { - ...mapState(['sysConfig','dict']), + ...mapState(['sysConfig', 'dict']), }, methods: { @@ -143,7 +143,7 @@ export default { if (!res.data.apiurl) this.$message.error({ showClose: true, message: `获取配置参数错误，请重新刷新本页面！` }) // 设置应用参数 this.setData({ key: "sysConfig", value: res.data }); - if(res.data?.dict?.completeFlag) this.dict.completeFlag = res.data.dict.completeFlag + if (res.data?.dict?.completeFlag) this.dict.completeFlag = res.data.dict.completeFlag // this.sysConfig = res.data window.sessionStorage.setItem('sysConfig', JSON.stringify(res.data)) @@ -208,13 +208,13 @@ export default { if (res.code > -1) { if (this.rememberMe) { - localStorage.setItem('username', this.form.Username); - localStorage.setItem('password', this.form.Password); - } else { - // 否则清除保存的用户信息 - localStorage.removeItem('username'); - localStorage.removeItem('password'); - } + localStorage.setItem('username', this.form.Username); + localStorage.setItem('password', this.form.Password); + } else { + // 否则清除保存的用户信息 + localStorage.removeItem('username'); + localStorage.removeItem('password'); + } window.sessionStorage.setItem("peisid", res.data.peisid); //设置当前人员所属体检中心 writetoken(res.data.expires_in); window.sessionStorage.setItem("token", res.data.access_token); @@ -222,7 +222,9 @@ export default { window.sessionStorage.setItem("tokentype", res.data.token_type); window.sessionStorage.setItem("operatorType", res.data.operatorType); window.sessionStorage.setItem("userId", res.data.userId); //当前人员ID - window.sessionStorage.setItem("user", this.form.Username); + window.sessionStorage.setItem("surname", res.data.surname); //当前人员姓名 + window.sessionStorage.setItem("user", this.form.Username); //当前人员账号 + // 壳程序懒加载通讯组件(壳须要token 2024-11-22) if (this.$peisAPI) { diff --git a/src/views/report/report.vue b/src/views/report/report.vue index c39f962..6fc36f5 100644 --- a/src/views/report/report.vue +++ b/src/views/report/report.vue @@ -769,15 +769,19 @@ export default { let dateType = '1' switch (e.dateType) { case 'medicalStartDate': + case '2': dateType = '2' break; case 'checkDate': + case '4': dateType = '4' break; case 'summaryDate': + case '3': dateType = '3' break; case 'sumCheckDate': + case '5': dateType = '5' break; default: diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue index 4f8cfac..e7bc793 100644 --- a/src/views/user-list/UserList.vue +++ b/src/views/user-list/UserList.vue @@ -80,7 +80,7 @@ row-key="id" :height=" window.pageHeight < 600 ? 450 : window.pageHeight - 130 - " + " border class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" @@ -92,19 +92,19 @@ min-width="50" align="center" > - - + + - + - +