pengjun 2 months ago
parent
commit
4373374ea1
  1. 8
      src/components/doctorCheck/RegisterCheckEdit.vue
  2. 4
      src/components/patientRegister/customerOrgTreeAll.vue
  3. 1
      src/components/report/PatientRegisterListNobtn.vue
  4. 862
      src/views/charge/invoiceReg.vue
  5. 14
      src/views/login/Login.vue
  6. 4
      src/views/report/report.vue
  7. 12
      src/views/user-list/UserList.vue

8
src/components/doctorCheck/RegisterCheckEdit.vue

@ -12,7 +12,7 @@
style="width: 120px" size="small" :filter-method="filterMethod"> style="width: 120px" size="small" :filter-method="filterMethod">
<el-option v-for="item in users" :key="item.id" :label="item.userName + ' ' + item.surname" :value="item.id" /> <el-option v-for="item in users" :key="item.id" :label="item.userName + ' ' + item.surname" :value="item.id" />
</el-select> </el-select>
<el-date-picker v-model="doctorCheck.RegisterCheckEdit.checkDate" type="datetime" placeholder="检查日期" style="width: 90px" size="small" />
<el-date-picker v-model="doctorCheck.RegisterCheckEdit.checkDate" type="datetime" format="yyyy-MM-dd HH:mm:ss" placeholder="检查日期" style="width: 145px" size="small" />
</div> </div>
<div> <div>
<span class="query">审核</span> <span class="query">审核</span>
@ -20,7 +20,7 @@
style="width: 120px" size="small" :disabled="doctorCheck.RegisterCheckEdit.isAudit == 'Y' ? true:false" :filter-method="filterMethod"> style="width: 120px" size="small" :disabled="doctorCheck.RegisterCheckEdit.isAudit == 'Y' ? true:false" :filter-method="filterMethod">
<el-option v-for="item in users" :key="item.id" :label="item.userName + ' ' + item.surname" :value="item.id" /> <el-option v-for="item in users" :key="item.id" :label="item.userName + ' ' + item.surname" :value="item.id" />
</el-select> </el-select>
<el-date-picker v-model="doctorCheck.RegisterCheckEdit.auditTime" type="datetime" placeholder="审核日期" style="width: 90px" size="small" :disabled="doctorCheck.RegisterCheckEdit.isAudit == 'Y' ? true:false" />
<el-date-picker v-model="doctorCheck.RegisterCheckEdit.auditTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" placeholder="审核日期" style="width: 145px" size="small" :disabled="doctorCheck.RegisterCheckEdit.isAudit == 'Y' ? true:false" />
<el-select v-model="doctorCheck.RegisterCheckEdit.isAudit" style="width: 60px" size="small" disabled> <el-select v-model="doctorCheck.RegisterCheckEdit.isAudit" style="width: 60px" size="small" disabled>
<el-option label="已审" value="Y" /> <el-option label="已审" value="Y" />
<el-option label="未审" value="N" /> <el-option label="未审" value="N" />
@ -31,8 +31,8 @@
<span class="query">操作</span> <span class="query">操作</span>
<el-input v-model="doctorCheck.RegisterCheckEdit.lastModifierName" size="small" style="width: 80px" disabled /> <el-input v-model="doctorCheck.RegisterCheckEdit.lastModifierName" size="small" style="width: 80px" disabled />
<el-input <el-input
:value="doctorCheck.RegisterCheckEdit.lastModificationTime ? lmoment(doctorCheck.RegisterCheckEdit.lastModificationTime, 'yyyy-MM-DD') : ''"
style="width: 90px" size="small" disabled></el-input>
:value="doctorCheck.RegisterCheckEdit.lastModificationTime ? lmoment(doctorCheck.RegisterCheckEdit.lastModificationTime, 'yyyy-MM-DD HH:mm:ss') : ''"
style="width: 140px" size="small" disabled></el-input>
</div> </div>
</div> </div>

4
src/components/patientRegister/customerOrgTreeAll.vue

@ -146,7 +146,7 @@ export default {
}, },
methods: { methods: {
//
//
getOrgDatas() { getOrgDatas() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
console.log('getOrgDatas', this.orgDatas.length) console.log('getOrgDatas', this.orgDatas.length)
@ -185,7 +185,7 @@ export default {
}) })
}, },
//
//
getCustomerOrgAll() { getCustomerOrgAll() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getDBCom('orgDatas') getDBCom('orgDatas')

1
src/components/report/PatientRegisterListNobtn.vue

@ -495,6 +495,7 @@ export default {
let dateType = '1' let dateType = '1'
switch (e.dateType) { switch (e.dateType) {
case 'medicalStartDate': case 'medicalStartDate':
case '2':
dateType = '2' dateType = '2'
break; break;
case 'checkDate': case 'checkDate':

862
src/views/charge/invoiceReg.vue
File diff suppressed because it is too large
View File

14
src/views/login/Login.vue

@ -89,15 +89,15 @@ export default {
} }
}, },
LocalConfigInit: {}, LocalConfigInit: {},
rememberMe:false
rememberMe: false
}; };
}, },
created() { created() {
this.form.Username = localStorage.getItem('username') || ''; this.form.Username = localStorage.getItem('username') || '';
this.form.Password = localStorage.getItem('password') || ''; 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: { computed: {
...mapState(['sysConfig','dict']),
...mapState(['sysConfig', 'dict']),
}, },
methods: { methods: {
@ -143,7 +143,7 @@ export default {
if (!res.data.apiurl) this.$message.error({ showClose: true, message: `获取配置参数错误,请重新刷新本页面!` }) if (!res.data.apiurl) this.$message.error({ showClose: true, message: `获取配置参数错误,请重新刷新本页面!` })
// //
this.setData({ key: "sysConfig", value: res.data }); 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 // this.sysConfig = res.data
window.sessionStorage.setItem('sysConfig', JSON.stringify(res.data)) window.sessionStorage.setItem('sysConfig', JSON.stringify(res.data))
@ -222,7 +222,9 @@ export default {
window.sessionStorage.setItem("tokentype", res.data.token_type); window.sessionStorage.setItem("tokentype", res.data.token_type);
window.sessionStorage.setItem("operatorType", res.data.operatorType); window.sessionStorage.setItem("operatorType", res.data.operatorType);
window.sessionStorage.setItem("userId", res.data.userId); //ID 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) // (token 2024-11-22)
if (this.$peisAPI) { if (this.$peisAPI) {

4
src/views/report/report.vue

@ -769,15 +769,19 @@ export default {
let dateType = '1' let dateType = '1'
switch (e.dateType) { switch (e.dateType) {
case 'medicalStartDate': case 'medicalStartDate':
case '2':
dateType = '2' dateType = '2'
break; break;
case 'checkDate': case 'checkDate':
case '4':
dateType = '4' dateType = '4'
break; break;
case 'summaryDate': case 'summaryDate':
case '3':
dateType = '3' dateType = '3'
break; break;
case 'sumCheckDate': case 'sumCheckDate':
case '5':
dateType = '5' dateType = '5'
break; break;
default: default:

12
src/views/user-list/UserList.vue

@ -80,7 +80,7 @@
row-key="id" row-key="id"
:height=" :height="
window.pageHeight < 600 ? 450 : window.pageHeight - 130 window.pageHeight < 600 ? 450 : window.pageHeight - 130
"
" border
class="el-table__body-wrapper tbody" class="el-table__body-wrapper tbody"
highlight-current-row highlight-current-row
@row-click="rowick" @row-click="rowick"
@ -92,19 +92,19 @@
min-width="50" min-width="50"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column prop="id" label="编号" min-width="200"></el-table-column>
<el-table-column prop="userName" label="账号" min-width="100">
<el-table-column prop="id" label="编号" min-width="200" align="center"></el-table-column>
<el-table-column prop="userName" label="账号" min-width="100" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="email" label="邮箱" min-width="150">
<el-table-column prop="email" label="邮箱" min-width="150" align="center">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="email" label="所属角色" width=""> </el-table-column> --> <!-- <el-table-column prop="email" label="所属角色" width=""> </el-table-column> -->
<el-table-column <el-table-column
prop="phoneNumber" prop="phoneNumber"
label="手机号" label="手机号"
min-width="130"
min-width="130" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column prop="surname" label="姓名" min-width="100">
<el-table-column prop="surname" label="姓名" min-width="100" align="center">
</el-table-column> </el-table-column>
<!-- <el-table-column label="操作" min-width="400"> <!-- <el-table-column label="操作" min-width="400">
<template slot-scope="scope"> <template slot-scope="scope">

Loading…
Cancel
Save